Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: free session after transport and app confirm
[vpp.git]
/
src
/
plugins
/
unittest
/
tcp_test.c
diff --git
a/src/plugins/unittest/tcp_test.c
b/src/plugins/unittest/tcp_test.c
index
d065787
..
66260df
100644
(file)
--- a/
src/plugins/unittest/tcp_test.c
+++ b/
src/plugins/unittest/tcp_test.c
@@
-83,7
+83,7
@@
tcp_test_sack_rx (vlib_main_t * vm, unformat_input_t * input)
return tcp_test_scoreboard_replay (vm, input);
}
return tcp_test_scoreboard_replay (vm, input);
}
- memset (tc, 0, sizeof (*tc));
+
clib_
memset (tc, 0, sizeof (*tc));
tc->snd_una = 0;
tc->snd_una_max = 1000;
tc->snd_una = 0;
tc->snd_una_max = 1000;
@@
-458,7
+458,7
@@
tcp_test_sack_tx (vlib_main_t * vm, unformat_input_t * input)
}
}
}
}
- memset (tc, 0, sizeof (*tc));
+
clib_
memset (tc, 0, sizeof (*tc));
/*
* Add odd sack block pairs
/*
* Add odd sack block pairs
@@
-740,7
+740,7
@@
fifo_prepare (u32 fifo_size)
f = svm_fifo_create (fifo_size);
/* Paint fifo data vector with -1's */
f = svm_fifo_create (fifo_size);
/* Paint fifo data vector with -1's */
- memset (f->data, 0xFF, fifo_size);
+
clib_
memset (f->data, 0xFF, fifo_size);
return f;
}
return f;
}
@@
-1646,12
+1646,12
@@
tcp_test_lookup (vlib_main_t * vm, unformat_input_t * input)
/*
* Allocate fake session and connection 1
*/
/*
* Allocate fake session and connection 1
*/
- pool_get (smm->
sessions[0]
, s);
- memset (s, 0, sizeof (*s));
- s->session_index = sidx = s - smm->
sessions[0]
;
+ pool_get (smm->
wrk[0].sessions
, s);
+
clib_
memset (s, 0, sizeof (*s));
+ s->session_index = sidx = s - smm->
wrk[0].sessions
;
pool_get (tm->connections[0], tc);
pool_get (tm->connections[0], tc);
- memset (tc, 0, sizeof (*tc));
+
clib_
memset (tc, 0, sizeof (*tc));
tc->connection.c_index = tc - tm->connections[0];
tc->connection.s_index = s->session_index;
s->connection_index = tc->connection.c_index;
tc->connection.c_index = tc - tm->connections[0];
tc->connection.s_index = s->session_index;
s->connection_index = tc->connection.c_index;
@@
-1662,17
+1662,17
@@
tcp_test_lookup (vlib_main_t * vm, unformat_input_t * input)
tc->connection.rmt_port = 53764;
tc->connection.proto = TRANSPORT_PROTO_TCP;
tc->connection.is_ip4 = 1;
tc->connection.rmt_port = 53764;
tc->connection.proto = TRANSPORT_PROTO_TCP;
tc->connection.is_ip4 = 1;
- clib_memcpy (tc1, &tc->connection, sizeof (*tc1));
+ clib_memcpy
_fast
(tc1, &tc->connection, sizeof (*tc1));
/*
* Allocate fake session and connection 2
*/
/*
* Allocate fake session and connection 2
*/
- pool_get (s
ession_manager_main.sessions[0]
, s);
- memset (s, 0, sizeof (*s));
- s->session_index = s - smm->
sessions[0]
;
+ pool_get (s
mm->wrk[0].sessions
, s);
+
clib_
memset (s, 0, sizeof (*s));
+ s->session_index = s - smm->
wrk[0].sessions
;
pool_get (tm->connections[0], tc);
pool_get (tm->connections[0], tc);
- memset (tc, 0, sizeof (*tc));
+
clib_
memset (tc, 0, sizeof (*tc));
tc->connection.c_index = tc - tm->connections[0];
tc->connection.s_index = s->session_index;
s->connection_index = tc->connection.c_index;
tc->connection.c_index = tc - tm->connections[0];
tc->connection.s_index = s->session_index;
s->connection_index = tc->connection.c_index;
@@
-1683,13
+1683,13
@@
tcp_test_lookup (vlib_main_t * vm, unformat_input_t * input)
tc->connection.rmt_port = 53764;
tc->connection.proto = TRANSPORT_PROTO_TCP;
tc->connection.is_ip4 = 1;
tc->connection.rmt_port = 53764;
tc->connection.proto = TRANSPORT_PROTO_TCP;
tc->connection.is_ip4 = 1;
- clib_memcpy (tc2, &tc->connection, sizeof (*tc2));
+ clib_memcpy
_fast
(tc2, &tc->connection, sizeof (*tc2));
/*
* Confirm that connection lookup works
*/
/*
* Confirm that connection lookup works
*/
- s1 = pool_elt_at_index (smm->
sessions[0]
, sidx);
+ s1 = pool_elt_at_index (smm->
wrk[0].sessions
, sidx);
session_lookup_add_connection (tc1, session_handle (s1));
tconn = session_lookup_connection_wt4 (0, &tc1->lcl_ip.ip4,
&tc1->rmt_ip.ip4,
session_lookup_add_connection (tc1, session_handle (s1));
tconn = session_lookup_connection_wt4 (0, &tc1->lcl_ip.ip4,
&tc1->rmt_ip.ip4,
@@
-1769,7
+1769,7
@@
tcp_test_session (vlib_main_t * vm, unformat_input_t * input)
remote_port = clib_host_to_net_u16 (11234);
pool_get (tm->connections[0], tc0);
remote_port = clib_host_to_net_u16 (11234);
pool_get (tm->connections[0], tc0);
- memset (tc0, 0, sizeof (*tc0));
+
clib_
memset (tc0, 0, sizeof (*tc0));
tc0->state = TCP_STATE_ESTABLISHED;
tc0->rcv_las = 1;
tc0->state = TCP_STATE_ESTABLISHED;
tc0->rcv_las = 1;
@@
-1795,7
+1795,7
@@
tcp_test_session (vlib_main_t * vm, unformat_input_t * input)
{
tc0 = tcp_connection_get (0 /* connection index */ , 0 /* thread */ );
tc0->state = TCP_STATE_CLOSED;
{
tc0 = tcp_connection_get (0 /* connection index */ , 0 /* thread */ );
tc0->state = TCP_STATE_CLOSED;
- s
tream_session_disconnect
_notify (&tc0->connection);
+ s
ession_transport_closing
_notify (&tc0->connection);
}
return rv;
}
return rv;