ip_copy (ip46_address_t * dst, ip46_address_t * src, u8 is_ip4)
{
if (is_ip4)
- dst->ip4.as_u32 = src->ip4.as_u32;
+ {
+ ip46_address_mask_ip4 (dst);
+ dst->ip4.as_u32 = src->ip4.as_u32;
+ }
else
clib_memcpy_fast (&dst->ip6, &src->ip6, sizeof (ip6_address_t));
}
ip_set (ip46_address_t * dst, void *src, u8 is_ip4)
{
if (is_ip4)
- dst->ip4.as_u32 = ((ip4_address_t *) src)->as_u32;
+ {
+ ip46_address_mask_ip4 (dst);
+ dst->ip4.as_u32 = ((ip4_address_t *) src)->as_u32;
+ }
else
clib_memcpy_fast (&dst->ip6, (ip6_address_t *) src,
sizeof (ip6_address_t));
}
-u8
-ip_interface_has_address (u32 sw_if_index, ip46_address_t * ip, u8 is_ip4)
-{
- ip_interface_address_t *ia = 0;
+/* *INDENT-OFF* */
+static const char *ip_arc_names[N_IP_FEATURE_LOCATIONS][N_AF][N_SAFI] = {
+ [IP_FEATURE_INPUT] = {
+ [AF_IP4] = {
+ [SAFI_UNICAST] = "ip4-unicast",
+ [SAFI_MULTICAST] = "ip4-multicast",
+ },
+ [AF_IP6] = {
+ [SAFI_UNICAST] = "ip6-unicast",
+ [SAFI_MULTICAST] = "ip6-multicast",
+ },
+ },
+ [IP_FEATURE_OUTPUT] = {
+ [AF_IP4] = {
+ [SAFI_UNICAST] = "ip4-output",
+ [SAFI_MULTICAST] = "ip4-output",
+ },
+ [AF_IP6] = {
+ [SAFI_UNICAST] = "ip6-output",
+ [SAFI_MULTICAST] = "ip6-output",
+ },
+ },
+ [IP_FEATURE_LOCAL] = {
+ [AF_IP4] = {
+ [SAFI_UNICAST] = "ip4-local",
+ [SAFI_MULTICAST] = "ip4-local",
+ },
+ [AF_IP6] = {
+ [SAFI_UNICAST] = "ip6-local",
+ [SAFI_MULTICAST] = "ip6-local",
+ },
+ },
+ [IP_FEATURE_PUNT] = {
+ [AF_IP4] = {
+ [SAFI_UNICAST] = "ip4-punt",
+ [SAFI_MULTICAST] = "ip4-punt",
+ },
+ [AF_IP6] = {
+ [SAFI_UNICAST] = "ip6-punt",
+ [SAFI_MULTICAST] = "ip6-punt",
+ },
+ },
+ [IP_FEATURE_DROP] = {
+ [AF_IP4] = {
+ [SAFI_UNICAST] = "ip4-drop",
+ [SAFI_MULTICAST] = "ip4-drop",
+ },
+ [AF_IP6] = {
+ [SAFI_UNICAST] = "ip6-drop",
+ [SAFI_MULTICAST] = "ip6-drop",
+ },
+ },
+};
+/* *INDENT-ON* */
- if (is_ip4)
+void
+ip_feature_enable_disable (ip_address_family_t af,
+ ip_sub_address_family_t safi,
+ ip_feature_location_t loc,
+ const char *feature_name,
+ u32 sw_if_index, int enable,
+ void *feature_config, u32 n_feature_config_bytes)
+{
+ if (IP_FEATURE_INPUT == loc)
{
- ip_lookup_main_t *lm4 = &ip4_main.lookup_main;
- ip4_address_t *ip4;
- /* *INDENT-OFF* */
- foreach_ip_interface_address (lm4, ia, sw_if_index, 1 /* unnumbered */ ,
- ({
- ip4 = ip_interface_address_get_address (lm4, ia);
- if (ip4_address_compare (ip4, &ip->ip4) == 0)
- return 1;
- }));
- /* *INDENT-ON* */
+ if (N_SAFI == safi)
+ FOR_EACH_IP_ADDRESS_SUB_FAMILY (safi)
+ vnet_feature_enable_disable (ip_arc_names[loc][af][safi],
+ feature_name, sw_if_index,
+ enable, feature_config,
+ n_feature_config_bytes);
+ else
+ vnet_feature_enable_disable (ip_arc_names[loc][af][safi],
+ feature_name, sw_if_index,
+ enable, feature_config,
+ n_feature_config_bytes);
}
else
- {
- ip_lookup_main_t *lm6 = &ip6_main.lookup_main;
- ip6_address_t *ip6;
- /* *INDENT-OFF* */
- foreach_ip_interface_address (lm6, ia, sw_if_index, 1 /* unnumbered */ ,
- ({
- ip6 = ip_interface_address_get_address (lm6, ia);
- if (ip6_address_compare (ip6, &ip->ip6) == 0)
- return 1;
- }));
- /* *INDENT-ON* */
- }
- return 0;
+ vnet_feature_enable_disable (ip_arc_names[loc][af][SAFI_UNICAST],
+ feature_name, sw_if_index,
+ enable, feature_config,
+ n_feature_config_bytes);
}
-void *
-ip_interface_get_first_ip (u32 sw_if_index, u8 is_ip4)
+
+
+u8 *
+format_ip_address_family (u8 * s, va_list * args)
{
- ip_lookup_main_t *lm4 = &ip4_main.lookup_main;
- ip_lookup_main_t *lm6 = &ip6_main.lookup_main;
- ip_interface_address_t *ia = 0;
+ ip_address_family_t af = va_arg (*args, int); // int promo ip_address_family_t);
- if (is_ip4)
- {
- /* *INDENT-OFF* */
- foreach_ip_interface_address (lm4, ia, sw_if_index, 1 /* unnumbered */ ,
- ({
- return ip_interface_address_get_address (lm4, ia);
- }));
- /* *INDENT-ON* */
- }
- else
+ switch (af)
{
- /* *INDENT-OFF* */
- foreach_ip_interface_address (lm6, ia, sw_if_index, 1 /* unnumbered */ ,
- ({
- ip6_address_t *rv;
- rv = ip_interface_address_get_address (lm6, ia);
- /* Trying to use a link-local ip6 src address is a fool's errand */
- if (!ip6_address_is_link_local_unicast (rv))
- return rv;
- }));
- /* *INDENT-ON* */
+ case AF_IP4:
+ return (format (s, "ip4"));
+ case AF_IP6:
+ return (format (s, "ip6"));
}
- return 0;
+ return (format (s, "unknown"));
}
-void
-ip4_address_normalize (ip4_address_t * ip4, u8 preflen)
+uword
+unformat_ip_address_family (unformat_input_t * input, va_list * args)
{
- ASSERT (preflen <= 32);
- if (preflen == 0)
- ip4->data_u32 = 0;
- else
- ip4->data_u32 &= clib_net_to_host_u32 (0xffffffff << (32 - preflen));
-}
+ ip_address_family_t *af = va_arg (*args, ip_address_family_t *);
-void
-ip6_address_normalize (ip6_address_t * ip6, u8 preflen)
-{
- ASSERT (preflen <= 128);
- if (preflen == 0)
+ if (unformat (input, "ip4") || unformat (input, "ipv4") ||
+ unformat (input, "IP4") || unformat (input, "IPv4"))
{
- ip6->as_u64[0] = 0;
- ip6->as_u64[1] = 0;
+ *af = AF_IP4;
+ return (1);
}
- else if (preflen <= 64)
+ else if (unformat (input, "ip6") || unformat (input, "ipv6") ||
+ unformat (input, "IP6") || unformat (input, "IPv6"))
{
- ip6->as_u64[0] &=
- clib_host_to_net_u64 (0xffffffffffffffffL << (64 - preflen));
- ip6->as_u64[1] = 0;
+ *af = AF_IP6;
+ return (1);
}
- else
- ip6->as_u64[1] &=
- clib_host_to_net_u64 (0xffffffffffffffffL << (128 - preflen));
+ return (0);
}
-void
-ip4_preflen_to_mask (u8 pref_len, ip4_address_t * ip)
+u8 *
+format_ip_sub_address_family (u8 * s, va_list * args)
{
- if (pref_len == 0)
- ip->as_u32 = 0;
- else
- ip->as_u32 = clib_host_to_net_u32 (~((1 << (32 - pref_len)) - 1));
-}
+ ip_sub_address_family_t safi = va_arg (*args, int); // int promo ip_sub_address_family_t);
-u32
-ip4_mask_to_preflen (ip4_address_t * mask)
-{
- if (mask->as_u32 == 0)
- return 0;
- return (32 - log2_first_set (clib_net_to_host_u32 (mask->as_u32)));
-}
+ switch (safi)
+ {
+ case SAFI_UNICAST:
+ return (format (s, "unicast"));
+ case SAFI_MULTICAST:
+ return (format (s, "multicast"));
+ }
-void
-ip4_prefix_max_address_host_order (ip4_address_t * ip, u8 plen,
- ip4_address_t * res)
-{
- u32 not_mask;
- not_mask = (1 << (32 - plen)) - 1;
- res->as_u32 = clib_net_to_host_u32 (ip->as_u32) + not_mask;
+ return (format (s, "unknown"));
}
-void
-ip6_preflen_to_mask (u8 pref_len, ip6_address_t * mask)
+uword
+unformat_ip_sub_address_family (unformat_input_t * input, va_list * args)
{
- if (pref_len == 0)
- {
- mask->as_u64[0] = 0;
- mask->as_u64[1] = 0;
- }
- else if (pref_len <= 64)
+ ip_sub_address_family_t *safi = va_arg (*args, ip_sub_address_family_t *);
+
+ if (unformat (input, "unicast") || unformat (input, "uni"))
{
- mask->as_u64[0] =
- clib_host_to_net_u64 (0xffffffffffffffffL << (64 - pref_len));
- mask->as_u64[1] = 0;
+ *safi = SAFI_UNICAST;
+ return (1);
}
- else
+ else if (unformat (input, "multicast") || unformat (input, "multi"))
{
- mask->as_u64[1] =
- clib_host_to_net_u64 (0xffffffffffffffffL << (128 - pref_len));
+ *safi = SAFI_MULTICAST;
+ return (1);
}
+ return (0);
}
-void
-ip6_prefix_max_address_host_order (ip6_address_t * ip, u8 plen,
- ip6_address_t * res)
+u8 *
+format_ip_dscp (u8 * s, va_list * va)
{
- u64 not_mask;
- if (plen == 0)
- {
- res->as_u64[0] = 0xffffffffffffffffL;
- res->as_u64[1] = 0xffffffffffffffffL;
- }
- else if (plen <= 64)
- {
- not_mask = ((u64) 1 << (64 - plen)) - 1;
- res->as_u64[0] = clib_net_to_host_u64 (ip->as_u64[0]) + not_mask;
- res->as_u64[1] = 0xffffffffffffffffL;
- }
- else
+ ip_dscp_t dscp = va_arg (*va, u32); // int promotion of u8
+
+ switch (dscp)
{
- not_mask = ((u64) 1 << (128 - plen)) - 1;
- res->as_u64[1] = clib_net_to_host_u64 (ip->as_u64[1]) + not_mask;
+#define _(n,v) \
+ case IP_DSCP_##v: \
+ return (format (s, "%s", #v));
+ foreach_ip_dscp
+#undef _
}
+
+ return (format (s, "unknown"));
}
-u32
-ip6_mask_to_preflen (ip6_address_t * mask)
+uword
+unformat_ip_dscp (unformat_input_t * input, va_list * args)
{
- u8 first1, first0;
- if (mask->as_u64[0] == 0 && mask->as_u64[1] == 0)
+ ip_dscp_t *dscp = va_arg (*args, ip_dscp_t *);
+
+ if (0)
+ ;
+#define _(n,v) \
+ else if (unformat (input, #v)) \
+ *dscp = IP_DSCP_##v;
+ foreach_ip_dscp
+#undef _
+ else
return 0;
- first1 = log2_first_set (clib_net_to_host_u64 (mask->as_u64[1]));
- first0 = log2_first_set (clib_net_to_host_u64 (mask->as_u64[0]));
- if (first1 != 0)
- return 128 - first1;
- else
- return 64 - first0;
+ return 1;
}
u8 *
-format_ip_address_family (u8 * s, va_list * args)
+format_ip_ecn (u8 * s, va_list * va)
{
- ip_address_family_t af = va_arg (*args, ip_address_family_t);
+ ip_ecn_t ecn = va_arg (*va, u32); // int promotion of u8
- switch (af)
+ switch (ecn)
{
- case AF_IP4:
- return (format (s, "ip4"));
- case AF_IP6:
- return (format (s, "ip6"));
+#define _(n,v) \
+ case IP_ECN_##v: \
+ return (format (s, "%s", #v));
+ foreach_ip_ecn
+#undef _
}
return (format (s, "unknown"));