X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdhcp%2Fdhcp_api.c;h=ad96e027f577d947899a2d43583f502a2beae096;hb=70bfcaf47779340951c1e6f169b1cedcabe708d1;hp=e9c757e85b6adf5ba239f4098b6a1e846b8532c5;hpb=3466c30261950823828d1dad0d2fb170ee2f9aaf;p=vpp.git

diff --git a/src/vnet/dhcp/dhcp_api.c b/src/vnet/dhcp/dhcp_api.c
index e9c757e85b6..ad96e027f57 100644
--- a/src/vnet/dhcp/dhcp_api.c
+++ b/src/vnet/dhcp/dhcp_api.c
@@ -55,14 +55,16 @@ static void
 vl_api_dhcp_proxy_set_vss_t_handler (vl_api_dhcp_proxy_set_vss_t * mp)
 {
   vl_api_dhcp_proxy_set_vss_reply_t *rmp;
+  u8 *vpn_ascii_id;
   int rv;
 
-  rv = dhcp_proxy_set_vss ((mp->is_ipv6 ?
-			    FIB_PROTOCOL_IP6 :
-			    FIB_PROTOCOL_IP4),
-			   ntohl (mp->tbl_id),
-			   ntohl (mp->oui),
-			   ntohl (mp->fib_id), (int) mp->is_add == 0);
+  mp->vpn_ascii_id[sizeof (mp->vpn_ascii_id) - 1] = 0;
+  vpn_ascii_id = format (0, "%s", mp->vpn_ascii_id);
+  rv =
+    dhcp_proxy_set_vss ((mp->is_ipv6 ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4),
+			ntohl (mp->tbl_id), mp->vss_type, vpn_ascii_id,
+			ntohl (mp->oui), ntohl (mp->vpn_index),
+			mp->is_add == 0);
 
   REPLY_MACRO (VL_API_DHCP_PROXY_SET_VSS_REPLY);
 }
@@ -147,11 +149,27 @@ dhcp_send_details (fib_protocol_t proto,
 
   vss = dhcp_get_vss_info (&dhcp_proxy_main, proxy->rx_fib_index, proto);
 
-  if (NULL != vss)
+  if (vss)
     {
-      mp->vss_oui = htonl (vss->oui);
-      mp->vss_fib_id = htonl (vss->fib_id);
+      mp->vss_type = vss->vss_type;
+      if (vss->vss_type == VSS_TYPE_ASCII)
+	{
+	  u32 id_len = vec_len (vss->vpn_ascii_id);
+	  clib_memcpy (mp->vss_vpn_ascii_id, vss->vpn_ascii_id, id_len);
+	}
+      else if (vss->vss_type == VSS_TYPE_VPN_ID)
+	{
+	  u32 oui = ((u32) vss->vpn_id[0] << 16) + ((u32) vss->vpn_id[1] << 8)
+	    + ((u32) vss->vpn_id[2]);
+	  u32 fib_id = ((u32) vss->vpn_id[3] << 24) +
+	    ((u32) vss->vpn_id[4] << 16) + ((u32) vss->vpn_id[5] << 8) +
+	    ((u32) vss->vpn_id[6]);
+	  mp->vss_oui = htonl (oui);
+	  mp->vss_fib_id = htonl (fib_id);
+	}
     }
+  else
+    mp->vss_type = VSS_TYPE_INVALID;
 
   vec_foreach_index (count, proxy->dhcp_servers)
   {
@@ -187,11 +205,12 @@ dhcp_send_details (fib_protocol_t proto,
 
 void
 dhcp_compl_event_callback (u32 client_index, u32 pid, u8 * hostname,
-			   u8 is_ipv6, u8 * host_address, u8 * router_address,
-			   u8 * host_mac)
+			   u8 mask_width, u8 is_ipv6, u8 * host_address,
+			   u8 * router_address, u8 * host_mac)
 {
   unix_shared_memory_queue_t *q;
   vl_api_dhcp_compl_event_t *mp;
+  u32 len;
 
   q = vl_api_client_index_to_input_queue (client_index);
   if (!q)
@@ -201,8 +220,10 @@ dhcp_compl_event_callback (u32 client_index, u32 pid, u8 * hostname,
   mp->client_index = client_index;
   mp->pid = pid;
   mp->is_ipv6 = is_ipv6;
-  clib_memcpy (&mp->hostname, hostname, vec_len (hostname));
-  mp->hostname[vec_len (hostname) + 1] = '\n';
+  len = (vec_len (hostname) < 63) ? vec_len (hostname) : 63;
+  clib_memcpy (&mp->hostname, hostname, len);
+  mp->hostname[len] = 0;
+  mp->mask_width = mask_width;
   clib_memcpy (&mp->host_address[0], host_address, 16);
   clib_memcpy (&mp->router_address[0], router_address, 16);
 
@@ -224,7 +245,8 @@ static void vl_api_dhcp_client_config_t_handler
   VALIDATE_SW_IF_INDEX (mp);
 
   rv = dhcp_client_config (vm, ntohl (mp->sw_if_index),
-			   mp->hostname, mp->is_add, mp->client_index,
+			   mp->hostname, mp->client_id,
+			   mp->is_add, mp->client_index,
 			   mp->want_dhcp_event ? dhcp_compl_event_callback :
 			   NULL, mp->pid);