udp/session: refactor to support dgram mode

[vpp.git] / src / vnet / session / transport.h

diff --git a/src/vnet/session/transport.h b/src/vnet/session/transport.h
index f2cc80b..8340fd8 100644 (file)
--- a/src/vnet/session/transport.h
+++ b/src/vnet/session/transport.h
@@ -25,20 +25,34 @@
  */
 typedef struct _transport_connection
 {
-  ip46_address_t rmt_ip;       /**< Remote IP */
-  ip46_address_t lcl_ip;       /**< Local IP */
-  u16 lcl_port;                        /**< Local port */
-  u16 rmt_port;                        /**< Remote port */
-  u8 proto;                    /**< Protocol id */
-  u8 is_ip4;                   /**< Flag if IP4 connection */
-  u32 fib_index;                       /**< Network namespace */
+  /** Connection ID */
+  union
+  {
+    /*
+     * Network connection ID tuple
+     */
+    struct
+    {
+      ip46_address_t rmt_ip;   /**< Remote IP */
+      ip46_address_t lcl_ip;   /**< Local IP */
+      u16 rmt_port;            /**< Remote port */
+      u16 lcl_port;            /**< Local port */
+      u8 is_ip4;               /**< Flag if IP4 connection */
+      u8 proto;                        /**< Protocol id */
+      u32 fib_index;           /**< Network namespace */
+    };
+    /*
+     * Opaque connection ID
+     */
+    u8 opaque_conn_id[42];
+  };
 
   u32 s_index;                 /**< Parent session index */
   u32 c_index;                 /**< Connection index in transport pool */
   u32 thread_index;            /**< Worker-thread index */
 
-  fib_node_index_t rmt_fei;    /**< FIB entry index for rmt */
-  dpo_id_t rmt_dpo;            /**< Forwarding DPO for rmt */
+  /*fib_node_index_t rmt_fei;
+     dpo_id_t rmt_dpo; */
 
 #if TRANSPORT_DEBUG
   elog_track_t elog_track;     /**< Event logging */
@@ -64,20 +78,29 @@ typedef struct _transport_connection
 #define c_cc_stat_tstamp connection.cc_stat_tstamp
 #define c_rmt_fei connection.rmt_fei
 #define c_rmt_dpo connection.rmt_dpo
+#define c_opaque_id connection.opaque_conn_id
 } transport_connection_t;
 
 typedef enum _transport_proto
 {
   TRANSPORT_PROTO_TCP,
   TRANSPORT_PROTO_UDP,
+  TRANSPORT_PROTO_SCTP,
+  TRANSPORT_PROTO_NONE,
+  TRANSPORT_PROTO_TLS,
+  TRANSPORT_PROTO_UDPC,
   TRANSPORT_N_PROTO
 } transport_proto_t;
 
+u8 *format_transport_proto (u8 * s, va_list * args);
+u8 *format_transport_proto_short (u8 * s, va_list * args);
+uword unformat_transport_proto (unformat_input_t * input, va_list * args);
+
 #define foreach_transport_connection_fields                            \
   _(u32, sw_if_index)  /**< interface endpoint is associated with  */  \
   _(ip46_address_t, ip) /**< ip address */                             \
   _(u32, fib_index)    /**< fib table endpoint is associated with */   \
-  _(u8, is_ip4)        /**< 1 if ip4 */                                        \
+  _(u8, is_ip4)                /**< set if ip4 */                              \
   _(u16, port)         /**< port in net order */                       \
 
 typedef struct _transport_endpoint
@@ -103,18 +126,6 @@ transport_endpoint_fib_proto (transport_endpoint_t * tep)
   return tep->is_ip4 ? FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6;
 }
 
-always_inline u8
-transport_is_stream (u8 proto)
-{
-  return (proto == TRANSPORT_PROTO_TCP);
-}
-
-always_inline u8
-transport_is_dgram (u8 proto)
-{
-  return (proto == TRANSPORT_PROTO_UDP);
-}
-
 int transport_alloc_local_port (u8 proto, ip46_address_t * ip);
 int transport_alloc_local_endpoint (u8 proto, transport_endpoint_t * rmt,
                                    ip46_address_t * lcl_addr,