diff options
| -rw-r--r-- | src/plugins/nat/in2out.c | 5 | ||||
| -rw-r--r-- | src/plugins/nat/in2out_ed.c | 16 | ||||
| -rw-r--r-- | src/plugins/nat/nat.h | 10 | ||||
| -rw-r--r-- | src/plugins/nat/out2in.c | 5 |
4 files changed, 9 insertions, 27 deletions
diff --git a/src/plugins/nat/in2out.c b/src/plugins/nat/in2out.c index b8febc17c99..f904d02b344 100644 --- a/src/plugins/nat/in2out.c +++ b/src/plugins/nat/in2out.c @@ -94,8 +94,7 @@ _(UDP_PACKETS, "UDP packets") \ _(ICMP_PACKETS, "ICMP packets") \ _(OTHER_PACKETS, "other protocol packets") \ _(FRAGMENTS, "fragments") \ -_(CACHED_FRAGMENTS, "cached fragments") \ -_(PROCESSED_FRAGMENTS, "processed fragments") +_(CANNOT_CREATE_USER, "cannot create NAT user") typedef enum { @@ -312,7 +311,7 @@ slow_path (snat_main_t * sm, vlib_buffer_t * b0, thread_index); if (!u) { - nat_elog_warn ("create NAT user failed"); + b0->error = node->errors[SNAT_IN2OUT_ERROR_CANNOT_CREATE_USER]; return SNAT_IN2OUT_NEXT_DROP; } diff --git a/src/plugins/nat/in2out_ed.c b/src/plugins/nat/in2out_ed.c index 19b128864f0..e5f29e4b445 100644 --- a/src/plugins/nat/in2out_ed.c +++ b/src/plugins/nat/in2out_ed.c @@ -368,12 +368,7 @@ slow_path_ed (snat_main_t * sm, &sm_fib_index, 0, 0, 0, &lb, 0, &identity_nat)) { s = nat_ed_session_alloc (sm, thread_index, now, proto); - if (!s) - { - nat_elog_warn ("create NAT session failed"); - b->error = node->errors[NAT_IN2OUT_ED_ERROR_MAX_USER_SESS_EXCEEDED]; - return NAT_NEXT_DROP; - } + ASSERT (s); s->in2out.addr = l_addr; s->in2out.port = l_port; s->nat_proto = nat_proto; @@ -418,12 +413,7 @@ slow_path_ed (snat_main_t * sm, return next; } s = nat_ed_session_alloc (sm, thread_index, now, proto); - if (!s) - { - nat_elog_warn ("create NAT session failed"); - b->error = node->errors[NAT_IN2OUT_ED_ERROR_MAX_USER_SESS_EXCEEDED]; - return NAT_NEXT_DROP; - } + ASSERT (s); s->out2in.addr = sm_addr; s->out2in.port = sm_port; s->in2out.addr = l_addr; @@ -863,7 +853,7 @@ nat44_ed_in2out_unknown_proto (snat_main_t * sm, s = nat_ed_session_alloc (sm, thread_index, now, ip->protocol); if (!s) { - b->error = node->errors[NAT_IN2OUT_ED_ERROR_MAX_USER_SESS_EXCEEDED]; + b->error = node->errors[NAT_IN2OUT_ED_ERROR_MAX_SESSIONS_EXCEEDED]; nat_elog_warn ("create NAT session failed"); return 0; } diff --git a/src/plugins/nat/nat.h b/src/plugins/nat/nat.h index d5b236dac01..1885ab57df7 100644 --- a/src/plugins/nat/nat.h +++ b/src/plugins/nat/nat.h @@ -154,18 +154,14 @@ _(IN2OUT_PACKETS, "good in2out packets processed") \ _(OUT_OF_PORTS, "out of ports") \ _(BAD_ICMP_TYPE, "unsupported ICMP type") \ _(MAX_SESSIONS_EXCEEDED, "maximum sessions exceeded") \ -_(MAX_USER_SESS_EXCEEDED, "max user sessions exceeded") \ _(DROP_FRAGMENT, "drop fragment") \ -_(CANNOT_CREATE_USER, "cannot create NAT user") \ _(NON_SYN, "non-SYN packet try to create session") \ _(TCP_PACKETS, "TCP packets") \ _(TCP_CLOSED, "drops due to TCP in transitory timeout") \ _(UDP_PACKETS, "UDP packets") \ _(ICMP_PACKETS, "ICMP packets") \ _(OTHER_PACKETS, "other protocol packets") \ -_(FRAGMENTS, "fragments") \ -_(CACHED_FRAGMENTS, "cached fragments") \ -_(PROCESSED_FRAGMENTS, "processed fragments") +_(FRAGMENTS, "fragments") typedef enum { @@ -191,9 +187,7 @@ _(TCP_CLOSED, "drops due to TCP in transitory timeout") \ _(UDP_PACKETS, "UDP packets") \ _(ICMP_PACKETS, "ICMP packets") \ _(OTHER_PACKETS, "other protocol packets") \ -_(FRAGMENTS, "fragments") \ -_(CACHED_FRAGMENTS, "cached fragments") \ -_(PROCESSED_FRAGMENTS, "processed fragments") +_(FRAGMENTS, "fragments") typedef enum { diff --git a/src/plugins/nat/out2in.c b/src/plugins/nat/out2in.c index 57e658ba0c4..071e16d4416 100644 --- a/src/plugins/nat/out2in.c +++ b/src/plugins/nat/out2in.c @@ -85,8 +85,7 @@ _(UDP_PACKETS, "UDP packets") \ _(ICMP_PACKETS, "ICMP packets") \ _(OTHER_PACKETS, "other protocol packets") \ _(FRAGMENTS, "fragments") \ -_(CACHED_FRAGMENTS, "cached fragments") \ -_(PROCESSED_FRAGMENTS, "processed fragments") +_(CANNOT_CREATE_USER, "cannot create NAT user") typedef enum { @@ -206,7 +205,7 @@ create_session_for_static_mapping (snat_main_t * sm, u = nat_user_get_or_create (sm, &i2o_addr, i2o_fib_index, thread_index); if (!u) { - nat_elog_warn ("create NAT user failed"); + b0->error = node->errors[SNAT_OUT2IN_ERROR_CANNOT_CREATE_USER]; return 0; } |