dhcp: API cleanup

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

diff --git a/src/vnet/dhcp/dhcp6_pd_client_cp.c b/src/vnet/dhcp/dhcp6_pd_client_cp.c
index a157b16..804f62a 100644 (file)
--- a/src/vnet/dhcp/dhcp6_pd_client_cp.c
+++ b/src/vnet/dhcp/dhcp6_pd_client_cp.c
@@ -323,7 +323,7 @@ dhcp6_pd_reply_event_handler (vl_api_dhcp6_pd_reply_event_t * mp)
   inner_status_code = ntohs (mp->inner_status_code);
   status_code = ntohs (mp->status_code);
 
-  if (mp->msg_type == DHCPV6_MSG_ADVERTISE
+  if (mp->msg_type == DHCPV6_MSG_API_ADVERTISE
       && client_state->server_index == ~0)
     {
       prefix_info_t *prefix_list = 0, *prefix_info;
@@ -341,8 +341,8 @@ dhcp6_pd_reply_event_handler (vl_api_dhcp6_pd_reply_event_t * mp)
       for (i = 0; i < n_prefixes; i++)
        {
          api_prefix = &mp->prefixes[i];
-         prefix = (ip6_address_t *) api_prefix->prefix;
-         prefix_length = api_prefix->prefix_length;
+         prefix = (ip6_address_t *) api_prefix->prefix.address;
+         prefix_length = api_prefix->prefix.len;
 
          prefix_info = &prefix_list[i];
          prefix_info->prefix = *prefix;
@@ -358,7 +358,7 @@ dhcp6_pd_reply_event_handler (vl_api_dhcp6_pd_reply_event_t * mp)
       vec_free (prefix_list);
     }
 
-  if (mp->msg_type != DHCPV6_MSG_REPLY)
+  if (mp->msg_type != DHCPV6_MSG_API_REPLY)
     return 0;
 
   if (!client_state->rebinding && client_state->server_index != server_index)
@@ -398,15 +398,15 @@ dhcp6_pd_reply_event_handler (vl_api_dhcp6_pd_reply_event_t * mp)
 
       api_prefix = &mp->prefixes[i];
 
-      prefix = (ip6_address_t *) api_prefix->prefix;
-      prefix_length = api_prefix->prefix_length;
+      prefix = (ip6_address_t *) api_prefix->prefix.address;
+      prefix_length = api_prefix->prefix.len;
 
       if (ip6_address_is_link_local_unicast (prefix))
        continue;
 
       valid_time = ntohl (api_prefix->valid_time);
       preferred_time = ntohl (api_prefix->preferred_time);
-      prefix_length = api_prefix->prefix_length;
+      prefix_length = api_prefix->prefix.len;
 
       if (preferred_time > valid_time)
        continue;