From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q8YgO-00070X-S8 for garchives@archives.gentoo.org; Sat, 09 Apr 2011 13:58:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DE451C03E; Sat, 9 Apr 2011 13:58:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C05821C03E for ; Sat, 9 Apr 2011 13:58:09 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 491D81BC0CE for ; Sat, 9 Apr 2011 13:58:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B19778006E for ; Sat, 9 Apr 2011 13:58:08 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <491cedbc9d47a3683f63668e6bc362c17ebf8477.vapier@gentoo> Subject: [gentoo-commits] proj/net-tools:master commit in: / X-VCS-Repository: proj/net-tools X-VCS-Files: netstat.c X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 491cedbc9d47a3683f63668e6bc362c17ebf8477 Date: Sat, 9 Apr 2011 13:58:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 32c6dc16a26112069232ddafdbb62362 commit: 491cedbc9d47a3683f63668e6bc362c17ebf8477 Author: Mike Frysinger gentoo org> AuthorDate: Sat Apr 9 13:57:28 2011 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Apr 9 13:57:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/net-tools.git= ;a=3Dcommit;h=3D491cedbc netstat: split host resolution out from --numeric-ports According to the manual the option "--numeric-ports" should not affect host resolution, but it does. All connected hosts are displayed with numeric values instead of their FQDN. patch by Mads Martin Joergensen in Gentoo bug 76756 --- netstat.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/netstat.c b/netstat.c index 0acda76..b625d19 100644 --- a/netstat.c +++ b/netstat.c @@ -6,7 +6,7 @@ * NET-3 Networking Distribution for the LINUX operating * system. * - * Version: $Id: netstat.c,v 1.71 2011-04-09 13:52:05 vapier Exp $ + * Version: $Id: netstat.c,v 1.72 2011-04-09 13:57:28 vapier Exp $ * * Authors: Fred Baumgarten, * Fred N. van Kempen, @@ -612,7 +612,7 @@ static void igmp_do_one(int lnr, const char *line,con= st char *prot) return; } safe_strncpy(mcast_addr, ap->sprint((struct sockaddr *) &mcastaddr,=20 - flag_not), sizeof(mcast_addr)); + flag_not & FLAG_NUM_HOST), sizeof(mcast_addr)); printf("%-15s %-6d %s\n", device, refcnt, mcast_addr); #endif } else { /* IPV4 */ @@ -650,7 +650,7 @@ static void igmp_do_one(int lnr, const char *line,con= st char *prot) return; } safe_strncpy(mcast_addr, ap->sprint((struct sockaddr *) &mcastaddr,=20 - flag_not), sizeof(mcast_addr)); + flag_not & FLAG_NUM_HOST), sizeof(mcast_addr)); printf("%-15s %-6d %s\n", device, refcnt, mcast_addr ); #endif } /* IPV4 */ @@ -931,8 +931,8 @@ static void tcp_do_one(int lnr, const char *line, con= st char *prot) return; } safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localaddr,=20 - flag_not), sizeof(local_addr)); - safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr, flag= _not), + flag_not & FLAG_NUM_HOST), sizeof(local_addr)); + safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr, flag= _not & FLAG_NUM_HOST), sizeof(rem_addr)); =20 snprintf(buffer, sizeof(buffer), "%s", @@ -1088,7 +1088,7 @@ static void udp_do_one(int lnr, const char *line,co= nst char *prot) if (flag_all || (notnull(remaddr) && !flag_lst) || (!notnull(remaddr= ) && flag_lst)) { safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localad= dr,=20 - flag_not), sizeof(local_addr)); + flag_not & FLAG_NUM_HOST), sizeof(local_addr)); snprintf(buffer, sizeof(buffer), "%s", get_sname(htons(local_port), "udp", flag_not & FLAG_NUM_PORT)); @@ -1100,7 +1100,7 @@ static void udp_do_one(int lnr, const char *line,co= nst char *prot) snprintf(buffer, sizeof(buffer), "%s", get_sname(htons(rem_port), "udp", flag_not & FLAG_NUM_PORT)); safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr,=20 - flag_not), sizeof(rem_addr)); + flag_not & FLAG_NUM_HOST), sizeof(rem_addr)); if ((strlen(rem_addr) + strlen(buffer)) > 22) rem_addr[22 - strlen(buffer)] =3D '\0'; strcat(rem_addr, ":"); @@ -1216,7 +1216,7 @@ static void raw_do_one(int lnr, const char *line,co= nst char *prot) get_sname(htons(local_port), "raw", flag_not & FLAG_NUM_PORT)); safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localad= dr,=20 - flag_not), sizeof(local_addr)); + flag_not & FLAG_NUM_HOST), sizeof(local_addr)); if ((strlen(local_addr) + strlen(buffer)) > 22) local_addr[22 - strlen(buffer)] =3D '\0'; strcat(local_addr, ":"); @@ -1225,7 +1225,7 @@ static void raw_do_one(int lnr, const char *line,co= nst char *prot) snprintf(buffer, sizeof(buffer), "%s", get_sname(htons(rem_port), "raw", flag_not & FLAG_NUM_PORT)); safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr,=20 - flag_not), sizeof(rem_addr)); + flag_not & FLAG_NUM_HOST), sizeof(rem_addr)); if ((strlen(rem_addr) + strlen(buffer)) > 22) rem_addr[22 - strlen(buffer)] =3D '\0'; strcat(rem_addr, ":"); @@ -1609,13 +1609,13 @@ static int ipx_info(void) =20 /* Fetch and resolve the Source */ (void) ap->input(4, sad, &sa); - safe_strncpy(buf, ap->sprint(&sa, flag_not), sizeof(buf)); + safe_strncpy(buf, ap->sprint(&sa, flag_not & FLAG_NUM_HOST), sizeof(buf= )); snprintf(sad, sizeof(sad), "%s:%04X", buf, sport); =20 if (!nc) { /* Fetch and resolve the Destination */ (void) ap->input(4, dad, &sa); - safe_strncpy(buf, ap->sprint(&sa, flag_not), sizeof(buf)); + safe_strncpy(buf, ap->sprint(&sa, flag_not & FLAG_NUM_HOST), sizeof= (buf)); snprintf(dad, sizeof(dad), "%s:%04X", buf, dport); } else strcpy(dad, "-"); From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q8Ygm-0007Us-1c for garchives@archives.gentoo.org; Sat, 09 Apr 2011 13:59:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D2791C02C; Sat, 9 Apr 2011 13:58:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CF6DA1C02C for ; Sat, 9 Apr 2011 13:58:07 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 506331BC016 for ; Sat, 9 Apr 2011 13:58:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B36DC8006D for ; Sat, 9 Apr 2011 13:58:06 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <491cedbc9d47a3683f63668e6bc362c17ebf8477.vapier@gentoo> Subject: [gentoo-commits] proj/net-tools:gentoo commit in: / X-VCS-Repository: proj/net-tools X-VCS-Files: netstat.c X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 491cedbc9d47a3683f63668e6bc362c17ebf8477 Date: Sat, 9 Apr 2011 13:58:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d4caa1d8fc3a3aea089d090618016585 Message-ID: <20110409135806.oVVDrGClESsp-g1R-XgOkHYRZfQnzNWd5CQn0ggSEDQ@z> commit: 491cedbc9d47a3683f63668e6bc362c17ebf8477 Author: Mike Frysinger gentoo org> AuthorDate: Sat Apr 9 13:57:28 2011 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Apr 9 13:57:28 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/net-tools.git= ;a=3Dcommit;h=3D491cedbc netstat: split host resolution out from --numeric-ports According to the manual the option "--numeric-ports" should not affect host resolution, but it does. All connected hosts are displayed with numeric values instead of their FQDN. patch by Mads Martin Joergensen in Gentoo bug 76756 --- netstat.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/netstat.c b/netstat.c index 0acda76..b625d19 100644 --- a/netstat.c +++ b/netstat.c @@ -6,7 +6,7 @@ * NET-3 Networking Distribution for the LINUX operating * system. * - * Version: $Id: netstat.c,v 1.71 2011-04-09 13:52:05 vapier Exp $ + * Version: $Id: netstat.c,v 1.72 2011-04-09 13:57:28 vapier Exp $ * * Authors: Fred Baumgarten, * Fred N. van Kempen, @@ -612,7 +612,7 @@ static void igmp_do_one(int lnr, const char *line,con= st char *prot) return; } safe_strncpy(mcast_addr, ap->sprint((struct sockaddr *) &mcastaddr,=20 - flag_not), sizeof(mcast_addr)); + flag_not & FLAG_NUM_HOST), sizeof(mcast_addr)); printf("%-15s %-6d %s\n", device, refcnt, mcast_addr); #endif } else { /* IPV4 */ @@ -650,7 +650,7 @@ static void igmp_do_one(int lnr, const char *line,con= st char *prot) return; } safe_strncpy(mcast_addr, ap->sprint((struct sockaddr *) &mcastaddr,=20 - flag_not), sizeof(mcast_addr)); + flag_not & FLAG_NUM_HOST), sizeof(mcast_addr)); printf("%-15s %-6d %s\n", device, refcnt, mcast_addr ); #endif } /* IPV4 */ @@ -931,8 +931,8 @@ static void tcp_do_one(int lnr, const char *line, con= st char *prot) return; } safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localaddr,=20 - flag_not), sizeof(local_addr)); - safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr, flag= _not), + flag_not & FLAG_NUM_HOST), sizeof(local_addr)); + safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr, flag= _not & FLAG_NUM_HOST), sizeof(rem_addr)); =20 snprintf(buffer, sizeof(buffer), "%s", @@ -1088,7 +1088,7 @@ static void udp_do_one(int lnr, const char *line,co= nst char *prot) if (flag_all || (notnull(remaddr) && !flag_lst) || (!notnull(remaddr= ) && flag_lst)) { safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localad= dr,=20 - flag_not), sizeof(local_addr)); + flag_not & FLAG_NUM_HOST), sizeof(local_addr)); snprintf(buffer, sizeof(buffer), "%s", get_sname(htons(local_port), "udp", flag_not & FLAG_NUM_PORT)); @@ -1100,7 +1100,7 @@ static void udp_do_one(int lnr, const char *line,co= nst char *prot) snprintf(buffer, sizeof(buffer), "%s", get_sname(htons(rem_port), "udp", flag_not & FLAG_NUM_PORT)); safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr,=20 - flag_not), sizeof(rem_addr)); + flag_not & FLAG_NUM_HOST), sizeof(rem_addr)); if ((strlen(rem_addr) + strlen(buffer)) > 22) rem_addr[22 - strlen(buffer)] =3D '\0'; strcat(rem_addr, ":"); @@ -1216,7 +1216,7 @@ static void raw_do_one(int lnr, const char *line,co= nst char *prot) get_sname(htons(local_port), "raw", flag_not & FLAG_NUM_PORT)); safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localad= dr,=20 - flag_not), sizeof(local_addr)); + flag_not & FLAG_NUM_HOST), sizeof(local_addr)); if ((strlen(local_addr) + strlen(buffer)) > 22) local_addr[22 - strlen(buffer)] =3D '\0'; strcat(local_addr, ":"); @@ -1225,7 +1225,7 @@ static void raw_do_one(int lnr, const char *line,co= nst char *prot) snprintf(buffer, sizeof(buffer), "%s", get_sname(htons(rem_port), "raw", flag_not & FLAG_NUM_PORT)); safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr,=20 - flag_not), sizeof(rem_addr)); + flag_not & FLAG_NUM_HOST), sizeof(rem_addr)); if ((strlen(rem_addr) + strlen(buffer)) > 22) rem_addr[22 - strlen(buffer)] =3D '\0'; strcat(rem_addr, ":"); @@ -1609,13 +1609,13 @@ static int ipx_info(void) =20 /* Fetch and resolve the Source */ (void) ap->input(4, sad, &sa); - safe_strncpy(buf, ap->sprint(&sa, flag_not), sizeof(buf)); + safe_strncpy(buf, ap->sprint(&sa, flag_not & FLAG_NUM_HOST), sizeof(buf= )); snprintf(sad, sizeof(sad), "%s:%04X", buf, sport); =20 if (!nc) { /* Fetch and resolve the Destination */ (void) ap->input(4, dad, &sa); - safe_strncpy(buf, ap->sprint(&sa, flag_not), sizeof(buf)); + safe_strncpy(buf, ap->sprint(&sa, flag_not & FLAG_NUM_HOST), sizeof= (buf)); snprintf(dad, sizeof(dad), "%s:%04X", buf, dport); } else strcpy(dad, "-");