X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Flisp-cp%2Flisp_types.h;h=235d4701d46a5bf45fb0fb987f03ec6b348710f3;hb=324112fad06e0461958f22827f944595466e1891;hp=9602387fd9bbfcba8356ac5cd0069143b9010469;hpb=e127a7e4528472a320bf1cc343d3656dcdd4b108;p=vpp.git

diff --git a/vnet/vnet/lisp-cp/lisp_types.h b/vnet/vnet/lisp-cp/lisp_types.h
index 9602387fd9b..235d4701d46 100644
--- a/vnet/vnet/lisp-cp/lisp_types.h
+++ b/vnet/vnet/lisp-cp/lisp_types.h
@@ -25,27 +25,32 @@ typedef enum
   IP6
 } ip_address_type_t;
 
-typedef struct
+typedef CLIB_PACKED(struct ip_address
 {
   union
   {
     ip4_address_t v4;
     ip6_address_t v6;
   } ip;
-  ip_address_type_t version;
-} ip_address_t;
-
-typedef struct
-{
-  ip_address_t addr;
-  u8 len;
-} ip_prefix_t;
+  u8 version;
+}) ip_address_t;
 
 #define ip_addr_addr(_a) (_a)->ip
 #define ip_addr_v4(_a) (_a)->ip.v4
 #define ip_addr_v6(_a) (_a)->ip.v6
 #define ip_addr_version(_a) (_a)->version
 
+int ip_address_cmp (ip_address_t * ip1, ip_address_t * ip2);
+void ip_address_copy (ip_address_t * dst , ip_address_t * src);
+void ip_address_copy_addr (void * dst , ip_address_t * src);
+void ip_address_set(ip_address_t * dst, void * src, u8 version);
+
+typedef CLIB_PACKED(struct ip_prefix
+{
+  ip_address_t addr;
+  u8 len;
+}) ip_prefix_t;
+
 #define ip_prefix_addr(_a) (_a)->addr
 #define ip_prefix_version(_a) ip_addr_version(&ip_prefix_addr(_a))
 #define ip_prefix_len(_a) (_a)->len
@@ -56,19 +61,70 @@ typedef enum
 {
   /* NOTE: ip addresses are left out on purpose. Use max masked ip-prefixes
    * instead */
-  IP_PREFIX,
-  NO_ADDRESS,
+  GID_ADDR_IP_PREFIX,
+  GID_ADDR_LCAF,
+  GID_ADDR_MAC,
+  GID_ADDR_NO_ADDRESS,
   GID_ADDR_TYPES
 } gid_address_type_t;
 
-/* might want to expand this in the future :) */
+typedef enum
+{
+  /* make sure that values corresponds with RFC */
+  LCAF_NULL_BODY = 0,
+  LCAF_AFI_LIST_TYPE,
+  LCAF_INSTANCE_ID,
+  LCAF_TYPES
+} lcaf_type_t;
+
+struct _gid_address_t;
+
+typedef struct
+{
+  u8 src_len;
+  u8 dst_len;
+  struct _gid_address_t *src;
+  struct _gid_address_t *dst;
+} source_dest_t;
+
 typedef struct
+{
+  u8 vni_mask_len;
+  u32 vni;
+  struct _gid_address_t *gid_addr;
+} vni_t;
+
+#define vni_vni(_a) (_a)->vni
+#define vni_mask_len(_a) (_a)->vni_mask_len
+#define vni_gid(_a) (_a)->gid_addr
+
+typedef struct
+{
+  /* the union needs to be at the beginning! */
+  union
+  {
+    source_dest_t sd;
+    vni_t uni;
+  };
+  u8 type;
+} lcaf_t;
+
+#define lcaf_type(_a) (_a)->type
+#define lcaf_vni(_a) vni_vni(& (_a)->uni)
+#define lcaf_vni_len(_a) vni_mask_len(& (_a)->uni)
+
+/* might want to expand this in the future :) */
+typedef struct _gid_address_t
 {
   union
   {
     ip_prefix_t ippref;
+    lcaf_t lcaf;
+    u8 mac[6];
   };
   u8 type;
+  u32 vni;
+  u8 vni_mask;
 } gid_address_t;
 
 u8 * format_ip_address (u8 * s, va_list * args);
@@ -91,11 +147,14 @@ typedef enum {
     LISP_AFI_NO_ADDR,
     LISP_AFI_IP,
     LISP_AFI_IP6,
+    LISP_AFI_MAC = 6,
     LISP_AFI_LCAF = 16387
 } lisp_afi_e;
 
 u8 *format_gid_address (u8 * s, va_list * args);
 uword unformat_gid_address (unformat_input_t * input, va_list * args);
+int gid_address_cmp (gid_address_t * a1, gid_address_t * a2);
+void gid_address_free (gid_address_t *a);
 
 u16 gid_address_size_to_put (gid_address_t * a);
 u16 gid_address_put (u8 * b, gid_address_t * gid);
@@ -108,14 +167,27 @@ u32 gid_address_parse (u8 * offset, gid_address_t *a);
 #define gid_address_ippref(_a) (_a)->ippref
 #define gid_address_ippref_len(_a) (_a)->ippref.len
 #define gid_address_ip(_a) ip_prefix_addr(&gid_address_ippref(_a))
+#define gid_address_ip_version(_a) ip_addr_version(&gid_address_ip(_a))
+#define gid_address_lcaf(_a) (_a)->lcaf
+#define gid_address_mac(_a) (_a)->mac
+#define gid_address_vni(_a) (_a)->vni
+#define gid_address_vni_mask(_a) (_a)->vni_mask
 
 /* 'sub'address functions */
-int ip_address_cmp (ip_address_t * ip1, ip_address_t * ip2);
-u16 ip_prefix_size_to_write (void * pref);
-u16 ip_prefix_write (u8 * p, void * pref);
-u8 ip_prefix_length (void *a);
-void *ip_prefix_cast (gid_address_t * a);
-void ip_prefix_copy (void * dst , void * src);
+#define foreach_gid_address_type_fcns  \
+  _(ip_prefix)                    \
+  _(lcaf)                         \
+  _(mac)
+
+#define _(_n)                                 \
+u16    _n ## _size_to_write (void * pref);    \
+u16    _n ## _write (u8 * p, void * pref);    \
+u8     _n ## _length (void *a);               \
+void * _n ## _cast (gid_address_t * a);       \
+void   _n ## _copy (void * dst , void * src);
+
+foreach_gid_address_type_fcns
+#undef _
 
 typedef struct
 {
@@ -135,6 +207,7 @@ typedef struct
 u32 locator_parse (void * ptr, locator_t * loc);
 void locator_copy (locator_t * dst, locator_t * src);
 u32 locator_cmp (locator_t * l1, locator_t * l2);
+void locator_free (locator_t * l);
 
 typedef struct
 {
@@ -160,4 +233,6 @@ typedef struct
   u8 local;
 } mapping_t;
 
+lcaf_t lcaf_iid_init (u32 vni);
+
 #endif /* VNET_LISP_GPE_LISP_TYPES_H_ */