vlib: introduce vlib_get_elog_main()

[vpp.git] / src / vnet / ip6-nd / ip6_ra.c

diff --git a/src/vnet/ip6-nd/ip6_ra.c b/src/vnet/ip6-nd/ip6_ra.c
index 5605939..547ecf3 100644 (file)
--- a/src/vnet/ip6-nd/ip6_ra.c
+++ b/src/vnet/ip6-nd/ip6_ra.c
@@ -252,9 +252,10 @@ ip6_neighbor_syslog (vlib_main_t * vm, int priority, char *fmt, ...)
       {
        u32 s[2];
       } *ed;
-      ed = ELOG_DATA (&vm->elog_main, e);
-      ed->s[0] = elog_string (&vm->elog_main, log_level_strings[priority]);
-      ed->s[1] = elog_string (&vm->elog_main, (char *) what);
+      ed = ELOG_DATA (vlib_get_elog_main (), e);
+      ed->s[0] =
+       elog_string (vlib_get_elog_main (), log_level_strings[priority]);
+      ed->s[1] = elog_string (vlib_get_elog_main (), (char *) what);
     }
   va_end (va);
   return;
@@ -368,11 +369,15 @@ icmp6_router_solicitation (vlib_main_t * vm,
          if (PREDICT_TRUE (error0 == ICMP6_ERROR_NONE && o0 != 0 &&
                            !is_unspecified && !is_link_local))
            {
+              /* *INDENT-OFF* */
              ip_neighbor_learn_t learn = {
-               .type = IP46_TYPE_IP6,
                .sw_if_index = sw_if_index0,
-               .ip.ip6 = ip0->src_address,
+               .ip = {
+                  .ip.ip6 = ip0->src_address,
+                  .version = AF_IP6,
+                },
              };
+              /* *INDENT-ON* */
              memcpy (&learn.mac, o0->ethernet_address, sizeof (learn.mac));
              ip_neighbor_learn_dp (&learn);
            }
@@ -477,7 +482,7 @@ icmp6_router_solicitation (vlib_main_t * vm,
 
                          /* copy ll address */
                          clib_memcpy (&h.ethernet_address[0],
-                                      eth_if0->address, 6);
+                                      &eth_if0->address, 6);
 
                          if (vlib_buffer_add_data
                              (vm, &bi0, (void *) &h,
@@ -521,8 +526,8 @@ icmp6_router_solicitation (vlib_main_t * vm,
                      ip6_radv_prefix_t *pr_info;
 
                      /* *INDENT-OFF* */
-                     pool_foreach (pr_info, radv_info->adv_prefixes_pool,
-                      ({
+                     pool_foreach (pr_info, radv_info->adv_prefixes_pool)
+                       {
                         if(pr_info->enabled &&
                            (!pr_info->decrement_lifetime_flag
                             || (pr_info->pref_lifetime_expires >0)))
@@ -585,7 +590,7 @@ icmp6_router_solicitation (vlib_main_t * vm,
                               }
 
                           }
-                      }));
+                      }
                      /* *INDENT-ON* */
 
                      /* add additional options before here */
@@ -633,7 +638,7 @@ icmp6_router_solicitation (vlib_main_t * vm,
                          eth0 = vlib_buffer_get_current (p0);
                          clib_memcpy (eth0->dst_address, eth0->src_address,
                                       6);
-                         clib_memcpy (eth0->src_address, eth_if0->address,
+                         clib_memcpy (eth0->src_address, &eth_if0->address,
                                       6);
                          next0 =
                            is_dropped ? next0 :
@@ -1003,8 +1008,8 @@ icmp6_router_advertisement (vlib_main_t * vm,
 
                                /* look for matching prefix - if we our advertising it, it better be consistant */
                                /* *INDENT-OFF* */
-                               pool_foreach (pr_info, radv_info->adv_prefixes_pool,
-                                ({
+                               pool_foreach (pr_info, radv_info->adv_prefixes_pool)
+                                 {
 
                                   ip6_address_t mask;
                                   ip6_address_mask_from_width(&mask, pr_info->prefix_len);
@@ -1032,7 +1037,7 @@ icmp6_router_advertisement (vlib_main_t * vm,
                                         }
                                     }
                                   break;
-                                }));
+                                }
                                /* *INDENT-ON* */
                                break;
                              }
@@ -1274,12 +1279,12 @@ send_rs_process (vlib_main_t * vm, vlib_node_runtime_t * rt,
        {
          due_time = current_time + 1e9;
         /* *INDENT-OFF* */
-        pool_foreach (radv_info, ip6_ra_pool,
-        ({
+        pool_foreach (radv_info, ip6_ra_pool)
+         {
            if (check_send_rs (vm, radv_info, current_time, &dt)
                && (dt < due_time))
              due_time = dt;
-        }));
+        }
         /* *INDENT-ON* */
          current_time = vlib_time_now (vm);
        }
@@ -1436,10 +1441,10 @@ ip6_ra_update_secondary_radv_info (ip6_address_t * address, u8 prefix_len,
 
   vec_reset_length (radv_indices);
   /* *INDENT-OFF* */
-  pool_foreach (radv_info, ip6_ra_pool,
-  ({
+  pool_foreach (radv_info, ip6_ra_pool)
+   {
     vec_add1 (radv_indices, radv_info - ip6_ra_pool);
-  }));
+  }
   /* *INDENT-ON* */
 
   /*
@@ -1456,8 +1461,8 @@ ip6_ra_update_secondary_radv_info (ip6_address_t * address, u8 prefix_len,
        continue;
 
       /* *INDENT-OFF* */
-      pool_foreach (this_prefix, radv_info->adv_prefixes_pool,
-      ({
+      pool_foreach (this_prefix, radv_info->adv_prefixes_pool)
+       {
         if (this_prefix->prefix_len == prefix_len
             && ip6_address_is_equal_masked (&this_prefix->prefix, address,
                                             &mask))
@@ -1477,7 +1482,7 @@ ip6_ra_update_secondary_radv_info (ip6_address_t * address, u8 prefix_len,
             if (rv != 0)
               clib_warning ("ip6_neighbor_ra_prefix returned %d", rv);
           }
-      }));
+      }
       /* *INDENT-ON*/
     }
 }
@@ -1500,8 +1505,8 @@ ip6_ra_process_timer_event (vlib_main_t * vm,
 
   /* Interface ip6 radv info list */
   /* *INDENT-OFF* */
-  pool_foreach (radv_info, ip6_ra_pool,
-  ({
+  pool_foreach (radv_info, ip6_ra_pool)
+   {
     if( !vnet_sw_interface_is_admin_up (vnm, radv_info->sw_if_index))
       {
         radv_info->initial_adverts_sent = radv_info->initial_adverts_count-1;
@@ -1588,7 +1593,7 @@ ip6_ra_process_timer_event (vlib_main_t * vm,
             f = 0;
           }
       }
-  }));
+  }
   /* *INDENT-ON* */
 
   if (f)
@@ -2114,12 +2119,12 @@ format_ip6_ra (u8 * s, va_list * args)
   indent += 2;
 
   /* *INDENT-OFF* */
-  pool_foreach (p, radv_info->adv_prefixes_pool,
-  ({
+  pool_foreach (p, radv_info->adv_prefixes_pool)
+   {
     s = format (s, "%Uprefix %U, length %d\n",
                 format_white_space, indent+2,
                 format_ip6_address, &p->prefix, p->prefix_len);
-  }));
+  }
   /* *INDENT-ON* */
 
   s = format (s, "%UMTU is %d\n",