rpms/net-tools/devel net-tools-1.60-sctp-addrs.patch, NONE, 1.1 net-tools.spec, 1.91, 1.92
Radek Vokál (rvokal)
fedora-extras-commits at redhat.com
Tue Jul 8 06:34:29 UTC 2008
Author: rvokal
Update of /cvs/extras/rpms/net-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7007
Modified Files:
net-tools.spec
Added Files:
net-tools-1.60-sctp-addrs.patch
Log Message:
- netstat displays correct sctp statistics (#445535) <zprikryl at redhat.com>
net-tools-1.60-sctp-addrs.patch:
--- NEW FILE net-tools-1.60-sctp-addrs.patch ---
--- net-tools-1.60/netstat.c.sctp-addrs 2008-06-18 14:41:29.000000000 +0200
+++ net-tools-1.60/netstat.c 2008-06-18 14:12:03.000000000 +0200
@@ -1299,23 +1299,21 @@ static void sctp_eps_do_one(int lnr, cha
const char *lport_str;
const char *uid_str;
const char *inode_str;
- const char *pladdr_str;
char *laddrs_str;
if(lnr == 0) {
- /* ENDPT SOCK STY SST HBKT LPORT uid inode pladdr LADDRS*/
+ /* ENDPT SOCK STY SST HBKT LPORT UID INODE LADDRS */
return;
}
- strtok(line," \t\n"); /*skip ptr*/
- strtok(0," \t\n"); /*skip ptr*/
+ strtok(line," \t\n"); /*skip endpt*/
+ strtok(0," \t\n"); /*skip sock*/
sty_str = strtok(0," \t\n");
sst_str = strtok(0," \t\n");
strtok(0," \t\n"); /*skip hash bucket*/
lport_str=strtok(0," \t\n");
uid_str = strtok(0," \t\n");
inode_str = strtok(0," \t\n");
- pladdr_str = strtok(0," \t\n");
laddrs_str=strtok(0,"\t\n");
type = atoi(sty_str);
@@ -1323,61 +1321,35 @@ static void sctp_eps_do_one(int lnr, cha
port = atoi(lport_str);
uid = atoi(uid_str);
inode = strtoul(inode_str,0,0);
-
- if(flag_sctp<=1) {
- /* only print the primary address */
- char local_addr[64];
- char local_port[16];
-
- ap = process_sctp_addr_str(pladdr_str, (struct sockaddr*)&localaddr);
- if(ap)
- safe_strncpy(local_addr,
- ap->sprint((struct sockaddr *) &localaddr, flag_not),
- sizeof(local_addr));
- else
- sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
-
- snprintf(local_port, sizeof(local_port), "%s",
- get_sname(htons(port), "sctp",
- flag_not & FLAG_NUM_PORT));
-
- printf("sctp ");
- sprintf(buffer,"%s:%s", local_addr, local_port);
- printf("%-47s", buffer);
- printf(" %-12s", sctp_socket_state_str(state));
- } else {
- /*print all addresses*/
- const char *this_local_addr;
- int first=1;
- char local_port[16];
- snprintf(local_port, sizeof(local_port), "%s",
- get_sname(htons(port), "sctp",
- flag_not & FLAG_NUM_PORT));
- for(this_local_addr=strtok(laddrs_str," \t\n");
- this_local_addr;
- this_local_addr=strtok(0," \t\n"))
- {
- char local_addr[64];
- ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr);
- if(ap)
- safe_strncpy(local_addr,
- ap->sprint((struct sockaddr *) &localaddr, flag_not),
- sizeof(local_addr));
- else
- sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
- if(!first) printf("\n");
- if(first)
- printf("sctp ");
- else
- printf(" ");
- sprintf(buffer,"%s:%s", local_addr, local_port);
- printf("%-47s", buffer);
- printf(" %-12s", first?sctp_socket_state_str(state):"");
- first = 0;
- }
+ const char *this_local_addr;
+ int first=1;
+ char local_port[16];
+ snprintf(local_port, sizeof(local_port), "%s",
+ get_sname(htons(port), "sctp", flag_not & FLAG_NUM_PORT));
+ for(this_local_addr=strtok(laddrs_str," \t\n");
+ this_local_addr;
+ this_local_addr=strtok(0," \t\n"))
+ {
+ char local_addr[64];
+ ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr);
+ if(ap)
+ safe_strncpy(local_addr,
+ ap->sprint((struct sockaddr *) &localaddr, flag_not),
+ sizeof(local_addr));
+ else
+ sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
+
+ if(!first) printf("\n");
+ if(first)
+ printf("sctp ");
+ else
+ printf(" ");
+ sprintf(buffer,"%s:%s", local_addr, local_port);
+ printf("%-55s", buffer);
+ printf(" %-12s", first?sctp_socket_state_str(state):"");
+ first = 0;
}
-
finish_this_one(uid,inode,"");
}
@@ -1403,32 +1375,29 @@ static void sctp_assoc_do_one(int lnr, c
const char *lport_str,*rport_str;
const char *uid_str;
const char *inode_str;
- const char *pladdr_str;
char *laddrs_str;
- const char *praddr_str;
char *raddrs_str;
-
+
if(lnr == 0) {
- /* ASSOC SOCK STY SST ST HBKT tx_queue rx_queue uid inode LPORT RPORT pladdr praddr LADDRS <-> RADDRS*/
+ /* ASSOC SOCK STY SST ST HBKT ASSOC-ID TX_QUEUE RX_QUEUE UID INODE LPORT RPORT LADDRS <-> RADDRS */
return;
}
-
- strtok(line," \t\n"); /*skip ptr*/
- strtok(0," \t\n"); /*skip ptr*/
+
+ strtok(line," \t\n"); /*skip assoc*/
+ strtok(0," \t\n"); /*skip sock*/
sty_str = strtok(0," \t\n");
sst_str = strtok(0," \t\n");
st_str = strtok(0," \t\n");
strtok(0," \t\n"); /*skip hash bucket*/
+ strtok(0," \t\n"); /*skip hash assoc-id*/
txqueue_str = strtok(0," \t\n");
rxqueue_str = strtok(0," \t\n");
uid_str = strtok(0," \t\n");
inode_str = strtok(0," \t\n");
lport_str=strtok(0," \t\n");
rport_str=strtok(0," \t\n");
- pladdr_str = strtok(0," \t\n");
- praddr_str = strtok(0," \t\n");
- laddrs_str=strtok(0,"<->\t\n");
- raddrs_str=strtok(0,"<->\t\n");
+ laddrs_str = strtok(0,"<->\t\n");
+ raddrs_str = strtok(0,"<->\t\n");
type = atoi(sty_str);
state = atoi(sst_str);
@@ -1439,116 +1408,81 @@ static void sctp_assoc_do_one(int lnr, c
inode = strtoul(inode_str,0,0);
lport = atoi(lport_str);
rport = atoi(rport_str);
-
- if(flag_sctp<=1) {
- /* only print the primary addresses */
- char local_addr[64];
- char local_port[16];
- char remote_addr[64];
- char remote_port[16];
-
- ap = process_sctp_addr_str(pladdr_str, (struct sockaddr*)&localaddr);
- if(ap)
- safe_strncpy(local_addr,
- ap->sprint((struct sockaddr *) &localaddr, flag_not),
- sizeof(local_addr));
- else
- sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
-
- snprintf(local_port, sizeof(local_port), "%s",
- get_sname(htons(lport), "sctp",
- flag_not & FLAG_NUM_PORT));
-
- ap = process_sctp_addr_str(praddr_str, (struct sockaddr*)&remoteaddr);
- if(ap)
- safe_strncpy(remote_addr,
- ap->sprint((struct sockaddr *) &remoteaddr, flag_not),
- sizeof(remote_addr));
- else
- sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family);
-
- snprintf(remote_port, sizeof(remote_port), "%s",
- get_sname(htons(rport), "sctp",
- flag_not & FLAG_NUM_PORT));
-
- printf("sctp");
- printf(" %6u %6u ", rxqueue, txqueue);
- sprintf(buffer,"%s:%s", local_addr, local_port);
- printf("%-23s", buffer);
- printf(" ");
- sprintf(buffer,"%s:%s", remote_addr, remote_port);
- printf("%-23s", buffer);
- printf(" %-12s", sctp_socket_state_str(state));
- } else {
- /*print all addresses*/
- const char *this_local_addr;
- const char *this_remote_addr;
- char *ss1,*ss2;
- int first=1;
- char local_port[16];
- char remote_port[16];
- snprintf(local_port, sizeof(local_port), "%s",
- get_sname(htons(lport), "sctp",
- flag_not & FLAG_NUM_PORT));
- snprintf(remote_port, sizeof(remote_port), "%s",
- get_sname(htons(rport), "sctp",
- flag_not & FLAG_NUM_PORT));
-
- this_local_addr=strtok_r(laddrs_str," \t\n",&ss1);
- this_remote_addr=strtok_r(raddrs_str," \t\n",&ss2);
- while(this_local_addr || this_remote_addr) {
- char local_addr[64];
- char remote_addr[64];
- if(this_local_addr) {
- ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr);
- if(ap)
- safe_strncpy(local_addr,
- ap->sprint((struct sockaddr *) &localaddr, flag_not),
- sizeof(local_addr));
- else
- sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
- }
- if(this_remote_addr) {
- ap = process_sctp_addr_str(this_remote_addr, (struct sockaddr*)&remoteaddr);
- if(ap)
- safe_strncpy(remote_addr,
- ap->sprint((struct sockaddr *) &remoteaddr, flag_not),
- sizeof(remote_addr));
- else
- sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family);
- }
- if(!first) printf("\n");
- if(first)
- printf("sctp %6u %6u ", rxqueue, txqueue);
- else
- printf(" ");
- if(this_local_addr) {
- if(first)
- sprintf(buffer,"%s:%s", local_addr, local_port);
+ /*print all addresses*/
+ const char *this_local_addr;
+ const char *this_remote_addr;
+ char *ss1,*ss2;
+ int first=1;
+ char local_port[16];
+ char remote_port[16];
+ snprintf(local_port, sizeof(local_port), "%s",
+ get_sname(htons(lport), "sctp",
+ flag_not & FLAG_NUM_PORT));
+ snprintf(remote_port, sizeof(remote_port), "%s",
+ get_sname(htons(rport), "sctp",
+ flag_not & FLAG_NUM_PORT));
+
+ this_local_addr=strtok_r(laddrs_str," \t\n",&ss1);
+ this_remote_addr=strtok_r(raddrs_str," \t\n",&ss2);
+ while(this_local_addr || this_remote_addr) {
+ char local_addr[64];
+ char remote_addr[64];
+
+ if(this_local_addr) {
+ if (this_local_addr[0] == '*') {
+ /* skip * */
+ this_local_addr++;
+ }
+ ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr);
+ if(ap)
+ safe_strncpy(local_addr,
+ ap->sprint((struct sockaddr *) &localaddr, flag_not), sizeof(local_addr));
else
- sprintf(buffer,"%s", local_addr);
- printf("%-23s", buffer);
- } else
- printf("%-23s", "");
- printf(" ");
- if(this_remote_addr) {
- if(first)
- sprintf(buffer,"%s:%s", remote_addr, remote_port);
+ sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
+ }
+ if(this_remote_addr) {
+ if (this_remote_addr[0] == '*') {
+ /* skip * */
+ this_remote_addr++;
+ }
+ ap = process_sctp_addr_str(this_remote_addr, (struct sockaddr*)&remoteaddr);
+ if(ap)
+ safe_strncpy(remote_addr,
+ ap->sprint((struct sockaddr *) &remoteaddr, flag_not), sizeof(remote_addr));
else
- sprintf(buffer,"%s", remote_addr);
- printf("%-23s", buffer);
- } else
- printf("%-23s", "");
-
- printf(" %-12s", first?sctp_socket_state_str(state):"");
+ sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family);
+ }
- first = 0;
- this_local_addr=strtok_r(0," \t\n",&ss1);
- this_remote_addr=strtok_r(0," \t\n",&ss2);
- }
+ if(!first) printf("\n");
+ if(first)
+ printf("sctp %6u %6u ", rxqueue, txqueue);
+ else
+ printf(" ");
+ if(this_local_addr) {
+ if(first)
+ sprintf(buffer,"%s:%s", local_addr, local_port);
+ else
+ sprintf(buffer,"%s", local_addr);
+ printf("%-27s", buffer);
+ } else
+ printf("%-27s", "");
+ printf(" ");
+ if(this_remote_addr) {
+ if(first)
+ sprintf(buffer,"%s:%s", remote_addr, remote_port);
+ else
+ sprintf(buffer,"%s", remote_addr);
+ printf("%-27s", buffer);
+ } else
+ printf("%-27s", "");
+
+ printf(" %-12s", first?sctp_socket_state_str(state):"");
+
+ first = 0;
+ this_local_addr=strtok_r(0," \t\n",&ss1);
+ this_remote_addr=strtok_r(0," \t\n",&ss2);
}
-
finish_this_one(uid,inode,"");
}
Index: net-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/net-tools/devel/net-tools.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- net-tools.spec 4 Mar 2008 11:57:44 -0000 1.91
+++ net-tools.spec 8 Jul 2008 06:33:37 -0000 1.92
@@ -3,7 +3,7 @@
Summary: Basic networking tools
Name: net-tools
Version: 1.60
-Release: 87%{?dist}
+Release: 88%{?dist}
License: GPL+
Group: System Environment/Base
URL: http://www.tazenda.demon.co.uk/phil/net-tools/
@@ -76,6 +76,7 @@
Patch63: net-tools-1.60-netplugd_init.patch
Patch64: net-tools-1.60-ec_hw_null.patch
Patch65: net-tools-1.60-statistics_buffer.patch
+Patch66: net-tools-1.60-sctp-addrs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): /sbin/chkconfig
@@ -152,6 +153,7 @@
%patch63 -p1
%patch64 -p1
%patch65 -p1 -b .buffer
+%patch66 -p1 -b .sctp-addrs
cp %SOURCE2 ./config.h
cp %SOURCE3 ./config.make
@@ -267,7 +269,10 @@
%{_sysconfdir}/rc.d/init.d/netplugd
%changelog
-* Tue Mar 4 2008 Radek Vokál <rvokal at redhat.com> - 1.80-87
+* Tue Jul 8 2008 Radek Vokál <rvokal at redhat.com> - 1.60-88
+- netstat displays correct sctp statistics (#445535) <zprikryl at redhat.com>
+
+* Tue Mar 4 2008 Radek Vokál <rvokal at redhat.com> - 1.60-87
- fix buffer for newer kernels (#435554)
* Mon Feb 25 2008 Radek Vokal <rvokal at redhat.com> - 1.60-86
More information about the fedora-extras-commits
mailing list