X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fnat_ipfix_logging.c;h=b2c167096aacd2290723d04c150b14d26419d382;hb=2d24cd027275905f308f75bf45d0f9d163f2235b;hp=ef1ab859d8d692e2e4363191ef836c4498d22c63;hpb=a431ad1c486ad0fd9ca35e14c527fe7611965fc2;p=vpp.git diff --git a/src/plugins/nat/nat_ipfix_logging.c b/src/plugins/nat/nat_ipfix_logging.c index ef1ab859d8d..b2c167096aa 100644 --- a/src/plugins/nat/nat_ipfix_logging.c +++ b/src/plugins/nat/nat_ipfix_logging.c @@ -15,8 +15,9 @@ * limitations under the License. */ -#include +#include #include +#include #include snat_ipfix_logging_main_t snat_ipfix_logging_main; @@ -403,7 +404,9 @@ snat_template_rewrite_addr_exhausted (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t *elts, + u32 n_elts, u32 *stream_index) { return snat_template_rewrite (frm, fr, collector_address, src_address, collector_port, NAT_ADDRESSES_EXHAUTED, 0); @@ -414,7 +417,9 @@ snat_template_rewrite_nat44_session (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t *elts, + u32 n_elts, u32 *stream_index) { return snat_template_rewrite (frm, fr, collector_address, src_address, collector_port, NAT44_SESSION_CREATE, 0); @@ -425,7 +430,9 @@ snat_template_rewrite_max_entries_per_usr (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t *elts, + u32 n_elts, u32 *stream_index) { return snat_template_rewrite (frm, fr, collector_address, src_address, collector_port, QUOTA_EXCEEDED, @@ -437,7 +444,9 @@ nat_template_rewrite_max_sessions (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t *elts, + u32 n_elts, u32 *stream_index) { return snat_template_rewrite (frm, fr, collector_address, src_address, collector_port, QUOTA_EXCEEDED, @@ -449,7 +458,9 @@ nat_template_rewrite_max_bibs (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t *elts, + u32 n_elts, u32 *stream_index) { return snat_template_rewrite (frm, fr, collector_address, src_address, collector_port, QUOTA_EXCEEDED, @@ -461,7 +472,9 @@ nat_template_rewrite_max_frags_ip4 (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t *elts, + u32 n_elts, u32 *stream_index) { return snat_template_rewrite (frm, fr, collector_address, src_address, collector_port, QUOTA_EXCEEDED, @@ -473,7 +486,9 @@ nat_template_rewrite_max_frags_ip6 (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t *elts, + u32 n_elts, u32 *stream_index) { return snat_template_rewrite (frm, fr, collector_address, src_address, collector_port, QUOTA_EXCEEDED, @@ -485,7 +500,9 @@ nat_template_rewrite_nat64_bib (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t *elts, + u32 n_elts, u32 *stream_index) { return snat_template_rewrite (frm, fr, collector_address, src_address, collector_port, NAT64_BIB_CREATE, 0); @@ -496,7 +513,9 @@ nat_template_rewrite_nat64_session (flow_report_main_t * frm, flow_report_t * fr, ip4_address_t * collector_address, ip4_address_t * src_address, - u16 collector_port) + u16 collector_port, + ipfix_report_element_t *elts, + u32 n_elts, u32 *stream_index) { return snat_template_rewrite (frm, fr, collector_address, src_address, collector_port, NAT64_SESSION_CREATE, 0); @@ -519,7 +538,7 @@ snat_ipfix_header_create (flow_report_main_t * frm, b0->current_data = 0; b0->current_length = sizeof (*ip) + sizeof (*udp) + sizeof (*h) + sizeof (*s); - b0->flags |= (VLIB_BUFFER_TOTAL_LENGTH_VALID | VLIB_BUFFER_FLOW_REPORT); + b0->flags |= (VLIB_BUFFER_TOTAL_LENGTH_VALID | VNET_BUFFER_F_FLOW_REPORT); vnet_buffer (b0)->sw_if_index[VLIB_RX] = 0; vnet_buffer (b0)->sw_if_index[VLIB_TX] = frm->fib_index; tp = vlib_buffer_get_current (b0); @@ -621,7 +640,7 @@ snat_ipfix_logging_nat44_ses (u8 nat_event, u32 src_ip, u32 nat_src_ip, if (vlib_buffer_alloc (vm, &bi0, 1) != 1) { - clib_warning ("can't allocate buffer for NAT IPFIX event"); + nat_log_err ("can't allocate buffer for NAT IPFIX event"); return; } @@ -722,7 +741,7 @@ snat_ipfix_logging_addr_exhausted (u32 pool_id, int do_flush) if (vlib_buffer_alloc (vm, &bi0, 1) != 1) { - clib_warning ("can't allocate buffer for NAT IPFIX event"); + nat_log_err ("can't allocate buffer for NAT IPFIX event"); return; } @@ -809,7 +828,7 @@ snat_ipfix_logging_max_entries_per_usr (u32 limit, u32 src_ip, int do_flush) if (vlib_buffer_alloc (vm, &bi0, 1) != 1) { - clib_warning ("can't allocate buffer for NAT IPFIX event"); + nat_log_err ("can't allocate buffer for NAT IPFIX event"); return; } @@ -902,7 +921,7 @@ nat_ipfix_logging_max_ses (u32 limit, int do_flush) if (vlib_buffer_alloc (vm, &bi0, 1) != 1) { - clib_warning ("can't allocate buffer for NAT IPFIX event"); + nat_log_err ("can't allocate buffer for NAT IPFIX event"); return; } @@ -992,7 +1011,7 @@ nat_ipfix_logging_max_bib (u32 limit, int do_flush) if (vlib_buffer_alloc (vm, &bi0, 1) != 1) { - clib_warning ("can't allocate buffer for NAT IPFIX event"); + nat_log_err ("can't allocate buffer for NAT IPFIX event"); return; } @@ -1082,7 +1101,7 @@ nat_ipfix_logging_max_frag_ip4 (u32 limit, u32 src, int do_flush) if (vlib_buffer_alloc (vm, &bi0, 1) != 1) { - clib_warning ("can't allocate buffer for NAT IPFIX event"); + nat_log_err ("can't allocate buffer for NAT IPFIX event"); return; } @@ -1175,7 +1194,7 @@ nat_ipfix_logging_max_frag_ip6 (u32 limit, ip6_address_t * src, int do_flush) if (vlib_buffer_alloc (vm, &bi0, 1) != 1) { - clib_warning ("can't allocate buffer for NAT IPFIX event"); + nat_log_err ("can't allocate buffer for NAT IPFIX event"); return; } @@ -1268,7 +1287,7 @@ nat_ipfix_logging_nat64_bibe (u8 nat_event, ip6_address_t * src_ip, if (vlib_buffer_alloc (vm, &bi0, 1) != 1) { - clib_warning ("can't allocate buffer for NAT IPFIX event"); + nat_log_err ("can't allocate buffer for NAT IPFIX event"); return; } @@ -1372,7 +1391,7 @@ nat_ipfix_logging_nat64_ses (u8 nat_event, ip6_address_t * src_ip, if (vlib_buffer_alloc (vm, &bi0, 1) != 1) { - clib_warning ("can't allocate buffer for NAT IPFIX event"); + nat_log_err ("can't allocate buffer for NAT IPFIX event"); return; } @@ -1923,7 +1942,7 @@ snat_ipfix_logging_enable_disable (int enable, u32 domain_id, u16 src_port) rv = vnet_flow_report_add_del (frm, &a, NULL); if (rv) { - clib_warning ("vnet_flow_report_add_del returned %d", rv); + nat_log_warn ("vnet_flow_report_add_del returned %d", rv); return -1; } } @@ -1935,7 +1954,7 @@ snat_ipfix_logging_enable_disable (int enable, u32 domain_id, u16 src_port) rv = vnet_flow_report_add_del (frm, &a, NULL); if (rv) { - clib_warning ("vnet_flow_report_add_del returned %d", rv); + nat_log_warn ("vnet_flow_report_add_del returned %d", rv); return -1; } @@ -1945,7 +1964,7 @@ snat_ipfix_logging_enable_disable (int enable, u32 domain_id, u16 src_port) rv = vnet_flow_report_add_del (frm, &a, NULL); if (rv) { - clib_warning ("vnet_flow_report_add_del returned %d", rv); + nat_log_warn ("vnet_flow_report_add_del returned %d", rv); return -1; } @@ -1955,7 +1974,7 @@ snat_ipfix_logging_enable_disable (int enable, u32 domain_id, u16 src_port) rv = vnet_flow_report_add_del (frm, &a, NULL); if (rv) { - clib_warning ("vnet_flow_report_add_del returned %d", rv); + nat_log_warn ("vnet_flow_report_add_del returned %d", rv); return -1; } @@ -1965,7 +1984,7 @@ snat_ipfix_logging_enable_disable (int enable, u32 domain_id, u16 src_port) rv = vnet_flow_report_add_del (frm, &a, NULL); if (rv) { - clib_warning ("vnet_flow_report_add_del returned %d", rv); + nat_log_warn ("vnet_flow_report_add_del returned %d", rv); return -1; } @@ -1975,7 +1994,7 @@ snat_ipfix_logging_enable_disable (int enable, u32 domain_id, u16 src_port) rv = vnet_flow_report_add_del (frm, &a, NULL); if (rv) { - clib_warning ("vnet_flow_report_add_del returned %d", rv); + nat_log_warn ("vnet_flow_report_add_del returned %d", rv); return -1; } @@ -1985,7 +2004,7 @@ snat_ipfix_logging_enable_disable (int enable, u32 domain_id, u16 src_port) rv = vnet_flow_report_add_del (frm, &a, NULL); if (rv) { - clib_warning ("vnet_flow_report_add_del returned %d", rv); + nat_log_warn ("vnet_flow_report_add_del returned %d", rv); return -1; } @@ -1995,7 +2014,7 @@ snat_ipfix_logging_enable_disable (int enable, u32 domain_id, u16 src_port) rv = vnet_flow_report_add_del (frm, &a, NULL); if (rv) { - clib_warning ("vnet_flow_report_add_del returned %d", rv); + nat_log_warn ("vnet_flow_report_add_del returned %d", rv); return -1; } @@ -2005,9 +2024,22 @@ snat_ipfix_logging_enable_disable (int enable, u32 domain_id, u16 src_port) rv = vnet_flow_report_add_del (frm, &a, NULL); if (rv) { - clib_warning ("vnet_flow_report_add_del returned %d", rv); + nat_log_warn ("vnet_flow_report_add_del returned %d", rv); return -1; } + + if (sm->endpoint_dependent) + { + a.rewrite_callback = snat_template_rewrite_max_entries_per_usr; + a.flow_data_callback = snat_data_callback_max_entries_per_usr; + + rv = vnet_flow_report_add_del (frm, &a, NULL); + if (rv) + { + nat_log_warn ("vnet_flow_report_add_del returned %d", rv); + return -1; + } + } } return 0;