git: c7f2035e1fc4 - stable/13 - sctp: improve debug output

[Michael Tuexen]

The branch stable/13 has been updated by tuexen:

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

commit c7f2035e1fc40c6a2db7b0d3c547ca0a694ac7cf
Author:     Michael Tuexen <tue...@freebsd.org>
AuthorDate: 2024-10-24 11:18:22 +0000
Commit:     Michael Tuexen <tue...@freebsd.org>
CommitDate: 2024-10-31 17:02:03 +0000

    sctp: improve debug output
    
    (cherry picked from commit ce20b48a60fbae275085237dd48075d426f00d37)
---
 sys/netinet/sctp_asconf.c | 6 +++---
 sys/netinet/sctp_output.c | 8 ++++----
 sys/netinet/sctp_pcb.c    | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c
index 3a30b0ba3740..6b98557c45a6 100644
--- a/sys/netinet/sctp_asconf.c
+++ b/sys/netinet/sctp_asconf.c
@@ -1313,13 +1313,13 @@ sctp_asconf_queue_mgmt(struct sctp_tcb *stcb, struct 
sctp_ifa *ifa,
 #ifdef SCTP_DEBUG
        if (SCTP_BASE_SYSCTL(sctp_debug_on) & SCTP_DEBUG_ASCONF2) {
                if (type == SCTP_ADD_IP_ADDRESS) {
-                       SCTP_PRINTF("asconf_queue_mgmt: inserted asconf 
ADD_IP_ADDRESS: ");
+                       SCTPDBG(SCTP_DEBUG_ASCONF2, "asconf_queue_mgmt: 
inserted asconf ADD_IP_ADDRESS: ");
                        SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, &ifa->address.sa);
                } else if (type == SCTP_DEL_IP_ADDRESS) {
-                       SCTP_PRINTF("asconf_queue_mgmt: appended asconf 
DEL_IP_ADDRESS: ");
+                       SCTPDBG(SCTP_DEBUG_ASCONF2, "asconf_queue_mgmt: 
appended asconf DEL_IP_ADDRESS: ");
                        SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, &ifa->address.sa);
                } else {
-                       SCTP_PRINTF("asconf_queue_mgmt: appended asconf 
SET_PRIM_ADDR: ");
+                       SCTPDBG(SCTP_DEBUG_ASCONF2, "asconf_queue_mgmt: 
appended asconf SET_PRIM_ADDR: ");
                        SCTPDBG_ADDR(SCTP_DEBUG_ASCONF2, &ifa->address.sa);
                }
        }
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index bf4d383d732c..13d5f1d68f5e 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -13772,15 +13772,15 @@ sctp_v4src_match_nexthop(struct sctp_ifa *sifa, 
sctp_route_t *ro)
        mask = (struct sockaddr_in *)(ifa->ifa_netmask);
        sin = &sifa->address.sin;
        srcnetaddr.s_addr = (sin->sin_addr.s_addr & mask->sin_addr.s_addr);
-       SCTPDBG(SCTP_DEBUG_OUTPUT1, "match_nexthop4: src address is ");
+       SCTPDBG(SCTP_DEBUG_OUTPUT2, "match_nexthop4: src address is ");
        SCTPDBG_ADDR(SCTP_DEBUG_OUTPUT2, &sifa->address.sa);
-       SCTPDBG(SCTP_DEBUG_OUTPUT1, "network address is %x\n", 
srcnetaddr.s_addr);
+       SCTPDBG(SCTP_DEBUG_OUTPUT2, "network address is %x\n", 
srcnetaddr.s_addr);
 
        sin = &ro->ro_nh->gw4_sa;
        gwnetaddr.s_addr = (sin->sin_addr.s_addr & mask->sin_addr.s_addr);
-       SCTPDBG(SCTP_DEBUG_OUTPUT1, "match_nexthop4: nexthop is ");
+       SCTPDBG(SCTP_DEBUG_OUTPUT2, "match_nexthop4: nexthop is ");
        SCTPDBG_ADDR(SCTP_DEBUG_OUTPUT2, &ro->ro_nh->gw_sa);
-       SCTPDBG(SCTP_DEBUG_OUTPUT1, "network address is %x\n", 
gwnetaddr.s_addr);
+       SCTPDBG(SCTP_DEBUG_OUTPUT2, "network address is %x\n", 
gwnetaddr.s_addr);
        if (srcnetaddr.s_addr == gwnetaddr.s_addr) {
                return (1);
        }
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index e9ba04be57ea..080cb81fa09a 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -769,7 +769,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockaddr 
*addr,
        else {
                SCTPDBG(SCTP_DEBUG_PCB4, "Del Addr-ifn:%d Could not find 
address:",
                    ifn_index);
-               SCTPDBG_ADDR(SCTP_DEBUG_PCB1, addr);
+               SCTPDBG_ADDR(SCTP_DEBUG_PCB4, addr);
        }
 #endif