From nobody Thu Oct 31 14:02:30 2024 X-Original-To: dev-commits-src-branches@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 4XfQft5hVbz5blpt; Thu, 31 Oct 2024 14:02:30 +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 4XfQft5Cfzz42Q8; Thu, 31 Oct 2024 14:02:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730383350; 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=0BXctueyxXKI/Szsr4W53oK3wNhJ5g2rEsTY9KT6QXU=; b=OSx44c8rhToT9ABThx12XVivQzH1q2aO12P+uFLvyHjwCNDB3wUEjdEM7fDusSMU+EX1T3 3pXYMi9A1AkNkvbVf4aGhyIYo4DxjzC2NL5I8GQiusN1VNiIqXZrfkNfhmKvIm5YJetCFW ur3CHIsnApsL6ZzVXPHqPCKyr1yZgFKqBnRC+7y9HxOlgAHvkTCktPkqH3rKjSTHZGx2Q6 DqnlDjrUH+227xbfICxQPyjyCC/ond+5aAE2cucLddLDAhpNsw1PINyLT8qhIgO5eA4Omp lyEoEbVyjAelszmFapNSaGDMsHKC7iQ4eY14YCgnqag1xp/x1WdTcnJWgjXPpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730383350; 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=0BXctueyxXKI/Szsr4W53oK3wNhJ5g2rEsTY9KT6QXU=; b=GlWMQRphztoGjvpafY91a5Rkzi8wjhcOFolhaUWA50sWRIn6ZPP3UvlB3ZZPUPHvLhwCGc N9ZSnBw55RM4oKD23Exu+Kl3/FCmPSGS1qU/nDD60cRcWSpa8/RsW8W+X9UEMtG7FZ6/Vc u4QfvsBoVy+A8gTU+OmyMOb+05BvJr0qNTDUb568UUz3JEzLXV+GaS93+vPEv/pNkK+dHp EK5zExGeFUbeWBpV5Bl0IjiGDovAeOH1/vadJBilcGc/pB13NUjOHqcOeZzgj2QwsiiL9Z AQck7B3qnpkcVB8hcTiv4wM/sWj9sy53+29ed4zjtD59JAb3e9+5+AmW7IVsYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730383350; a=rsa-sha256; cv=none; b=xHCz3fv/netu+n1DvU7v5pzdl8rDjysBjLHCVO5UiVwJ3LEPdkQ8nfyfPwoRP0YQvhLSB8 64pnwSOK/XbxxfT+yD4q4fDeidMJWEkUY+I6W5oUBaOUkwDB1TURv/6RPIxRy2UYAffRLq uTcoeOtmtP/TRfvbaJaWJIxfJFFC74qmVCdAbNbCom1ntJfx5SNBHebnO6P7+HWCCw5Slv nI7ldGJnZhC/vwFen60y+qb2mEENZgdHo4ljNMz5bxSLDbS9VXQ6ZbhF5yCGyxtsKdAM2Y bNgqpbHAw8KEmUiZFyZJuibPcjQOajhij2e4Ll9AIEZVTJFNrVAK4np7rzAFcw== 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 4XfQft4q00zfY0; Thu, 31 Oct 2024 14:02:30 +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 49VE2U3e048901; Thu, 31 Oct 2024 14:02:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VE2UjT048898; Thu, 31 Oct 2024 14:02:30 GMT (envelope-from git) Date: Thu, 31 Oct 2024 14:02:30 GMT Message-Id: <202410311402.49VE2UjT048898@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: 8689398f0921 - stable/14 - sctp: improve debug output List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 8689398f0921fd2f26240608e6866fe78feff672 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8689398f0921fd2f26240608e6866fe78feff672 commit 8689398f0921fd2f26240608e6866fe78feff672 Author: Michael Tuexen AuthorDate: 2024-10-24 11:18:22 +0000 Commit: Michael Tuexen CommitDate: 2024-10-31 11:41:06 +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 cc8d017aba16..2a3c0248be60 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -13913,15 +13913,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 a0f323043d9b..d09b5062a512 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