diff options
| author | tuexen <tuexen@FreeBSD.org> | 2015-05-29 13:34:31 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2015-05-29 13:34:31 +0000 |
| commit | a2dbf980ab6181ee9f52258752226529b74378d2 (patch) | |
| tree | 2a28fab43292f65ac30433b2b92a3cf92b084fca /sys/netinet/sctp_indata.c | |
| parent | 109c389f07ee9e8626156479a2d04049dce7a65f (diff) | |
| download | FreeBSD-src-a2dbf980ab6181ee9f52258752226529b74378d2.zip FreeBSD-src-a2dbf980ab6181ee9f52258752226529b74378d2.tar.gz | |
MFC r282042:
Don't panic under INVARIANTS when receiving a SACK which cumacks
a TSN never sent.
While there, fix two typos.
Diffstat (limited to 'sys/netinet/sctp_indata.c')
| -rw-r--r-- | sys/netinet/sctp_indata.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c index ea3d3e7..d3b4855 100644 --- a/sys/netinet/sctp_indata.c +++ b/sys/netinet/sctp_indata.c @@ -3614,24 +3614,17 @@ sctp_express_handle_sack(struct sctp_tcb *stcb, uint32_t cumack, send_s = asoc->sending_seq; } if (SCTP_TSN_GE(cumack, send_s)) { -#ifndef INVARIANTS struct mbuf *op_err; char msg[SCTP_DIAG_INFO_LEN]; -#endif -#ifdef INVARIANTS - panic("Impossible sack 1"); -#else - *abort_now = 1; /* XXX */ - snprintf(msg, sizeof(msg), "Cum ack %8.8x greater or equal then TSN %8.8x", + snprintf(msg, sizeof(msg), "Cum ack %8.8x greater or equal than TSN %8.8x", cumack, send_s); op_err = sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg); stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INDATA + SCTP_LOC_25; sctp_abort_an_association(stcb->sctp_ep, stcb, op_err, SCTP_SO_NOT_LOCKED); return; -#endif } } asoc->this_sack_highest_gap = cumack; @@ -4195,7 +4188,7 @@ sctp_handle_sack(struct mbuf *m, int offset_seg, int offset_dup, hopeless_peer: *abort_now = 1; /* XXX */ - snprintf(msg, sizeof(msg), "Cum ack %8.8x greater or equal then TSN %8.8x", + snprintf(msg, sizeof(msg), "Cum ack %8.8x greater or equal than TSN %8.8x", cum_ack, send_s); op_err = sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg); stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INDATA + SCTP_LOC_25; |
