tags 397935 + patch
thanks
Attached is a patch for both #397935 and #402121.
Regards,
--
Rémi Denis-Courmont
http://www.remlab.net/
diff -ru iputils-20020927.orig/ping6.c iputils-20020927/ping6.c
--- iputils-20020927.orig/ping6.c 2006-12-18 18:56:38.000000000 +0100
+++ iputils-20020927/ping6.c 2006-12-19 00:22:14.000000000 +0100
@@ -482,7 +482,7 @@
if (1) {
int on = 1;
- if (setsockopt(icmp_sock, IPPROTO_IPV6, IPV6_RECVHOPLIMIT,
+ if (setsockopt(icmp_sock, IPPROTO_IPV6, IPV6_2292HOPLIMIT,
&on, sizeof(on)) == -1) {
perror ("can't receive hop limit");
exit(2);
@@ -700,7 +700,7 @@
for (c = CMSG_FIRSTHDR(msg); c; c = CMSG_NXTHDR(msg, c)) {
if (c->cmsg_level != SOL_IPV6 ||
- c->cmsg_type != IPV6_HOPLIMIT)
+ c->cmsg_type != IPV6_2292HOPLIMIT)
continue;
if (c->cmsg_len < CMSG_LEN(sizeof(int)))
continue;
diff -ru iputils-20020927.orig/tracepath6.c iputils-20020927/tracepath6.c
--- iputils-20020927.orig/tracepath6.c 2006-12-18 23:39:38.000000000 +0100
+++ iputils-20020927/tracepath6.c 2006-12-19 00:23:08.000000000 +0100
@@ -111,7 +111,7 @@
if (cmsg->cmsg_level == SOL_IPV6) {
if (cmsg->cmsg_type == IPV6_RECVERR) {
e = (struct sock_extended_err *)CMSG_DATA(cmsg);
- } else if (cmsg->cmsg_type == IPV6_HOPLIMIT) {
+ } else if (cmsg->cmsg_type == IPV6_2292HOPLIMIT) {
rethops = *(int*)CMSG_DATA(cmsg);
}
} else if (cmsg->cmsg_level == SOL_IP) {
@@ -354,7 +354,7 @@
perror("IP_RECVERR");
exit(1);
}
- if (setsockopt(fd, SOL_IPV6, IPV6_HOPLIMIT, &on, sizeof(on))) {
+ if (setsockopt(fd, SOL_IPV6, IPV6_2292HOPLIMIT, &on, sizeof(on))) {
perror("IPV6_HOPLIMIT");
exit(1);
}
