#include <vppinfra/xxhash.h>
static inline u32
-crc_u32(u32 data, u32 value)
+crc_u32 (u32 data, u32 value)
{
- u64 tmp = ((u64)data<<32) | (u64) value;
- return (u32) clib_xxhash(tmp);
+ u64 tmp = ((u64) data << 32) | (u64) value;
+ return (u32) clib_xxhash (tmp);
}
#endif
i32
-ip4_get_port (ip4_header_t *ip, map_dir_e dir, u16 buffer_len)
+ip4_get_port (ip4_header_t * ip, map_dir_e dir, u16 buffer_len)
{
//TODO: use buffer length
if (ip->ip_version_and_header_length != 0x45 ||
- ip4_get_fragment_offset(ip))
- return -1;
+ ip4_get_fragment_offset (ip))
+ return -1;
- if (PREDICT_TRUE((ip->protocol == IP_PROTOCOL_TCP) ||
- (ip->protocol == IP_PROTOCOL_UDP))) {
- udp_header_t *udp = (void *)(ip + 1);
- return (dir == MAP_SENDER) ? udp->src_port : udp->dst_port;
- } else if (ip->protocol == IP_PROTOCOL_ICMP) {
- icmp46_header_t *icmp = (void *)(ip + 1);
- if (icmp->type == ICMP4_echo_request ||
- icmp->type == ICMP4_echo_reply) {
- return *((u16 *)(icmp + 1));
- } else if (clib_net_to_host_u16(ip->length) >= 64) {
- ip = (ip4_header_t *)(icmp + 2);
- if (PREDICT_TRUE((ip->protocol == IP_PROTOCOL_TCP) ||
- (ip->protocol == IP_PROTOCOL_UDP))) {
- udp_header_t *udp = (void *)(ip + 1);
- return (dir == MAP_SENDER) ? udp->dst_port : udp->src_port;
- } else if (ip->protocol == IP_PROTOCOL_ICMP) {
- icmp46_header_t *icmp = (void *)(ip + 1);
- if (icmp->type == ICMP4_echo_request ||
- icmp->type == ICMP4_echo_reply) {
- return *((u16 *)(icmp + 1));
- }
- }
+ if (PREDICT_TRUE ((ip->protocol == IP_PROTOCOL_TCP) ||
+ (ip->protocol == IP_PROTOCOL_UDP)))
+ {
+ udp_header_t *udp = (void *) (ip + 1);
+ return (dir == MAP_SENDER) ? udp->src_port : udp->dst_port;
+ }
+ else if (ip->protocol == IP_PROTOCOL_ICMP)
+ {
+ icmp46_header_t *icmp = (void *) (ip + 1);
+ if (icmp->type == ICMP4_echo_request || icmp->type == ICMP4_echo_reply)
+ {
+ return *((u16 *) (icmp + 1));
+ }
+ else if (clib_net_to_host_u16 (ip->length) >= 64)
+ {
+ ip = (ip4_header_t *) (icmp + 2);
+ if (PREDICT_TRUE ((ip->protocol == IP_PROTOCOL_TCP) ||
+ (ip->protocol == IP_PROTOCOL_UDP)))
+ {
+ udp_header_t *udp = (void *) (ip + 1);
+ return (dir == MAP_SENDER) ? udp->dst_port : udp->src_port;
+ }
+ else if (ip->protocol == IP_PROTOCOL_ICMP)
+ {
+ icmp46_header_t *icmp = (void *) (ip + 1);
+ if (icmp->type == ICMP4_echo_request ||
+ icmp->type == ICMP4_echo_reply)
+ {
+ return *((u16 *) (icmp + 1));
+ }
+ }
+ }
}
- }
return -1;
}
i32
-ip6_get_port (ip6_header_t *ip6, map_dir_e dir, u16 buffer_len)
+ip6_get_port (ip6_header_t * ip6, map_dir_e dir, u16 buffer_len)
{
u8 l4_protocol;
u16 l4_offset;
u16 frag_offset;
u8 *l4;
- if (ip6_parse(ip6, buffer_len, &l4_protocol, &l4_offset, &frag_offset))
+ if (ip6_parse (ip6, buffer_len, &l4_protocol, &l4_offset, &frag_offset))
return -1;
//TODO: Use buffer length
if (frag_offset &&
- ip6_frag_hdr_offset(((ip6_frag_hdr_t *)u8_ptr_add(ip6, frag_offset))))
- return -1; //Can't deal with non-first fragment for now
-
- l4 = u8_ptr_add(ip6, l4_offset);
- if (l4_protocol == IP_PROTOCOL_TCP ||
- l4_protocol == IP_PROTOCOL_UDP) {
- return (dir == MAP_SENDER) ? ((udp_header_t *)(l4))->src_port : ((udp_header_t *)(l4))->dst_port;
- } else if (l4_protocol == IP_PROTOCOL_ICMP6) {
- icmp46_header_t *icmp = (icmp46_header_t *)(l4);
- if (icmp->type == ICMP6_echo_request) {
- return (dir == MAP_SENDER) ? ((u16*)(icmp))[2] : -1;
- } else if (icmp->type == ICMP6_echo_reply) {
- return (dir == MAP_SENDER) ? -1 : ((u16*)(icmp))[2];
+ ip6_frag_hdr_offset (((ip6_frag_hdr_t *)
+ u8_ptr_add (ip6, frag_offset))))
+ return -1; //Can't deal with non-first fragment for now
+
+ l4 = u8_ptr_add (ip6, l4_offset);
+ if (l4_protocol == IP_PROTOCOL_TCP || l4_protocol == IP_PROTOCOL_UDP)
+ {
+ return (dir ==
+ MAP_SENDER) ? ((udp_header_t *) (l4))->
+ src_port : ((udp_header_t *) (l4))->dst_port;
+ }
+ else if (l4_protocol == IP_PROTOCOL_ICMP6)
+ {
+ icmp46_header_t *icmp = (icmp46_header_t *) (l4);
+ if (icmp->type == ICMP6_echo_request)
+ {
+ return (dir == MAP_SENDER) ? ((u16 *) (icmp))[2] : -1;
+ }
+ else if (icmp->type == ICMP6_echo_reply)
+ {
+ return (dir == MAP_SENDER) ? -1 : ((u16 *) (icmp))[2];
+ }
}
- }
return -1;
}
int
-map_create_domain (ip4_address_t *ip4_prefix,
- u8 ip4_prefix_len,
- ip6_address_t *ip6_prefix,
- u8 ip6_prefix_len,
- ip6_address_t *ip6_src,
- u8 ip6_src_len,
- u8 ea_bits_len,
- u8 psid_offset,
- u8 psid_length,
- u32 *map_domain_index,
- u16 mtu,
- u8 flags)
+map_create_domain (ip4_address_t * ip4_prefix,
+ u8 ip4_prefix_len,
+ ip6_address_t * ip6_prefix,
+ u8 ip6_prefix_len,
+ ip6_address_t * ip6_src,
+ u8 ip6_src_len,
+ u8 ea_bits_len,
+ u8 psid_offset,
+ u8 psid_length, u32 * map_domain_index, u16 mtu, u8 flags)
{
map_main_t *mm = &map_main;
ip4_main_t *im4 = &ip4_main;
return -1;
/* Sanity check on the src prefix length */
- if (flags & MAP_DOMAIN_TRANSLATION) {
- if (ip6_src_len != 96) {
- clib_warning("MAP-T only supports ip6_src_len = 96 for now.");
+ if (flags & MAP_DOMAIN_TRANSLATION)
+ {
+ if (ip6_src_len != 96)
+ {
+ clib_warning ("MAP-T only supports ip6_src_len = 96 for now.");
return -1;
- }
- } else {
- if (ip6_src_len != 128) {
- clib_warning("MAP-E requires a BR address, not a prefix (ip6_src_len should be 128).");
+ }
+ }
+ else
+ {
+ if (ip6_src_len != 128)
+ {
+ clib_warning
+ ("MAP-E requires a BR address, not a prefix (ip6_src_len should be 128).");
return -1;
- }
- }
+ }
+ }
/* Get domain index */
- pool_get_aligned(mm->domains, d, CLIB_CACHE_LINE_BYTES);
- memset(d, 0, sizeof (*d));
+ pool_get_aligned (mm->domains, d, CLIB_CACHE_LINE_BYTES);
+ memset (d, 0, sizeof (*d));
*map_domain_index = d - mm->domains;
/* Init domain struct */
d->flags = flags;
/* How many, and which bits to grab from the IPv4 DA */
- if (ip4_prefix_len + ea_bits_len < 32) {
- d->flags |= MAP_DOMAIN_PREFIX;
- suffix_len = d->suffix_shift = 32 - ip4_prefix_len - ea_bits_len;
- } else {
- d->suffix_shift = 0;
- suffix_len = 32 - ip4_prefix_len;
- }
- d->suffix_mask = (1<<suffix_len) - 1;
+ if (ip4_prefix_len + ea_bits_len < 32)
+ {
+ d->flags |= MAP_DOMAIN_PREFIX;
+ suffix_len = d->suffix_shift = 32 - ip4_prefix_len - ea_bits_len;
+ }
+ else
+ {
+ d->suffix_shift = 0;
+ suffix_len = 32 - ip4_prefix_len;
+ }
+ d->suffix_mask = (1 << suffix_len) - 1;
d->psid_shift = 16 - psid_length - psid_offset;
d->psid_mask = (1 << d->psid_length) - 1;
d->ea_shift = 64 - ip6_prefix_len - suffix_len - d->psid_length;
/* Init IP adjacency */
- memset(&adj, 0, sizeof(adj));
+ memset (&adj, 0, sizeof (adj));
adj.explicit_fib_index = ~0;
- adj.lookup_next_index = (d->flags & MAP_DOMAIN_TRANSLATION) ? IP_LOOKUP_NEXT_MAP_T : IP_LOOKUP_NEXT_MAP;
- p = (uword *)&adj.rewrite_data[0];
+ adj.lookup_next_index =
+ (d->
+ flags & MAP_DOMAIN_TRANSLATION) ? IP_LOOKUP_NEXT_MAP_T :
+ IP_LOOKUP_NEXT_MAP;
+ p = (uword *) & adj.rewrite_data[0];
*p = (uword) (*map_domain_index);
- if (ip4_get_route(im4, 0, 0, (u8 *)ip4_prefix, ip4_prefix_len)) {
- clib_warning("IPv4 route already defined: %U/%d", format_ip4_address, ip4_prefix, ip4_prefix_len);
- pool_put(mm->domains, d);
- return -1;
- }
-
+ if (ip4_get_route (im4, 0, 0, (u8 *) ip4_prefix, ip4_prefix_len))
+ {
+ clib_warning ("IPv4 route already defined: %U/%d", format_ip4_address,
+ ip4_prefix, ip4_prefix_len);
+ pool_put (mm->domains, d);
+ return -1;
+ }
+
/* Create ip4 adjacency */
- memset(&args4, 0, sizeof(args4));
+ memset (&args4, 0, sizeof (args4));
args4.table_index_or_table_id = 0;
args4.flags = IP4_ROUTE_FLAG_ADD;
args4.dst_address.as_u32 = ip4_prefix->as_u32;
args4.adj_index = ~0;
args4.add_adj = &adj;
args4.n_add_adj = 1;
- ip4_add_del_route(im4, &args4);
+ ip4_add_del_route (im4, &args4);
/* Multiple MAP domains may share same source IPv6 TEP */
- u32 ai = ip6_get_route(im6, 0, 0, ip6_src, ip6_src_len);
- if (ai > 0) {
- ip_lookup_main_t *lm6 = &ip6_main.lookup_main;
- ip_adjacency_t *adj6 = ip_get_adjacency(lm6, ai);
- if (adj6->lookup_next_index != IP_LOOKUP_NEXT_MAP &&
- adj6->lookup_next_index != IP_LOOKUP_NEXT_MAP_T) {
- clib_warning("BR source address already assigned: %U", format_ip6_address, ip6_src);
- pool_put(mm->domains, d);
- return -1;
+ u32 ai = ip6_get_route (im6, 0, 0, ip6_src, ip6_src_len);
+ if (ai > 0)
+ {
+ ip_lookup_main_t *lm6 = &ip6_main.lookup_main;
+ ip_adjacency_t *adj6 = ip_get_adjacency (lm6, ai);
+ if (adj6->lookup_next_index != IP_LOOKUP_NEXT_MAP &&
+ adj6->lookup_next_index != IP_LOOKUP_NEXT_MAP_T)
+ {
+ clib_warning ("BR source address already assigned: %U",
+ format_ip6_address, ip6_src);
+ pool_put (mm->domains, d);
+ return -1;
+ }
+ /* Shared source */
+ p = (uword *) & adj6->rewrite_data[0];
+ p[0] = ~0;
+
+ /* Add refcount, so we don't accidentially delete the route underneath someone */
+ p[1]++;
+ }
+ else
+ {
+ /* Create ip6 adjacency. */
+ memset (&args6, 0, sizeof (args6));
+ args6.table_index_or_table_id = 0;
+ args6.flags = IP6_ROUTE_FLAG_ADD;
+ args6.dst_address.as_u64[0] = ip6_src->as_u64[0];
+ args6.dst_address.as_u64[1] = ip6_src->as_u64[1];
+ args6.dst_address_length = ip6_src_len;
+ args6.adj_index = ~0;
+ args6.add_adj = &adj;
+ args6.n_add_adj = 1;
+ ip6_add_del_route (im6, &args6);
}
- /* Shared source */
- p = (uword *)&adj6->rewrite_data[0];
- p[0] = ~0;
-
- /* Add refcount, so we don't accidentially delete the route underneath someone */
- p[1]++;
- } else {
- /* Create ip6 adjacency. */
- memset(&args6, 0, sizeof(args6));
- args6.table_index_or_table_id = 0;
- args6.flags = IP6_ROUTE_FLAG_ADD;
- args6.dst_address.as_u64[0] = ip6_src->as_u64[0];
- args6.dst_address.as_u64[1] = ip6_src->as_u64[1];
- args6.dst_address_length = ip6_src_len;
- args6.adj_index = ~0;
- args6.add_adj = &adj;
- args6.n_add_adj = 1;
- ip6_add_del_route(im6, &args6);
- }
/* Validate packet/byte counters */
- map_domain_counter_lock(mm);
+ map_domain_counter_lock (mm);
int i;
- for (i = 0; i < vec_len(mm->simple_domain_counters); i++) {
- vlib_validate_simple_counter(&mm->simple_domain_counters[i], *map_domain_index);
- vlib_zero_simple_counter(&mm->simple_domain_counters[i], *map_domain_index);
- }
- for (i = 0; i < vec_len(mm->domain_counters); i++) {
- vlib_validate_combined_counter(&mm->domain_counters[i], *map_domain_index);
- vlib_zero_combined_counter(&mm->domain_counters[i], *map_domain_index);
- }
- map_domain_counter_unlock(mm);
+ for (i = 0; i < vec_len (mm->simple_domain_counters); i++)
+ {
+ vlib_validate_simple_counter (&mm->simple_domain_counters[i],
+ *map_domain_index);
+ vlib_zero_simple_counter (&mm->simple_domain_counters[i],
+ *map_domain_index);
+ }
+ for (i = 0; i < vec_len (mm->domain_counters); i++)
+ {
+ vlib_validate_combined_counter (&mm->domain_counters[i],
+ *map_domain_index);
+ vlib_zero_combined_counter (&mm->domain_counters[i], *map_domain_index);
+ }
+ map_domain_counter_unlock (mm);
return 0;
}
ip4_add_del_route_args_t args4;
ip6_add_del_route_args_t args6;
- if (pool_is_free_index(mm->domains, map_domain_index)) {
- clib_warning("MAP domain delete: domain does not exist: %d", map_domain_index);
- return -1;
- }
+ if (pool_is_free_index (mm->domains, map_domain_index))
+ {
+ clib_warning ("MAP domain delete: domain does not exist: %d",
+ map_domain_index);
+ return -1;
+ }
- d = pool_elt_at_index(mm->domains, map_domain_index);
+ d = pool_elt_at_index (mm->domains, map_domain_index);
- memset(&adj, 0, sizeof(adj));
+ memset (&adj, 0, sizeof (adj));
adj.explicit_fib_index = ~0;
- adj.lookup_next_index = (d->flags & MAP_DOMAIN_TRANSLATION) ? IP_LOOKUP_NEXT_MAP_T : IP_LOOKUP_NEXT_MAP;
+ adj.lookup_next_index =
+ (d->
+ flags & MAP_DOMAIN_TRANSLATION) ? IP_LOOKUP_NEXT_MAP_T :
+ IP_LOOKUP_NEXT_MAP;
/* Delete ip4 adjacency */
- memset(&args4, 0, sizeof(args4));
+ memset (&args4, 0, sizeof (args4));
args4.table_index_or_table_id = 0;
args4.flags = IP4_ROUTE_FLAG_DEL;
args4.dst_address.as_u32 = d->ip4_prefix.as_u32;
args4.adj_index = 0;
args4.add_adj = &adj;
args4.n_add_adj = 0;
- ip4_add_del_route(im4, &args4);
+ ip4_add_del_route (im4, &args4);
/* Delete ip6 adjacency */
- u32 ai = ip6_get_route(im6, 0, 0, &d->ip6_src, d->ip6_src_len);
- if (ai > 0) {
- ip_lookup_main_t *lm6 = &ip6_main.lookup_main;
- ip_adjacency_t *adj6 = ip_get_adjacency(lm6, ai);
-
- uword *p = (uword *)&adj6->rewrite_data[0];
- /* Delete route when no other domains use this source */
- if (p[1] == 0) {
- memset(&args6, 0, sizeof (args6));
- args6.table_index_or_table_id = 0;
- args6.flags = IP6_ROUTE_FLAG_DEL;
- args6.dst_address.as_u64[0] = d->ip6_src.as_u64[0];
- args6.dst_address.as_u64[1] = d->ip6_src.as_u64[1];
- args6.dst_address_length = d->ip6_src_len;
- args6.adj_index = 0;
- args6.add_adj = &adj;
- args6.n_add_adj = 0;
- ip6_add_del_route(im6, &args6);
+ u32 ai = ip6_get_route (im6, 0, 0, &d->ip6_src, d->ip6_src_len);
+ if (ai > 0)
+ {
+ ip_lookup_main_t *lm6 = &ip6_main.lookup_main;
+ ip_adjacency_t *adj6 = ip_get_adjacency (lm6, ai);
+
+ uword *p = (uword *) & adj6->rewrite_data[0];
+ /* Delete route when no other domains use this source */
+ if (p[1] == 0)
+ {
+ memset (&args6, 0, sizeof (args6));
+ args6.table_index_or_table_id = 0;
+ args6.flags = IP6_ROUTE_FLAG_DEL;
+ args6.dst_address.as_u64[0] = d->ip6_src.as_u64[0];
+ args6.dst_address.as_u64[1] = d->ip6_src.as_u64[1];
+ args6.dst_address_length = d->ip6_src_len;
+ args6.adj_index = 0;
+ args6.add_adj = &adj;
+ args6.n_add_adj = 0;
+ ip6_add_del_route (im6, &args6);
+ }
+ p[1]--;
}
- p[1]--;
- }
/* Deleting rules */
if (d->rules)
- clib_mem_free(d->rules);
+ clib_mem_free (d->rules);
- pool_put(mm->domains, d);
+ pool_put (mm->domains, d);
return 0;
}
int
-map_add_del_psid (u32 map_domain_index, u16 psid, ip6_address_t *tep,
+map_add_del_psid (u32 map_domain_index, u16 psid, ip6_address_t * tep,
u8 is_add)
{
map_domain_t *d;
map_main_t *mm = &map_main;
- if (pool_is_free_index(mm->domains, map_domain_index)) {
- clib_warning("MAP rule: domain does not exist: %d", map_domain_index);
- return -1;
- }
- d = pool_elt_at_index(mm->domains, map_domain_index);
+ if (pool_is_free_index (mm->domains, map_domain_index))
+ {
+ clib_warning ("MAP rule: domain does not exist: %d", map_domain_index);
+ return -1;
+ }
+ d = pool_elt_at_index (mm->domains, map_domain_index);
/* Rules are only used in 1:1 independent case */
if (d->ea_bits_len > 0)
return (-1);
- if (!d->rules) {
- u32 l = (0x1 << d->psid_length) * sizeof(ip6_address_t);
- d->rules = clib_mem_alloc_aligned(l, CLIB_CACHE_LINE_BYTES);
- if (!d->rules) return -1;
- memset(d->rules, 0, l);
- }
+ if (!d->rules)
+ {
+ u32 l = (0x1 << d->psid_length) * sizeof (ip6_address_t);
+ d->rules = clib_mem_alloc_aligned (l, CLIB_CACHE_LINE_BYTES);
+ if (!d->rules)
+ return -1;
+ memset (d->rules, 0, l);
+ }
- if (psid >= (0x1 << d->psid_length)) {
- clib_warning("MAP rule: PSID outside bounds: %d [%d]", psid, 0x1 << d->psid_length);
- return -1;
- }
+ if (psid >= (0x1 << d->psid_length))
+ {
+ clib_warning ("MAP rule: PSID outside bounds: %d [%d]", psid,
+ 0x1 << d->psid_length);
+ return -1;
+ }
- if (is_add) {
- d->rules[psid] = *tep;
- } else {
- memset(&d->rules[psid], 0, sizeof(ip6_address_t));
- }
+ if (is_add)
+ {
+ d->rules[psid] = *tep;
+ }
+ else
+ {
+ memset (&d->rules[psid], 0, sizeof (ip6_address_t));
+ }
return 0;
}
#ifdef MAP_SKIP_IP6_LOOKUP
static void
-map_pre_resolve (ip4_address_t *ip4, ip6_address_t *ip6)
+map_pre_resolve (ip4_address_t * ip4, ip6_address_t * ip6)
{
map_main_t *mm = &map_main;
ip4_main_t *im4 = &ip4_main;
ip6_main_t *im6 = &ip6_main;
- if (ip6->as_u64[0] != 0 || ip6->as_u64[1] != 0) {
- mm->adj6_index = ip6_fib_lookup_with_table(im6, 0, ip6);
- clib_warning("FIB lookup results in: %u", mm->adj6_index);
- }
- if (ip4->as_u32 != 0) {
- mm->adj4_index = ip4_fib_lookup_with_table(im4, 0, ip4, 0);
- clib_warning("FIB lookup results in: %u", mm->adj4_index);
- }
+ if (ip6->as_u64[0] != 0 || ip6->as_u64[1] != 0)
+ {
+ mm->adj6_index = ip6_fib_lookup_with_table (im6, 0, ip6);
+ clib_warning ("FIB lookup results in: %u", mm->adj6_index);
+ }
+ if (ip4->as_u32 != 0)
+ {
+ mm->adj4_index = ip4_fib_lookup_with_table (im4, 0, ip4, 0);
+ clib_warning ("FIB lookup results in: %u", mm->adj4_index);
+ }
}
#endif
static clib_error_t *
-map_security_check_command_fn (vlib_main_t *vm,
- unformat_input_t *input,
- vlib_cli_command_t *cmd)
+map_security_check_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
map_main_t *mm = &map_main;
/* Get a line of input. */
- if (!unformat_user(input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
-
- while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(line_input, "off"))
- mm->sec_check = false;
- else if (unformat(line_input, "on"))
- mm->sec_check = true;
- else
- return clib_error_return(0, "unknown input `%U'",
- format_unformat_error, input);
- }
- unformat_free(line_input);
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "off"))
+ mm->sec_check = false;
+ else if (unformat (line_input, "on"))
+ mm->sec_check = true;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
+ }
+ unformat_free (line_input);
return 0;
}
static clib_error_t *
-map_security_check_frag_command_fn (vlib_main_t *vm,
- unformat_input_t *input,
- vlib_cli_command_t *cmd)
+map_security_check_frag_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
map_main_t *mm = &map_main;
/* Get a line of input. */
- if (!unformat_user(input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
-
- while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(line_input, "off"))
- mm->sec_check_frag = false;
- else if (unformat(line_input, "on"))
- mm->sec_check_frag = true;
- else
- return clib_error_return(0, "unknown input `%U'",
- format_unformat_error, input);
- }
- unformat_free(line_input);
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "off"))
+ mm->sec_check_frag = false;
+ else if (unformat (line_input, "on"))
+ mm->sec_check_frag = true;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
+ }
+ unformat_free (line_input);
return 0;
}
static clib_error_t *
-map_add_domain_command_fn (vlib_main_t *vm,
- unformat_input_t *input,
- vlib_cli_command_t *cmd)
+map_add_domain_command_fn (vlib_main_t * vm,
+ unformat_input_t * input, vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
ip4_address_t ip4_prefix;
ip6_src_len = 128;
/* Get a line of input. */
- if (!unformat_user(input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
-
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(line_input, "ip4-pfx %U/%d", unformat_ip4_address, &ip4_prefix, &ip4_prefix_len))
- num_m_args++;
- else if (unformat(line_input, "ip6-pfx %U/%d", unformat_ip6_address, &ip6_prefix, &ip6_prefix_len))
- num_m_args++;
- else if (unformat(line_input, "ip6-src %U/%d", unformat_ip6_address, &ip6_src, &ip6_src_len))
- num_m_args++;
- else if (unformat(line_input, "ip6-src %U", unformat_ip6_address, &ip6_src))
- num_m_args++;
- else if (unformat(line_input, "ea-bits-len %d", &ea_bits_len))
- num_m_args++;
- else if (unformat(line_input, "psid-offset %d", &psid_offset))
- num_m_args++;
- else if (unformat(line_input, "psid-len %d", &psid_length))
- num_m_args++;
- else if (unformat(line_input, "mtu %d", &mtu))
- num_m_args++;
- else if (unformat(line_input, "map-t"))
- flags |= MAP_DOMAIN_TRANSLATION;
- else
- return clib_error_return(0, "unknown input `%U'",
- format_unformat_error, input);
- }
- unformat_free(line_input);
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat
+ (line_input, "ip4-pfx %U/%d", unformat_ip4_address, &ip4_prefix,
+ &ip4_prefix_len))
+ num_m_args++;
+ else
+ if (unformat
+ (line_input, "ip6-pfx %U/%d", unformat_ip6_address, &ip6_prefix,
+ &ip6_prefix_len))
+ num_m_args++;
+ else
+ if (unformat
+ (line_input, "ip6-src %U/%d", unformat_ip6_address, &ip6_src,
+ &ip6_src_len))
+ num_m_args++;
+ else
+ if (unformat
+ (line_input, "ip6-src %U", unformat_ip6_address, &ip6_src))
+ num_m_args++;
+ else if (unformat (line_input, "ea-bits-len %d", &ea_bits_len))
+ num_m_args++;
+ else if (unformat (line_input, "psid-offset %d", &psid_offset))
+ num_m_args++;
+ else if (unformat (line_input, "psid-len %d", &psid_length))
+ num_m_args++;
+ else if (unformat (line_input, "mtu %d", &mtu))
+ num_m_args++;
+ else if (unformat (line_input, "map-t"))
+ flags |= MAP_DOMAIN_TRANSLATION;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
+ }
+ unformat_free (line_input);
if (num_m_args < 3)
- return clib_error_return(0, "mandatory argument(s) missing");
+ return clib_error_return (0, "mandatory argument(s) missing");
- map_create_domain(&ip4_prefix, ip4_prefix_len,
- &ip6_prefix, ip6_prefix_len, &ip6_src, ip6_src_len,
- ea_bits_len, psid_offset, psid_length, &map_domain_index,
- mtu, flags);
+ map_create_domain (&ip4_prefix, ip4_prefix_len,
+ &ip6_prefix, ip6_prefix_len, &ip6_src, ip6_src_len,
+ ea_bits_len, psid_offset, psid_length, &map_domain_index,
+ mtu, flags);
return 0;
}
static clib_error_t *
-map_del_domain_command_fn (vlib_main_t *vm,
- unformat_input_t *input,
- vlib_cli_command_t *cmd)
+map_del_domain_command_fn (vlib_main_t * vm,
+ unformat_input_t * input, vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
u32 num_m_args = 0;
u32 map_domain_index;
/* Get a line of input. */
- if (! unformat_user(input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
-
- while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(line_input, "index %d", &map_domain_index))
- num_m_args++;
- else
- return clib_error_return(0, "unknown input `%U'",
- format_unformat_error, input);
- }
- unformat_free(line_input);
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "index %d", &map_domain_index))
+ num_m_args++;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
+ }
+ unformat_free (line_input);
if (num_m_args != 1)
- return clib_error_return(0, "mandatory argument(s) missing");
+ return clib_error_return (0, "mandatory argument(s) missing");
- map_delete_domain(map_domain_index);
+ map_delete_domain (map_domain_index);
return 0;
}
static clib_error_t *
-map_add_rule_command_fn (vlib_main_t *vm,
- unformat_input_t *input,
- vlib_cli_command_t *cmd)
+map_add_rule_command_fn (vlib_main_t * vm,
+ unformat_input_t * input, vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
ip6_address_t tep;
u32 num_m_args = 0;
u32 psid, map_domain_index;
-
+
/* Get a line of input. */
- if (! unformat_user(input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
- while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(line_input, "index %d", &map_domain_index))
- num_m_args++;
- else if (unformat(line_input, "psid %d", &psid))
- num_m_args++;
- else if (unformat(line_input, "ip6-dst %U", unformat_ip6_address, &tep))
- num_m_args++;
- else
- return clib_error_return(0, "unknown input `%U'",
- format_unformat_error, input);
- }
- unformat_free(line_input);
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "index %d", &map_domain_index))
+ num_m_args++;
+ else if (unformat (line_input, "psid %d", &psid))
+ num_m_args++;
+ else
+ if (unformat (line_input, "ip6-dst %U", unformat_ip6_address, &tep))
+ num_m_args++;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
+ }
+ unformat_free (line_input);
if (num_m_args != 3)
- return clib_error_return(0, "mandatory argument(s) missing");
+ return clib_error_return (0, "mandatory argument(s) missing");
- if (map_add_del_psid(map_domain_index, psid, &tep, 1) != 0) {
- return clib_error_return(0, "Failing to add Mapping Rule");
- }
+ if (map_add_del_psid (map_domain_index, psid, &tep, 1) != 0)
+ {
+ return clib_error_return (0, "Failing to add Mapping Rule");
+ }
return 0;
}
#if MAP_SKIP_IP6_LOOKUP
static clib_error_t *
-map_pre_resolve_command_fn (vlib_main_t *vm,
- unformat_input_t *input,
- vlib_cli_command_t *cmd)
+map_pre_resolve_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
ip4_address_t ip4nh;
ip6_address_t ip6nh;
map_main_t *mm = &map_main;
- memset(&ip4nh, 0, sizeof(ip4nh));
- memset(&ip6nh, 0, sizeof(ip6nh));
+ memset (&ip4nh, 0, sizeof (ip4nh));
+ memset (&ip6nh, 0, sizeof (ip6nh));
/* Get a line of input. */
- if (!unformat_user(input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
-
- while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(line_input, "ip4-nh %U", unformat_ip4_address, &ip4nh))
- mm->preresolve_ip4 = ip4nh;
- else if (unformat(line_input, "ip6-nh %U", unformat_ip6_address, &ip6nh))
- mm->preresolve_ip6 = ip6nh;
- else
- return clib_error_return(0, "unknown input `%U'",
- format_unformat_error, input);
- }
- unformat_free(line_input);
- map_pre_resolve(&ip4nh, &ip6nh);
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "ip4-nh %U", unformat_ip4_address, &ip4nh))
+ mm->preresolve_ip4 = ip4nh;
+ else
+ if (unformat (line_input, "ip6-nh %U", unformat_ip6_address, &ip6nh))
+ mm->preresolve_ip6 = ip6nh;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
+ }
+ unformat_free (line_input);
+
+ map_pre_resolve (&ip4nh, &ip6nh);
return 0;
}
#endif
static clib_error_t *
-map_icmp_relay_source_address_command_fn (vlib_main_t *vm,
- unformat_input_t *input,
- vlib_cli_command_t *cmd)
+map_icmp_relay_source_address_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
ip4_address_t icmp_src_address;
mm->icmp4_src_address.as_u32 = 0;
/* Get a line of input. */
- if (!unformat_user(input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
-
- while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(line_input, "%U", unformat_ip4_address, &icmp_src_address))
- mm->icmp4_src_address = icmp_src_address;
- else
- return clib_error_return(0, "unknown input `%U'",
- format_unformat_error, input);
- }
- unformat_free(line_input);
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat
+ (line_input, "%U", unformat_ip4_address, &icmp_src_address))
+ mm->icmp4_src_address = icmp_src_address;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
+ }
+ unformat_free (line_input);
return 0;
}
static clib_error_t *
-map_icmp_unreachables_command_fn (vlib_main_t *vm,
- unformat_input_t *input,
- vlib_cli_command_t *cmd)
+map_icmp_unreachables_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
map_main_t *mm = &map_main;
int num_m_args = 0;
/* Get a line of input. */
- if (!unformat_user(input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
-
- while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
- num_m_args++;
- if (unformat(line_input, "on"))
- mm->icmp6_enabled = true;
- else if (unformat(line_input, "off"))
- mm->icmp6_enabled = false;
- else
- return clib_error_return(0, "unknown input `%U'",
- format_unformat_error, input);
- }
- unformat_free(line_input);
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ num_m_args++;
+ if (unformat (line_input, "on"))
+ mm->icmp6_enabled = true;
+ else if (unformat (line_input, "off"))
+ mm->icmp6_enabled = false;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
+ }
+ unformat_free (line_input);
if (num_m_args != 1)
- return clib_error_return(0, "mandatory argument(s) missing");
+ return clib_error_return (0, "mandatory argument(s) missing");
return 0;
}
static clib_error_t *
-map_fragment_command_fn (vlib_main_t *vm,
- unformat_input_t *input,
- vlib_cli_command_t *cmd)
+map_fragment_command_fn (vlib_main_t * vm,
+ unformat_input_t * input, vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
map_main_t *mm = &map_main;
/* Get a line of input. */
- if (!unformat_user(input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
-
- while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(line_input, "inner"))
- mm->frag_inner = true;
- else if (unformat(line_input, "outer"))
- mm->frag_inner = false;
- else
- return clib_error_return(0, "unknown input `%U'",
- format_unformat_error, input);
- }
- unformat_free(line_input);
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "inner"))
+ mm->frag_inner = true;
+ else if (unformat (line_input, "outer"))
+ mm->frag_inner = false;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
+ }
+ unformat_free (line_input);
return 0;
}
static clib_error_t *
-map_fragment_df_command_fn (vlib_main_t *vm,
- unformat_input_t *input,
- vlib_cli_command_t *cmd)
+map_fragment_df_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
map_main_t *mm = &map_main;
/* Get a line of input. */
- if (!unformat_user(input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
-
- while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(line_input, "on"))
- mm->frag_ignore_df = true;
- else if (unformat(line_input, "off"))
- mm->frag_ignore_df = false;
- else
- return clib_error_return(0, "unknown input `%U'",
- format_unformat_error, input);
- }
- unformat_free(line_input);
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "on"))
+ mm->frag_ignore_df = true;
+ else if (unformat (line_input, "off"))
+ mm->frag_ignore_df = false;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
+ }
+ unformat_free (line_input);
return 0;
}
static clib_error_t *
-map_traffic_class_command_fn (vlib_main_t *vm,
- unformat_input_t *input,
- vlib_cli_command_t *cmd)
+map_traffic_class_command_fn (vlib_main_t * vm,
+ unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
map_main_t *mm = &map_main;
mm->tc_copy = false;
/* Get a line of input. */
- if (!unformat_user(input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
-
- while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(line_input, "copy"))
- mm->tc_copy = true;
- else if (unformat(line_input, "%x", &tc))
- mm->tc = tc & 0xff;
- else
- return clib_error_return(0, "unknown input `%U'",
- format_unformat_error, input);
- }
- unformat_free(line_input);
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "copy"))
+ mm->tc_copy = true;
+ else if (unformat (line_input, "%x", &tc))
+ mm->tc = tc & 0xff;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
+ }
+ unformat_free (line_input);
return 0;
}
static u8 *
-format_map_domain (u8 *s, va_list *args)
+format_map_domain (u8 * s, va_list * args)
{
- map_domain_t *d = va_arg(*args, map_domain_t *);
- bool counters = va_arg(*args, int);
+ map_domain_t *d = va_arg (*args, map_domain_t *);
+ bool counters = va_arg (*args, int);
map_main_t *mm = &map_main;
ip6_address_t ip6_prefix;
if (d->rules)
- memset(&ip6_prefix, 0, sizeof(ip6_prefix));
+ memset (&ip6_prefix, 0, sizeof (ip6_prefix));
else
ip6_prefix = d->ip6_prefix;
-
- s = format(s,
- "[%d] ip4-pfx %U/%d ip6-pfx %U/%d ip6-src %U/%d ea_bits_len %d psid-offset %d psid-len %d mtu %d %s",
- d - mm->domains,
- format_ip4_address, &d->ip4_prefix, d->ip4_prefix_len,
- format_ip6_address, &ip6_prefix, d->ip6_prefix_len,
- format_ip6_address, &d->ip6_src, d->ip6_src_len,
- d->ea_bits_len, d->psid_offset, d->psid_length, d->mtu,
- (d->flags & MAP_DOMAIN_TRANSLATION) ? "map-t" : "");
-
- if (counters) {
- map_domain_counter_lock(mm);
- vlib_counter_t v;
- vlib_get_combined_counter(&mm->domain_counters[MAP_DOMAIN_COUNTER_TX], d - mm->domains, &v);
- s = format(s, " TX: %lld/%lld", v.packets, v.bytes);
- vlib_get_combined_counter(&mm->domain_counters[MAP_DOMAIN_COUNTER_RX], d - mm->domains, &v);
- s = format(s, " RX: %lld/%lld", v.packets, v.bytes);
- map_domain_counter_unlock(mm);
- }
- s = format(s, "\n");
-
- if (d->rules) {
- int i;
- ip6_address_t dst;
- for (i = 0; i < (0x1 << d->psid_length); i++) {
- dst = d->rules[i];
- if (dst.as_u64[0] == 0 && dst.as_u64[1] == 0 )
- continue;
- s = format(s,
- " rule psid: %d ip6-dst %U\n", i, format_ip6_address, &dst);
+
+ s = format (s,
+ "[%d] ip4-pfx %U/%d ip6-pfx %U/%d ip6-src %U/%d ea_bits_len %d psid-offset %d psid-len %d mtu %d %s",
+ d - mm->domains,
+ format_ip4_address, &d->ip4_prefix, d->ip4_prefix_len,
+ format_ip6_address, &ip6_prefix, d->ip6_prefix_len,
+ format_ip6_address, &d->ip6_src, d->ip6_src_len,
+ d->ea_bits_len, d->psid_offset, d->psid_length, d->mtu,
+ (d->flags & MAP_DOMAIN_TRANSLATION) ? "map-t" : "");
+
+ if (counters)
+ {
+ map_domain_counter_lock (mm);
+ vlib_counter_t v;
+ vlib_get_combined_counter (&mm->domain_counters[MAP_DOMAIN_COUNTER_TX],
+ d - mm->domains, &v);
+ s = format (s, " TX: %lld/%lld", v.packets, v.bytes);
+ vlib_get_combined_counter (&mm->domain_counters[MAP_DOMAIN_COUNTER_RX],
+ d - mm->domains, &v);
+ s = format (s, " RX: %lld/%lld", v.packets, v.bytes);
+ map_domain_counter_unlock (mm);
+ }
+ s = format (s, "\n");
+
+ if (d->rules)
+ {
+ int i;
+ ip6_address_t dst;
+ for (i = 0; i < (0x1 << d->psid_length); i++)
+ {
+ dst = d->rules[i];
+ if (dst.as_u64[0] == 0 && dst.as_u64[1] == 0)
+ continue;
+ s = format (s,
+ " rule psid: %d ip6-dst %U\n", i, format_ip6_address,
+ &dst);
+ }
}
- }
return s;
}
static u8 *
-format_map_ip4_reass (u8 *s, va_list *args)
+format_map_ip4_reass (u8 * s, va_list * args)
{
map_main_t *mm = &map_main;
- map_ip4_reass_t *r = va_arg(*args, map_ip4_reass_t *);
+ map_ip4_reass_t *r = va_arg (*args, map_ip4_reass_t *);
map_ip4_reass_key_t *k = &r->key;
- f64 now = vlib_time_now(mm->vlib_main);
- f64 lifetime = (((f64)mm->ip4_reass_conf_lifetime_ms) / 1000);
+ f64 now = vlib_time_now (mm->vlib_main);
+ f64 lifetime = (((f64) mm->ip4_reass_conf_lifetime_ms) / 1000);
f64 dt = (r->ts + lifetime > now) ? (r->ts + lifetime - now) : -1;
- s = format(s,
- "ip4-reass src=%U dst=%U protocol=%d identifier=%d port=%d lifetime=%.3lf\n",
- format_ip4_address, &k->src.as_u8, format_ip4_address, &k->dst.as_u8,
- k->protocol, clib_net_to_host_u16(k->fragment_id), (r->port >= 0)?clib_net_to_host_u16(r->port):-1, dt);
+ s = format (s,
+ "ip4-reass src=%U dst=%U protocol=%d identifier=%d port=%d lifetime=%.3lf\n",
+ format_ip4_address, &k->src.as_u8, format_ip4_address,
+ &k->dst.as_u8, k->protocol,
+ clib_net_to_host_u16 (k->fragment_id),
+ (r->port >= 0) ? clib_net_to_host_u16 (r->port) : -1, dt);
return s;
}
static u8 *
-format_map_ip6_reass (u8 *s, va_list *args)
+format_map_ip6_reass (u8 * s, va_list * args)
{
map_main_t *mm = &map_main;
- map_ip6_reass_t *r = va_arg(*args, map_ip6_reass_t *);
+ map_ip6_reass_t *r = va_arg (*args, map_ip6_reass_t *);
map_ip6_reass_key_t *k = &r->key;
- f64 now = vlib_time_now(mm->vlib_main);
- f64 lifetime = (((f64)mm->ip6_reass_conf_lifetime_ms) / 1000);
+ f64 now = vlib_time_now (mm->vlib_main);
+ f64 lifetime = (((f64) mm->ip6_reass_conf_lifetime_ms) / 1000);
f64 dt = (r->ts + lifetime > now) ? (r->ts + lifetime - now) : -1;
- s = format(s,
- "ip6-reass src=%U dst=%U protocol=%d identifier=%d lifetime=%.3lf\n",
- format_ip6_address, &k->src.as_u8, format_ip6_address, &k->dst.as_u8,
- k->protocol, clib_net_to_host_u32(k->fragment_id), dt);
+ s = format (s,
+ "ip6-reass src=%U dst=%U protocol=%d identifier=%d lifetime=%.3lf\n",
+ format_ip6_address, &k->src.as_u8, format_ip6_address,
+ &k->dst.as_u8, k->protocol,
+ clib_net_to_host_u32 (k->fragment_id), dt);
return s;
}
static clib_error_t *
-show_map_domain_command_fn (vlib_main_t *vm, unformat_input_t *input, vlib_cli_command_t *cmd)
+show_map_domain_command_fn (vlib_main_t * vm, unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
map_main_t *mm = &map_main;
u32 map_domain_index = ~0;
/* Get a line of input. */
- if (!unformat_user(input, unformat_line_input, line_input))
+ if (!unformat_user (input, unformat_line_input, line_input))
return 0;
-
- while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
- if (unformat(line_input, "counters"))
- counters = true;
- else if (unformat(line_input, "index %d", &map_domain_index))
- ;
- else
- return clib_error_return(0, "unknown input `%U'",
- format_unformat_error, input);
- }
- unformat_free(line_input);
- if (pool_elts(mm->domains) == 0)
- vlib_cli_output(vm, "No MAP domains are configured...");
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "counters"))
+ counters = true;
+ else if (unformat (line_input, "index %d", &map_domain_index))
+ ;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
+ }
+ unformat_free (line_input);
+
+ if (pool_elts (mm->domains) == 0)
+ vlib_cli_output (vm, "No MAP domains are configured...");
- if (map_domain_index == ~0) {
+ if (map_domain_index == ~0)
+ {
+ /* *INDENT-OFF* */
pool_foreach(d, mm->domains, ({vlib_cli_output(vm, "%U", format_map_domain, d, counters);}));
- } else {
- if (pool_is_free_index(mm->domains, map_domain_index)) {
- return clib_error_return(0, "MAP domain does not exists %d", map_domain_index);
+ /* *INDENT-ON* */
+ }
+ else
+ {
+ if (pool_is_free_index (mm->domains, map_domain_index))
+ {
+ return clib_error_return (0, "MAP domain does not exists %d",
+ map_domain_index);
+ }
+
+ d = pool_elt_at_index (mm->domains, map_domain_index);
+ vlib_cli_output (vm, "%U", format_map_domain, d, counters);
}
-
- d = pool_elt_at_index(mm->domains, map_domain_index);
- vlib_cli_output(vm, "%U", format_map_domain, d, counters);
- }
return 0;
}
static clib_error_t *
-show_map_fragments_command_fn (vlib_main_t *vm, unformat_input_t *input, vlib_cli_command_t *cmd)
+show_map_fragments_command_fn (vlib_main_t * vm, unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
map_main_t *mm = &map_main;
map_ip4_reass_t *f4;
map_ip6_reass_t *f6;
+ /* *INDENT-OFF* */
pool_foreach(f4, mm->ip4_reass_pool, ({vlib_cli_output (vm, "%U", format_map_ip4_reass, f4);}));
+ /* *INDENT-ON* */
+ /* *INDENT-OFF* */
pool_foreach(f6, mm->ip6_reass_pool, ({vlib_cli_output (vm, "%U", format_map_ip6_reass, f6);}));
+ /* *INDENT-ON* */
return (0);
}
u64
map_error_counter_get (u32 node_index, map_error_t map_error)
{
- vlib_main_t *vm = vlib_get_main();
- vlib_node_runtime_t *error_node = vlib_node_get_runtime(vm, node_index);
+ vlib_main_t *vm = vlib_get_main ();
+ vlib_node_runtime_t *error_node = vlib_node_get_runtime (vm, node_index);
vlib_error_main_t *em = &vm->error_main;
vlib_error_t e = error_node->errors[map_error];
- vlib_node_t *n = vlib_get_node(vm, node_index);
+ vlib_node_t *n = vlib_get_node (vm, node_index);
u32 ci;
- ci = vlib_error_get_code(e);
+ ci = vlib_error_get_code (e);
ASSERT (ci < n->n_errors);
ci += n->error_heap_index;
}
static clib_error_t *
-show_map_stats_command_fn (vlib_main_t *vm, unformat_input_t *input, vlib_cli_command_t *cmd)
+show_map_stats_command_fn (vlib_main_t * vm, unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
map_main_t *mm = &map_main;
map_domain_t *d;
int domains = 0, rules = 0, domaincount = 0, rulecount = 0;
if (pool_elts (mm->domains) == 0)
- vlib_cli_output(vm, "No MAP domains are configured...");
+ vlib_cli_output (vm, "No MAP domains are configured...");
+ /* *INDENT-OFF* */
pool_foreach(d, mm->domains, ({
if (d->rules) {
rulecount+= 0x1 << d->psid_length;
domains += sizeof(*d);
domaincount++;
}));
+ /* *INDENT-ON* */
- vlib_cli_output(vm, "MAP domains structure: %d\n", sizeof (map_domain_t));
- vlib_cli_output(vm, "MAP domains: %d (%d bytes)\n", domaincount, domains);
- vlib_cli_output(vm, "MAP rules: %d (%d bytes)\n", rulecount, rules);
- vlib_cli_output(vm, "Total: %d bytes)\n", rules + domains);
+ vlib_cli_output (vm, "MAP domains structure: %d\n", sizeof (map_domain_t));
+ vlib_cli_output (vm, "MAP domains: %d (%d bytes)\n", domaincount, domains);
+ vlib_cli_output (vm, "MAP rules: %d (%d bytes)\n", rulecount, rules);
+ vlib_cli_output (vm, "Total: %d bytes)\n", rules + domains);
#if MAP_SKIP_IP6_LOOKUP
- vlib_cli_output(vm, "MAP pre-resolve: IP6 next-hop: %U (%u), IP4 next-hop: %U (%u)\n",
- format_ip6_address, &mm->preresolve_ip6, mm->adj6_index,
- format_ip4_address, &mm->preresolve_ip4, mm->adj4_index);
+ vlib_cli_output (vm,
+ "MAP pre-resolve: IP6 next-hop: %U (%u), IP4 next-hop: %U (%u)\n",
+ format_ip6_address, &mm->preresolve_ip6, mm->adj6_index,
+ format_ip4_address, &mm->preresolve_ip4, mm->adj4_index);
#endif
if (mm->tc_copy)
- vlib_cli_output(vm, "MAP traffic-class: copy");
+ vlib_cli_output (vm, "MAP traffic-class: copy");
else
- vlib_cli_output(vm, "MAP traffic-class: %x", mm->tc);
-
- vlib_cli_output(vm, "MAP IPv6 inbound security check: %s, fragmented packet security check: %s", mm->sec_check ? "enabled" : "disabled",
- mm->sec_check_frag ? "enabled" : "disabled");
-
- vlib_cli_output(vm, "ICMP-relay IPv4 source address: %U\n", format_ip4_address, &mm->icmp4_src_address);
- vlib_cli_output(vm, "ICMP6 unreachables sent for unmatched packets: %s\n", mm->icmp6_enabled ? "enabled" : "disabled");
- vlib_cli_output(vm, "Inner fragmentation: %s\n", mm->frag_inner ? "enabled" : "disabled");
- vlib_cli_output(vm, "Fragment packets regardless of DF flag: %s\n", mm->frag_ignore_df ? "enabled" : "disabled");
+ vlib_cli_output (vm, "MAP traffic-class: %x", mm->tc);
+
+ vlib_cli_output (vm,
+ "MAP IPv6 inbound security check: %s, fragmented packet security check: %s",
+ mm->sec_check ? "enabled" : "disabled",
+ mm->sec_check_frag ? "enabled" : "disabled");
+
+ vlib_cli_output (vm, "ICMP-relay IPv4 source address: %U\n",
+ format_ip4_address, &mm->icmp4_src_address);
+ vlib_cli_output (vm, "ICMP6 unreachables sent for unmatched packets: %s\n",
+ mm->icmp6_enabled ? "enabled" : "disabled");
+ vlib_cli_output (vm, "Inner fragmentation: %s\n",
+ mm->frag_inner ? "enabled" : "disabled");
+ vlib_cli_output (vm, "Fragment packets regardless of DF flag: %s\n",
+ mm->frag_ignore_df ? "enabled" : "disabled");
/*
* Counters
memset (total_bytes, 0, sizeof (total_bytes));
map_domain_counter_lock (mm);
- vec_foreach (cm, mm->domain_counters) {
+ vec_foreach (cm, mm->domain_counters)
+ {
which = cm - mm->domain_counters;
- for (i = 0; i < vec_len (cm->maxi); i++) {
- vlib_get_combined_counter (cm, i, &v);
- total_pkts[which] += v.packets;
- total_bytes[which] += v.bytes;
- }
+ for (i = 0; i < vec_len (cm->maxi); i++)
+ {
+ vlib_get_combined_counter (cm, i, &v);
+ total_pkts[which] += v.packets;
+ total_bytes[which] += v.bytes;
+ }
}
map_domain_counter_unlock (mm);
- vlib_cli_output(vm, "Encapsulated packets: %lld bytes: %lld\n", total_pkts[MAP_DOMAIN_COUNTER_TX],
- total_bytes[MAP_DOMAIN_COUNTER_TX]);
- vlib_cli_output(vm, "Decapsulated packets: %lld bytes: %lld\n", total_pkts[MAP_DOMAIN_COUNTER_RX],
- total_bytes[MAP_DOMAIN_COUNTER_RX]);
+ vlib_cli_output (vm, "Encapsulated packets: %lld bytes: %lld\n",
+ total_pkts[MAP_DOMAIN_COUNTER_TX],
+ total_bytes[MAP_DOMAIN_COUNTER_TX]);
+ vlib_cli_output (vm, "Decapsulated packets: %lld bytes: %lld\n",
+ total_pkts[MAP_DOMAIN_COUNTER_RX],
+ total_bytes[MAP_DOMAIN_COUNTER_RX]);
- vlib_cli_output(vm, "ICMP relayed packets: %d\n", vlib_get_simple_counter(&mm->icmp_relayed, 0));
+ vlib_cli_output (vm, "ICMP relayed packets: %d\n",
+ vlib_get_simple_counter (&mm->icmp_relayed, 0));
return 0;
}
static clib_error_t *
-map_params_reass_command_fn (vlib_main_t *vm, unformat_input_t *input, vlib_cli_command_t *cmd)
+map_params_reass_command_fn (vlib_main_t * vm, unformat_input_t * input,
+ vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
u32 lifetime = ~0;
- f64 ht_ratio = (MAP_IP4_REASS_CONF_HT_RATIO_MAX+1);
+ f64 ht_ratio = (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1);
u32 pool_size = ~0;
u64 buffers = ~(0ull);
u8 ip4 = 0, ip6 = 0;
- if (!unformat_user(input, unformat_line_input, line_input))
- return 0;
+ if (!unformat_user (input, unformat_line_input, line_input))
+ return 0;
- while (unformat_check_input(line_input) != UNFORMAT_END_OF_INPUT) {
- if (!unformat(line_input, "lifetime %u", &lifetime) &&
- !unformat(line_input, "ht-ratio %lf", &ht_ratio) &&
- !unformat(line_input, "pool-size %u", &pool_size) &&
- !unformat(line_input, "buffers %llu", &buffers) &&
- !((unformat(line_input, "ip4")) && (ip4 = 1)) &&
- !((unformat(line_input, "ip6")) && (ip6 = 1))) {
- unformat_free(line_input);
- return clib_error_return(0, "invalid input");
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (!unformat (line_input, "lifetime %u", &lifetime) &&
+ !unformat (line_input, "ht-ratio %lf", &ht_ratio) &&
+ !unformat (line_input, "pool-size %u", &pool_size) &&
+ !unformat (line_input, "buffers %llu", &buffers) &&
+ !((unformat (line_input, "ip4")) && (ip4 = 1)) &&
+ !((unformat (line_input, "ip6")) && (ip6 = 1)))
+ {
+ unformat_free (line_input);
+ return clib_error_return (0, "invalid input");
+ }
}
- }
- unformat_free(line_input);
+ unformat_free (line_input);
if (!ip4 && !ip6)
- return clib_error_return(0, "must specify ip4 and/or ip6");
-
- if (ip4) {
- if (pool_size != ~0 && pool_size > MAP_IP4_REASS_CONF_POOL_SIZE_MAX)
- return clib_error_return(0, "invalid ip4-reass pool-size ( > %d)", MAP_IP4_REASS_CONF_POOL_SIZE_MAX);
- if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX+1) && ht_ratio > MAP_IP4_REASS_CONF_HT_RATIO_MAX)
- return clib_error_return(0, "invalid ip4-reass ht-ratio ( > %d)", MAP_IP4_REASS_CONF_HT_RATIO_MAX);
- if (lifetime != ~0 && lifetime > MAP_IP4_REASS_CONF_LIFETIME_MAX)
- return clib_error_return(0, "invalid ip4-reass lifetime ( > %d)", MAP_IP4_REASS_CONF_LIFETIME_MAX);
- if (buffers != ~(0ull) && buffers > MAP_IP4_REASS_CONF_BUFFERS_MAX)
- return clib_error_return(0, "invalid ip4-reass buffers ( > %ld)", MAP_IP4_REASS_CONF_BUFFERS_MAX);
- }
-
- if (ip6) {
- if (pool_size != ~0 && pool_size > MAP_IP6_REASS_CONF_POOL_SIZE_MAX)
- return clib_error_return(0, "invalid ip6-reass pool-size ( > %d)", MAP_IP6_REASS_CONF_POOL_SIZE_MAX);
- if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX+1) && ht_ratio > MAP_IP6_REASS_CONF_HT_RATIO_MAX)
- return clib_error_return(0, "invalid ip6-reass ht-log2len ( > %d)", MAP_IP6_REASS_CONF_HT_RATIO_MAX);
- if (lifetime != ~0 && lifetime > MAP_IP6_REASS_CONF_LIFETIME_MAX)
- return clib_error_return(0, "invalid ip6-reass lifetime ( > %d)", MAP_IP6_REASS_CONF_LIFETIME_MAX);
- if (buffers != ~(0ull) && buffers > MAP_IP6_REASS_CONF_BUFFERS_MAX)
- return clib_error_return(0, "invalid ip6-reass buffers ( > %ld)", MAP_IP6_REASS_CONF_BUFFERS_MAX);
- }
-
- if (ip4) {
- u32 reass = 0, packets = 0;
- if (pool_size != ~0) {
- if (map_ip4_reass_conf_pool_size(pool_size, &reass, &packets)) {
- vlib_cli_output(vm, "Could not set ip4-reass pool-size");
- } else {
- vlib_cli_output(vm, "Setting ip4-reass pool-size (destroyed-reassembly=%u , dropped-fragments=%u)", reass, packets);
- }
- }
- if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX+1)) {
- if (map_ip4_reass_conf_ht_ratio(ht_ratio, &reass, &packets)) {
- vlib_cli_output(vm, "Could not set ip4-reass ht-log2len");
- } else {
- vlib_cli_output(vm, "Setting ip4-reass ht-log2len (destroyed-reassembly=%u , dropped-fragments=%u)", reass, packets);
- }
- }
- if (lifetime != ~0) {
- if (map_ip4_reass_conf_lifetime(lifetime))
- vlib_cli_output(vm, "Could not set ip4-reass lifetime");
- else
- vlib_cli_output(vm, "Setting ip4-reass lifetime");
- }
- if (buffers != ~(0ull)) {
- if (map_ip4_reass_conf_buffers(buffers))
- vlib_cli_output(vm, "Could not set ip4-reass buffers");
- else
- vlib_cli_output(vm, "Setting ip4-reass buffers");
+ return clib_error_return (0, "must specify ip4 and/or ip6");
+
+ if (ip4)
+ {
+ if (pool_size != ~0 && pool_size > MAP_IP4_REASS_CONF_POOL_SIZE_MAX)
+ return clib_error_return (0, "invalid ip4-reass pool-size ( > %d)",
+ MAP_IP4_REASS_CONF_POOL_SIZE_MAX);
+ if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1)
+ && ht_ratio > MAP_IP4_REASS_CONF_HT_RATIO_MAX)
+ return clib_error_return (0, "invalid ip4-reass ht-ratio ( > %d)",
+ MAP_IP4_REASS_CONF_HT_RATIO_MAX);
+ if (lifetime != ~0 && lifetime > MAP_IP4_REASS_CONF_LIFETIME_MAX)
+ return clib_error_return (0, "invalid ip4-reass lifetime ( > %d)",
+ MAP_IP4_REASS_CONF_LIFETIME_MAX);
+ if (buffers != ~(0ull) && buffers > MAP_IP4_REASS_CONF_BUFFERS_MAX)
+ return clib_error_return (0, "invalid ip4-reass buffers ( > %ld)",
+ MAP_IP4_REASS_CONF_BUFFERS_MAX);
}
- if (map_main.ip4_reass_conf_buffers >
- map_main.ip4_reass_conf_pool_size * MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY) {
- vlib_cli_output(vm, "Note: 'ip4-reass buffers' > pool-size * max-fragments-per-reassembly.");
+ if (ip6)
+ {
+ if (pool_size != ~0 && pool_size > MAP_IP6_REASS_CONF_POOL_SIZE_MAX)
+ return clib_error_return (0, "invalid ip6-reass pool-size ( > %d)",
+ MAP_IP6_REASS_CONF_POOL_SIZE_MAX);
+ if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1)
+ && ht_ratio > MAP_IP6_REASS_CONF_HT_RATIO_MAX)
+ return clib_error_return (0, "invalid ip6-reass ht-log2len ( > %d)",
+ MAP_IP6_REASS_CONF_HT_RATIO_MAX);
+ if (lifetime != ~0 && lifetime > MAP_IP6_REASS_CONF_LIFETIME_MAX)
+ return clib_error_return (0, "invalid ip6-reass lifetime ( > %d)",
+ MAP_IP6_REASS_CONF_LIFETIME_MAX);
+ if (buffers != ~(0ull) && buffers > MAP_IP6_REASS_CONF_BUFFERS_MAX)
+ return clib_error_return (0, "invalid ip6-reass buffers ( > %ld)",
+ MAP_IP6_REASS_CONF_BUFFERS_MAX);
}
- }
- if (ip6) {
- u32 reass = 0, packets = 0;
- if (pool_size != ~0) {
- if (map_ip6_reass_conf_pool_size(pool_size, &reass, &packets)) {
- vlib_cli_output(vm, "Could not set ip6-reass pool-size");
- } else {
- vlib_cli_output(vm, "Setting ip6-reass pool-size (destroyed-reassembly=%u , dropped-fragments=%u)", reass, packets);
- }
- }
- if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX+1)) {
- if (map_ip6_reass_conf_ht_ratio(ht_ratio, &reass, &packets)) {
- vlib_cli_output(vm, "Could not set ip6-reass ht-log2len");
- } else {
- vlib_cli_output(vm, "Setting ip6-reass ht-log2len (destroyed-reassembly=%u , dropped-fragments=%u)", reass, packets);
- }
- }
- if (lifetime != ~0) {
- if (map_ip6_reass_conf_lifetime(lifetime))
- vlib_cli_output(vm, "Could not set ip6-reass lifetime");
- else
- vlib_cli_output(vm, "Setting ip6-reass lifetime");
- }
- if (buffers != ~(0ull)) {
- if (map_ip6_reass_conf_buffers(buffers))
- vlib_cli_output(vm, "Could not set ip6-reass buffers");
- else
- vlib_cli_output(vm, "Setting ip6-reass buffers");
+ if (ip4)
+ {
+ u32 reass = 0, packets = 0;
+ if (pool_size != ~0)
+ {
+ if (map_ip4_reass_conf_pool_size (pool_size, &reass, &packets))
+ {
+ vlib_cli_output (vm, "Could not set ip4-reass pool-size");
+ }
+ else
+ {
+ vlib_cli_output (vm,
+ "Setting ip4-reass pool-size (destroyed-reassembly=%u , dropped-fragments=%u)",
+ reass, packets);
+ }
+ }
+ if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1))
+ {
+ if (map_ip4_reass_conf_ht_ratio (ht_ratio, &reass, &packets))
+ {
+ vlib_cli_output (vm, "Could not set ip4-reass ht-log2len");
+ }
+ else
+ {
+ vlib_cli_output (vm,
+ "Setting ip4-reass ht-log2len (destroyed-reassembly=%u , dropped-fragments=%u)",
+ reass, packets);
+ }
+ }
+ if (lifetime != ~0)
+ {
+ if (map_ip4_reass_conf_lifetime (lifetime))
+ vlib_cli_output (vm, "Could not set ip4-reass lifetime");
+ else
+ vlib_cli_output (vm, "Setting ip4-reass lifetime");
+ }
+ if (buffers != ~(0ull))
+ {
+ if (map_ip4_reass_conf_buffers (buffers))
+ vlib_cli_output (vm, "Could not set ip4-reass buffers");
+ else
+ vlib_cli_output (vm, "Setting ip4-reass buffers");
+ }
+
+ if (map_main.ip4_reass_conf_buffers >
+ map_main.ip4_reass_conf_pool_size *
+ MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY)
+ {
+ vlib_cli_output (vm,
+ "Note: 'ip4-reass buffers' > pool-size * max-fragments-per-reassembly.");
+ }
}
- if (map_main.ip6_reass_conf_buffers >
- map_main.ip6_reass_conf_pool_size * MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY) {
- vlib_cli_output(vm, "Note: 'ip6-reass buffers' > pool-size * max-fragments-per-reassembly.");
+ if (ip6)
+ {
+ u32 reass = 0, packets = 0;
+ if (pool_size != ~0)
+ {
+ if (map_ip6_reass_conf_pool_size (pool_size, &reass, &packets))
+ {
+ vlib_cli_output (vm, "Could not set ip6-reass pool-size");
+ }
+ else
+ {
+ vlib_cli_output (vm,
+ "Setting ip6-reass pool-size (destroyed-reassembly=%u , dropped-fragments=%u)",
+ reass, packets);
+ }
+ }
+ if (ht_ratio != (MAP_IP4_REASS_CONF_HT_RATIO_MAX + 1))
+ {
+ if (map_ip6_reass_conf_ht_ratio (ht_ratio, &reass, &packets))
+ {
+ vlib_cli_output (vm, "Could not set ip6-reass ht-log2len");
+ }
+ else
+ {
+ vlib_cli_output (vm,
+ "Setting ip6-reass ht-log2len (destroyed-reassembly=%u , dropped-fragments=%u)",
+ reass, packets);
+ }
+ }
+ if (lifetime != ~0)
+ {
+ if (map_ip6_reass_conf_lifetime (lifetime))
+ vlib_cli_output (vm, "Could not set ip6-reass lifetime");
+ else
+ vlib_cli_output (vm, "Setting ip6-reass lifetime");
+ }
+ if (buffers != ~(0ull))
+ {
+ if (map_ip6_reass_conf_buffers (buffers))
+ vlib_cli_output (vm, "Could not set ip6-reass buffers");
+ else
+ vlib_cli_output (vm, "Setting ip6-reass buffers");
+ }
+
+ if (map_main.ip6_reass_conf_buffers >
+ map_main.ip6_reass_conf_pool_size *
+ MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY)
+ {
+ vlib_cli_output (vm,
+ "Note: 'ip6-reass buffers' > pool-size * max-fragments-per-reassembly.");
+ }
}
- }
return 0;
}
* packet trace format function
*/
u8 *
-format_map_trace (u8 *s, va_list *args)
+format_map_trace (u8 * s, va_list * args)
{
- CLIB_UNUSED(vlib_main_t *vm) = va_arg (*args, vlib_main_t *);
- CLIB_UNUSED(vlib_node_t *node) = va_arg (*args, vlib_node_t *);
+ CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+ CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
map_trace_t *t = va_arg (*args, map_trace_t *);
u32 map_domain_index = t->map_domain_index;
u16 port = t->port;
- s = format(s, "MAP domain index: %d L4 port: %u", map_domain_index, clib_net_to_host_u16(port));
+ s =
+ format (s, "MAP domain index: %d L4 port: %u", map_domain_index,
+ clib_net_to_host_u16 (port));
return s;
}
static_always_inline map_ip4_reass_t *
-map_ip4_reass_lookup(map_ip4_reass_key_t *k, u32 bucket, f64 now)
+map_ip4_reass_lookup (map_ip4_reass_key_t * k, u32 bucket, f64 now)
{
map_main_t *mm = &map_main;
u32 ri = mm->ip4_reass_hash_table[bucket];
- while(ri != MAP_REASS_INDEX_NONE) {
- map_ip4_reass_t * r = pool_elt_at_index(mm->ip4_reass_pool, ri);
- if (r->key.as_u64[0] == k->as_u64[0] &&
- r->key.as_u64[1] == k->as_u64[1] &&
- now < r->ts + (((f64)mm->ip4_reass_conf_lifetime_ms) / 1000)) {
- return r;
- }
- ri = r->bucket_next;
- }
+ while (ri != MAP_REASS_INDEX_NONE)
+ {
+ map_ip4_reass_t *r = pool_elt_at_index (mm->ip4_reass_pool, ri);
+ if (r->key.as_u64[0] == k->as_u64[0] &&
+ r->key.as_u64[1] == k->as_u64[1] &&
+ now < r->ts + (((f64) mm->ip4_reass_conf_lifetime_ms) / 1000))
+ {
+ return r;
+ }
+ ri = r->bucket_next;
+ }
return NULL;
}
#define map_ip4_reass_pool_index(r) (r - map_main.ip4_reass_pool)
void
-map_ip4_reass_free(map_ip4_reass_t *r, u32 **pi_to_drop)
+map_ip4_reass_free (map_ip4_reass_t * r, u32 ** pi_to_drop)
{
map_main_t *mm = &map_main;
- map_ip4_reass_get_fragments(r, pi_to_drop);
+ map_ip4_reass_get_fragments (r, pi_to_drop);
// Unlink in hash bucket
map_ip4_reass_t *r2 = NULL;
u32 r2i = mm->ip4_reass_hash_table[r->bucket];
- while (r2i != map_ip4_reass_pool_index(r)) {
- ASSERT(r2i != MAP_REASS_INDEX_NONE);
- r2 = pool_elt_at_index(mm->ip4_reass_pool, r2i);
- r2i = r2->bucket_next;
- }
- if (r2) {
- r2->bucket_next = r->bucket_next;
- } else {
- mm->ip4_reass_hash_table[r->bucket] = r->bucket_next;
- }
+ while (r2i != map_ip4_reass_pool_index (r))
+ {
+ ASSERT (r2i != MAP_REASS_INDEX_NONE);
+ r2 = pool_elt_at_index (mm->ip4_reass_pool, r2i);
+ r2i = r2->bucket_next;
+ }
+ if (r2)
+ {
+ r2->bucket_next = r->bucket_next;
+ }
+ else
+ {
+ mm->ip4_reass_hash_table[r->bucket] = r->bucket_next;
+ }
// Unlink in list
- if (r->fifo_next == map_ip4_reass_pool_index(r)) {
- mm->ip4_reass_fifo_last = MAP_REASS_INDEX_NONE;
- } else {
- if(mm->ip4_reass_fifo_last == map_ip4_reass_pool_index(r))
- mm->ip4_reass_fifo_last = r->fifo_prev;
- pool_elt_at_index(mm->ip4_reass_pool, r->fifo_prev)->fifo_next = r->fifo_next;
- pool_elt_at_index(mm->ip4_reass_pool, r->fifo_next)->fifo_prev = r->fifo_prev;
- }
+ if (r->fifo_next == map_ip4_reass_pool_index (r))
+ {
+ mm->ip4_reass_fifo_last = MAP_REASS_INDEX_NONE;
+ }
+ else
+ {
+ if (mm->ip4_reass_fifo_last == map_ip4_reass_pool_index (r))
+ mm->ip4_reass_fifo_last = r->fifo_prev;
+ pool_elt_at_index (mm->ip4_reass_pool, r->fifo_prev)->fifo_next =
+ r->fifo_next;
+ pool_elt_at_index (mm->ip4_reass_pool, r->fifo_next)->fifo_prev =
+ r->fifo_prev;
+ }
- pool_put(mm->ip4_reass_pool, r);
+ pool_put (mm->ip4_reass_pool, r);
mm->ip4_reass_allocated--;
}
map_ip4_reass_t *
-map_ip4_reass_get(u32 src, u32 dst, u16 fragment_id,
- u8 protocol, u32 **pi_to_drop)
+map_ip4_reass_get (u32 src, u32 dst, u16 fragment_id,
+ u8 protocol, u32 ** pi_to_drop)
{
- map_ip4_reass_t * r;
+ map_ip4_reass_t *r;
map_main_t *mm = &map_main;
map_ip4_reass_key_t k = {.src.data_u32 = src,
- .dst.data_u32 = dst,
- .fragment_id = fragment_id,
- .protocol = protocol };
+ .dst.data_u32 = dst,
+ .fragment_id = fragment_id,
+ .protocol = protocol
+ };
u32 h = 0;
- h = crc_u32(k.as_u32[0], h);
- h = crc_u32(k.as_u32[1], h);
- h = crc_u32(k.as_u32[2], h);
- h = crc_u32(k.as_u32[3], h);
+ h = crc_u32 (k.as_u32[0], h);
+ h = crc_u32 (k.as_u32[1], h);
+ h = crc_u32 (k.as_u32[2], h);
+ h = crc_u32 (k.as_u32[3], h);
h = h >> (32 - mm->ip4_reass_ht_log2len);
- f64 now = vlib_time_now(mm->vlib_main);
+ f64 now = vlib_time_now (mm->vlib_main);
//Cache garbage collection
- while (mm->ip4_reass_fifo_last != MAP_REASS_INDEX_NONE) {
- map_ip4_reass_t *last = pool_elt_at_index(mm->ip4_reass_pool, mm->ip4_reass_fifo_last);
- if (last->ts + (((f64)mm->ip4_reass_conf_lifetime_ms) / 1000) < now)
- map_ip4_reass_free(last, pi_to_drop);
- else
- break;
- }
+ while (mm->ip4_reass_fifo_last != MAP_REASS_INDEX_NONE)
+ {
+ map_ip4_reass_t *last =
+ pool_elt_at_index (mm->ip4_reass_pool, mm->ip4_reass_fifo_last);
+ if (last->ts + (((f64) mm->ip4_reass_conf_lifetime_ms) / 1000) < now)
+ map_ip4_reass_free (last, pi_to_drop);
+ else
+ break;
+ }
- if ((r = map_ip4_reass_lookup(&k, h, now)))
+ if ((r = map_ip4_reass_lookup (&k, h, now)))
return r;
if (mm->ip4_reass_allocated >= mm->ip4_reass_conf_pool_size)
return NULL;
- pool_get(mm->ip4_reass_pool, r);
+ pool_get (mm->ip4_reass_pool, r);
mm->ip4_reass_allocated++;
int i;
- for (i=0; i<MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+ for (i = 0; i < MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
r->fragments[i] = ~0;
- u32 ri = map_ip4_reass_pool_index(r);
+ u32 ri = map_ip4_reass_pool_index (r);
//Link in new bucket
r->bucket = h;
mm->ip4_reass_hash_table[h] = ri;
//Link in fifo
- if(mm->ip4_reass_fifo_last != MAP_REASS_INDEX_NONE) {
- r->fifo_next = pool_elt_at_index(mm->ip4_reass_pool, mm->ip4_reass_fifo_last)->fifo_next;
- r->fifo_prev = mm->ip4_reass_fifo_last;
- pool_elt_at_index(mm->ip4_reass_pool, r->fifo_prev)->fifo_next = ri;
- pool_elt_at_index(mm->ip4_reass_pool, r->fifo_next)->fifo_prev = ri;
- } else {
- r->fifo_next = r->fifo_prev = ri;
- mm->ip4_reass_fifo_last = ri;
- }
+ if (mm->ip4_reass_fifo_last != MAP_REASS_INDEX_NONE)
+ {
+ r->fifo_next =
+ pool_elt_at_index (mm->ip4_reass_pool,
+ mm->ip4_reass_fifo_last)->fifo_next;
+ r->fifo_prev = mm->ip4_reass_fifo_last;
+ pool_elt_at_index (mm->ip4_reass_pool, r->fifo_prev)->fifo_next = ri;
+ pool_elt_at_index (mm->ip4_reass_pool, r->fifo_next)->fifo_prev = ri;
+ }
+ else
+ {
+ r->fifo_next = r->fifo_prev = ri;
+ mm->ip4_reass_fifo_last = ri;
+ }
//Set other fields
r->ts = now;
}
int
-map_ip4_reass_add_fragment(map_ip4_reass_t *r, u32 pi)
+map_ip4_reass_add_fragment (map_ip4_reass_t * r, u32 pi)
{
if (map_main.ip4_reass_buffered_counter >= map_main.ip4_reass_conf_buffers)
return -1;
int i;
- for (i=0; i<MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
- if(r->fragments[i] == ~0) {
- r->fragments[i] = pi;
- map_main.ip4_reass_buffered_counter++;
- return 0;
- }
+ for (i = 0; i < MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+ if (r->fragments[i] == ~0)
+ {
+ r->fragments[i] = pi;
+ map_main.ip4_reass_buffered_counter++;
+ return 0;
+ }
return -1;
}
static_always_inline map_ip6_reass_t *
-map_ip6_reass_lookup(map_ip6_reass_key_t *k, u32 bucket, f64 now)
+map_ip6_reass_lookup (map_ip6_reass_key_t * k, u32 bucket, f64 now)
{
map_main_t *mm = &map_main;
u32 ri = mm->ip6_reass_hash_table[bucket];
- while(ri != MAP_REASS_INDEX_NONE) {
- map_ip6_reass_t * r = pool_elt_at_index(mm->ip6_reass_pool, ri);
- if(now < r->ts + (((f64)mm->ip6_reass_conf_lifetime_ms) / 1000) &&
- r->key.as_u64[0] == k->as_u64[0] &&
- r->key.as_u64[1] == k->as_u64[1] &&
- r->key.as_u64[2] == k->as_u64[2] &&
- r->key.as_u64[3] == k->as_u64[3] &&
- r->key.as_u64[4] == k->as_u64[4])
- return r;
- ri = r->bucket_next;
- }
+ while (ri != MAP_REASS_INDEX_NONE)
+ {
+ map_ip6_reass_t *r = pool_elt_at_index (mm->ip6_reass_pool, ri);
+ if (now < r->ts + (((f64) mm->ip6_reass_conf_lifetime_ms) / 1000) &&
+ r->key.as_u64[0] == k->as_u64[0] &&
+ r->key.as_u64[1] == k->as_u64[1] &&
+ r->key.as_u64[2] == k->as_u64[2] &&
+ r->key.as_u64[3] == k->as_u64[3] &&
+ r->key.as_u64[4] == k->as_u64[4])
+ return r;
+ ri = r->bucket_next;
+ }
return NULL;
}
#define map_ip6_reass_pool_index(r) (r - map_main.ip6_reass_pool)
void
-map_ip6_reass_free(map_ip6_reass_t *r, u32 **pi_to_drop)
+map_ip6_reass_free (map_ip6_reass_t * r, u32 ** pi_to_drop)
{
map_main_t *mm = &map_main;
int i;
- for (i=0; i<MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
- if(r->fragments[i].pi != ~0) {
- vec_add1(*pi_to_drop, r->fragments[i].pi);
- r->fragments[i].pi = ~0;
- map_main.ip6_reass_buffered_counter--;
- }
+ for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+ if (r->fragments[i].pi != ~0)
+ {
+ vec_add1 (*pi_to_drop, r->fragments[i].pi);
+ r->fragments[i].pi = ~0;
+ map_main.ip6_reass_buffered_counter--;
+ }
// Unlink in hash bucket
map_ip6_reass_t *r2 = NULL;
u32 r2i = mm->ip6_reass_hash_table[r->bucket];
- while (r2i != map_ip6_reass_pool_index(r)) {
- ASSERT(r2i != MAP_REASS_INDEX_NONE);
- r2 = pool_elt_at_index(mm->ip6_reass_pool, r2i);
- r2i = r2->bucket_next;
- }
- if (r2) {
- r2->bucket_next = r->bucket_next;
- } else {
- mm->ip6_reass_hash_table[r->bucket] = r->bucket_next;
- }
+ while (r2i != map_ip6_reass_pool_index (r))
+ {
+ ASSERT (r2i != MAP_REASS_INDEX_NONE);
+ r2 = pool_elt_at_index (mm->ip6_reass_pool, r2i);
+ r2i = r2->bucket_next;
+ }
+ if (r2)
+ {
+ r2->bucket_next = r->bucket_next;
+ }
+ else
+ {
+ mm->ip6_reass_hash_table[r->bucket] = r->bucket_next;
+ }
// Unlink in list
- if (r->fifo_next == map_ip6_reass_pool_index(r)) {
- //Single element in the list, list is now empty
- mm->ip6_reass_fifo_last = MAP_REASS_INDEX_NONE;
- } else {
- if (mm->ip6_reass_fifo_last == map_ip6_reass_pool_index(r)) //First element
- mm->ip6_reass_fifo_last = r->fifo_prev;
- pool_elt_at_index(mm->ip6_reass_pool, r->fifo_prev)->fifo_next = r->fifo_next;
- pool_elt_at_index(mm->ip6_reass_pool, r->fifo_next)->fifo_prev = r->fifo_prev;
- }
+ if (r->fifo_next == map_ip6_reass_pool_index (r))
+ {
+ //Single element in the list, list is now empty
+ mm->ip6_reass_fifo_last = MAP_REASS_INDEX_NONE;
+ }
+ else
+ {
+ if (mm->ip6_reass_fifo_last == map_ip6_reass_pool_index (r)) //First element
+ mm->ip6_reass_fifo_last = r->fifo_prev;
+ pool_elt_at_index (mm->ip6_reass_pool, r->fifo_prev)->fifo_next =
+ r->fifo_next;
+ pool_elt_at_index (mm->ip6_reass_pool, r->fifo_next)->fifo_prev =
+ r->fifo_prev;
+ }
// Free from pool if necessary
- pool_put(mm->ip6_reass_pool, r);
+ pool_put (mm->ip6_reass_pool, r);
mm->ip6_reass_allocated--;
}
map_ip6_reass_t *
-map_ip6_reass_get(ip6_address_t *src, ip6_address_t *dst, u32 fragment_id,
- u8 protocol, u32 **pi_to_drop)
+map_ip6_reass_get (ip6_address_t * src, ip6_address_t * dst, u32 fragment_id,
+ u8 protocol, u32 ** pi_to_drop)
{
- map_ip6_reass_t * r;
+ map_ip6_reass_t *r;
map_main_t *mm = &map_main;
map_ip6_reass_key_t k = {
- .src = *src,
- .dst = *dst,
- .fragment_id = fragment_id,
- .protocol = protocol };
+ .src = *src,
+ .dst = *dst,
+ .fragment_id = fragment_id,
+ .protocol = protocol
+ };
u32 h = 0;
int i;
- for (i=0; i<10; i++)
- h = crc_u32(k.as_u32[i], h);
+ for (i = 0; i < 10; i++)
+ h = crc_u32 (k.as_u32[i], h);
h = h >> (32 - mm->ip6_reass_ht_log2len);
- f64 now = vlib_time_now(mm->vlib_main);
+ f64 now = vlib_time_now (mm->vlib_main);
//Cache garbage collection
- while (mm->ip6_reass_fifo_last != MAP_REASS_INDEX_NONE) {
- map_ip6_reass_t *last = pool_elt_at_index(mm->ip6_reass_pool, mm->ip6_reass_fifo_last);
- if (last->ts + (((f64)mm->ip6_reass_conf_lifetime_ms) / 1000) < now)
- map_ip6_reass_free(last, pi_to_drop);
- else
- break;
- }
+ while (mm->ip6_reass_fifo_last != MAP_REASS_INDEX_NONE)
+ {
+ map_ip6_reass_t *last =
+ pool_elt_at_index (mm->ip6_reass_pool, mm->ip6_reass_fifo_last);
+ if (last->ts + (((f64) mm->ip6_reass_conf_lifetime_ms) / 1000) < now)
+ map_ip6_reass_free (last, pi_to_drop);
+ else
+ break;
+ }
- if ((r = map_ip6_reass_lookup(&k, h, now)))
+ if ((r = map_ip6_reass_lookup (&k, h, now)))
return r;
if (mm->ip6_reass_allocated >= mm->ip6_reass_conf_pool_size)
return NULL;
- pool_get(mm->ip6_reass_pool, r);
+ pool_get (mm->ip6_reass_pool, r);
mm->ip6_reass_allocated++;
- for (i=0; i<MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++) {
- r->fragments[i].pi = ~0;
- r->fragments[i].next_data_len = 0;
- r->fragments[i].next_data_offset = 0;
- }
+ for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+ {
+ r->fragments[i].pi = ~0;
+ r->fragments[i].next_data_len = 0;
+ r->fragments[i].next_data_offset = 0;
+ }
- u32 ri = map_ip6_reass_pool_index(r);
+ u32 ri = map_ip6_reass_pool_index (r);
//Link in new bucket
r->bucket = h;
mm->ip6_reass_hash_table[h] = ri;
//Link in fifo
- if(mm->ip6_reass_fifo_last != MAP_REASS_INDEX_NONE) {
- r->fifo_next = pool_elt_at_index(mm->ip6_reass_pool, mm->ip6_reass_fifo_last)->fifo_next;
- r->fifo_prev = mm->ip6_reass_fifo_last;
- pool_elt_at_index(mm->ip6_reass_pool, r->fifo_prev)->fifo_next = ri;
- pool_elt_at_index(mm->ip6_reass_pool, r->fifo_next)->fifo_prev = ri;
- } else {
- r->fifo_next = r->fifo_prev = ri;
- mm->ip6_reass_fifo_last = ri;
- }
+ if (mm->ip6_reass_fifo_last != MAP_REASS_INDEX_NONE)
+ {
+ r->fifo_next =
+ pool_elt_at_index (mm->ip6_reass_pool,
+ mm->ip6_reass_fifo_last)->fifo_next;
+ r->fifo_prev = mm->ip6_reass_fifo_last;
+ pool_elt_at_index (mm->ip6_reass_pool, r->fifo_prev)->fifo_next = ri;
+ pool_elt_at_index (mm->ip6_reass_pool, r->fifo_next)->fifo_prev = ri;
+ }
+ else
+ {
+ r->fifo_next = r->fifo_prev = ri;
+ mm->ip6_reass_fifo_last = ri;
+ }
//Set other fields
r->ts = now;
}
int
-map_ip6_reass_add_fragment(map_ip6_reass_t *r, u32 pi,
- u16 data_offset, u16 next_data_offset,
- u8 *data_start, u16 data_len)
+map_ip6_reass_add_fragment (map_ip6_reass_t * r, u32 pi,
+ u16 data_offset, u16 next_data_offset,
+ u8 * data_start, u16 data_len)
{
map_ip6_fragment_t *f = NULL, *prev_f = NULL;
u16 copied_len = (data_len > 20) ? 20 : data_len;
//Lookup for fragments for the current buffer
//and the one before that
int i;
- for (i=0; i<MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++) {
- if (data_offset && r->fragments[i].next_data_offset == data_offset) {
- prev_f = &r->fragments[i]; // This is buffer for previous packet
- } else if (r->fragments[i].next_data_offset == next_data_offset) {
- f = &r->fragments[i]; // This is a buffer for the current packet
- } else if (r->fragments[i].next_data_offset == 0) { //Available
- if (f == NULL)
- f = &r->fragments[i];
- else if (prev_f == NULL)
- prev_f = &r->fragments[i];
+ for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+ {
+ if (data_offset && r->fragments[i].next_data_offset == data_offset)
+ {
+ prev_f = &r->fragments[i]; // This is buffer for previous packet
+ }
+ else if (r->fragments[i].next_data_offset == next_data_offset)
+ {
+ f = &r->fragments[i]; // This is a buffer for the current packet
+ }
+ else if (r->fragments[i].next_data_offset == 0)
+ { //Available
+ if (f == NULL)
+ f = &r->fragments[i];
+ else if (prev_f == NULL)
+ prev_f = &r->fragments[i];
+ }
}
- }
if (!f || f->pi != ~0)
return -1;
- if (data_offset) {
- if (!prev_f)
- return -1;
+ if (data_offset)
+ {
+ if (!prev_f)
+ return -1;
- clib_memcpy(prev_f->next_data, data_start, copied_len);
- prev_f->next_data_len = copied_len;
- prev_f->next_data_offset = data_offset;
- } else {
- if (((ip4_header_t *)data_start)->ip_version_and_header_length != 0x45)
- return -1;
+ clib_memcpy (prev_f->next_data, data_start, copied_len);
+ prev_f->next_data_len = copied_len;
+ prev_f->next_data_offset = data_offset;
+ }
+ else
+ {
+ if (((ip4_header_t *) data_start)->ip_version_and_header_length != 0x45)
+ return -1;
- if (r->ip4_header.ip_version_and_header_length == 0)
- clib_memcpy(&r->ip4_header, data_start, sizeof(ip4_header_t));
- }
+ if (r->ip4_header.ip_version_and_header_length == 0)
+ clib_memcpy (&r->ip4_header, data_start, sizeof (ip4_header_t));
+ }
- if(data_len > 20) {
- f->next_data_offset = next_data_offset;
- f->pi = pi;
- map_main.ip6_reass_buffered_counter++;
- }
+ if (data_len > 20)
+ {
+ f->next_data_offset = next_data_offset;
+ f->pi = pi;
+ map_main.ip6_reass_buffered_counter++;
+ }
return 0;
}
-void map_ip4_reass_reinit(u32 *trashed_reass, u32 *dropped_packets)
+void
+map_ip4_reass_reinit (u32 * trashed_reass, u32 * dropped_packets)
{
map_main_t *mm = &map_main;
int i;
- if(dropped_packets)
+ if (dropped_packets)
*dropped_packets = mm->ip4_reass_buffered_counter;
- if(trashed_reass)
+ if (trashed_reass)
*trashed_reass = mm->ip4_reass_allocated;
- if (mm->ip4_reass_fifo_last != MAP_REASS_INDEX_NONE) {
- u16 ri = mm->ip4_reass_fifo_last;
- do {
- map_ip4_reass_t *r = pool_elt_at_index(mm->ip4_reass_pool, ri);
- for (i=0; i<MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
- if (r->fragments[i] != ~0)
- map_ip4_drop_pi(r->fragments[i]);
-
- ri = r->fifo_next;
- pool_put(mm->ip4_reass_pool, r);
- } while (ri != mm->ip4_reass_fifo_last);
- }
+ if (mm->ip4_reass_fifo_last != MAP_REASS_INDEX_NONE)
+ {
+ u16 ri = mm->ip4_reass_fifo_last;
+ do
+ {
+ map_ip4_reass_t *r = pool_elt_at_index (mm->ip4_reass_pool, ri);
+ for (i = 0; i < MAP_IP4_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+ if (r->fragments[i] != ~0)
+ map_ip4_drop_pi (r->fragments[i]);
+
+ ri = r->fifo_next;
+ pool_put (mm->ip4_reass_pool, r);
+ }
+ while (ri != mm->ip4_reass_fifo_last);
+ }
- vec_free(mm->ip4_reass_hash_table);
- vec_resize(mm->ip4_reass_hash_table, 1 << mm->ip4_reass_ht_log2len);
- for (i=0; i<(1 << mm->ip4_reass_ht_log2len); i++)
+ vec_free (mm->ip4_reass_hash_table);
+ vec_resize (mm->ip4_reass_hash_table, 1 << mm->ip4_reass_ht_log2len);
+ for (i = 0; i < (1 << mm->ip4_reass_ht_log2len); i++)
mm->ip4_reass_hash_table[i] = MAP_REASS_INDEX_NONE;
- pool_free(mm->ip4_reass_pool);
- pool_alloc(mm->ip4_reass_pool, mm->ip4_reass_conf_pool_size);
+ pool_free (mm->ip4_reass_pool);
+ pool_alloc (mm->ip4_reass_pool, mm->ip4_reass_conf_pool_size);
mm->ip4_reass_allocated = 0;
mm->ip4_reass_fifo_last = MAP_REASS_INDEX_NONE;
mm->ip4_reass_buffered_counter = 0;
}
-u8 map_get_ht_log2len(f32 ht_ratio, u16 pool_size)
+u8
+map_get_ht_log2len (f32 ht_ratio, u16 pool_size)
{
- u32 desired_size = (u32)(pool_size * ht_ratio);
+ u32 desired_size = (u32) (pool_size * ht_ratio);
u8 i;
- for (i=1; i<31; i++)
+ for (i = 1; i < 31; i++)
if ((1 << i) >= desired_size)
return i;
return 4;
}
-int map_ip4_reass_conf_ht_ratio(f32 ht_ratio, u32 *trashed_reass, u32 *dropped_packets)
+int
+map_ip4_reass_conf_ht_ratio (f32 ht_ratio, u32 * trashed_reass,
+ u32 * dropped_packets)
{
map_main_t *mm = &map_main;
if (ht_ratio > MAP_IP4_REASS_CONF_HT_RATIO_MAX)
return -1;
- map_ip4_reass_lock();
+ map_ip4_reass_lock ();
mm->ip4_reass_conf_ht_ratio = ht_ratio;
- mm->ip4_reass_ht_log2len = map_get_ht_log2len(ht_ratio, mm->ip4_reass_conf_pool_size);
- map_ip4_reass_reinit(trashed_reass, dropped_packets);
- map_ip4_reass_unlock();
+ mm->ip4_reass_ht_log2len =
+ map_get_ht_log2len (ht_ratio, mm->ip4_reass_conf_pool_size);
+ map_ip4_reass_reinit (trashed_reass, dropped_packets);
+ map_ip4_reass_unlock ();
return 0;
}
-int map_ip4_reass_conf_pool_size(u16 pool_size, u32 *trashed_reass, u32 *dropped_packets)
+int
+map_ip4_reass_conf_pool_size (u16 pool_size, u32 * trashed_reass,
+ u32 * dropped_packets)
{
map_main_t *mm = &map_main;
if (pool_size > MAP_IP4_REASS_CONF_POOL_SIZE_MAX)
return -1;
- map_ip4_reass_lock();
+ map_ip4_reass_lock ();
mm->ip4_reass_conf_pool_size = pool_size;
- map_ip4_reass_reinit(trashed_reass, dropped_packets);
- map_ip4_reass_unlock();
+ map_ip4_reass_reinit (trashed_reass, dropped_packets);
+ map_ip4_reass_unlock ();
return 0;
}
-int map_ip4_reass_conf_lifetime(u16 lifetime_ms)
+int
+map_ip4_reass_conf_lifetime (u16 lifetime_ms)
{
map_main.ip4_reass_conf_lifetime_ms = lifetime_ms;
return 0;
}
-int map_ip4_reass_conf_buffers(u32 buffers)
+int
+map_ip4_reass_conf_buffers (u32 buffers)
{
map_main.ip4_reass_conf_buffers = buffers;
return 0;
}
-void map_ip6_reass_reinit(u32 *trashed_reass, u32 *dropped_packets)
+void
+map_ip6_reass_reinit (u32 * trashed_reass, u32 * dropped_packets)
{
map_main_t *mm = &map_main;
- if(dropped_packets)
+ if (dropped_packets)
*dropped_packets = mm->ip6_reass_buffered_counter;
- if(trashed_reass)
+ if (trashed_reass)
*trashed_reass = mm->ip6_reass_allocated;
int i;
- if (mm->ip6_reass_fifo_last != MAP_REASS_INDEX_NONE) {
- u16 ri = mm->ip6_reass_fifo_last;
- do {
- map_ip6_reass_t *r = pool_elt_at_index(mm->ip6_reass_pool, ri);
- for (i=0; i<MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
- if (r->fragments[i].pi != ~0)
- map_ip6_drop_pi(r->fragments[i].pi);
-
- ri = r->fifo_next;
- pool_put(mm->ip6_reass_pool, r);
- } while (ri != mm->ip6_reass_fifo_last);
- mm->ip6_reass_fifo_last = MAP_REASS_INDEX_NONE;
- }
+ if (mm->ip6_reass_fifo_last != MAP_REASS_INDEX_NONE)
+ {
+ u16 ri = mm->ip6_reass_fifo_last;
+ do
+ {
+ map_ip6_reass_t *r = pool_elt_at_index (mm->ip6_reass_pool, ri);
+ for (i = 0; i < MAP_IP6_REASS_MAX_FRAGMENTS_PER_REASSEMBLY; i++)
+ if (r->fragments[i].pi != ~0)
+ map_ip6_drop_pi (r->fragments[i].pi);
+
+ ri = r->fifo_next;
+ pool_put (mm->ip6_reass_pool, r);
+ }
+ while (ri != mm->ip6_reass_fifo_last);
+ mm->ip6_reass_fifo_last = MAP_REASS_INDEX_NONE;
+ }
- vec_free(mm->ip6_reass_hash_table);
- vec_resize(mm->ip6_reass_hash_table, 1 << mm->ip6_reass_ht_log2len);
- for(i=0; i<(1 << mm->ip6_reass_ht_log2len); i++)
+ vec_free (mm->ip6_reass_hash_table);
+ vec_resize (mm->ip6_reass_hash_table, 1 << mm->ip6_reass_ht_log2len);
+ for (i = 0; i < (1 << mm->ip6_reass_ht_log2len); i++)
mm->ip6_reass_hash_table[i] = MAP_REASS_INDEX_NONE;
- pool_free(mm->ip6_reass_pool);
- pool_alloc(mm->ip6_reass_pool, mm->ip4_reass_conf_pool_size);
+ pool_free (mm->ip6_reass_pool);
+ pool_alloc (mm->ip6_reass_pool, mm->ip4_reass_conf_pool_size);
mm->ip6_reass_allocated = 0;
mm->ip6_reass_buffered_counter = 0;
}
-int map_ip6_reass_conf_ht_ratio(f32 ht_ratio, u32 *trashed_reass, u32 *dropped_packets)
+int
+map_ip6_reass_conf_ht_ratio (f32 ht_ratio, u32 * trashed_reass,
+ u32 * dropped_packets)
{
map_main_t *mm = &map_main;
if (ht_ratio > MAP_IP6_REASS_CONF_HT_RATIO_MAX)
return -1;
- map_ip6_reass_lock();
+ map_ip6_reass_lock ();
mm->ip6_reass_conf_ht_ratio = ht_ratio;
- mm->ip6_reass_ht_log2len = map_get_ht_log2len(ht_ratio, mm->ip6_reass_conf_pool_size);
- map_ip6_reass_reinit(trashed_reass, dropped_packets);
- map_ip6_reass_unlock();
+ mm->ip6_reass_ht_log2len =
+ map_get_ht_log2len (ht_ratio, mm->ip6_reass_conf_pool_size);
+ map_ip6_reass_reinit (trashed_reass, dropped_packets);
+ map_ip6_reass_unlock ();
return 0;
}
-int map_ip6_reass_conf_pool_size(u16 pool_size, u32 *trashed_reass, u32 *dropped_packets)
+int
+map_ip6_reass_conf_pool_size (u16 pool_size, u32 * trashed_reass,
+ u32 * dropped_packets)
{
map_main_t *mm = &map_main;
if (pool_size > MAP_IP6_REASS_CONF_POOL_SIZE_MAX)
return -1;
- map_ip6_reass_lock();
+ map_ip6_reass_lock ();
mm->ip6_reass_conf_pool_size = pool_size;
- map_ip6_reass_reinit(trashed_reass, dropped_packets);
- map_ip6_reass_unlock();
+ map_ip6_reass_reinit (trashed_reass, dropped_packets);
+ map_ip6_reass_unlock ();
return 0;
}
-int map_ip6_reass_conf_lifetime(u16 lifetime_ms)
+int
+map_ip6_reass_conf_lifetime (u16 lifetime_ms)
{
map_main.ip6_reass_conf_lifetime_ms = lifetime_ms;
return 0;
}
-int map_ip6_reass_conf_buffers(u32 buffers)
+int
+map_ip6_reass_conf_buffers (u32 buffers)
{
map_main.ip6_reass_conf_buffers = buffers;
return 0;
}
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(map_ip4_reass_lifetime_command, static) = {
.path = "map params reassembly",
.short_help = "[ip4 | ip6] [lifetime <lifetime-ms>] [pool-size <pool-size>] [buffers <buffers>] [ht-ratio <ht-ratio>]",
.function = map_params_reass_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(map_traffic_class_command, static) = {
.path = "map params traffic-class",
.short_help =
"traffic-class {0x0-0xff | copy}",
.function = map_traffic_class_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(map_pre_resolve_command, static) = {
.path = "map params pre-resolve",
.short_help =
"pre-resolve {ip4-nh <address>} | {ip6-nh <address>}",
.function = map_pre_resolve_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(map_security_check_command, static) = {
.path = "map params security-check",
.short_help =
"security-check on|off",
.function = map_security_check_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(map_icmp_relay_source_address_command, static) = {
.path = "map params icmp source-address",
.short_help = "source-address <ip4-address>",
.function = map_icmp_relay_source_address_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(map_icmp_unreachables_command, static) = {
.path = "map params icmp6 unreachables",
.short_help = "unreachables {on|off}",
.function = map_icmp_unreachables_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(map_fragment_command, static) = {
.path = "map params fragment",
.short_help = "[inner|outer] [ignore-df [on|off]]",
.function = map_fragment_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(map_fragment_df_command, static) = {
.path = "map params fragment ignore-df",
.short_help = "on|off",
.function = map_fragment_df_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(map_security_check_frag_command, static) = {
.path = "map params security-check fragments",
.short_help =
"fragments on|off",
.function = map_security_check_frag_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(map_add_domain_command, static) = {
.path = "map add domain",
.short_help =
"ea-bits-len <n> psid-offset <n> psid-len <n> [map-t] [mtu <mtu>]",
.function = map_add_domain_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(map_add_rule_command, static) = {
.path = "map add rule",
.short_help =
"map add rule index <domain> psid <psid> ip6-dst <ip6-addr>",
.function = map_add_rule_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(map_del_command, static) = {
.path = "map del domain",
.short_help =
"map del domain index <domain>",
.function = map_del_domain_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(show_map_domain_command, static) = {
.path = "show map domain",
.function = show_map_domain_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(show_map_stats_command, static) = {
.path = "show map stats",
.function = show_map_stats_command_fn,
};
+/* *INDENT-ON* */
+/* *INDENT-OFF* */
VLIB_CLI_COMMAND(show_map_fragments_command, static) = {
.path = "show map fragments",
.function = show_map_fragments_command_fn,
};
+/* *INDENT-ON* */
/*
* map_init
*/
-clib_error_t *map_init (vlib_main_t *vm)
+clib_error_t *
+map_init (vlib_main_t * vm)
{
map_main_t *mm = &map_main;
- mm->vnet_main = vnet_get_main();
+ mm->vnet_main = vnet_get_main ();
mm->vlib_main = vm;
-#ifdef MAP_SKIP_IP6_LOOKUP
- memset(&mm->preresolve_ip4, 0, sizeof(mm->preresolve_ip4));
- memset(&mm->preresolve_ip6, 0, sizeof(mm->preresolve_ip6));
+#ifdef MAP_SKIP_IP6_LOOKUP
+ memset (&mm->preresolve_ip4, 0, sizeof (mm->preresolve_ip4));
+ memset (&mm->preresolve_ip6, 0, sizeof (mm->preresolve_ip6));
mm->adj4_index = 0;
mm->adj6_index = 0;
#endif
mm->frag_inner = false;
mm->frag_ignore_df = false;
- vec_validate(mm->domain_counters, MAP_N_DOMAIN_COUNTER - 1);
+ vec_validate (mm->domain_counters, MAP_N_DOMAIN_COUNTER - 1);
mm->domain_counters[MAP_DOMAIN_COUNTER_RX].name = "rx";
mm->domain_counters[MAP_DOMAIN_COUNTER_TX].name = "tx";
- vlib_validate_simple_counter(&mm->icmp_relayed, 0);
- vlib_zero_simple_counter(&mm->icmp_relayed, 0);
+ vlib_validate_simple_counter (&mm->icmp_relayed, 0);
+ vlib_zero_simple_counter (&mm->icmp_relayed, 0);
/* IP4 virtual reassembly */
mm->ip4_reass_hash_table = 0;
mm->ip4_reass_pool = 0;
- mm->ip4_reass_lock = clib_mem_alloc_aligned(CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
+ mm->ip4_reass_lock =
+ clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
mm->ip4_reass_conf_ht_ratio = MAP_IP4_REASS_HT_RATIO_DEFAULT;
mm->ip4_reass_conf_lifetime_ms = MAP_IP4_REASS_LIFETIME_DEFAULT;
mm->ip4_reass_conf_pool_size = MAP_IP4_REASS_POOL_SIZE_DEFAULT;
mm->ip4_reass_conf_buffers = MAP_IP4_REASS_BUFFERS_DEFAULT;
- mm->ip4_reass_ht_log2len = map_get_ht_log2len(mm->ip4_reass_conf_ht_ratio, mm->ip4_reass_conf_pool_size);
+ mm->ip4_reass_ht_log2len =
+ map_get_ht_log2len (mm->ip4_reass_conf_ht_ratio,
+ mm->ip4_reass_conf_pool_size);
mm->ip4_reass_fifo_last = MAP_REASS_INDEX_NONE;
- map_ip4_reass_reinit(NULL, NULL);
+ map_ip4_reass_reinit (NULL, NULL);
/* IP6 virtual reassembly */
mm->ip6_reass_hash_table = 0;
mm->ip6_reass_pool = 0;
- mm->ip6_reass_lock = clib_mem_alloc_aligned(CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
+ mm->ip6_reass_lock =
+ clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
mm->ip6_reass_conf_ht_ratio = MAP_IP6_REASS_HT_RATIO_DEFAULT;
mm->ip6_reass_conf_lifetime_ms = MAP_IP6_REASS_LIFETIME_DEFAULT;
mm->ip6_reass_conf_pool_size = MAP_IP6_REASS_POOL_SIZE_DEFAULT;
mm->ip6_reass_conf_buffers = MAP_IP6_REASS_BUFFERS_DEFAULT;
- mm->ip6_reass_ht_log2len = map_get_ht_log2len(mm->ip6_reass_conf_ht_ratio, mm->ip6_reass_conf_pool_size);
+ mm->ip6_reass_ht_log2len =
+ map_get_ht_log2len (mm->ip6_reass_conf_ht_ratio,
+ mm->ip6_reass_conf_pool_size);
mm->ip6_reass_fifo_last = MAP_REASS_INDEX_NONE;
- map_ip6_reass_reinit(NULL, NULL);
+ map_ip6_reass_reinit (NULL, NULL);
return 0;
}
-VLIB_INIT_FUNCTION(map_init);
+VLIB_INIT_FUNCTION (map_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
Code Review / vpp.git / blobdiff