cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweak decision logic for deciding if we should use the ipv4 or ipv6 tools.

Browse Source 
it would default to ipv6 as most interfaces have an unused ipv6 address, while
actually using the ipv4 address. this fixes ping/traceroute functionality when
using hostnames instead of ip addresses.
This commit is contained in:
jasper 2011-05-18 15:25:34 +00:00
parent e93b9fa8f1
commit 2b668becca
4 changed files with 82 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/nettool/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.9 2011/05/14 21:29:04 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.10 2011/05/18 15:25:55 jasper Exp $
COMMENT= GNOME interface for various networking tools
GNOME_PROJECT= gnome-nettool
GNOME_VERSION= 2.32.0
REVISION= 1
REVISION= 2
CATEGORIES= net

42
x11/gnome/nettool/patches/patch-src_nettool_c
View File

@ -1,6 +1,16 @@
$OpenBSD: patch-src_nettool_c,v 1.1.1.1 2010/04/10 16:51:07 ajacoutot Exp $
--- src/nettool.c.orig Tue Sep 22 15:30:34 2009
+++ src/nettool.c Tue Mar 30 15:38:15 2010
$OpenBSD: patch-src_nettool_c,v 1.2 2011/05/18 15:25:55 jasper Exp $
On OpenBSD configured interfaces have default IPv6 address, this would
cause the code in netinfo_get_ip_version() to believe we should use the IPv6
version of various tools, like ping6 and traceroute6. While in reality many people
leave the interfaces as is (don't remove the IPv6 address) and use the interface
over IPv4. So the IPv6 tools wouldn't have a proper way out and fail, this was the
default behaviour...
Now the code defaults to checking if for AF_INET address family instead
of the other way around (which would thus always return IPv6).
--- src/nettool.c.orig Thu Dec 2 10:26:14 2010
+++ src/nettool.c Wed May 18 15:43:49 2011
@@ -24,6 +24,7 @@
#include <string.h>
#include <sys/types.h>
@ -9,6 +19,32 @@ $OpenBSD: patch-src_nettool_c,v 1.1.1.1 2010/04/10 16:51:07 ajacoutot Exp $
#include <signal.h>
#include <errno.h>
#include <sys/wait.h>
@@ -137,21 +138,21 @@ netinfo_get_ip_version (Netinfo * netinfo)
(GTK_BIN (netinfo->host)))));
if (strlen (ip) > 0) {
- host = gethostbyname2 (ip, AF_INET6);
+ host = gethostbyname2 (ip, AF_INET);
if (host == NULL) {
- host = gethostbyname2 (ip, AF_INET);
+ host = gethostbyname2 (ip, AF_INET6);
if (host == NULL)
return -1;
else {
g_free (ip);
- return IPV4;
+ return IPV6;
}
return -1;
}
else {
g_free (ip);
- return IPV6;
+ return IPV4;
}
}
@@ -374,6 +375,10 @@ netinfo_io_text_buffer_dialog (GIOChannel * channel,
len, NULL);
}

4
x11/gnome3/x11/gnome/nettool/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2011/05/18 13:29:11 jasper Exp $
# $OpenBSD: Makefile,v 1.3 2011/05/18 15:25:34 jasper Exp $
COMMENT= GNOME interface for various networking tools
GNOME_PROJECT= gnome-nettool
GNOME_VERSION= 3.0.0
REVISION= 0
REVISION= 1
CATEGORIES= net

42
x11/gnome3/x11/gnome/nettool/patches/patch-src_nettool_c
View File

@ -1,6 +1,16 @@
$OpenBSD: patch-src_nettool_c,v 1.1.1.1 2011/05/17 17:21:35 jasper Exp $
--- src/nettool.c.orig Tue Sep 22 15:30:34 2009
+++ src/nettool.c Tue Mar 30 15:38:15 2010
$OpenBSD: patch-src_nettool_c,v 1.2 2011/05/18 15:25:34 jasper Exp $
On OpenBSD configured interfaces have default IPv6 address, this would
cause the code in netinfo_get_ip_version() to believe we should use the IPv6
version of various tools, like ping6 and traceroute6. While in reality many people
leave the interfaces as is (don't remove the IPv6 address) and use the interface
over IPv4. So the IPv6 tools wouldn't have a proper way out and fail, this was the
default behaviour...
Now the code defaults to checking if for AF_INET address family instead
of the other way around (which would thus always return IPv6).
--- src/nettool.c.orig Thu Dec 2 10:26:14 2010
+++ src/nettool.c Wed May 18 15:43:49 2011
@@ -24,6 +24,7 @@
#include <string.h>
#include <sys/types.h>
@ -9,6 +19,32 @@ $OpenBSD: patch-src_nettool_c,v 1.1.1.1 2011/05/17 17:21:35 jasper Exp $
#include <signal.h>
#include <errno.h>
#include <sys/wait.h>
@@ -137,21 +138,21 @@ netinfo_get_ip_version (Netinfo * netinfo)
(GTK_BIN (netinfo->host)))));
if (strlen (ip) > 0) {
- host = gethostbyname2 (ip, AF_INET6);
+ host = gethostbyname2 (ip, AF_INET);
if (host == NULL) {
- host = gethostbyname2 (ip, AF_INET);
+ host = gethostbyname2 (ip, AF_INET6);
if (host == NULL)
return -1;
else {
g_free (ip);
- return IPV4;
+ return IPV6;
}
return -1;
}
else {
g_free (ip);
- return IPV6;
+ return IPV4;
}
}
@@ -374,6 +375,10 @@ netinfo_io_text_buffer_dialog (GIOChannel * channel,
len, NULL);
}