1 --- net-tools-1.60/statistics.c.sctp 2006-04-13 10:06:45.000000000 -0400
2 +++ net-tools-1.60/statistics.c 2006-04-13 10:06:45.000000000 -0400
7 -int print_static,f_raw,f_tcp,f_udp,f_unknown = 1;
8 +int print_static,f_raw,f_tcp,f_udp,f_sctp,f_unknown = 1;
11 number = 0, opt_number, i_forward, i_inp_icmp, i_outp_icmp, i_rto_alg,
13 { "TCPLoss", N_("%u TCP data loss events") },
16 +struct entry Sctptab[] =
18 + {"SctpCurrEstab", N_("%u Current Associations"), number},
19 + {"SctpActiveEstabs", N_("%u Active Associations"), number},
20 + {"SctpPassiveEstabs", N_("%u Passive Associations"), number},
21 + {"SctpAborteds", N_("%u Number of Aborteds "), number},
22 + {"SctpShutdowns", N_("%u Number of Graceful Terminations"), number},
23 + {"SctpOutOfBlues", N_("%u Number of Out of Blue packets"), number},
24 + {"SctpChecksumErrors", N_("%u Number of Packets with invalid Checksum"), number},
25 + {"SctpOutCtrlChunks", N_("%u Number of control chunks sent"), number},
26 + {"SctpOutOrderChunks", N_("%u Number of ordered chunks sent"), number},
27 + {"SctpOutUnorderChunks", N_("%u Number of Unordered chunks sent"), number},
28 + {"SctpInCtrlChunks", N_("%u Number of control chunks received"), number},
29 + {"SctpInOrderChunks", N_("%u Number of ordered chunks received"), number},
30 + {"SctpInUnorderChunks", N_("%u Number of Unordered chunks received"), number},
31 + {"SctpFragUsrMsgs", N_("%u Number of messages fragmented"), number},
32 + {"SctpReasmUsrMsgs", N_("%u Number of messages reassembled "), number},
33 + {"SctpOutSCTPPacks", N_("%u Number of SCTP packets sent"), number},
34 + {"SctpInSCTPPacks", N_("%u Number of SCTP packets received"), number},
41 {"Icmp", Icmptab, sizeof(Icmptab), &f_raw},
42 {"Tcp", Tcptab, sizeof(Tcptab), &f_tcp},
43 {"Udp", Udptab, sizeof(Udptab), &f_udp},
44 + {"Sctp", Sctptab, sizeof(Sctptab), &f_sctp},
45 {"TcpExt", Tcpexttab, sizeof(Tcpexttab), &f_tcp},
52 +/* Process a file with name-value lines (like /proc/net/sctp/snmp) */
53 +void process_fd2(FILE *f, const char *filename)
59 + tab = newtable(snmptabs, "Sctp");
61 + while (fgets(buf1, sizeof buf1, f)) {
62 + sp = buf1 + strcspn(buf1, " \t\n");
68 + sp += strspn(sp, " \t\n");
70 -int parsesnmp(int flag_raw, int flag_tcp, int flag_udp)
71 + if (*sp != '\0' && *(tab->flag))
72 + printval(tab, buf1, strtoul(sp, 0, 10));
77 + fprintf(stderr,_("error parsing %s\n"), filename);
81 +int parsesnmp(int flag_raw, int flag_tcp, int flag_udp, int flag_sctp)
85 - f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp;
86 + f_raw = flag_raw; f_tcp = flag_tcp; f_udp = flag_udp; f_sctp = flag_sctp;
88 f = fopen("/proc/net/snmp", "r");
95 + f = fopen("/proc/net/sctp/snmp", "r");
97 + process_fd2(f,"/proc/net/sctp/snmp");
99 + perror("/proc/net/sctp/snmp");
107 --- net-tools-1.60/netstat.c.sctp 2006-04-13 10:06:45.000000000 -0400
108 +++ net-tools-1.60/netstat.c 2006-04-13 10:10:23.000000000 -0400
111 *990420 {1.38} Tuan Hoang removed a useless assignment from igmp_do_one()
112 *20010404 {1.39} Arnaldo Carvalho de Melo - use setlocale
113 + *20050516 {1.40} Ivan Skytte Joergensen:Added SCTP support
115 * This program is free software; you can redistribute it
116 * and/or modify it under the terms of the GNU General
120 /* prototypes for statistics.c */
121 -int parsesnmp(int, int, int);
122 +int parsesnmp(int, int, int, int);
127 SS_DISCONNECTING /* in process of disconnecting */
131 +#define SCTP_NSTATES 9 /* The number of states in array*/
133 +static const char *sctp_state[] = {
137 + N_("COOKIE_ECHOED"),
139 + N_("SHUTDOWN_PENDING"),
140 + N_("SHUTDOWN_SENT"),
141 + N_("SHUTDOWN_RECEIVED"),
142 + N_("SHUTDOWN_ACK_SENT")
145 +#define SCTP_NTYPES 3 /* The number of types in array */
147 +static const char *sctp_type[] = {
153 #define SO_ACCEPTCON (1<<16) /* performed a listen */
154 #define SO_WAITDATA (1<<17) /* wait data to read */
155 #define SO_NOSPACE (1<<18) /* no space to write */
164 @@ -1189,6 +1214,365 @@
168 +static const char *sctp_socket_type_str(int type) {
169 + if(type>=0 && type<SCTP_NTYPES)
170 + return sctp_type[type];
172 + static char type_str_buf[64];
173 + sprintf(type_str_buf,"UNKNOWN(%d)",type);
174 + return type_str_buf;
178 +static const char *sctp_state_str(int state)
180 + if(state>=0 && state<SCTP_NSTATES)
181 + return sctp_state[state];
183 + static char state_str_buf[64];
184 + sprintf(state_str_buf,"UNKNOWN(%d)",state);
185 + return state_str_buf;
189 +static const char *sctp_socket_state_str(int state)
191 + if(state>=0 && state<=10)
192 + return tcp_state[state];
194 + static char state_str_buf[64];
195 + sprintf(state_str_buf,"UNKNOWN(%d)",state);
196 + return state_str_buf;
200 +static struct aftype *process_sctp_addr_str(const char *addr_str, struct sockaddr *sa)
202 + if (strchr(addr_str,':')) {
204 + extern struct aftype inet6_aftype;
205 + /* Demangle what the kernel gives us */
206 + struct in6_addr in6;
207 + char addr6_str[INET6_ADDRSTRLEN];
208 + unsigned u0,u1,u2,u3,u4,u5,u6,u7;
209 + sscanf(addr_str, "%04X:%04X:%04X:%04X:%04X:%04X:%04X:%04X",
210 + &u0, &u1, &u2, &u3, &u4, &u5, &u6, &u7);
211 + in6.s6_addr16[0] = htons(u0);
212 + in6.s6_addr16[1] = htons(u1);
213 + in6.s6_addr16[2] = htons(u2);
214 + in6.s6_addr16[3] = htons(u3);
215 + in6.s6_addr16[4] = htons(u4);
216 + in6.s6_addr16[5] = htons(u5);
217 + in6.s6_addr16[6] = htons(u6);
218 + in6.s6_addr16[7] = htons(u7);
220 + inet_ntop(AF_INET6, &in6, addr6_str, sizeof(addr6_str));
221 + inet6_aftype.input(1, addr6_str, sa);
222 + sa->sa_family = AF_INET6;
225 + ((struct sockaddr_in*)sa)->sin_addr.s_addr = inet_addr(addr_str);
226 + sa->sa_family = AF_INET;
228 + return get_afntype(sa->sa_family);
231 +static void sctp_eps_do_one(int lnr, char *line)
234 + int type, state, port;
236 + unsigned long inode;
240 + struct sockaddr_in6 localaddr;
242 + struct sockaddr_in localaddr;
244 + const char *sty_str;
245 + const char *sst_str;
246 + const char *lport_str;
247 + const char *uid_str;
248 + const char *inode_str;
249 + const char *pladdr_str;
253 + /* ENDPT SOCK STY SST HBKT LPORT uid inode pladdr LADDRS*/
257 + strtok(line," \t\n"); /*skip ptr*/
258 + strtok(0," \t\n"); /*skip ptr*/
259 + sty_str = strtok(0," \t\n");
260 + sst_str = strtok(0," \t\n");
261 + strtok(0," \t\n"); /*skip hash bucket*/
262 + lport_str=strtok(0," \t\n");
263 + uid_str = strtok(0," \t\n");
264 + inode_str = strtok(0," \t\n");
265 + pladdr_str = strtok(0," \t\n");
266 + laddrs_str=strtok(0,"\t\n");
268 + type = atoi(sty_str);
269 + state = atoi(sst_str);
270 + port = atoi(lport_str);
271 + uid = atoi(uid_str);
272 + inode = strtoul(inode_str,0,0);
275 + /* only print the primary address */
276 + char local_addr[64];
277 + char local_port[16];
279 + ap = process_sctp_addr_str(pladdr_str, (struct sockaddr*)&localaddr);
281 + safe_strncpy(local_addr,
282 + ap->sprint((struct sockaddr *) &localaddr, flag_not),
283 + sizeof(local_addr));
285 + sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
287 + snprintf(local_port, sizeof(local_port), "%s",
288 + get_sname(htons(port), "sctp",
289 + flag_not & FLAG_NUM_PORT));
292 + sprintf(buffer,"%s:%s", local_addr, local_port);
293 + printf("%-47s", buffer);
294 + printf(" %-12s", sctp_socket_state_str(state));
296 + /*print all addresses*/
297 + const char *this_local_addr;
299 + char local_port[16];
300 + snprintf(local_port, sizeof(local_port), "%s",
301 + get_sname(htons(port), "sctp",
302 + flag_not & FLAG_NUM_PORT));
303 + for(this_local_addr=strtok(laddrs_str," \t\n");
305 + this_local_addr=strtok(0," \t\n"))
307 + char local_addr[64];
308 + ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr);
310 + safe_strncpy(local_addr,
311 + ap->sprint((struct sockaddr *) &localaddr, flag_not),
312 + sizeof(local_addr));
314 + sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
316 + if(!first) printf("\n");
321 + sprintf(buffer,"%s:%s", local_addr, local_port);
322 + printf("%-47s", buffer);
323 + printf(" %-12s", first?sctp_socket_state_str(state):"");
328 + finish_this_one(uid,inode,"");
331 +static void sctp_assoc_do_one(int lnr, char *line)
334 + int type, state, state2, lport,rport;
336 + unsigned rxqueue,txqueue;
337 + unsigned long inode;
341 + struct sockaddr_in6 localaddr,remoteaddr;
343 + struct sockaddr_in localaddr,remoteaddr;
345 + const char *sty_str;
346 + const char *sst_str;
347 + const char *st_str;
348 + const char *txqueue_str;
349 + const char *rxqueue_str;
350 + const char *lport_str,*rport_str;
351 + const char *uid_str;
352 + const char *inode_str;
353 + const char *pladdr_str;
355 + const char *praddr_str;
359 + /* ASSOC SOCK STY SST ST HBKT tx_queue rx_queue uid inode LPORT RPORT pladdr praddr LADDRS <-> RADDRS*/
363 + strtok(line," \t\n"); /*skip ptr*/
364 + strtok(0," \t\n"); /*skip ptr*/
365 + sty_str = strtok(0," \t\n");
366 + sst_str = strtok(0," \t\n");
367 + st_str = strtok(0," \t\n");
368 + strtok(0," \t\n"); /*skip hash bucket*/
369 + txqueue_str = strtok(0," \t\n");
370 + rxqueue_str = strtok(0," \t\n");
371 + uid_str = strtok(0," \t\n");
372 + inode_str = strtok(0," \t\n");
373 + lport_str=strtok(0," \t\n");
374 + rport_str=strtok(0," \t\n");
375 + pladdr_str = strtok(0," \t\n");
376 + praddr_str = strtok(0," \t\n");
377 + laddrs_str=strtok(0,"<->\t\n");
378 + raddrs_str=strtok(0,"<->\t\n");
380 + type = atoi(sty_str);
381 + state = atoi(sst_str);
382 + state2 = atoi(st_str);
383 + txqueue = atoi(txqueue_str);
384 + rxqueue = atoi(rxqueue_str);
385 + uid = atoi(uid_str);
386 + inode = strtoul(inode_str,0,0);
387 + lport = atoi(lport_str);
388 + rport = atoi(rport_str);
391 + /* only print the primary addresses */
392 + char local_addr[64];
393 + char local_port[16];
394 + char remote_addr[64];
395 + char remote_port[16];
397 + ap = process_sctp_addr_str(pladdr_str, (struct sockaddr*)&localaddr);
399 + safe_strncpy(local_addr,
400 + ap->sprint((struct sockaddr *) &localaddr, flag_not),
401 + sizeof(local_addr));
403 + sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
405 + snprintf(local_port, sizeof(local_port), "%s",
406 + get_sname(htons(lport), "sctp",
407 + flag_not & FLAG_NUM_PORT));
409 + ap = process_sctp_addr_str(praddr_str, (struct sockaddr*)&remoteaddr);
411 + safe_strncpy(remote_addr,
412 + ap->sprint((struct sockaddr *) &remoteaddr, flag_not),
413 + sizeof(remote_addr));
415 + sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family);
417 + snprintf(remote_port, sizeof(remote_port), "%s",
418 + get_sname(htons(rport), "sctp",
419 + flag_not & FLAG_NUM_PORT));
422 + printf(" %6u %6u ", rxqueue, txqueue);
423 + sprintf(buffer,"%s:%s", local_addr, local_port);
424 + printf("%-23s", buffer);
426 + sprintf(buffer,"%s:%s", remote_addr, remote_port);
427 + printf("%-23s", buffer);
428 + printf(" %-12s", sctp_socket_state_str(state));
430 + /*print all addresses*/
431 + const char *this_local_addr;
432 + const char *this_remote_addr;
435 + char local_port[16];
436 + char remote_port[16];
437 + snprintf(local_port, sizeof(local_port), "%s",
438 + get_sname(htons(lport), "sctp",
439 + flag_not & FLAG_NUM_PORT));
440 + snprintf(remote_port, sizeof(remote_port), "%s",
441 + get_sname(htons(rport), "sctp",
442 + flag_not & FLAG_NUM_PORT));
444 + this_local_addr=strtok_r(laddrs_str," \t\n",&ss1);
445 + this_remote_addr=strtok_r(raddrs_str," \t\n",&ss2);
446 + while(this_local_addr || this_remote_addr) {
447 + char local_addr[64];
448 + char remote_addr[64];
449 + if(this_local_addr) {
450 + ap = process_sctp_addr_str(this_local_addr, (struct sockaddr*)&localaddr);
452 + safe_strncpy(local_addr,
453 + ap->sprint((struct sockaddr *) &localaddr, flag_not),
454 + sizeof(local_addr));
456 + sprintf(local_addr,_("unsupported address family %d"), ((struct sockaddr*)&localaddr)->sa_family);
458 + if(this_remote_addr) {
459 + ap = process_sctp_addr_str(this_remote_addr, (struct sockaddr*)&remoteaddr);
461 + safe_strncpy(remote_addr,
462 + ap->sprint((struct sockaddr *) &remoteaddr, flag_not),
463 + sizeof(remote_addr));
465 + sprintf(remote_addr,_("unsupported address family %d"), ((struct sockaddr*)&remoteaddr)->sa_family);
468 + if(!first) printf("\n");
470 + printf("sctp %6u %6u ", rxqueue, txqueue);
473 + if(this_local_addr) {
475 + sprintf(buffer,"%s:%s", local_addr, local_port);
477 + sprintf(buffer,"%s", local_addr);
478 + printf("%-23s", buffer);
480 + printf("%-23s", "");
482 + if(this_remote_addr) {
484 + sprintf(buffer,"%s:%s", remote_addr, remote_port);
486 + sprintf(buffer,"%s", remote_addr);
487 + printf("%-23s", buffer);
489 + printf("%-23s", "");
491 + printf(" %-12s", first?sctp_socket_state_str(state):"");
494 + this_local_addr=strtok_r(0," \t\n",&ss1);
495 + this_remote_addr=strtok_r(0," \t\n",&ss2);
499 + finish_this_one(uid,inode,"");
502 +static int sctp_info_eps(void)
504 +#if !defined(_PATH_PROCNET_SCTP_EPS)
505 +#define _PATH_PROCNET_SCTP_EPS "/proc/net/sctp/eps"
507 + INFO_GUTS(_PATH_PROCNET_SCTP_EPS, "AF INET (sctp)",
511 +static int sctp_info_assocs(void)
513 +#if !defined(_PATH_PROCNET_SCTP_ASSOCS)
514 +#define _PATH_PROCNET_SCTP_ASSOCS "/proc/net/sctp/assocs"
516 + INFO_GUTS(_PATH_PROCNET_SCTP_ASSOCS, "AF INET (sctp)",
517 + sctp_assoc_do_one);
520 +static int sctp_info(void)
524 + return sctp_info_assocs();
527 static void raw_do_one(int lnr, const char *line)
529 char buffer[8192], local_addr[64], rem_addr[64];
530 @@ -1742,7 +2126,7 @@
531 fprintf(stderr, _(" -Z, --context display SELinux security context for sockets\n\n"));
533 fprintf(stderr, _(" <Iface>: Name of interface to monitor/list.\n"));
534 - fprintf(stderr, _(" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n"));
535 + fprintf(stderr, _(" <Socket>={-t|--tcp} {-u|--udp} {-S|--sctp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n"));
536 fprintf(stderr, _(" <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
537 fprintf(stderr, _(" List of possible address families (which support routing):\n"));
538 print_aflist(1); /* 1 = routeable */
539 @@ -1769,6 +2153,7 @@
540 {"protocol", 1, 0, 'A'},
543 + {"sctp", 0, 0, 'S' },
546 {"listening", 0, 0, 'l'},
547 @@ -1801,7 +2186,7 @@
551 - while ((i = getopt_long(argc, argv, "MCFA:acdegphiI::nNorstuVv?wxlZT", longopts, &lop)) != EOF)
552 + while ((i = getopt_long(argc, argv, "MCFA:acdegphiI::nNorstuSVv?wxlZT", longopts, &lop)) != EOF)
556 @@ -1887,10 +2272,12 @@
570 @@ -1932,13 +2319,13 @@
571 if (flag_int + flag_rou + flag_mas + flag_sta > 1)
574 - if ((flag_inet || flag_inet6 || flag_sta) && !(flag_tcp || flag_udp || flag_raw))
575 - flag_tcp = flag_udp = flag_raw = 1;
576 + if ((flag_inet || flag_inet6 || flag_sta) && !(flag_tcp || flag_udp || flag_sctp || flag_raw))
577 + flag_tcp = flag_udp = flag_sctp = flag_raw = 1;
579 - if ((flag_tcp || flag_udp || flag_raw || flag_igmp) && !(flag_inet || flag_inet6))
580 + if ((flag_tcp || flag_udp || flag_sctp || flag_raw || flag_igmp) && !(flag_inet || flag_inet6))
581 flag_inet = flag_inet6 = 1;
583 - flag_arg = flag_tcp + flag_udp + flag_raw + flag_unx + flag_ipx
584 + flag_arg = flag_tcp + flag_udp + flag_sctp + flag_raw + flag_unx + flag_ipx
585 + flag_ax25 + flag_netrom + flag_igmp + flag_x25;
588 @@ -1964,7 +2351,7 @@
592 - i = parsesnmp(flag_raw, flag_tcp, flag_udp);
593 + i = parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp);
597 @@ -2006,7 +2393,7 @@
601 - if (!flag_arg || flag_tcp || flag_udp || flag_raw) {
602 + if (!flag_arg || flag_tcp || flag_udp || flag_sctp || flag_raw) {
605 printf(_("Active Internet connections ")); /* xxx */
606 @@ -2044,6 +2431,11 @@
610 + if (!flag_arg || flag_sctp) {
615 if (!flag_arg || flag_raw) {