summaryrefslogtreecommitdiffstats
path: root/src/vnet/session
diff options
context:
space:
mode:
authorroot <root@wasa-ucs-13.linuxfoundation.org>2017-08-15 12:58:31 -0400
committerFlorin Coras <florin.coras@gmail.com>2017-08-16 16:47:44 +0000
commitc9d1c5b6b3668e243bbdd978069976cc1184892b (patch)
tree58442fb9d3f12f1562c0f24c4aaa4eccac666f67 /src/vnet/session
parentab9a59c19a2765e001dd24a8f3e51882b6806e2d (diff)
tcp: fix v6 sessions
Change-Id: Ia6dd5e948b17b2f3866fe70838eabb09e35415e1 Signed-off-by: Dave Barach <dbarach@cisco.com> Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/session')
-rw-r--r--src/vnet/session/session.c4
-rwxr-xr-xsrc/vnet/session/session_cli.c2
-rw-r--r--src/vnet/session/session_lookup.c8
3 files changed, 8 insertions, 6 deletions
diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c
index 843d474fa19..70a5cd83749 100644
--- a/src/vnet/session/session.c
+++ b/src/vnet/session/session.c
@@ -375,10 +375,12 @@ stream_session_connect_notify (transport_connection_t * tc, u8 is_fail)
u64 handle;
u32 opaque = 0;
int error = 0;
+ u8 st;
+ st = session_type_from_proto_and_ip (tc->transport_proto, tc->is_ip4);
handle = stream_session_half_open_lookup_handle (&tc->lcl_ip, &tc->rmt_ip,
tc->lcl_port, tc->rmt_port,
- tc->transport_proto);
+ st);
if (handle == HALF_OPEN_LOOKUP_INVALID_VALUE)
{
clib_warning ("This can't be good!");
diff --git a/src/vnet/session/session_cli.c b/src/vnet/session/session_cli.c
index 9f3d217cf61..f60048f1214 100755
--- a/src/vnet/session/session_cli.c
+++ b/src/vnet/session/session_cli.c
@@ -315,7 +315,7 @@ show_session_command_fn (vlib_main_t * vm, unformat_input_t * input,
VLIB_CLI_COMMAND (vlib_cli_show_session_command) =
{
.path = "show session",
- .short_help = "show session [verbose]",
+ .short_help = "show session [verbose [nnn]]",
.function = show_session_command_fn,
};
/* *INDENT-ON* */
diff --git a/src/vnet/session/session_lookup.c b/src/vnet/session/session_lookup.c
index 41f9dbf0c1e..0f9abf9aa74 100644
--- a/src/vnet/session/session_lookup.c
+++ b/src/vnet/session/session_lookup.c
@@ -106,8 +106,8 @@ make_v4_listener_kv (session_kv4_t * kv, ip4_address_t * lcl, u16 lcl_port,
always_inline void
make_v4_ss_kv_from_tc (session_kv4_t * kv, transport_connection_t * t)
{
- return make_v4_ss_kv (kv, &t->lcl_ip.ip4, &t->rmt_ip.ip4, t->lcl_port,
- t->rmt_port, t->transport_proto);
+ make_v4_ss_kv (kv, &t->lcl_ip.ip4, &t->rmt_ip.ip4, t->lcl_port, t->rmt_port,
+ session_type_from_proto_and_ip (t->transport_proto, 1));
}
always_inline void
@@ -149,8 +149,8 @@ make_v6_listener_kv (session_kv6_t * kv, ip6_address_t * lcl, u16 lcl_port,
always_inline void
make_v6_ss_kv_from_tc (session_kv6_t * kv, transport_connection_t * t)
{
- make_v6_ss_kv (kv, &t->lcl_ip.ip6, &t->rmt_ip.ip6, t->lcl_port,
- t->rmt_port, t->transport_proto);
+ make_v6_ss_kv (kv, &t->lcl_ip.ip6, &t->rmt_ip.ip6, t->lcl_port, t->rmt_port,
+ session_type_from_proto_and_ip (t->transport_proto, 0));
}
/*