Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mtr: fix build with globally disabled IPv6

Browse source 
The current mtr does not build if IPv6 is disabled globally, add a patch to
fix the build in this case.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich 2015-06-30 17:32:03 +02:00
parent 9bf03cb1f5
commit f17dd769f1
2 changed files with 50 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/mtr/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mtr
PKG_REV:=dd2b750
PKG_VERSION:=0.85+newdns-$(PKG_REV)
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/traviscross/mtr.git

49
net/mtr/patches/100-disabled-ipv6-fix.patch Normal file
View file

@ -0,0 +1,49 @@
--- a/net.c
+++ b/net.c
@@ -307,9 +307,11 @@ void net_send_tcp(int index)
struct sockaddr_storage local;
struct sockaddr_storage remote;
struct sockaddr_in *local4 = (struct sockaddr_in *) &local;
- struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote;
+#ifdef ENABLE_IPV6
+ struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local;
struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote;
+#endif
socklen_t len;
ttl = index + 1;
@@ -566,8 +568,10 @@ void net_send_query(int index)
/* sendto() assumes packet length includes the IPv4 header but not the
IPv6 header. */
- spacketsize = abs(packetsize) -
- ( ( af == AF_INET ) ? 0 : sizeof (struct ip6_hdr) );
+ spacketsize = abs(packetsize);
+#ifdef ENABLE_IPV6
+ spacketsize -= ( ( af == AF_INET ) ? 0 : sizeof (struct ip6_hdr) );
+#endif
rv = sendto(sendsock, packet, spacketsize, 0, remotesockaddr, salen);
if (first && (rv < 0) && ((errno == EINVAL) || (errno == EMSGSIZE))) {
/* Try the first packet again using host byte order. */
--- a/dns.c
+++ b/dns.c
@@ -49,7 +49,7 @@
#include <unistd.h>
#include <fcntl.h>
//#include <ctype.h>
-//#include <string.h>
+#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
--- a/net.h
+++ b/net.h
@@ -20,6 +20,7 @@
#include <netdb.h>
#include <arpa/inet.h>
#include <netinet/in.h>
+#include <sys/select.h>
#include <sys/socket.h>
#ifdef ENABLE_IPV6
#include <netinet/ip6.h>