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
{
u8 len;
}) ip_prefix_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
-
#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
* instead */
GID_ADDR_IP_PREFIX,
GID_ADDR_LCAF,
+ GID_ADDR_MAC,
+ GID_ADDR_SRC_DST,
GID_ADDR_NO_ADDRESS,
GID_ADDR_TYPES
} gid_address_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;
+
+#define SD_CAST (source_dest_t *)
+#define sd_dst_gid(_a) (SD_CAST _a)->dst
+#define sd_src_gid(_a) (SD_CAST _a)->src
+
typedef struct
{
u8 vni_mask_len;
#define vni_mask_len(_a) (_a)->vni_mask_len
#define vni_gid(_a) (_a)->gid_addr
-typedef struct
-{
- u8 src_len;
- u8 dst_len;
- struct _gid_address_t *src;
- struct _gid_address_t *dst;
-} source_dest_t;
-
typedef struct
{
/* the union needs to be at the beginning! */
#define lcaf_type(_a) (_a)->type
#define lcaf_vni(_a) vni_vni(& (_a)->uni)
#define lcaf_vni_len(_a) vni_mask_len(& (_a)->uni)
-#define lcaf_gid (_a) vni_gid(& (_a)->uni)
/* might want to expand this in the future :) */
typedef struct _gid_address_t
{
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);
uword unformat_ip_address (unformat_input_t * input, va_list * args);
u8 * format_ip_prefix (u8 * s, va_list * args);
uword unformat_ip_prefix (unformat_input_t * input, va_list * args);
+u8 * format_mac_address (u8 * s, va_list * args);
+uword unformat_mac_address (unformat_input_t * input, va_list * args);
u16 ip4_address_size_to_put ();
u16 ip6_address_size_to_put ();
LISP_AFI_NO_ADDR,
LISP_AFI_IP,
LISP_AFI_IP6,
+ LISP_AFI_MAC = 6,
LISP_AFI_LCAF = 16387
} lisp_afi_e;
#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_vni(_a) ( (GID_ADDR_LCAF == gid_address_type(_a)) ? \
- lcaf_vni(&gid_address_lcaf(_a)) : 0)
-/* setter for vni */
-#define gid_address_set_vni(_a, _val) \
- (lcaf_vni(&gid_address_lcaf(_a)) = (_val))
+#define gid_address_mac(_a) (_a)->mac
+#define gid_address_vni(_a) (_a)->vni
+#define gid_address_vni_mask(_a) (_a)->vni_mask
+#define gid_address_sd_dest_pref(_a) \
+ gid_address_ippref(sd_dst_gid(_a))
+#define gid_address_sd_source_pref(_a) \
+ gid_address_ippref(sd_src_gid(_a))
/* 'sub'address functions */
-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);
-
-int lcaf_cmp (lcaf_t * lcaf1, lcaf_t * lcaf2);
-u16 lcaf_size_to_write (void * pref);
-u16 lcaf_write (u8 * p, void * pref);
-u8 lcaf_prefix_length (void *a);
-void *lcaf_cast (gid_address_t * a);
-void lcaf_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
{
u8 local;
} mapping_t;
+lcaf_t lcaf_iid_init (u32 vni);
+
#endif /* VNET_LISP_GPE_LISP_TYPES_H_ */