/usr/local/www/services_dhcp.php - Diff - pfSense - pfSense bugtracker

« Previous | Next »

Revision 0027de0a

Create two new functions lock($subsystem)/unlock() to have more reliable locking using semaphores.
This function can sleep till the resource is free and can help find not well behaving code.
Remove most of the config_lock/config_unlock logics on the whole scripts/pages it is an abuse of this.
If any sybsytem wants to lock can do so with its own lock.
Lock the config when doing a filter reload to avoid parallell recursion on this function, since it is not reentrant.
This compenstates for the removal of lock aquiring from the scripts/pages.
config_lock/config_unlock are now compate shims that do nothing. They are preserved since packages 'abuse' them too.

     		$retval = 0;
     		$retvaldhcp = 0;
     		$retvaldns = 0;
     		config_lock();
     		/* Stop DHCP so we can cleanup leases */
     		killbyname("dhcpd");
     		dhcp_clean_leases();
-...
     					unlink($d_staticmapsdirty_path);
+    			}
+    		}
     		config_unlock();
     		if($retvaldhcp == 1 || $retvaldns == 1)
     			$retval = 1;
     		$savemsg = get_std_save_message($retval);

Also available in: Unified diff