X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fsrv6-mobile%2Fmobile.h;h=517e7c8f84c0419c257389438946101998c5af9f;hb=9e722bd466383dd53b10d4c1de95ad18db939147;hp=8be9dc2b944a72e668e767d25059953f0cfae12e;hpb=1b81e6ef66cbce15ba1b05904732f92251d531cd;p=vpp.git

diff --git a/src/plugins/srv6-mobile/mobile.h b/src/plugins/srv6-mobile/mobile.h
index 8be9dc2b944..517e7c8f84c 100644
--- a/src/plugins/srv6-mobile/mobile.h
+++ b/src/plugins/srv6-mobile/mobile.h
@@ -33,10 +33,20 @@
 #define SRV6_NHTYPE_IPV6 	2
 #define SRV6_NHTYPE_NON_IP	3
 
-#ifndef IP_PROTOCOL_NONE
-#define IP_PROTOCOL_NONE	59
+#ifndef IP_PROTOCOL_IP6_ETHERNET
+#define IP_PROTOCOL_IP6_ETHERNET	143
 #endif
 
+#define SRV6_GTP6_UNKNOW	0
+#define SRV6_GTP6_DT4		1
+#define SRV6_GTP6_DT6		2
+#define SRV6_GTP6_DT46		3
+
+#define SRV6_GTP4_UNKNOW	0
+#define SRV6_GTP4_DT4		1
+#define SRV6_GTP4_DT6		2
+#define SRV6_GTP4_DT46		3
+
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 #define BITALIGN2(A,B)          A; B
 #define BITALIGN3(A,B,C)        A; B; C
@@ -46,6 +56,7 @@
 #endif
 
 #define GTPU_EXTHDR_FLAG                0x04
+#define GTPU_SEQ_FLAG			0x02
 #define GTPU_EXTHDR_PDU_SESSION         0x85
 
 #define SRH_TAG_ECHO_REPLY              0x0008
@@ -53,6 +64,19 @@
 #define SRH_TAG_ERROR_INDICATION        0x0002
 #define SRH_TAG_END_MARKER              0x0001
 
+#define GTPU_RECOVERY_IE_TYPE		0x0e
+
+#define GTPU_IE_MAX_SIZ			256
+#define SRH_TLV_USER_PLANE_CONTAINER	0x0a	/* tentative */
+
+/* *INDENT-OFF* */
+typedef struct
+{
+  u8 type;
+  u8 restart_counter;
+} __attribute__ ((packed)) gtpu_recovery_ie;
+/* *INDENT-ON* */
+
 /* *INDENT-OFF* */
 typedef struct
 {
@@ -139,6 +163,17 @@ typedef struct
 
 #define GTPU_PT_GTP   (1<<4)
 
+/* *INDENT-OFF* */
+typedef struct
+{
+  u8 type;
+  u8 length;
+  u8 value[0];
+} __attribute__ ((packed)) user_plane_sub_tlv_t;
+/* *INDENT-ON* */
+
+#define USER_PLANE_SUB_TLV_IE	0x01
+
 typedef struct srv6_end_gtp6_param_s
 {
   u8 nhtype;
@@ -147,6 +182,24 @@ typedef struct srv6_end_gtp6_param_s
   u32 sr_prefixlen;
 } srv6_end_gtp6_param_t;
 
+typedef struct srv6_end_gtp6_dt_param_s
+{
+  u8 type;
+
+  u32 fib4_index;
+  u32 fib6_index;
+  u32 local_fib_index;
+} srv6_end_gtp6_dt_param_t;
+
+typedef struct srv6_t_gtp4_dt_param_s
+{
+  u8 type;
+
+  u32 fib4_index;
+  u32 fib6_index;
+  u32 local_fib_index;
+} srv6_t_gtp4_dt_param_t;
+
 typedef struct srv6_end_gtp4_param_s
 {
   u8 nhtype;
@@ -175,19 +228,19 @@ typedef struct srv6_end_main_v4_s
 
 } srv6_end_main_v4_t;
 
-typedef struct srv6_end_main_v4_decap_s
+typedef struct srv6_t_main_v4_decap_s
 {
   vlib_main_t *vlib_main;
   vnet_main_t *vnet_main;
 
-  u32 end_m_gtp4_d_node_index;
+  u32 t_m_gtp4_d_node_index;
   u32 error_node_index;
 
   ip6_header_t cache_hdr;
-} srv6_end_main_v4_decap_t;
+} srv6_t_main_v4_decap_t;
 
 extern srv6_end_main_v4_t srv6_end_main_v4;
-extern srv6_end_main_v4_decap_t srv6_end_main_v4_decap;
+extern srv6_t_main_v4_decap_t srv6_t_main_v4_decap;
 extern vlib_node_registration_t srv6_end_m_gtp4_e;
 
 typedef struct srv6_end_main_v6_s
@@ -232,6 +285,30 @@ typedef struct srv6_end_main_v6_decap_di_s
 extern srv6_end_main_v6_decap_di_t srv6_end_main_v6_decap_di;
 extern vlib_node_registration_t srv6_end_m_gtp6_d_di;
 
+typedef struct srv6_end_main_v6_dt_s
+{
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+
+  u32 end_m_gtp6_dt_node_index;
+  u32 error_node_index;
+} srv6_end_main_v6_dt_t;
+
+extern srv6_end_main_v6_dt_t srv6_end_main_v6_dt;
+extern vlib_node_registration_t srv6_end_m_gtp6_dt;
+
+typedef struct srv6_t_main_v4_dt_s
+{
+  vlib_main_t *vlib_main;
+  vnet_main_t *vnet_main;
+
+  u32 t_m_gtp4_dt_node_index;
+  u32 error_node_index;
+} srv6_t_main_v4_dt_t;
+
+extern srv6_t_main_v4_dt_t srv6_t_main_v4_dt;
+extern vlib_node_registration_t srv6_t_m_gtp4_dt;
+
 #endif /* __included_srv6_end_h__ */
 
 /*