From nobody Mon Feb 9 10:00:14 2026 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 4f8gDG3ypXz6R92H for ; Mon, 09 Feb 2026 10:00:14 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8gDG3F6gz3MN5 for ; Mon, 09 Feb 2026 10:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770631214; 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=WRNkFmxIMR+EEL89L3OSzF28SMsCykG7/oNxU85u5JQ=; b=iVALvcogDe7fEBnzXajoi2xSPH4d3y2UWbawlC8A789UGBG3rBP6v6PEDtpkRXFtlZfk1R dBNMZ5FDA9ME0EjCeJdUieCktm+USMCaSA6el2sWjV2USbKHebU6dAPBUpgRX4iJ9TtSHO VS+Ywzh1jbBLe3da+cWMg4kIphajngCRQi/pPK/hGimeoDO8LU3AfC5WNajFl2Onjo5dtO gak1Swf6Fi3o91INGxrUHjqdtkhVdvubrbf7FrPvA0YdyXswsBxZG0/bKQE7H1G1LBGCZq LB5y/SDYvMzU+eVih//SfKa8MnqhwOJLAufKpb87bvbMUjQJrmHFNnfp7kzqHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770631214; a=rsa-sha256; cv=none; b=U0pNRExq6soexuDYYHW4x9omfrG5i7MfU9Z3SJmScvXRzurZ5cSFWQa6K1masS2mETPtcW 7SMJ3S6Qs/ZJ2UAwClixyXl0MzQOx/AJqz9qdQ/FmV8CaDYNp2T3WbwqaTxVIvurtFKzHk SzfNxUfFtIWARmfGU0/xMtnQnaQu9wKe1lL2SQC2/zXCO748RXDuhIY/aqVBGkUjKvvMF/ /n6ZTSpvvXh/BKY3UNbjsfk7XBnzy1TnO+ESwPIeYQPHl5PSqC+Q6Wf6W/fTd7tAitlrXU W6NfoxFe9uzYDCgOvVDJLUh+6zo13rfVMkSEUloabiQLViLlOB+zbuxED0J5tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770631214; 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=WRNkFmxIMR+EEL89L3OSzF28SMsCykG7/oNxU85u5JQ=; b=uGw0YA1YKRtp36aFuAP/2OLsvvmIdJ5NSAqTYgb3BCVnqO2mJHYJndEH5cfsrXPo1Y6mz7 ow8teFIxULMkXfdnKK2UAiWlPx6KBULOQgjfPAJNzlHQPm6Gnzd9vGAN71OdWs8ee5/cX8 XhUnDeHeiYe4hcAtpiQGWbDaDLUQF+czjfTIhiiT/U2wk5MJ0PPxC+7oLfCr6C1eqemXEd iKO0UECoXlYgHd6fwOLi5fo8VaTItHcMXwLs6mgUnQRtaTZCiGVKG0F2BCTDmosR8kqFFu q0Ip+8rPnj7IyCOxTwmDm+JEZpBMRnNhrQFtzvYFU3BijceP6cYuyHpkd8i7dA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8gDG2YmlzCS2 for ; Mon, 09 Feb 2026 10:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c92d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 10:00:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 60a6ebaf7371 - main - traceroute: graceful recover after networking errors with as_server 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: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60a6ebaf73719ef7aa15768c3906626fb106b2b3 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 10:00:14 +0000 Message-Id: <6989b02e.1c92d.ca70ad2@gitrepo.freebsd.org> The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=60a6ebaf73719ef7aa15768c3906626fb106b2b3 commit 60a6ebaf73719ef7aa15768c3906626fb106b2b3 Author: Eugene Grosbein AuthorDate: 2026-02-09 09:47:01 +0000 Commit: Eugene Grosbein CommitDate: 2026-02-09 10:00:10 +0000 traceroute: graceful recover after networking errors with as_server Currentlu, the traceroute[6] utility does not check for possible networking errors while talking to as_server in case of "traceroute -a". Meantime, there is a common case when trace is long and it has many non-responding hops (shown as '* * *'), so as_server aborts our connection, hence no AS numbers shown for the rest of trace. Somewhat artifical way to reproduce the problem: traceroute to 57.144.244.1 (57.144.244.1), 80 hops max, 48 byte packets 5 [AS174] be2950.ccr42.fra05.atlas.cogentco.com (154.54.72.42) 74.277 ms 9.605 ms 9.599 ms 6 [AS174] 149.11.228.19 (149.11.228.19) 9.506 ms 9.466 ms 9.420 ms 7 [AS33182] po172.asw02.fra5.tfbnw.net (129.134.108.146) 9.725 ms 9.874 ms 9.696 ms 8 [AS32934] psw04.fra5.tfbnw.net (157.240.59.85) 8.718 ms 8.691 ms 8.618 ms 9 * * * 10 [AS0] edge-star-mini-shv-01-fra5.facebook.com (57.144.244.1) 9.747 ms 9.815 ms 9.699 ms Note what due to increased timeout (-w10) we get [AS0] for 10th hop because as_server closed our connection. Same problem occurs with default -w3 when there are lots of '* * *' hops in a trace. Fix it with some additional error checking and a reconnection. This patch was in my use for many years and after traceroute(8) moved from contrib/ to usr.sbin/ it's nice to have it in the tree. MFC after: 2 weeks --- usr.sbin/traceroute/as.c | 24 ++++++++++++++++++++---- usr.sbin/traceroute/as.h | 2 +- usr.sbin/traceroute/traceroute.c | 21 +++++++++++++++++++-- usr.sbin/traceroute6/traceroute6.c | 23 +++++++++++++++++++++-- 4 files changed, 61 insertions(+), 9 deletions(-) diff --git a/usr.sbin/traceroute/as.c b/usr.sbin/traceroute/as.c index 7fb952ed3da1..512f1dd6f14c 100644 --- a/usr.sbin/traceroute/as.c +++ b/usr.sbin/traceroute/as.c @@ -118,7 +118,7 @@ as_setup(const char *server) } unsigned int -as_lookup(void *_asn, char *addr, sa_family_t family) +as_lookup(void *_asn, char *addr, sa_family_t family, int *status) { struct aslookup *asn = _asn; char buf[1024]; @@ -128,8 +128,17 @@ as_lookup(void *_asn, char *addr, sa_family_t family) as = 0; rc = dlen = 0; plen = (family == AF_INET6) ? 128 : 32; - (void)fprintf(asn->as_f, "!r%s/%d,l\n", addr, plen); - (void)fflush(asn->as_f); + *status = fprintf(asn->as_f, "!r%s/%d,l\n", addr, plen); + if (*status < 0) { + *status = errno; + return 0; + } + *status = fflush(asn->as_f); + if (*status == EOF) { + *status = errno; + return 0; + } + *status = 0; #ifdef AS_DEBUG_FILE if (asn->as_debug) { @@ -138,7 +147,14 @@ as_lookup(void *_asn, char *addr, sa_family_t family) } #endif /* AS_DEBUG_FILE */ - while (fgets(buf, sizeof(buf), asn->as_f) != NULL) { + while (1) { + if (fgets(buf, sizeof(buf), asn->as_f) == NULL) { + if(feof(asn->as_f) || ferror(asn->as_f)) { + *status = EIO; + return 0; + } + break; + } buf[sizeof(buf) - 1] = '\0'; #ifdef AS_DEBUG_FILE diff --git a/usr.sbin/traceroute/as.h b/usr.sbin/traceroute/as.h index f5a5dae2acec..ac61bbab4786 100644 --- a/usr.sbin/traceroute/as.h +++ b/usr.sbin/traceroute/as.h @@ -30,5 +30,5 @@ */ void *as_setup(const char *); -unsigned int as_lookup(void *, char *, sa_family_t); +unsigned int as_lookup(void *, char *, sa_family_t, int *); void as_shutdown(void *); diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c index 1297d3402ebd..be14c40b8d7b 100644 --- a/usr.sbin/traceroute/traceroute.c +++ b/usr.sbin/traceroute/traceroute.c @@ -1653,6 +1653,7 @@ print(register u_char *buf, register int cc, register struct sockaddr_in *from) { register struct ip *ip; register int hlen; + int as, status; char addr[INET_ADDRSTRLEN]; ip = (struct ip *) buf; @@ -1661,8 +1662,24 @@ print(register u_char *buf, register int cc, register struct sockaddr_in *from) strlcpy(addr, inet_ntoa(from->sin_addr), sizeof(addr)); - if (as_path) - Printf(" [AS%u]", as_lookup(asn, addr, AF_INET)); + while(as_path) { + as = as_lookup(asn, addr, AF_INET, &status); + if (status) { + as_shutdown(asn); + asn = as_setup(as_server); + if (asn == NULL) { + Fprintf(stderr, "%s: as_setup failed, AS# lookups" + " disabled\n", prog); + (void)fflush(stderr); + as_path = 0; + break; + } + else + continue; + } + Printf(" [AS%u]", as); + break; + } if (nflag) Printf(" %s", addr); diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c index 173e97c13bb3..eb6086706f9f 100644 --- a/usr.sbin/traceroute6/traceroute6.c +++ b/usr.sbin/traceroute6/traceroute6.c @@ -894,6 +894,8 @@ main(int argc, char *argv[]) as_path = 0; } } + if (as_path) + signal(SIGPIPE, SIG_IGN); /* * Message to users @@ -1577,13 +1579,30 @@ void print(struct msghdr *mhdr, int cc) { struct sockaddr_in6 *from = (struct sockaddr_in6 *)mhdr->msg_name; + int as, status; char hbuf[NI_MAXHOST]; if (cap_getnameinfo(capdns, (struct sockaddr *)from, from->sin6_len, hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0) strlcpy(hbuf, "invalid", sizeof(hbuf)); - if (as_path) - printf(" [AS%u]", as_lookup(asn, hbuf, AF_INET6)); + while (as_path) { + as = as_lookup(asn, hbuf, AF_INET6, &status); + if (status) { + as_shutdown(asn); + asn = as_setup(as_server); + if (asn == NULL) { + fprintf(stderr, "traceroute6: as_setup failed, AS# lookups" + " disabled\n"); + (void)fflush(stderr); + as_path = 0; + break; + } + else + continue; + } + printf(" [AS%u]", as); + break; + } if (nflag) printf(" %s", hbuf); else