summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
authortuexen <tuexen@FreeBSD.org>2015-06-17 19:26:23 +0000
committertuexen <tuexen@FreeBSD.org>2015-06-17 19:26:23 +0000
commit25a52b7a51a96888456f2135cc4f511c3bda54f1 (patch)
treecab441cbad635e75537e15f61391e7d398c09ad9 /sys/netinet
parentcd7e51a58a1764246ac1651d361dfee32ec0ed46 (diff)
downloadFreeBSD-src-25a52b7a51a96888456f2135cc4f511c3bda54f1.zip
FreeBSD-src-25a52b7a51a96888456f2135cc4f511c3bda54f1.tar.gz
Fix a bug related to flow assignment I introduce in
https://svnweb.freebsd.org/base?view=revision&revision=275483 MFC after: 3 days
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/sctp_input.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index 40bd2b2..c6bea83 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -2676,8 +2676,9 @@ sctp_handle_cookie_echo(struct mbuf *m, int iphlen, int offset,
/* still no TCB... must be bad cookie-echo */
return (NULL);
}
- if ((*netp != NULL) && (mflowtype != M_HASHTYPE_NONE)) {
+ if (*netp != NULL) {
(*netp)->flowtype = mflowtype;
+ (*netp)->flowid = mflowid;
}
/*
* Ok, we built an association so confirm the address we sent the
@@ -5662,8 +5663,9 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt
net->port = port;
}
#endif
- if ((net != NULL) && (mflowtype != M_HASHTYPE_NONE)) {
+ if (net != NULL) {
net->flowtype = mflowtype;
+ net->flowid = mflowid;
}
if ((inp != NULL) && (stcb != NULL)) {
sctp_send_packet_dropped(stcb, net, m, length, iphlen, 1);
@@ -5692,8 +5694,9 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt
net->port = port;
}
#endif
- if ((net != NULL) && (mflowtype != M_HASHTYPE_NONE)) {
+ if (net != NULL) {
net->flowtype = mflowtype;
+ net->flowid = mflowid;
}
if (inp == NULL) {
SCTP_STAT_INCR(sctps_noport);
OpenPOWER on IntegriCloud