Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.2:Test
net-tools
net-tools-1.60-sctp.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File net-tools-1.60-sctp.patch of Package net-tools
lib/pathnames.h | 2 netstat.c | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- statistics.c | 67 ++++++++- 3 files changed, 464 insertions(+), 13 deletions(-) Index: net-tools-1.60/netstat.c =================================================================== --- net-tools-1.60.orig/netstat.c +++ net-tools-1.60/netstat.c @@ -58,6 +58,7 @@ * *990420 {1.38} Tuan Hoang removed a useless assignment from igmp_do_one() *20010404 {1.39} Arnaldo Carvalho de Melo - use setlocale + *20050516 {1.40} Ivan Skytte Joergensen:Added SCTP support * * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General @@ -102,7 +103,7 @@ #endif /* prototypes for statistics.c */ -void parsesnmp(int, int, int); +void parsesnmp(int, int, int, int); void inittab(void); typedef enum { @@ -113,6 +114,29 @@ typedef enum { SS_DISCONNECTING /* in process of disconnecting */ } socket_state; + +#define SCTP_NSTATES 9 /* The number of states in array*/ + +static const char *sctp_state[] = { + N_("EMPTY"), + N_("CLOSED"), + N_("COOKIE_WAIT"), + N_("COOKIE_ECHOED"), + N_("ESTABLISHED"), + N_("SHUTDOWN_PENDING"), + N_("SHUTDOWN_SENT"), + N_("SHUTDOWN_RECEIVED"), + N_("SHUTDOWN_ACK_SENT") +}; + +#define SCTP_NTYPES 3 /* The number of types in array */ + +static const char *sctp_type[] = { + N_("udp"), + N_("udp-high-bw"), + N_("tcp") +}; + #define SO_ACCEPTCON (1<<16) /* performed a listen */ #define SO_WAITDATA (1<<17) /* wait data to read */ #define SO_NOSPACE (1<<18) /* no space to write */ @@ -143,6 +167,7 @@ int flag_opt = 0; int flag_raw = 0; int flag_tcp = 0; int flag_udp = 0; +int flag_sctp= 0; int flag_igmp= 0; int flag_rom = 0; int flag_exp = 1; @@ -151,6 +176,8 @@ int flag_arg = 0; int flag_ver = 0; int flag_cacheof = 0; +#define OPT_SCTP 0x100 + FILE *procinfo; struct iface_cache { @@ -1052,6 +1079,359 @@ static int udp_info(void) udp_do_one); } +static const char *sctp_socket_type_str(int type) { + if(type>=0 && type<SCTP_NTYPES) + return sctp_type[type]; + else { + static char type_str_buf[64]; + sprintf(type_str_buf,"UNKNOWN(%d)",type); + return type_str_buf; + } +} + +static const char *sctp_state_str(int state) +{ + if(state>=0 && state<SCTP_NSTATES) + return sctp_state[state]; + else { + static char state_str_buf[64]; + sprintf(state_str_buf,"UNKNOWN(%d)",state); + return state_str_buf; + } +} + +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; + } +} + +static struct aftype *process_sctp_addr_str(const char *addr_str, struct sockaddr *sa) +{ + 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); +} + +static void sctp_eps_do_one(int lnr, char *line) +{ + char buffer[1024]; + int type, state, port; + int uid; + unsigned long inode; + + struct aftype *ap; +#if HAVE_AFINET6 + struct sockaddr_in6 localaddr; +#else + struct sockaddr_in localaddr; +#endif + const char *sty_str; + const char *sst_str; + 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*/ + return; + } + + strtok(line," \t\n"); /*skip ptr*/ + strtok(0," \t\n"); /*skip ptr*/ + 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); + state = atoi(sst_str); + 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; + } + } + + finish_this_one(uid,inode,""); +} + +static void sctp_assoc_do_one(int lnr, char *line) +{ + char buffer[1024]; + int type, state, state2, 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 *sty_str; + const char *sst_str; + const char *st_str; + const char *txqueue_str; + const char *rxqueue_str; + 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*/ + return; + } + + strtok(line," \t\n"); /*skip ptr*/ + strtok(0," \t\n"); /*skip ptr*/ + 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*/ + 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"); + + type = atoi(sty_str); + state = atoi(sst_str); + state2 = atoi(st_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); + + 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); + 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(" %-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,""); +} + +static int sctp_info_eps(void) +{ + INFO_GUTS(_PATH_PROCNET_SCTP_EPS, "AF INET (sctp)", + sctp_eps_do_one); +} + +static int sctp_info_assocs(void) +{ + INFO_GUTS(_PATH_PROCNET_SCTP_ASSOCS, "AF INET (sctp)", + sctp_assoc_do_one); +} + +static int sctp_info(void) +{ + if(flag_all) + sctp_info_eps(); + return sctp_info_assocs(); +} + static void raw_do_one(int lnr, const char *line) { char buffer[8192], local_addr[64], rem_addr[64]; @@ -1599,7 +1979,7 @@ static void usage(void) fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n")); fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); - fprintf(stderr, _(" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n")); + fprintf(stderr, _(" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom --sctp\n")); fprintf(stderr, _(" <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF); fprintf(stderr, _(" List of possible address families (which support routing):\n")); print_aflist(1); /* 1 = routeable */ @@ -1624,6 +2004,7 @@ int main {"protocol", 1, 0, 'A'}, {"tcp", 0, 0, 't'}, {"udp", 0, 0, 'u'}, + {"sctp", 0, 0, OPT_SCTP }, {"raw", 0, 0, 'w'}, {"unix", 0, 0, 'x'}, {"listening", 0, 0, 'l'}, @@ -1653,7 +2034,7 @@ int main getroute_init(); /* Set up AF routing support */ afname[0] = '\0'; - while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl", longopts, &lop)) != EOF) + while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl", longopts, &lop)) != EOF) switch (i) { case -1: break; @@ -1735,10 +2116,12 @@ int main case 't': flag_tcp++; break; - case 'u': flag_udp++; break; + case OPT_SCTP: + flag_sctp++; + break; case 'w': flag_raw++; break; @@ -1756,13 +2139,13 @@ int main if (flag_int + flag_rou + flag_mas + flag_sta > 1) usage(); - if ((flag_inet || flag_inet6 || flag_sta) && !(flag_tcp || flag_udp || flag_raw)) - flag_tcp = flag_udp = flag_raw = 1; + if ((flag_inet || flag_inet6 || flag_sta) && !(flag_tcp || flag_udp || flag_sctp || flag_raw)) + flag_tcp = flag_udp = flag_sctp = flag_raw = 1; - if ((flag_tcp || flag_udp || flag_raw || flag_igmp) && !(flag_inet || flag_inet6)) + if ((flag_tcp || flag_udp || flag_sctp || flag_raw || flag_igmp) && !(flag_inet || flag_inet6)) flag_inet = flag_inet6 = 1; - flag_arg = flag_tcp + flag_udp + flag_raw + flag_unx + flag_ipx + flag_arg = flag_tcp + flag_udp + flag_sctp + flag_raw + flag_unx + flag_ipx + flag_ax25 + flag_netrom + flag_igmp + flag_x25; if (flag_mas) { @@ -1787,7 +2170,7 @@ int main if (flag_sta) { inittab(); - parsesnmp(flag_raw, flag_tcp, flag_udp); + parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp); exit(0); } @@ -1824,7 +2207,7 @@ int main return (i); } for (;;) { - if (!flag_arg || flag_tcp || flag_udp || flag_raw) { + if (!flag_arg || flag_tcp || flag_udp || flag_sctp || flag_raw) { #if HAVE_AFINET prg_cache_load(); printf(_("Active Internet connections ")); /* xxx */ @@ -1862,6 +2245,11 @@ int main if (i) return (i); } + if (!flag_arg || flag_sctp) { + i = sctp_info(); + if (i) + return (i); + } if (!flag_arg || flag_raw) { i = raw_info(); if (i) Index: net-tools-1.60/statistics.c =================================================================== --- net-tools-1.60.orig/statistics.c +++ net-tools-1.60/statistics.c @@ -20,7 +20,7 @@ #define UFWARN(x) #endif -int print_static,f_raw,f_tcp,f_udp,f_unknown = 1; +int print_static,f_raw,f_tcp,f_udp,f_sctp,f_unknown = 1; enum State { number = 0, opt_number, i_forward, i_inp_icmp, i_outp_icmp, i_rto_alg, @@ -187,6 +187,27 @@ struct entry Tcpexttab[] = "packet sending"), opt_number }, }; +struct entry Sctptab[] = +{ + {"SctpCurrEstab", N_("%u Current Associations"), number}, + {"SctpActiveEstabs", N_("%u Active Associations"), number}, + {"SctpPassiveEstabs", N_("%u Passive Associations"), number}, + {"SctpAborteds", N_("%u Number of Aborteds "), number}, + {"SctpShutdowns", N_("%u Number of Graceful Terminations"), number}, + {"SctpOutOfBlues", N_("%u Number of Out of Blue packets"), number}, + {"SctpChecksumErrors", N_("%u Number of Packets with invalid Checksum"), number}, + {"SctpOutCtrlChunks", N_("%u Number of control chunks sent"), number}, + {"SctpOutOrderChunks", N_("%u Number of ordered chunks sent"), number}, + {"SctpOutUnorderChunks", N_("%u Number of Unordered chunks sent"), number}, + {"SctpInCtrlChunks", N_("%u Number of control chunks received"), number}, + {"SctpInOrderChunks", N_("%u Number of ordered chunks received"), number}, + {"SctpInUnorderChunks", N_("%u Number of Unordered chunks received"), number}, + {"SctpFragUsrMsgs", N_("%u Number of messages fragmented"), number}, + {"SctpReasmUsrMsgs", N_("%u Number of messages reassembled "), number}, + {"SctpOutSCTPPacks", N_("%u Number of SCTP packets sent"), number}, + {"SctpInSCTPPacks", N_("%u Number of SCTP packets received"), number}, +}; + struct tabtab { char *title; struct entry *tab; @@ -200,6 +221,7 @@ struct tabtab snmptabs[] = {"Icmp", Icmptab, sizeof(Icmptab), &f_raw}, {"Tcp", Tcptab, sizeof(Tcptab), &f_tcp}, {"Udp", Udptab, sizeof(Udptab), &f_udp}, + {"Sctp", Sctptab, sizeof(Sctptab), &f_sctp}, {"TcpExt", Tcpexttab, sizeof(Tcpexttab), &f_tcp}, {NULL} }; @@ -337,12 +359,40 @@ formaterr: return; } +/* Process a file with name-value lines (like /proc/net/sctp/snmp) */ +void process_fd2(FILE *f, const char *filename) +{ + char buf1[1024]; + char *sp; + struct tabtab *tab; + + tab = newtable(snmptabs, "Sctp"); + + while (fgets(buf1, sizeof buf1, f)) { + sp = buf1 + strcspn(buf1, " \t\n"); + if (!sp) + goto formaterr; + *sp = '\0'; + sp++; + + sp += strspn(sp, " \t\n"); + + if (*sp != '\0' && *(tab->flag)) + printval(tab, buf1, strtoul(sp, 0, 10)); + } + return; + +formaterr: + fprintf(stderr,_("error parsing %s\n"), filename); + return; +} + -void parsesnmp(int flag_raw, int flag_tcp, int flag_udp) +void parsesnmp(int flag_raw, int flag_tcp, int flag_udp, int flag_sctp) { FILE *f; - f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp; + f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp, f_sctp = flag_sctp; f = fopen("/proc/net/snmp", "r"); if (!f) { @@ -366,6 +416,17 @@ void parsesnmp(int flag_raw, int flag_tc fclose(f); } + + f = fopen("/proc/net/sctp/snmp", "r"); + if (f) { + process_fd2(f,"/proc/net/sctp/snmp"); + if (ferror(f)) + perror("/proc/net/sctp/snmp"); + + fclose(f); + } + + return; } Index: net-tools-1.60/lib/pathnames.h =================================================================== --- net-tools-1.60.orig/lib/pathnames.h +++ net-tools-1.60/lib/pathnames.h @@ -45,6 +45,8 @@ #define _PATH_PROCNET_X25 "/proc/net/x25" #define _PATH_PROCNET_X25_ROUTE "/proc/net/x25_routes" #define _PATH_PROCNET_DEV_MCAST "/proc/net/dev_mcast" +#define _PATH_PROCNET_SCTP_EPS "/proc/net/sctp/eps" +#define _PATH_PROCNET_SCTP_ASSOCS "/proc/net/sctp/assocs" /* pathname for the netlink device */ #define _PATH_DEV_ROUTE "/dev/route"
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
