diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2020-05-04 23:03:41 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2020-05-04 23:03:41 +0000 |
| commit | 2afe3963da26c426c4480aaa04082623fa72e6aa (patch) | |
| tree | 3592c72549c0aa6b6c1e3bcacf17b8677f276ba4 /net/multicat/files/patch-util.c | |
| parent | biology/plink: Whole genome association analysis toolset (diff) | |
net/multicat: Update to 2.3, new maintainer
- pkg-descr: WWW: changed to https://
- Makefile ordering: PORTDOCS and PKG_PLIST swapped (portclippy suggestion)
- extra patch of the file "patch" successfully ignored :-)
- set MAINTAINER (was unmaintained)
PR: 241982
Submitted by: Michael Muenz <m.muenz@gmail.com> (new maintainer)
Diffstat (limited to 'net/multicat/files/patch-util.c')
| -rw-r--r-- | net/multicat/files/patch-util.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/net/multicat/files/patch-util.c b/net/multicat/files/patch-util.c index 4374d3e96059..ddd7a8cf8f4f 100644 --- a/net/multicat/files/patch-util.c +++ b/net/multicat/files/patch-util.c @@ -1,6 +1,6 @@ ---- util.c.orig 2016-10-07 14:32:44 UTC +--- util.c.orig 2019-11-15 11:52:26 UTC +++ util.c -@@ -285,7 +285,7 @@ static int GetInterfaceIndex( const char +@@ -285,7 +285,7 @@ static int GetInterfaceIndex( const char *psz_name ) close( i_fd ); @@ -9,7 +9,7 @@ return ifr.ifr_index; #else return ifr.ifr_ifindex; -@@ -451,7 +451,7 @@ static void RawFillHeaders(struct udpraw +@@ -454,7 +454,7 @@ static void RawFillHeaders(struct udprawpkt *dgram, uint8_t ttl, uint8_t tos, uint16_t len) { #ifndef __APPLE__ @@ -18,7 +18,7 @@ struct ip *iph = &(dgram->iph); #else struct iphdr *iph = &(dgram->iph); -@@ -468,7 +468,7 @@ static void RawFillHeaders(struct udpraw +@@ -471,7 +471,7 @@ static void RawFillHeaders(struct udprawpkt *dgram, printf("Filling raw header (%p) (%s:%u -> %s:%u)\n", dgram, ipsrc_str, portsrc, ipdst_str, portdst); #endif @@ -27,7 +27,16 @@ // Fill ip header iph->ip_hl = 5; // ip header with no specific option iph->ip_v = 4; -@@ -710,7 +710,7 @@ int OpenSocket( const char *_psz_arg, in +@@ -558,7 +558,7 @@ int OpenSocket( const char *_psz_arg, int i_ttl, uint1 + in_addr_t i_raw_srcaddr = INADDR_ANY; + int i_raw_srcport = 0; + char *psz_ifname = NULL; +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__DragonFly__) + int hincl = 1; + #endif + +@@ -718,7 +718,7 @@ int OpenSocket( const char *_psz_arg, int i_ttl, uint1 i_raw_srcaddr, connect_addr.sin.sin_addr.s_addr, i_raw_srcport, ntohs(connect_addr.sin.sin_port), i_ttl, i_tos, 0); i_fd = socket( AF_INET, SOCK_RAW, IPPROTO_RAW ); @@ -36,7 +45,7 @@ if ( setsockopt( i_fd, IPPROTO_IP, IP_HDRINCL, &hincl, sizeof(hincl)) == -1 ) { msg_Err( NULL, "unable to set socket (%s)", strerror(errno) ); -@@ -747,7 +747,7 @@ int OpenSocket( const char *_psz_arg, in +@@ -755,7 +755,7 @@ int OpenSocket( const char *_psz_arg, int i_ttl, uint1 if ( bind_addr.ss.ss_family != AF_UNSPEC ) { @@ -45,7 +54,7 @@ if ( IN6_IS_ADDR_MULTICAST( &bind_addr.sin6.sin6_addr ) ) { struct ipv6_mreq imr; -@@ -827,7 +827,7 @@ normal_bind: +@@ -838,7 +838,7 @@ normal_bind: } else #endif |