[net-tools/f17: 3/3] better SCTP support (#826676)
Jiří Popelka
jpopelka at fedoraproject.org
Tue Jun 19 15:35:46 UTC 2012
commit fe6b2b4d87672c2449cc4f55a9503f7951b8a77a
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Tue Jun 19 17:35:05 2012 +0200
better SCTP support (#826676)
net-tools-1.60-sctp-statistics.patch | 419 +++++++++++++++++++++++++++++++++-
net-tools.spec | 5 +-
2 files changed, 417 insertions(+), 7 deletions(-)
---
diff --git a/net-tools-1.60-sctp-statistics.patch b/net-tools-1.60-sctp-statistics.patch
index 6ee0bbf..c875673 100644
--- a/net-tools-1.60-sctp-statistics.patch
+++ b/net-tools-1.60-sctp-statistics.patch
@@ -1,7 +1,7 @@
diff -up net-tools-1.60/netstat.c.sctp net-tools-1.60/netstat.c
---- net-tools-1.60/netstat.c.sctp 2011-12-06 16:28:09.726243816 +0100
-+++ net-tools-1.60/netstat.c 2011-12-06 16:28:09.769243277 +0100
-@@ -112,7 +112,7 @@
+--- net-tools-1.60/netstat.c.sctp 2012-06-19 17:22:46.424153397 +0200
++++ net-tools-1.60/netstat.c 2012-06-19 17:30:32.395825888 +0200
+@@ -114,7 +114,7 @@
#endif
/* prototypes for statistics.c */
@@ -10,7 +10,414 @@ diff -up net-tools-1.60/netstat.c.sctp net-tools-1.60/netstat.c
void inittab(void);
int parsesnmp6(int, int, int);
void inittab6(void);
-@@ -2093,7 +2093,7 @@ int main
+@@ -887,161 +887,264 @@ static int igmp_info(void)
+ igmp_do_one, "igmp", "igmp6");
+ }
+
+-static int ip_parse_dots(uint32_t *addr, char const *src) {
+- unsigned a, b, c, d;
+- unsigned ret = 4-sscanf(src, "%u.%u.%u.%u", &a, &b, &c, &d);
+- *addr = htonl((a << 24)|(b << 16)|(c << 8)|d);
+- return ret;
+-}
+-
+-static void print_ip_service(struct sockaddr_in *addr, char const *protname,
+- char *buf, unsigned size) {
+- struct aftype *ap;
+-
+- if(size == 0) return;
+-
+- /* print host */
+- if((ap = get_afntype(addr->sin_family)) == NULL) {
+- fprintf(stderr, _("netstat: unsupported address family %d !\n"),
+- addr->sin_family);
+- return;
+- }
+- safe_strncpy(buf, ap->sprint((struct sockaddr*)addr, flag_not), size);
+-
+- /* print service */
+- if(flag_all || (flag_lst && !addr->sin_port) || (!flag_lst && addr->sin_port)) {
+- char bfs[32];
+-
+- snprintf(bfs, sizeof(bfs), "%s",
+- get_sname(addr->sin_port, (char*)protname, flag_not & FLAG_NUM_PORT));
+-
+- /* check if we must cut on host and/or service name */
+- {
+- unsigned const bufl = strlen(buf);
+- unsigned const bfsl = strlen(bfs);
+-
+- if(bufl+bfsl+2 > size) {
+- unsigned const half = (size-2)>>1;
+- if(bufl > half) {
+- if(bfsl > half) {
+- buf[size-2-half] = '\0';
+- bfs[half+1] = '\0';
+- }
+- else buf[size-2-bfsl] = '\0';
+- }
+- else bfs[size-2-bufl] = '\0';
+- }
++static const char *sctp_socket_state_str(int state)
++{
++ if(state>=0 && state<=10)
++ return tcp_state[state];
++ else {
++ static char state_str_buf[64];
++ sprintf(state_str_buf,"UNKNOWN(%d)",state);
++ return state_str_buf;
+ }
+- strcat(buf, ":");
+- strcat(buf, bfs);
+- }
+ }
+
+-/* process single SCTP endpoint */
+-static void sctp_do_ept(int lnr, char const *line, const char *prot)
++static struct aftype *process_sctp_addr_str(const char *addr_str, struct sockaddr *sa)
+ {
+- struct sockaddr_in laddr, raddr;
+- unsigned uid, inode;
++ if (strchr(addr_str,':')) {
++#if HAVE_AFINET6
++ extern struct aftype inet6_aftype;
++ /* Demangle what the kernel gives us */
++ struct in6_addr in6;
++ char addr6_str[INET6_ADDRSTRLEN];
++ unsigned u0,u1,u2,u3,u4,u5,u6,u7;
++ sscanf(addr_str, "%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",
++ &u0, &u1, &u2, &u3, &u4, &u5, &u6, &u7);
++ in6.s6_addr16[0] = htons(u0);
++ in6.s6_addr16[1] = htons(u1);
++ in6.s6_addr16[2] = htons(u2);
++ in6.s6_addr16[3] = htons(u3);
++ in6.s6_addr16[4] = htons(u4);
++ in6.s6_addr16[5] = htons(u5);
++ in6.s6_addr16[6] = htons(u6);
++ in6.s6_addr16[7] = htons(u7);
++
++ inet_ntop(AF_INET6, &in6, addr6_str, sizeof(addr6_str));
++ inet6_aftype.input(1, addr6_str, sa);
++ sa->sa_family = AF_INET6;
++#endif
++ } else {
++ ((struct sockaddr_in*)sa)->sin_addr.s_addr = inet_addr(addr_str);
++ sa->sa_family = AF_INET;
++ }
++ return get_afntype(sa->sa_family);
++}
+
+- char l_addr[23], r_addr[23];
+
+- /* fill sockaddr_in structures */
+- {
+- unsigned lport;
+- unsigned ate;
+-
+- if(lnr == 0) return;
+- if(sscanf(line, "%*X %*X %*u %*u %*u %u %u %u %n",
+- &lport, &uid, &inode, &ate) < 3) goto err;
+-
+- /* decode IP address */
+- if(ip_parse_dots(&laddr.sin_addr.s_addr, line+ate)) goto err;
+- raddr.sin_addr.s_addr = htonl(0);
+- laddr.sin_family = raddr.sin_family = AF_INET;
+- laddr.sin_port = htons(lport);
+- raddr.sin_port = htons(0);
+- }
++static void sctp_eps_do_one(int lnr, char *line, const char *proto)
++{
++ char buffer[1024];
++ int state, port;
++ int uid;
++ unsigned long inode;
+
+- /* print IP:service to l_addr and r_addr */
+- print_ip_service(&laddr, prot, l_addr, sizeof(l_addr));
+- print_ip_service(&raddr, prot, r_addr, sizeof(r_addr));
+-
+- /* Print line */
+- printf("%-4s %6d %6d %-*s %-*s %-11s",
+- prot, 0, 0,
+- (int)netmax(23,strlen(l_addr)), l_addr,
+- (int)netmax(23,strlen(r_addr)), r_addr,
+- _(tcp_state[TCP_LISTEN]));
+- finish_this_one(uid, inode, "");
+- return;
+- err:
+- fprintf(stderr, "SCTP error in line: %d\n", lnr);
+-}
+-
+-/* process single SCTP association */
+-static void sctp_do_assoc(int lnr, char const *line, const char *prot)
+-{
+- struct sockaddr_in laddr, raddr;
+- unsigned long rxq, txq;
+- unsigned uid, inode;
+-
+- char l_addr[23], r_addr[23];
+-
+- /* fill sockaddr_in structures */
+- {
+- unsigned lport, rport;
+- unsigned ate;
+- char const *addr;
+-
+- if(lnr == 0) return;
+- if(sscanf(line, "%*X %*X %*u %*u %*u %*u %*u %lu %lu %u %u %u %u %n",
+- &txq, &rxq, &uid, &inode, &lport, &rport, &ate) < 6) goto err;
+-
+- /* decode IP addresses */
+- addr = strchr(line+ate, '*');
+- if(addr == 0) goto err;
+- if(ip_parse_dots(&laddr.sin_addr.s_addr, ++addr)) goto err;
+- addr = strchr(addr, '*');
+- if(addr == 0) goto err;
+- if(ip_parse_dots(&raddr.sin_addr.s_addr, ++addr)) goto err;
+-
+- /* complete sockaddr_in structures */
+- laddr.sin_family = raddr.sin_family = AF_INET;
+- laddr.sin_port = htons(lport);
+- raddr.sin_port = htons(rport);
+- }
++ struct aftype *ap;
++#if HAVE_AFINET6
++ struct sockaddr_in6 localaddr;
++#else
++ struct sockaddr_in localaddr;
++#endif
++ const char *sst_str;
++ const char *lport_str;
++ const char *uid_str;
++ const char *inode_str;
++ char *laddrs_str;
++
++ if(lnr == 0) {
++ /* ENDPT SOCK STY SST HBKT LPORT UID INODE LADDRS */
++ return;
++ }
++ strtok(line," \t\n"); /*skip endpt*/
++ strtok(0," \t\n"); /*skip sock*/
++ strtok(0," \t\n"); /*skp sty*/
++ 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");
++ laddrs_str=strtok(0,"\t\n");
++
++ state = atoi(sst_str);
++ port = atoi(lport_str);
++ uid = atoi(uid_str);
++ inode = strtoul(inode_str,0,0);
++
++ const char *this_local_addr;
++ int first=1;
++ char local_port[16];
++ snprintf(local_port, sizeof(local_port), "%s",
++ get_sname(htons(port), proto, flag_not & FLAG_NUM_PORT));
++ for(this_local_addr=strtok(laddrs_str," \t\n");
++ this_local_addr;
++ this_local_addr=strtok(0," \t\n"))
+
+- /* print IP:service to l_addr and r_addr */
+- print_ip_service(&laddr, prot, l_addr, sizeof(l_addr));
+- print_ip_service(&raddr, prot, r_addr, sizeof(r_addr));
+-
+- /* Print line */
+- printf("%-4s %6ld %6ld %-*s %-*s %-11s",
+- prot, rxq, txq,
+- (int)netmax(23,strlen(l_addr)), l_addr,
+- (int)netmax(23,strlen(r_addr)), r_addr,
+- _(tcp_state[TCP_ESTABLISHED]));
+- finish_this_one(uid, inode, "");
+- return;
+- err:
+- fprintf(stderr, "SCTP error in line: %d\n", lnr);
+-}
+-
+-static int sctp_info_epts(void) {
+- INFO_GUTS6(_PATH_PROCNET_SCTPEPTS, _PATH_PROCNET_SCTP6EPTS, "AF INET (sctp)",
+- sctp_do_ept, "sctp", "sctp6");
+-}
++ {
++ 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(" %-11s", first?sctp_socket_state_str(state):"");
++ first = 0;
++ }
++ finish_this_one(uid,inode,"");
++}
++
++static void sctp_assoc_do_one(int lnr, char *line, const char *proto)
++{
++ char buffer[1024];
++ int state, lport,rport;
++ int uid;
++ unsigned rxqueue,txqueue;
++ unsigned long inode;
++
++ struct aftype *ap;
++#if HAVE_AFINET6
++ struct sockaddr_in6 localaddr,remoteaddr;
++#else
++ struct sockaddr_in localaddr,remoteaddr;
++#endif
++ const char *sst_str;
++ const char *txqueue_str;
++ const char *rxqueue_str;
++ const char *lport_str,*rport_str;
++ const char *uid_str;
++ const char *inode_str;
++ char *laddrs_str;
++ char *raddrs_str;
++
++ if(lnr == 0) {
++ /* ASSOC SOCK STY SST ST HBKT ASSOC-ID TX_QUEUE RX_QUEUE UID INODE LPORT RPORT LADDRS <-> RADDRS */
++ return;
++ }
++
++ strtok(line," \t\n"); /*skip assoc*/
++ strtok(0," \t\n"); /*skip sock*/
++ strtok(0," \t\n"); /*skp sty*/
++ sst_str = strtok(0," \t\n");
++ 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");
++ laddrs_str = strtok(0,"<->\t\n");
++ raddrs_str = strtok(0,"<->\t\n");
++
++ state = atoi(sst_str);
++ txqueue = atoi(txqueue_str);
++ rxqueue = atoi(rxqueue_str);
++ uid = atoi(uid_str);
++ inode = strtoul(inode_str,0,0);
++ lport = atoi(lport_str);
++ rport = atoi(rport_str);
++
++ /*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), proto,
++ flag_not & FLAG_NUM_PORT));
++ snprintf(remote_port, sizeof(remote_port), "%s",
++ get_sname(htons(rport), proto,
++ 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(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(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);
++ 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);
++ else
++ sprintf(buffer,"%s", remote_addr);
++ printf("%-23s", buffer);
++ } else
++ printf("%-23s", "");
++
++ printf(" %-11s", 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,"");
++}
++
++static int sctp_info_eps(void)
++{
++ INFO_GUTS6(_PATH_PROCNET_SCTPEPTS, _PATH_PROCNET_SCTP6EPTS, "AF INET (sctp)",
++ sctp_eps_do_one, "sctp", "sctp6");
++ }
+
+ static int sctp_info_assocs(void) {
+ INFO_GUTS6(_PATH_PROCNET_SCTPASSOCS, _PATH_PROCNET_SCTP6ASSOCS, "AF INET (sctp)",
+- sctp_do_assoc, "sctp", "sctp6");
++ sctp_assoc_do_one, "sctp", "sctp6");
+ }
+
+-static int sctp_info(void) {
+- int res;
+- res = sctp_info_epts();
+- if(res) return res;
+- return sctp_info_assocs();
++static int sctp_info(void)
++{
++ if(flag_all)
++ sctp_info_eps();
++ return sctp_info_assocs();
+ }
+
+ static void addr_do_one(char *buf, size_t buf_len, size_t short_len, struct aftype *ap,
+@@ -2235,7 +2338,7 @@ int main
if (!strcmp(afname, "inet")) {
#if HAVE_AFINET
inittab();
@@ -20,8 +427,8 @@ diff -up net-tools-1.60/netstat.c.sctp net-tools-1.60/netstat.c
ENOSUPP("netstat", "AF INET");
#endif
diff -up net-tools-1.60/statistics.c.sctp net-tools-1.60/statistics.c
---- net-tools-1.60/statistics.c.sctp 2011-12-06 16:28:09.705244079 +0100
-+++ net-tools-1.60/statistics.c 2011-12-06 16:28:49.128751215 +0100
+--- net-tools-1.60/statistics.c.sctp 2012-06-19 17:22:46.401153708 +0200
++++ net-tools-1.60/statistics.c 2012-06-19 17:22:46.432153287 +0200
@@ -21,7 +21,7 @@
#define UFWARN(x)
#endif
diff --git a/net-tools.spec b/net-tools.spec
index 3be9cd7..5654db4 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -3,7 +3,7 @@
Summary: Basic networking tools
Name: net-tools
Version: 1.60
-Release: 135.%{checkout}%{?dist}
+Release: 136.%{checkout}%{?dist}
License: GPL+
Group: System Environment/Base
URL: http://net-tools.sourceforge.net
@@ -160,6 +160,9 @@ fi
%attr(0644,root,root) %{_unitdir}/arp-ethers.service
%changelog
+* Tue Jun 19 2012 Jiri Popelka <jpopelka at redhat.com> - 1.60-136.20120509git
+- better SCTP support (#826676)
+
* Wed May 09 2012 Jiri Popelka <jpopelka at redhat.com> - 1.60-135.20120509git
- don't require hostname package
More information about the scm-commits
mailing list