summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/iputils/files/debian
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/iputils/files/debian')
-rw-r--r--meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff43
-rw-r--r--meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff26
-rw-r--r--meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff16
-rw-r--r--meta/recipes-extended/iputils/files/debian/targets.diff14
-rw-r--r--meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff36
5 files changed, 25 insertions, 110 deletions
diff --git a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff b/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff
deleted file mode 100644
index 40070c346d..0000000000
--- a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff
+++ /dev/null
@@ -1,43 +0,0 @@
1Upstream-Status: Pending [from other distro Debian]
2
3Index: trunk/ping.c
4===================================================================
5--- trunk.orig/ping.c 2010-05-07 23:13:54.000000000 -0700
6+++ trunk/ping.c 2010-05-07 23:23:22.000000000 -0700
7@@ -883,9 +883,36 @@
8 case ICMP_SR_FAILED:
9 printf("Source Route Failed\n");
10 break;
11+ case ICMP_NET_UNKNOWN:
12+ printf("Destination Net Unknown\n");
13+ break;
14+ case ICMP_HOST_UNKNOWN:
15+ printf("Destination Host Unknown\n");
16+ break;
17+ case ICMP_HOST_ISOLATED:
18+ printf("Source Host Isolated\n");
19+ break;
20+ case ICMP_NET_ANO:
21+ printf("Destination Net Prohibited\n");
22+ break;
23+ case ICMP_HOST_ANO:
24+ printf("Destination Host Prohibited\n");
25+ break;
26+ case ICMP_NET_UNR_TOS:
27+ printf("Destination Net Unreachable for Type of Service\n");
28+ break;
29+ case ICMP_HOST_UNR_TOS:
30+ printf("Destination Host Unreachable for Type of Service\n");
31+ break;
32 case ICMP_PKT_FILTERED:
33 printf("Packet filtered\n");
34 break;
35+ case ICMP_PREC_VIOLATION:
36+ printf("Precedence Violation\n");
37+ break;
38+ case ICMP_PREC_CUTOFF:
39+ printf("Precedence Cutoff\n");
40+ break;
41 default:
42 printf("Dest Unreachable, Bad Code: %d\n", code);
43 break;
diff --git a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff b/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
deleted file mode 100644
index 3e34788a5a..0000000000
--- a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
+++ /dev/null
@@ -1,26 +0,0 @@
1Upstream-Status: Pending [from other distro Debian]
2
3Index: trunk/arping.c
4===================================================================
5--- trunk.orig/arping.c 2010-05-07 23:13:52.000000000 -0700
6+++ trunk/arping.c 2010-05-07 23:41:16.000000000 -0700
7@@ -182,12 +182,17 @@
8 if (start.tv_sec==0)
9 start = tv;
10
11- if (count-- == 0 || (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500))
12+ if (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500)
13 finish();
14
15- if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) {
16+ if ((!timeout) && (count == 0))
17+ finish();
18+
19+ if ( count!=0 && (last.tv_sec==0 || MS_TDIFF(tv,last) > 500 ) ) {
20 send_pack(s, src, dst,
21 (struct sockaddr_ll *)&me, (struct sockaddr_ll *)&he);
22+ if (count >= 0)
23+ count--;
24 if (count == 0 && unsolicited)
25 finish();
26 }
diff --git a/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff b/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff
deleted file mode 100644
index fda42bf028..0000000000
--- a/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff
+++ /dev/null
@@ -1,16 +0,0 @@
1Upstream-Status: Pending [from other distro Debian]
2
3Index: trunk/ping_common.c
4===================================================================
5--- trunk.orig/ping_common.c 2010-05-07 23:13:51.000000000 -0700
6+++ trunk/ping_common.c 2010-05-07 23:22:33.000000000 -0700
7@@ -872,7 +872,8 @@
8 printf("%spipe %d", comma, pipesize);
9 comma = ", ";
10 }
11- if (ntransmitted > 1 && (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) {
12+ if (ntransmitted > 1 && nreceived &&
13+ (!interval || (options&(F_FLOOD|F_ADAPTIVE)))) {
14 int ipg = (1000000*(long long)tv.tv_sec+tv.tv_usec)/(ntransmitted-1);
15 printf("%sipg/ewma %d.%03d/%d.%03d ms",
16 comma, ipg/1000, ipg%1000, rtt/8000, (rtt/8)%1000);
diff --git a/meta/recipes-extended/iputils/files/debian/targets.diff b/meta/recipes-extended/iputils/files/debian/targets.diff
index 6b899cb39e..2cb5576c62 100644
--- a/meta/recipes-extended/iputils/files/debian/targets.diff
+++ b/meta/recipes-extended/iputils/files/debian/targets.diff
@@ -1,15 +1,15 @@
1Upstream-Status: Inappropriate [disable feature] 1Upstream-Status: Inappropriate [disable feature]
2 2
3Index: trunk/Makefile 3Index: iputils-s20121221/Makefile
4=================================================================== 4===================================================================
5--- trunk.orig/Makefile 2010-05-07 23:43:00.000000000 -0700 5--- iputils-s20121221.orig/Makefile
6+++ trunk/Makefile 2010-05-07 23:47:10.000000000 -0700 6+++ iputils-s20121221/Makefile
7@@ -16,7 +16,7 @@ 7@@ -106,7 +106,7 @@ endif
8 CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g 8 endif
9 CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)
10 9
10 # -------------------------------------
11-IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd 11-IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
12+IPV4_TARGETS=tracepath ping arping clockdiff 12+IPV4_TARGETS=tracepath ping clockdiff arping
13 IPV6_TARGETS=tracepath6 traceroute6 ping6 13 IPV6_TARGETS=tracepath6 traceroute6 ping6
14 TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) 14 TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
15 15
diff --git a/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff b/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
index 1d01e151eb..d3b18868c0 100644
--- a/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
+++ b/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
@@ -1,31 +1,31 @@
1Upstream-Status: Pending [from other distro Debian] 1Upstream-Status: Pending [from other distro Debian]
2 2
3Index: trunk/tracepath.c 3Index: iputils-s20121221/tracepath.c
4=================================================================== 4===================================================================
5--- trunk.orig/tracepath.c 2010-05-07 23:13:52.000000000 -0700 5--- iputils-s20121221.orig/tracepath.c
6+++ trunk/tracepath.c 2010-05-07 23:24:09.000000000 -0700 6+++ iputils-s20121221/tracepath.c
7@@ -338,9 +338,9 @@ 7@@ -370,9 +370,9 @@ main(int argc, char **argv)
8 base_port = atoi(p+1); 8 }
9 } else 9 #endif
10 base_port = 44444; 10
11- he = gethostbyname(argv[0]); 11- he = gethostbyname(p);
12+ he = gethostbyname2(argv[0], AF_INET); 12+ he = gethostbyname2(argv[0], AF_INET);
13 if (he == NULL) { 13 if (he == NULL) {
14- herror("gethostbyname"); 14- herror("gethostbyname");
15+ herror("gethostbyname2"); 15+ herror("gethostbyname2");
16 exit(1); 16 exit(1);
17 } 17 }
18 memcpy(&target.sin_addr, he->h_addr, 4); 18
19Index: trunk/ping.c 19Index: iputils-s20121221/ping.c
20=================================================================== 20===================================================================
21--- trunk.orig/ping.c 2010-05-07 23:23:22.000000000 -0700 21--- iputils-s20121221.orig/ping.c
22+++ trunk/ping.c 2010-05-07 23:24:09.000000000 -0700 22+++ iputils-s20121221/ping.c
23@@ -250,7 +250,7 @@ 23@@ -279,7 +279,7 @@ main(int argc, char **argv)
24 if (argc == 1) 24 #else
25 options |= F_NUMERIC; 25 idn = target;
26 } else { 26 #endif
27- hp = gethostbyname(target); 27- hp = gethostbyname(idn);
28+ hp = gethostbyname2(target, AF_INET); 28+ hp = gethostbyname2(idn, AF_INET);
29 if (!hp) { 29 if (!hp) {
30 fprintf(stderr, "ping: unknown host %s\n", target); 30 fprintf(stderr, "ping: unknown host %s\n", target);
31 exit(2); 31 exit(2);
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 03:48:45 +0000