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

v0.69 with IPv6 support; contributed by David Hill

Browse Source
This commit is contained in:
jakob 2006-02-02 18:49:17 +00:00
parent 292ced1cf8
commit 0ee054fec6
4 changed files with 65 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/mtr/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.29 2005/03/23 19:45:31 alek Exp $
# $OpenBSD: Makefile,v 1.30 2006/02/02 18:49:17 jakob Exp $
COMMENT= "Matt's traceroute - network diagnostic tool"
VERSION= 0.67
VERSION= 0.69
DISTNAME= mtr-${VERSION}
CATEGORIES= net

8
net/mtr/distinfo
View File

@ -1,4 +1,4 @@
MD5 (mtr-0.67.tar.gz) = 76347197775ac604d7150ea01502a1df
RMD160 (mtr-0.67.tar.gz) = 2bd87ddb09a4c2aaf0f78156d8d8f272b4060f29
SHA1 (mtr-0.67.tar.gz) = 23fe652ebe25fe86fcb421e78eb76917248b9c94
SIZE (mtr-0.67.tar.gz) = 131393
MD5 (mtr-0.69.tar.gz) = 58904d6d8d70114195cdeb653d56914c
SHA1 (mtr-0.69.tar.gz) = 3fd0fa148b349d1966e0d79af0ffb84ecc7bed4b
RMD160 (mtr-0.69.tar.gz) = e95e0f27253d8d94587b429cbb65311035e93c2e
SIZE (mtr-0.69.tar.gz) = 183216

31
net/mtr/patches/patch-dns_c Normal file
View File

@ -0,0 +1,31 @@
Index: dns.c
diff -u -p dns.c.orig dns.c
--- dns.c.orig Tue Jan 11 17:32:42 2005
+++ dns.c Thu Feb 3 19:25:28 2005
@@ -437,7 +437,7 @@ char *strlongip(ip_t * ip)
}
-int longipstr(char *s, ip_t *dst)
+int longipstr(char *s, ip_t *dst, int af)
{
#ifdef ENABLE_IPV6
return inet_pton( af, s, dst );
@@ -488,7 +488,7 @@ void dns_open(void)
strerror(errno));
exit(-1);
}
- longipstr( "127.0.0.1", &localhost );
+ longipstr( "127.0.0.1", &localhost, AF_INET );
aseed = time(NULL) ^ (time(NULL) << 3) ^ (dword)getpid();
for (i = 0;i < BashSize;i++) {
idbash[i] = NULL;
@@ -1228,7 +1228,7 @@ void dns_ack(void)
if ( addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr),
(void *) &(from4->sin_addr), (int) AF_INET ) == 0 ||
addrcmp( (void *) &(_res.nsaddr_list[i].sin_addr),
- (void *) &unspec_addr, (int) AF_INET ) != 0 ) /* 0.0.0.0 replies as 127.0.0.1 */
+ (void *) &unspec_addr, (int) AF_INET ) == 0 ) /* 0.0.0.0 replies as 127.0.0.1 */
break;
} else
for (i = 0;i < _res.nscount;i++)

28
net/mtr/patches/patch-net_c Normal file
View File

@ -0,0 +1,28 @@
--- net.c.orig Thu Jan 13 08:13:53 2005
+++ net.c Wed Nov 16 19:43:05 2005
@@ -277,7 +277,7 @@
exit( EXIT_FAILURE);
}
echotype = ICMP6_ECHO_REQUEST;
- salen = sizeof (struct sockaddr_storage);
+ salen = sizeof (struct sockaddr_in6);
break;
#endif
}
@@ -305,7 +305,6 @@
rv = sendto(sendsock, packet, abs(packetsize), 0,
remotesockaddr, salen);
if (rv >= 0) {
- fprintf (stderr, "You've got a broken (FreeBSD?) system\n");
BSDfix = 1;
}
}
@@ -346,7 +345,7 @@
addrcpy( (void *) &(host[index].addrs[0]), addr, af );
} else {
for( i=0; i<MAXPATH; ) {
- if( addrcmp( (void *) &(host[index].addrs[i]), (void *) &addr,
+ if( addrcmp( (void *) &(host[index].addrs[i]), addr,
af ) == 0 ||
addrcmp( (void *) &(host[index].addrs[i]),
(void *) &unspec_addr, af ) == 0 ) break;