diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2005-12-09 14:40:32 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-12-09 14:40:32 +0000 |
| commit | f8e4c6c8c6b3c72c38dfcb20fb1304113c0b4a85 (patch) | |
| tree | 2d5888b10939a975d50d97e7cca568ad34852785 /net/mtr | |
| parent | c937cfe6f73b397b910798ab32d23bb898d6b09b (diff) | |
- Fix duplicate entries for multi-path routers
- Fix bug in IPv6
PR: ports/89312
Submitted by: Mark Knight <markk@knigma.org>
Approved by: maintainer timeout (billf; 19 days)
Notes
Notes:
svn path=/head/; revision=150730
Diffstat (limited to 'net/mtr')
| -rw-r--r-- | net/mtr/Makefile | 2 | ||||
| -rw-r--r-- | net/mtr/files/patch-net.c | 26 |
2 files changed, 23 insertions, 5 deletions
diff --git a/net/mtr/Makefile b/net/mtr/Makefile index d566463d4b05..3e1aac151e1c 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -7,7 +7,7 @@ PORTNAME= mtr PORTVERSION= 0.69 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \ ftp://ftp.netsw.org/net/ip/audit/packets/ \ diff --git a/net/mtr/files/patch-net.c b/net/mtr/files/patch-net.c index 8f80e6130d7b..25ee703243f1 100644 --- a/net/mtr/files/patch-net.c +++ b/net/mtr/files/patch-net.c @@ -1,10 +1,28 @@ ---- net.c.orig Wed Aug 25 09:21:27 2004 -+++ net.c Tue Oct 26 12:46:58 2004 -@@ -249,7 +249,6 @@ +--- 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, - (struct sockaddr *)&remoteaddress, sizeof(remoteaddress)); + 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; |