]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/traceroute-2.0.18-ipfire.patch
Merge remote-tracking branch 'origin/seventeen' into seventeen
[ipfire-2.x.git] / src / patches / traceroute-2.0.18-ipfire.patch
1 diff -Naur traceroute-2.0.18.org/traceroute/traceroute.c traceroute-2.0.18/traceroute/traceroute.c
2 --- traceroute-2.0.18.org/traceroute/traceroute.c 2011-08-18 17:19:48.000000000 +0200
3 +++ traceroute-2.0.18/traceroute/traceroute.c 2012-05-06 12:42:55.000000000 +0200
4 @@ -31,6 +31,9 @@
5 #include "version.h"
6 #include "traceroute.h"
7
8 +#ifndef IPV6_TCLASS
9 +#define IPV6_TCLASS 67
10 +#endif
11
12 #ifndef ICMP6_DST_UNREACH_BEYONDSCOPE
13 #ifdef ICMP6_DST_UNREACH_NOTNEIGHBOR
14 @@ -186,7 +189,7 @@
15
16 memset (&hints, 0, sizeof (hints));
17 hints.ai_family = af;
18 - hints.ai_flags = AI_IDN;
19 + /* hints.ai_flags = AI_IDN; */
20
21 ret = getaddrinfo (name, NULL, &hints, &res);
22 if (ret) {
23 @@ -688,7 +691,7 @@
24
25 buf[0] = '\0';
26 getnameinfo (&res->sa, sizeof (*res), buf, sizeof (buf),
27 - 0, 0, NI_IDN);
28 + 0, 0, 0);
29 printf (" %s (%s)", buf[0] ? buf : str, str);
30 }
31