GBP: Sclass to src-epg conversions

[vpp.git] / src / plugins / gbp / gbp_api.c

diff --git a/src/plugins/gbp/gbp_api.c b/src/plugins/gbp/gbp_api.c
index 8547367..665d97e 100644 (file)
--- a/src/plugins/gbp/gbp_api.c
+++ b/src/plugins/gbp/gbp_api.c
@@ -298,6 +298,7 @@ static void
   int rv = 0;
 
   rv = gbp_endpoint_group_add_and_lock (ntohs (mp->epg.epg_id),
+                                       ntohs (mp->epg.sclass),
                                        ntohl (mp->epg.bd_id),
                                        ntohl (mp->epg.rd_id),
                                        ntohl (mp->epg.uplink_sw_if_index));
@@ -341,7 +342,8 @@ vl_api_gbp_bridge_domain_add_t_handler (vl_api_gbp_bridge_domain_add_t * mp)
                                       gbp_bridge_domain_flags_from_api
                                       (mp->bd.flags),
                                       ntohl (mp->bd.bvi_sw_if_index),
-                                      ntohl (mp->bd.uu_fwd_sw_if_index));
+                                      ntohl (mp->bd.uu_fwd_sw_if_index),
+                                      ntohl (mp->bd.bm_flood_sw_if_index));
 
   REPLY_MACRO (VL_API_GBP_BRIDGE_DOMAIN_ADD_REPLY + GBP_MSG_BASE);
 }
@@ -523,6 +525,7 @@ gbp_endpoint_group_send_details (gbp_endpoint_group_t * gg, void *args)
 
   mp->epg.uplink_sw_if_index = ntohl (gg->gg_uplink_sw_if_index);
   mp->epg.epg_id = ntohs (gg->gg_id);
+  mp->epg.sclass = ntohs (gg->gg_sclass);
   mp->epg.bd_id = ntohl (gbp_endpoint_group_get_bd_id (gg));
   mp->epg.rd_id = ntohl (gbp_route_domain_get_rd_id (gg->gg_rd));
 
@@ -567,6 +570,7 @@ gbp_bridge_domain_send_details (gbp_bridge_domain_t * gb, void *args)
   mp->bd.bd_id = ntohl (gb->gb_bd_id);
   mp->bd.bvi_sw_if_index = ntohl (gb->gb_bvi_sw_if_index);
   mp->bd.uu_fwd_sw_if_index = ntohl (gb->gb_uu_fwd_sw_if_index);
+  mp->bd.bm_flood_sw_if_index = ntohl (gb->gb_bm_flood_sw_if_index);
 
   vl_api_send_msg (ctx->reg, (u8 *) mp);
 
@@ -645,10 +649,10 @@ vl_api_gbp_recirc_add_del_t_handler (vl_api_gbp_recirc_add_del_t * mp)
     goto bad_sw_if_index;
 
   if (mp->is_add)
-    gbp_recirc_add (sw_if_index,
-                   ntohs (mp->recirc.epg_id), mp->recirc.is_ext);
+    rv = gbp_recirc_add (sw_if_index,
+                        ntohs (mp->recirc.epg_id), mp->recirc.is_ext);
   else
-    gbp_recirc_delete (sw_if_index);
+    rv = gbp_recirc_delete (sw_if_index);
 
   BAD_SW_IF_INDEX_LABEL;
 
@@ -700,17 +704,20 @@ static void
 vl_api_gbp_ext_itf_add_del_t_handler (vl_api_gbp_ext_itf_add_del_t * mp)
 {
   vl_api_gbp_ext_itf_add_del_reply_t *rmp;
-  u32 sw_if_index;
+  u32 sw_if_index = ~0;
+  vl_api_gbp_ext_itf_t *ext_itf;
   int rv = 0;
 
-  sw_if_index = ntohl (mp->ext_itf.sw_if_index);
+  ext_itf = &mp->ext_itf;
+  if (ext_itf)
+    sw_if_index = ntohl (ext_itf->sw_if_index);
+
   if (!vnet_sw_if_index_is_api_valid (sw_if_index))
     goto bad_sw_if_index;
 
   if (mp->is_add)
     rv = gbp_ext_itf_add (sw_if_index,
-                         ntohl (mp->ext_itf.bd_id),
-                         ntohl (mp->ext_itf.rd_id));
+                         ntohl (ext_itf->bd_id), ntohl (ext_itf->rd_id));
   else
     rv = gbp_ext_itf_delete (sw_if_index);