The branch main has been updated by tuexen:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=979bc32c7c14f944a340058fcd1a580a7492f785

commit 979bc32c7c14f944a340058fcd1a580a7492f785
Author:     Michael Tuexen <tue...@freebsd.org>
AuthorDate: 2022-08-03 15:28:15 +0000
Commit:     Michael Tuexen <tue...@freebsd.org>
CommitDate: 2022-08-03 15:28:15 +0000

    sctp: tweak panic message
    
    MFC after:      1 week
---
 sys/netinet/sctp_indata.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index d3c969bb47b1..b8bfaf164904 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -3837,10 +3837,9 @@ static int
 sctp_fs_audit(struct sctp_association *asoc)
 {
        struct sctp_tmit_chunk *chk;
-       int inflight = 0, inbetween = 0;
+       int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0;
        int ret;
 #ifndef INVARIANTS
-       int resend = 0, acked = 0, above = 0;
        int entry_flight, entry_cnt;
 #endif
 
@@ -3860,29 +3859,23 @@ sctp_fs_audit(struct sctp_association *asoc)
                            chk->snd_count);
                        inflight++;
                } else if (chk->sent == SCTP_DATAGRAM_RESEND) {
-#ifndef INVARIANTS
                        resend++;
-#endif
                } else if (chk->sent < SCTP_DATAGRAM_ACKED) {
                        inbetween++;
                } else if (chk->sent > SCTP_DATAGRAM_ACKED) {
-#ifndef INVARIANTS
                        above++;
-#endif
                } else {
-#ifndef INVARIANTS
                        acked++;
-#endif
                }
        }
 
        if ((inflight > 0) || (inbetween > 0)) {
 #ifdef INVARIANTS
-               panic("Flight size-express incorrect? \n");
+               panic("Flight size-express incorrect F: %d I: %d R: %d Ab: %d 
ACK: %d",
+                   inflight, inbetween, resend, above, acked);
 #else
                SCTP_PRINTF("asoc->total_flight: %d cnt: %d\n",
                    entry_flight, entry_cnt);
-
                SCTP_PRINTF("Flight size-express incorrect F: %d I: %d R: %d 
Ab: %d ACK: %d\n",
                    inflight, inbetween, resend, above, acked);
                ret = 1;

Reply via email to