Optimize tftp server option handling to store siaddr

This fix allows to store siaddr in variable and restore it to update DHCP. Change-Id: I892f632a27b389899ac5691950324686990f634c Partial-Bug: #1724595
Juniper · Dec 25, 2017 · 8c8adff · 8c8adff
1 parent 04425bf
commit 8c8adff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/vnsw/agent/services/dhcp_handler.cc b/src/vnsw/agent/services/dhcp_handler.cc
@@ -1023,20 +1023,9 @@ uint16_t DhcpHandler::DhcpHdr(in_addr_t yiaddr, in_addr_t siaddr) {
             opt_len = AddDomainNameOption(opt_len);
         }
 
+        // update dhcp siaddr with stored value
         if (is_flag_set(DHCP_OPTION_TFTP_SERVER_NAME)) {
-            std::vector<autogen::DhcpOptionType> options;
-            vm_itf_->GetInterfaceDhcpOptions(&options);
-            for (unsigned int i = 0; i < options.size(); ++i) {
-                uint32_t option = OptionCode(options[i].dhcp_option_name);
-                if (option != DHCP_OPTION_TFTP_SERVER_NAME)
-                    continue;
-                // handle DHCP_OPTION_TFTP_SERVER_NAME
-                boost::system::error_code ec;
-                Ip4Address siaddr =
-                    Ip4Address::from_string(options[i].dhcp_option_value, ec);
-                if (ec.value() == 0)
-                    dhcp_->siaddr = htonl(siaddr.to_ulong());
-            }
+            dhcp_->siaddr = siaddr_tftp_;
         }
     }
 

diff --git a/src/vnsw/agent/services/dhcp_handler_base.cc b/src/vnsw/agent/services/dhcp_handler_base.cc
@@ -656,6 +656,15 @@ uint16_t DhcpHandlerBase::AddDhcpOptions(
                 break;
         }
 
+        // store siaddr for tftp server name to apply it later
+        if (option == DHCP_OPTION_TFTP_SERVER_NAME) {
+            boost::system::error_code ec;
+            Ip4Address siaddr =
+            Ip4Address::from_string(options[i].dhcp_option_value, ec);
+            if (ec.value() == 0)
+                siaddr_tftp_ = htonl(siaddr.to_ulong());
+        }
+
         if (opt_len != old_opt_len)
             set_flag(option);
     }

diff --git a/src/vnsw/agent/services/dhcp_handler_base.h b/src/vnsw/agent/services/dhcp_handler_base.h
@@ -159,6 +159,9 @@ class DhcpHandlerBase : public ProtoHandler {
     autogen::IpamType ipam_type_;
     autogen::VirtualDnsType vdns_type_;
 
+    // siaddr for tftp used for baremetal deployment
+    uint32_t siaddr_tftp_;
+
     DISALLOW_COPY_AND_ASSIGN(DhcpHandlerBase);
 };