From nobody Thu Oct 31 17:02:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XfVfV72hDz5c2Y0; Thu, 31 Oct 2024 17:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XfVfV6YJlz4n6J; Thu, 31 Oct 2024 17:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730394146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3pQtgRj2jejInbqITN5BRJBNZgPCGgpldxPNLdFlgPs=; b=MqEW3MPDNmzDS8TN+tJooz4XTkFAgJmQCkzbFMv4ymgSHpKXY1Bl4snGA7on9OoWOl7dnK Eq6+VKjQEZEffkzT2HMrjY4iuSNteagcwN+iglj044+p1lUC/hpO9LOSrsrj30PTkosXtR EIQv77Bw3/cFPNeMMuMsd9nD8izUTfx/I91Qd17FQ3N+NrRD19S49nYO25GD/QY2EOHccg o0wSqdr53pQrxwR4E6ne/7F9JynvQLC5Dj/L76bHecWFVibCJEHeTsXZ/gSf2t6YIWbV2Q 7t6q7oRIVX24VkRljo2YkrS0AqJMWok36+jMBuwFAPWWejE4Tw3Vu9P9KHtv9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730394146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3pQtgRj2jejInbqITN5BRJBNZgPCGgpldxPNLdFlgPs=; b=VAHVvBWjbNr4+Ex3vZ/WuA9OM90+2qWkigO+HKGMpUVdcQO6b9/X30OsSKiS40CrkuwxaL XhzIOmrvODCpU3126dxVPnELRDGhXWtk4KTrqvsjcQBXGAkrXGkC/wzUvewah+5zgxKZTP h4OxqxEY+uIG5SpdTXcZ81FB+0D1HZoEmrWPo/6bIz+74ETXNZTkZ3PxqCEMKd22vGPI35 DxUGxG3V+eV5J3U5+iVEdjdlytUAgu70NHi84rQjusfau7aELBIa1v6fjqDKvmpO1oQiwK czKldQc0An2C3BpGXFonTb2VIE67U1rbFhOofSUvC/sPr8/cFobvba7WYMKJ9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730394146; a=rsa-sha256; cv=none; b=SvT3f6+scxpuZMqPEFauuuXwxZZe9YZhym5gQUJ6nExrsm+hpjFCClTMv/bfN62yv3Y7uS cQK7x58MP7ZoF7hgKKAZU2pF6GT0z20h1s4lG07Cd149HGmkSX/RbjuiAsCkRd5qZTABer luAMuETafMwQPLF/Rx29UEm7VejLcee6rQqjMX0tPZa4Z1+DT4JFptMgD+8gBOeXLRPAWN 5Fvj5OZX2lrPTqsUIW7hdT8bzyrvAeszzaXtTSPVnvpFtyeG/MvZi8lFlpmXYvjJO/cIwC MesWfHxI2LnUvk9/DpEnHurpZ7nY/YqA5PEeEWOuK/dN5u9aq+uNjitxOrkRRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XfVfV61rNzkwS; Thu, 31 Oct 2024 17:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49VH2Q4B090230; Thu, 31 Oct 2024 17:02:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VH2Qoo090227; Thu, 31 Oct 2024 17:02:26 GMT (envelope-from git) Date: Thu, 31 Oct 2024 17:02:26 GMT Message-Id: <202410311702.49VH2Qoo090227@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: c7f2035e1fc4 - stable/13 - sctp: improve debug output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c7f2035e1fc40c6a2db7b0d3c547ca0a694ac7cf Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c7f2035e1fc40c6a2db7b0d3c547ca0a694ac7cf commit c7f2035e1fc40c6a2db7b0d3c547ca0a694ac7cf Author: Michael Tuexen AuthorDate: 2024-10-24 11:18:22 +0000 Commit: Michael Tuexen 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