c11 safe string handling support

[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 ecb85e1..9663a57 100644 (file)
--- a/src/vnet/dhcp/dhcp6_pd_client_cp.c
+++ b/src/vnet/dhcp/dhcp6_pd_client_cp.c
@@ -45,7 +45,6 @@ typedef struct
 {
   u32 prefix_group_index;
   uword opaque_data;           // used by prefix publisher
-  u32 TODO;
   ip6_address_t prefix;
   u8 prefix_length;
   u32 preferred_lt;
@@ -365,7 +364,7 @@ dhcp6_pd_reply_event_handler (vl_api_dhcp6_pd_reply_event_t * mp)
   if (!client_state->rebinding && client_state->server_index != server_index)
     {
       clib_warning ("Reply message arrived with Server ID different "
-                   "from that in Request of Renew message");
+                   "from that in Request or Renew message");
       return 0;
     }
 
@@ -433,6 +432,8 @@ dhcp6_pd_reply_event_handler (vl_api_dhcp6_pd_reply_event_t * mp)
          prefix_info->preferred_lt = preferred_time;
          prefix_info->valid_lt = valid_time;
          prefix_info->due_time = current_time + valid_time;
+         if (prefix_info->due_time > rm->max_valid_due_time)
+           rm->max_valid_due_time = prefix_info->due_time;
          continue;
        }
 
@@ -448,6 +449,8 @@ dhcp6_pd_reply_event_handler (vl_api_dhcp6_pd_reply_event_t * mp)
       prefix_info->preferred_lt = preferred_time;
       prefix_info->valid_lt = valid_time;
       prefix_info->due_time = current_time + valid_time;
+      if (prefix_info->due_time > rm->max_valid_due_time)
+       rm->max_valid_due_time = prefix_info->due_time;
       rm->client_state_by_sw_if_index[sw_if_index].prefix_count++;
 
       u32 prefix_index = prefix_info - pm->prefix_pool;
@@ -658,7 +661,7 @@ cp_ip6_construct_address (ip6_address_info_t * address_info, u32 prefix_index,
       clib_warning ("Prefix length is bigger that 64 bits");
       return 1;
     }
-  mask = (1 << (64 - prefix->prefix_length)) - 1;
+  mask = ((u64) 1 << (64 - prefix->prefix_length)) - 1;
   addr0 &= mask;
   pref = clib_host_to_net_u64 (prefix->prefix.as_u64[0]);
   pref &= ~mask;
@@ -871,10 +874,17 @@ cp_ip6_address_add_del (u32 sw_if_index, const u8 * prefix_group,
 {
 
   ip6_address_with_prefix_main_t *apm = &ip6_address_with_prefix_main;
+  vnet_main_t *vnm = vnet_get_main ();
   ip6_address_info_t *address_info;
   u32 prefix_group_index;
   u32 n;
 
+  if (!vnet_sw_interface_is_api_valid (vnm, sw_if_index))
+    {
+      clib_warning ("Invalid sw_if_index");
+      return VNET_API_ERROR_INVALID_VALUE;
+    }
+
   if (prefix_group != 0 && prefix_group[0] != '\0')
     {
       if (strnlen ((const char *) prefix_group, 64) == 64)
@@ -927,12 +937,9 @@ static void
   u8 prefix_length;
   int rv = 0;
 
+  VALIDATE_SW_IF_INDEX (mp);
+
   sw_if_index = ntohl (mp->sw_if_index);
-  if (!vnet_sw_if_index_is_api_valid (sw_if_index))
-    {
-      rv = VNET_API_ERROR_INVALID_SW_IF_INDEX;
-      goto bad_sw_if_index;
-    }
 
   memcpy (address.as_u8, mp->address, 16);
   prefix_length = mp->prefix_length;
@@ -1250,7 +1257,7 @@ dhcp6_pd_client_enable_disable (u32 sw_if_index, const u8 * prefix_group,
 
       vec_free (prefix_list);
 
-      memset (client_state, 0, sizeof (*client_state));
+      clib_memset (client_state, 0, sizeof (*client_state));
     }
 
   return 0;