Fix VPP-1528 get the same IP address from DHCP server for two VPP DHCP clients

[vpp.git] / src / vnet / dhcp / client.c

diff --git a/src/vnet/dhcp/client.c b/src/vnet/dhcp/client.c
index 98f2123..b571068 100644 (file)
--- a/src/vnet/dhcp/client.c
+++ b/src/vnet/dhcp/client.c
@@ -248,7 +248,14 @@ dhcp_client_for_us (u32 bi, vlib_buffer_t * b,
            c->router_address.as_u32 = router_address;
          }
          break;
-
+       case 6:         /* domain server address */
+         {
+           vec_free (c->domain_server_address);
+           vec_validate (c->domain_server_address,
+                         o->length / sizeof (ip4_address_t) - 1);
+           clib_memcpy (c->domain_server_address, o->data, o->length);
+         }
+         break;
        case 12:                /* hostname */
          {
            /* Replace the existing hostname if necessary */
@@ -315,6 +322,7 @@ dhcp_client_for_us (u32 bi, vlib_buffer_t * b,
          c->router_address.as_u32 = 0;
          c->lease_renewal_interval = 0;
          c->dhcp_server.as_u32 = 0;
+         vec_free (c->domain_server_address);
          break;
        }
 
@@ -422,7 +430,7 @@ send_dhcp_pkt (dhcp_client_main_t * dcm, dhcp_client_t * c,
   dhcp = (dhcp_header_t *) (udp + 1);
 
   /* $$$ optimize, maybe */
-  memset (ip, 0, sizeof (*ip) + sizeof (*udp) + sizeof (*dhcp));
+  clib_memset (ip, 0, sizeof (*ip) + sizeof (*udp) + sizeof (*dhcp));
 
   ip->ip_version_and_header_length = 0x45;
   ip->ttl = 128;
@@ -814,17 +822,27 @@ format_dhcp_client (u8 * s, va_list * va)
   dhcp_client_main_t *dcm = va_arg (*va, dhcp_client_main_t *);
   dhcp_client_t *c = va_arg (*va, dhcp_client_t *);
   int verbose = va_arg (*va, int);
+  ip4_address_t *addr;
 
   s = format (s, "[%d] %U state %U ", c - dcm->clients,
              format_vnet_sw_if_index_name, dcm->vnet_main, c->sw_if_index,
              format_dhcp_client_state, c->state);
 
   if (c->leased_address.as_u32)
-    s = format (s, "addr %U/%d gw %U\n",
-               format_ip4_address, &c->leased_address,
-               c->subnet_mask_width, format_ip4_address, &c->router_address);
+    {
+      s = format (s, "addr %U/%d gw %U",
+                 format_ip4_address, &c->leased_address,
+                 c->subnet_mask_width, format_ip4_address,
+                 &c->router_address);
+
+      vec_foreach (addr, c->domain_server_address)
+       s = format (s, " dns %U", format_ip4_address, addr);
+      vec_add1 (s, '\n');
+    }
   else
-    s = format (s, "no address\n");
+    {
+      s = format (s, "no address\n");
+    }
 
   if (verbose)
     {
@@ -907,8 +925,9 @@ dhcp_client_add_del (dhcp_client_add_del_args_t * a)
 
   if (a->is_add)
     {
+      dhcp_maybe_register_udp_ports (DHCP_PORT_REG_CLIENT);
       pool_get (dcm->clients, c);
-      memset (c, 0, sizeof (*c));
+      clib_memset (c, 0, sizeof (*c));
       c->state = DHCP_DISCOVER;
       c->sw_if_index = a->sw_if_index;
       c->client_index = a->client_index;
@@ -961,6 +980,7 @@ dhcp_client_add_del (dhcp_client_add_del_args_t * a)
        }
       dhcp_client_release_address (dcm, c);
 
+      vec_free (c->domain_server_address);
       vec_free (c->option_55_data);
       vec_free (c->hostname);
       vec_free (c->client_identifier);
@@ -984,7 +1004,7 @@ dhcp_client_config (u32 is_add,
   dhcp_client_add_del_args_t _a, *a = &_a;
   int rv;
 
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
   a->is_add = is_add;
   a->sw_if_index = sw_if_index;
   a->client_index = client_index;
@@ -1106,7 +1126,7 @@ dhcp_client_set_command_fn (vlib_main_t * vm,
   if (sw_if_index_set == 0)
     return clib_error_return (0, "interface not specified");
 
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
   a->is_add = is_add;
   a->sw_if_index = sw_if_index;
   a->hostname = hostname;
@@ -1189,7 +1209,7 @@ dhcp_client_init (vlib_main_t * vm)
 
   dcm->vlib_main = vm;
   dcm->vnet_main = vnet_get_main ();
-  dcm->seed = 0xdeaddabe;
+  dcm->seed = (u32) clib_cpu_time_now ();
   return 0;
 }