Browse Source

[3153] Unrelated change: minor clean-up in DHCPv4 call to hooks

Tomek Mrugalski 11 years ago
parent
commit
3207932815
1 changed files with 3 additions and 6 deletions
  1. 3 6
      src/bin/dhcp4/dhcp4_srv.cc

+ 3 - 6
src/bin/dhcp4/dhcp4_srv.cc

@@ -201,8 +201,7 @@ Dhcpv4Srv::run() {
 
 
         // The packet has just been received so contains the uninterpreted wire
         // The packet has just been received so contains the uninterpreted wire
         // data; execute callouts registered for buffer4_receive.
         // data; execute callouts registered for buffer4_receive.
-        if (HooksManager::getHooksManager()
-            .calloutsPresent(Hooks.hook_index_buffer4_receive_)) {
+        if (HooksManager::calloutsPresent(Hooks.hook_index_buffer4_receive_)) {
             CalloutHandlePtr callout_handle = getCalloutHandle(query);
             CalloutHandlePtr callout_handle = getCalloutHandle(query);
 
 
             // Delete previously set arguments
             // Delete previously set arguments
@@ -396,8 +395,7 @@ Dhcpv4Srv::run() {
             // Option objects modification does not make sense anymore. Hooks
             // Option objects modification does not make sense anymore. Hooks
             // can only manipulate wire buffer at this stage.
             // can only manipulate wire buffer at this stage.
             // Let's execute all callouts registered for buffer4_send
             // Let's execute all callouts registered for buffer4_send
-            if (HooksManager::getHooksManager()
-                .calloutsPresent(Hooks.hook_index_buffer4_send_)) {
+            if (HooksManager::calloutsPresent(Hooks.hook_index_buffer4_send_)) {
                 CalloutHandlePtr callout_handle = getCalloutHandle(query);
                 CalloutHandlePtr callout_handle = getCalloutHandle(query);
 
 
                 // Delete previously set arguments
                 // Delete previously set arguments
@@ -931,8 +929,7 @@ Dhcpv4Srv::processRelease(Pkt4Ptr& release) {
         bool skip = false;
         bool skip = false;
 
 
         // Execute all callouts registered for lease4_release
         // Execute all callouts registered for lease4_release
-        if (HooksManager::getHooksManager()
-            .calloutsPresent(Hooks.hook_index_lease4_release_)) {
+        if (HooksManager::calloutsPresent(Hooks.hook_index_lease4_release_)) {
             CalloutHandlePtr callout_handle = getCalloutHandle(release);
             CalloutHandlePtr callout_handle = getCalloutHandle(release);
 
 
             // Delete all previous arguments
             // Delete all previous arguments