srv6-mobile

[vpp.git] / src / vnet / srv6 / sr.h

diff --git a/src/vnet/srv6/sr.h b/src/vnet/srv6/sr.h
index 2014a23..1193583 100755 (executable)
--- a/src/vnet/srv6/sr.h
+++ b/src/vnet/srv6/sr.h
@@ -36,13 +36,14 @@
 
 #define SR_BEHAVIOR_END 1
 #define SR_BEHAVIOR_X 2
-#define SR_BEHAVIOR_D_FIRST 3  /* Unused. Separator in between regular and D */
-#define SR_BEHAVIOR_DX2 4
-#define SR_BEHAVIOR_DX6 5
-#define SR_BEHAVIOR_DX4 6
-#define SR_BEHAVIOR_DT6 7
-#define SR_BEHAVIOR_DT4 8
-#define SR_BEHAVIOR_LAST 9     /* Must always be the last one */
+#define SR_BEHAVIOR_T 3
+#define SR_BEHAVIOR_D_FIRST 4  /* Unused. Separator in between regular and D */
+#define SR_BEHAVIOR_DX2 5
+#define SR_BEHAVIOR_DX6 6
+#define SR_BEHAVIOR_DX4 7
+#define SR_BEHAVIOR_DT6 8
+#define SR_BEHAVIOR_DT4 9
+#define SR_BEHAVIOR_LAST 10    /* Must always be the last one */
 
 #define SR_STEER_L2 2
 #define SR_STEER_IPV4 4
@@ -53,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)
  */
@@ -102,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 */
@@ -140,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 */
@@ -249,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,
@@ -258,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);
@@ -275,6 +288,11 @@ sr_steering_policy (int is_del, ip6_address_t * bsid, u32 sr_policy_index,
                    u32 table_id, ip46_address_t * prefix, u32 mask_width,
                    u32 sw_if_index, u8 traffic_type);
 
+extern void sr_set_source (ip6_address_t * address);
+
+extern void sr_set_hop_limit (u8 hop_limit);
+extern u8 sr_get_hop_limit (void);
+
 /**
  * @brief SR rewrite string computation for SRH insertion (inline)
  *
@@ -299,15 +317,16 @@ ip6_sr_compute_rewrite_string_insert (ip6_address_t * sl)
   srh = (ip6_sr_header_t *) rs;
   srh->type = ROUTING_HEADER_TYPE_SR;
   srh->segments_left = vec_len (sl);
-  srh->first_segment = vec_len (sl);
+  srh->last_entry = vec_len (sl);
   srh->length = ((sizeof (ip6_sr_header_t) +
                  ((vec_len (sl) + 1) * sizeof (ip6_address_t))) / 8) - 1;
   srh->flags = 0x00;
-  srh->reserved = 0x0000;
+  srh->tag = 0x0000;
   addrp = srh->segments + vec_len (sl);
   vec_foreach (this_address, sl)
   {
-    clib_memcpy (addrp->as_u8, this_address->as_u8, sizeof (ip6_address_t));
+    clib_memcpy_fast (addrp->as_u8, this_address->as_u8,
+                     sizeof (ip6_address_t));
     addrp--;
   }
   return rs;