X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsrv6%2Fsr.h;h=11935833394aa5e6475bd3e716d1d1047b027cc7;hb=1b81e6ef66cbce15ba1b05904732f92251d531cd;hp=2e2d43978bf805f1b3cda4359ec732b0024cfda0;hpb=360b523b52a91bd0d1d7de1247141367c484d70f;p=vpp.git

diff --git a/src/vnet/srv6/sr.h b/src/vnet/srv6/sr.h
index 2e2d43978bf..11935833394 100755
--- a/src/vnet/srv6/sr.h
+++ b/src/vnet/srv6/sr.h
@@ -54,6 +54,14 @@
 
 #define SR_SEGMENT_LIST_WEIGHT_DEFAULT 1
 
+/* *INDENT-OFF* */
+typedef struct
+{
+  ip6_header_t ip;
+  ip6_sr_header_t sr;
+} __attribute__ ((packed)) ip6srv_combo_header_t;
+/* *INDENT-ON* */
+
 /**
  * @brief SR Segment List (SID list)
  */
@@ -103,6 +111,8 @@ typedef struct
 {
   ip6_address_t localsid;		/**< LocalSID IPv6 address */
 
+  u16 localsid_len;
+
   char end_psp;					/**< Combined with End.PSP? */
 
   u16 behavior;					/**< Behavior associated to this localsid */
@@ -141,6 +151,8 @@ typedef struct
 
   u8 *params_str;							/**< Behavior parameters (i.e. <oif> <IP46next_hop>) */
 
+  u8 prefix_length;
+
   dpo_type_t dpo;							/**< DPO type registration */
 
   format_function_t *ls_format;				/**< LocalSID format function */
@@ -250,7 +262,8 @@ extern void sr_dpo_unlock (dpo_id_t * dpo);
 extern int
 sr_localsid_register_function (vlib_main_t * vm, u8 * fn_name,
 			       u8 * keyword_str, u8 * def_str,
-			       u8 * params_str, dpo_type_t * dpo,
+			       u8 * params_str, u8 prefix_length,
+			       dpo_type_t * dpo,
 			       format_function_t * ls_format,
 			       unformat_function_t * ls_unformat,
 			       sr_plugin_callback_t * creation_fn,
@@ -259,14 +272,13 @@ sr_localsid_register_function (vlib_main_t * vm, u8 * fn_name,
 extern int
 sr_policy_add (ip6_address_t * bsid, ip6_address_t * segments,
 	       u32 weight, u8 behavior, u32 fib_table, u8 is_encap);
-extern int
-sr_policy_mod (ip6_address_t * bsid, u32 index, u32 fib_table,
-	       u8 operation, ip6_address_t * segments, u32 sl_index,
-	       u32 weight);
+extern int sr_policy_mod (ip6_address_t * bsid, u32 index, u32 fib_table,
+			  u8 operation, ip6_address_t * segments,
+			  u32 sl_index, u32 weight);
 extern int sr_policy_del (ip6_address_t * bsid, u32 index);
 
 extern int
-sr_cli_localsid (char is_del, ip6_address_t * localsid_addr,
+sr_cli_localsid (char is_del, ip6_address_t * localsid_addr, u16 prefixlen,
 		 char end_psp, u8 behavior, u32 sw_if_index,
 		 u32 vlan_index, u32 fib_table, ip46_address_t * nh_addr,
 		 void *ls_plugin_mem);