diff options
-rw-r--r-- | meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch b/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch index 12eed17af4..78daf6c3ed 100644 --- a/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch +++ b/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch | |||
@@ -11,10 +11,10 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com> | |||
11 | statistics.c | 68 +++++++++- | 11 | statistics.c | 68 +++++++++- |
12 | 2 files changed, 465 insertions(+), 14 deletions(-) | 12 | 2 files changed, 465 insertions(+), 14 deletions(-) |
13 | 13 | ||
14 | diff --git a/netstat.c b/netstat.c | 14 | Index: net-tools-1.60/netstat.c |
15 | index 1fb9e0c..5d1a4a1 100644 | 15 | =================================================================== |
16 | --- a/netstat.c | 16 | --- net-tools-1.60.orig/netstat.c |
17 | +++ b/netstat.c | 17 | +++ net-tools-1.60/netstat.c |
18 | @@ -58,6 +58,7 @@ | 18 | @@ -58,6 +58,7 @@ |
19 | * | 19 | * |
20 | *990420 {1.38} Tuan Hoang removed a useless assignment from igmp_do_one() | 20 | *990420 {1.38} Tuan Hoang removed a useless assignment from igmp_do_one() |
@@ -23,7 +23,7 @@ index 1fb9e0c..5d1a4a1 100644 | |||
23 | * | 23 | * |
24 | * This program is free software; you can redistribute it | 24 | * This program is free software; you can redistribute it |
25 | * and/or modify it under the terms of the GNU General | 25 | * and/or modify it under the terms of the GNU General |
26 | @@ -105,7 +106,7 @@ | 26 | @@ -106,7 +107,7 @@ |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | /* prototypes for statistics.c */ | 29 | /* prototypes for statistics.c */ |
@@ -32,7 +32,7 @@ index 1fb9e0c..5d1a4a1 100644 | |||
32 | void inittab(void); | 32 | void inittab(void); |
33 | void parsesnmp6(int, int, int); | 33 | void parsesnmp6(int, int, int); |
34 | void inittab6(void); | 34 | void inittab6(void); |
35 | @@ -118,6 +119,28 @@ typedef enum { | 35 | @@ -119,6 +120,28 @@ typedef enum { |
36 | SS_DISCONNECTING /* in process of disconnecting */ | 36 | SS_DISCONNECTING /* in process of disconnecting */ |
37 | } socket_state; | 37 | } socket_state; |
38 | 38 | ||
@@ -61,7 +61,7 @@ index 1fb9e0c..5d1a4a1 100644 | |||
61 | #define SO_ACCEPTCON (1<<16) /* performed a listen */ | 61 | #define SO_ACCEPTCON (1<<16) /* performed a listen */ |
62 | #define SO_WAITDATA (1<<17) /* wait data to read */ | 62 | #define SO_WAITDATA (1<<17) /* wait data to read */ |
63 | #define SO_NOSPACE (1<<18) /* no space to write */ | 63 | #define SO_NOSPACE (1<<18) /* no space to write */ |
64 | @@ -148,6 +171,7 @@ int flag_opt = 0; | 64 | @@ -149,6 +172,7 @@ int flag_opt = 0; |
65 | int flag_raw = 0; | 65 | int flag_raw = 0; |
66 | int flag_tcp = 0; | 66 | int flag_tcp = 0; |
67 | int flag_udp = 0; | 67 | int flag_udp = 0; |
@@ -69,7 +69,7 @@ index 1fb9e0c..5d1a4a1 100644 | |||
69 | int flag_igmp= 0; | 69 | int flag_igmp= 0; |
70 | int flag_rom = 0; | 70 | int flag_rom = 0; |
71 | int flag_exp = 1; | 71 | int flag_exp = 1; |
72 | @@ -990,6 +1014,365 @@ static int udp_info(void) | 72 | @@ -995,6 +1019,365 @@ static int udp_info(void) |
73 | udp_do_one); | 73 | udp_do_one); |
74 | } | 74 | } |
75 | 75 | ||
@@ -435,7 +435,7 @@ index 1fb9e0c..5d1a4a1 100644 | |||
435 | static void raw_do_one(int lnr, const char *line) | 435 | static void raw_do_one(int lnr, const char *line) |
436 | { | 436 | { |
437 | char buffer[8192], local_addr[64], rem_addr[64]; | 437 | char buffer[8192], local_addr[64], rem_addr[64]; |
438 | @@ -1549,7 +1932,7 @@ static void usage(void) | 438 | @@ -1558,7 +1941,7 @@ static void usage(void) |
439 | fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n")); | 439 | fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n")); |
440 | fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); | 440 | fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); |
441 | 441 | ||
@@ -444,7 +444,7 @@ index 1fb9e0c..5d1a4a1 100644 | |||
444 | fprintf(stderr, _(" <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF); | 444 | fprintf(stderr, _(" <AF>=Use '-6|-4' or '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF); |
445 | fprintf(stderr, _(" List of possible address families (which support routing):\n")); | 445 | fprintf(stderr, _(" List of possible address families (which support routing):\n")); |
446 | print_aflist(1); /* 1 = routeable */ | 446 | print_aflist(1); /* 1 = routeable */ |
447 | @@ -1574,6 +1957,7 @@ int main | 447 | @@ -1583,6 +1966,7 @@ int main |
448 | {"protocol", 1, 0, 'A'}, | 448 | {"protocol", 1, 0, 'A'}, |
449 | {"tcp", 0, 0, 't'}, | 449 | {"tcp", 0, 0, 't'}, |
450 | {"udp", 0, 0, 'u'}, | 450 | {"udp", 0, 0, 'u'}, |
@@ -452,7 +452,7 @@ index 1fb9e0c..5d1a4a1 100644 | |||
452 | {"raw", 0, 0, 'w'}, | 452 | {"raw", 0, 0, 'w'}, |
453 | {"unix", 0, 0, 'x'}, | 453 | {"unix", 0, 0, 'x'}, |
454 | {"listening", 0, 0, 'l'}, | 454 | {"listening", 0, 0, 'l'}, |
455 | @@ -1604,7 +1988,7 @@ int main | 455 | @@ -1613,7 +1997,7 @@ int main |
456 | getroute_init(); /* Set up AF routing support */ | 456 | getroute_init(); /* Set up AF routing support */ |
457 | 457 | ||
458 | afname[0] = '\0'; | 458 | afname[0] = '\0'; |
@@ -461,7 +461,7 @@ index 1fb9e0c..5d1a4a1 100644 | |||
461 | switch (i) { | 461 | switch (i) { |
462 | case -1: | 462 | case -1: |
463 | break; | 463 | break; |
464 | @@ -1696,10 +2080,12 @@ int main | 464 | @@ -1705,10 +2089,12 @@ int main |
465 | case 't': | 465 | case 't': |
466 | flag_tcp++; | 466 | flag_tcp++; |
467 | break; | 467 | break; |
@@ -475,7 +475,7 @@ index 1fb9e0c..5d1a4a1 100644 | |||
475 | case 'w': | 475 | case 'w': |
476 | flag_raw++; | 476 | flag_raw++; |
477 | break; | 477 | break; |
478 | @@ -1717,13 +2103,13 @@ int main | 478 | @@ -1726,13 +2112,13 @@ int main |
479 | if (flag_int + flag_rou + flag_mas + flag_sta > 1) | 479 | if (flag_int + flag_rou + flag_mas + flag_sta > 1) |
480 | usage(); | 480 | usage(); |
481 | 481 | ||
@@ -493,7 +493,7 @@ index 1fb9e0c..5d1a4a1 100644 | |||
493 | + flag_ax25 + flag_netrom + flag_igmp + flag_x25; | 493 | + flag_ax25 + flag_netrom + flag_igmp + flag_x25; |
494 | 494 | ||
495 | if (flag_mas) { | 495 | if (flag_mas) { |
496 | @@ -1751,7 +2137,7 @@ int main | 496 | @@ -1760,7 +2146,7 @@ int main |
497 | char buf[256]; | 497 | char buf[256]; |
498 | if (!afname[0]) { | 498 | if (!afname[0]) { |
499 | inittab(); | 499 | inittab(); |
@@ -502,7 +502,7 @@ index 1fb9e0c..5d1a4a1 100644 | |||
502 | } else { | 502 | } else { |
503 | safe_strncpy(buf, afname, sizeof(buf)); | 503 | safe_strncpy(buf, afname, sizeof(buf)); |
504 | tmp1 = buf; | 504 | tmp1 = buf; |
505 | @@ -1804,7 +2190,7 @@ int main | 505 | @@ -1815,7 +2201,7 @@ int main |
506 | return (i); | 506 | return (i); |
507 | } | 507 | } |
508 | for (;;) { | 508 | for (;;) { |
@@ -511,7 +511,7 @@ index 1fb9e0c..5d1a4a1 100644 | |||
511 | #if HAVE_AFINET | 511 | #if HAVE_AFINET |
512 | prg_cache_load(); | 512 | prg_cache_load(); |
513 | printf(_("Active Internet connections ")); /* xxx */ | 513 | printf(_("Active Internet connections ")); /* xxx */ |
514 | @@ -1843,6 +2229,11 @@ int main | 514 | @@ -1854,6 +2240,11 @@ int main |
515 | if (i) | 515 | if (i) |
516 | return (i); | 516 | return (i); |
517 | } | 517 | } |
@@ -523,10 +523,10 @@ index 1fb9e0c..5d1a4a1 100644 | |||
523 | if (!flag_arg || flag_raw) { | 523 | if (!flag_arg || flag_raw) { |
524 | i = raw_info(); | 524 | i = raw_info(); |
525 | if (i) | 525 | if (i) |
526 | diff --git a/statistics.c b/statistics.c | 526 | Index: net-tools-1.60/statistics.c |
527 | index 03600d7..eb8d7dc 100644 | 527 | =================================================================== |
528 | --- a/statistics.c | 528 | --- net-tools-1.60.orig/statistics.c |
529 | +++ b/statistics.c | 529 | +++ net-tools-1.60/statistics.c |
530 | @@ -21,7 +21,7 @@ | 530 | @@ -21,7 +21,7 @@ |
531 | #define UFWARN(x) | 531 | #define UFWARN(x) |
532 | #endif | 532 | #endif |
@@ -537,7 +537,7 @@ index 03600d7..eb8d7dc 100644 | |||
537 | enum State { | 537 | enum State { |
538 | number = 0, opt_number, i_forward, i_inp_icmp, i_outp_icmp, i_rto_alg, | 538 | number = 0, opt_number, i_forward, i_inp_icmp, i_outp_icmp, i_rto_alg, |
539 | @@ -297,6 +297,27 @@ struct entry Tcpexttab[] = | 539 | @@ -297,6 +297,27 @@ struct entry Tcpexttab[] = |
540 | { "TCPRenoRecoveryFail", N_("%u classic Reno fast retransmits failed"), opt_number }, | 540 | { "TCPRenoRecoveryFail", N_("%llu classic Reno fast retransmits failed"), opt_number }, |
541 | }; | 541 | }; |
542 | 542 | ||
543 | +struct entry Sctptab[] = | 543 | +struct entry Sctptab[] = |
@@ -616,7 +616,7 @@ index 03600d7..eb8d7dc 100644 | |||
616 | f = proc_fopen("/proc/net/snmp"); | 616 | f = proc_fopen("/proc/net/snmp"); |
617 | if (!f) { | 617 | if (!f) { |
618 | perror(_("cannot open /proc/net/snmp")); | 618 | perror(_("cannot open /proc/net/snmp")); |
619 | @@ -530,6 +580,16 @@ void parsesnmp(int flag_raw, int flag_tcp, int flag_udp) | 619 | @@ -530,6 +580,16 @@ void parsesnmp(int flag_raw, int flag_tc |
620 | 620 | ||
621 | fclose(f); | 621 | fclose(f); |
622 | } | 622 | } |
@@ -633,6 +633,3 @@ index 03600d7..eb8d7dc 100644 | |||
633 | return; | 633 | return; |
634 | } | 634 | } |
635 | 635 | ||
636 | -- | ||
637 | 1.8.5.2.233.g932f7e4 | ||
638 | |||