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: add session process node
[vpp.git]
/
src
/
vnet
/
sctp
/
sctp_output.c
diff --git
a/src/vnet/sctp/sctp_output.c
b/src/vnet/sctp/sctp_output.c
index
8ce94c6
..
3c83f68
100644
(file)
--- a/
src/vnet/sctp/sctp_output.c
+++ b/
src/vnet/sctp/sctp_output.c
@@
-406,6
+406,8
@@
sctp_enqueue_to_ip_lookup (vlib_main_t * vm, vlib_buffer_t * b, u32 bi,
u8 is_ip4, u32 fib_index)
{
sctp_enqueue_to_ip_lookup_i (vm, b, bi, is_ip4, fib_index, 0);
u8 is_ip4, u32 fib_index)
{
sctp_enqueue_to_ip_lookup_i (vm, b, bi, is_ip4, fib_index, 0);
+ if (vm->thread_index == 0 && vlib_num_workers ())
+ session_flush_frames_main_thread (vm);
}
/**
}
/**
@@
-868,7
+870,7
@@
sctp_prepare_initack_chunk_for_collision (sctp_connection_t * sctp_conn,
void
sctp_prepare_initack_chunk (sctp_connection_t * sctp_conn, u8 idx,
vlib_buffer_t * b, ip4_address_t * ip4_addr,
void
sctp_prepare_initack_chunk (sctp_connection_t * sctp_conn, u8 idx,
vlib_buffer_t * b, ip4_address_t * ip4_addr,
-
ip6_address_t * ip6_addr
)
+
u8 add_ip4, ip6_address_t * ip6_addr, u8 add_ip6
)
{
vlib_main_t *vm = vlib_get_main ();
sctp_ipv4_addr_param_t *ip4_param = 0;
{
vlib_main_t *vm = vlib_get_main ();
sctp_ipv4_addr_param_t *ip4_param = 0;
@@
-881,12
+883,12
@@
sctp_prepare_initack_chunk (sctp_connection_t * sctp_conn, u8 idx,
u16 alloc_bytes =
sizeof (sctp_init_ack_chunk_t) + sizeof (sctp_state_cookie_param_t);
u16 alloc_bytes =
sizeof (sctp_init_ack_chunk_t) + sizeof (sctp_state_cookie_param_t);
- if (PREDICT_
TRUE (ip4_addr != NULL
))
+ if (PREDICT_
FALSE (add_ip4 == 1
))
{
/* Create room for variable-length fields in the INIT_ACK chunk */
alloc_bytes += SCTP_IPV4_ADDRESS_TYPE_LENGTH;
}
{
/* Create room for variable-length fields in the INIT_ACK chunk */
alloc_bytes += SCTP_IPV4_ADDRESS_TYPE_LENGTH;
}
- if (PREDICT_
TRUE (ip6_addr != NULL
))
+ if (PREDICT_
FALSE (add_ip6 == 1
))
{
/* Create room for variable-length fields in the INIT_ACK chunk */
alloc_bytes += SCTP_IPV6_ADDRESS_TYPE_LENGTH;
{
/* Create room for variable-length fields in the INIT_ACK chunk */
alloc_bytes += SCTP_IPV6_ADDRESS_TYPE_LENGTH;
@@
-1702,7
+1704,7
@@
sctp46_output_inline (vlib_main_t * vm,
{
clib_warning
("Trying to send an unrecognized chunk... something is really bad.");
{
clib_warning
("Trying to send an unrecognized chunk... something is really bad.");
- error0 = SCTP_ERROR_UNKOWN_CHUNK;
+ error0 = SCTP_ERROR_UNK
N
OWN_CHUNK;
next0 = SCTP_OUTPUT_NEXT_DROP;
goto done;
}
next0 = SCTP_OUTPUT_NEXT_DROP;
goto done;
}
@@
-1735,7
+1737,7
@@
sctp46_output_inline (vlib_main_t * vm,
connection.rmt_port,
sctp_hdr->dst_port);
connection.rmt_port,
sctp_hdr->dst_port);
- error0 = SCTP_ERROR_UNKOWN_CHUNK;
+ error0 = SCTP_ERROR_UNK
N
OWN_CHUNK;
next0 = SCTP_OUTPUT_NEXT_DROP;
goto done;
}
next0 = SCTP_OUTPUT_NEXT_DROP;
goto done;
}
@@
-1758,7
+1760,7
@@
sctp46_output_inline (vlib_main_t * vm,
sctp_chunk_to_string (chunk_type),
sctp_state_to_string (sctp_conn->state));
sctp_chunk_to_string (chunk_type),
sctp_state_to_string (sctp_conn->state));
- error0 = SCTP_ERROR_UNKOWN_CHUNK;
+ error0 = SCTP_ERROR_UNK
N
OWN_CHUNK;
next0 = SCTP_OUTPUT_NEXT_DROP;
goto done;
next0 = SCTP_OUTPUT_NEXT_DROP;
goto done;