status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

miniupnpd/netfilter: build with linux kernel 5.0 

should fix #346
This commit is contained in:
Thomas Bernard 2019-02-03 13:26:27 +01:00
parent 2656f41c7a
commit 6106111972
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
miniupnpd/Changelog.txt
View File

@ -1,5 +1,8 @@
$Id: Changelog.txt,v 1.441 2018/05/08 21:34:18 nanard Exp $
2019/02/03:
netfilter: fix build with linux kernel 5.0
2018/09/07:
Fix PCP Public address announcement

38
miniupnpd/netfilter/iptcrdr.c
View File

@ -2,7 +2,7 @@
/* vim: tabstop=4 shiftwidth=4 noexpandtab
* MiniUPnP project
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
* (c) 2006-2018 Thomas Bernard
* (c) 2006-2019 Thomas Bernard
* This software is subject to the conditions detailed
* in the LICENCE file provided within the distribution */
#include <stdio.h>
@ -1180,9 +1180,11 @@ addnatrule(int proto, unsigned short eport,
} else {
match = get_udp_match(eport, 0);
}
e->nfcache = NFC_IP_DST_PT;
e->nfcache = NFC_UNKNOWN;
target = get_dnat_target(iaddr, iport);
e->nfcache |= NFC_UNKNOWN;
#ifdef NFC_IP_DST_PT
e->nfcache |= NFC_IP_DST_PT;
#endif
tmp = realloc(e, sizeof(struct ipt_entry)
+ match->u.match_size
+ target->u.target_size);
@ -1250,9 +1252,11 @@ addmasqueraderule(int proto,
} else {
match = get_udp_match(0, iport);
}
e->nfcache = NFC_IP_DST_PT;
e->nfcache = NFC_UNKNOWN;
target = get_masquerade_target(eport);
e->nfcache |= NFC_UNKNOWN;
#ifdef NFC_IP_DST_PT
e->nfcache |= NFC_IP_DST_PT;
#endif
tmp = realloc(e, sizeof(struct ipt_entry)
+ match->u.match_size
+ target->u.target_size);
@ -1330,9 +1334,14 @@ addpeernatrule(int proto,
} else {
match = get_udp_match(rport, iport);
}
e->nfcache = NFC_IP_DST_PT | NFC_IP_SRC_PT;
e->nfcache = NFC_UNKNOWN;
target = get_snat_target(eaddr, eport);
e->nfcache |= NFC_UNKNOWN;
#ifdef NFC_IP_DST_PT
e->nfcache |= NFC_IP_DST_PT;
#endif
#ifdef NFC_IP_SRC_PT
e->nfcache |= NFC_IP_SRC_PT;
#endif
tmp = realloc(e, sizeof(struct ipt_entry)
+ match->u.match_size
+ target->u.target_size);
@ -1401,9 +1410,14 @@ addpeerdscprule(int proto, unsigned char dscp,
} else {
match = get_udp_match(rport, iport);
}
e->nfcache = NFC_IP_DST_PT | NFC_IP_SRC_PT;
e->nfcache = NFC_UNKNOWN;
target = get_dscp_target(dscp);
e->nfcache |= NFC_UNKNOWN;
#ifdef NFC_IP_DST_PT
e->nfcache |= NFC_IP_DST_PT;
#endif
#ifdef NFC_IP_SRC_PT
e->nfcache |= NFC_IP_SRC_PT;
#endif
tmp = realloc(e, sizeof(struct ipt_entry)
+ match->u.match_size
+ target->u.target_size);
@ -1484,11 +1498,13 @@ add_filter_rule(int proto, const char * rhost,
} else {
match = get_udp_match(iport,0);
}
e->nfcache = NFC_IP_DST_PT;
e->ip.dst.s_addr = inet_addr(iaddr);
e->ip.dmsk.s_addr = INADDR_NONE;
e->nfcache = NFC_UNKNOWN;
target = get_accept_target();
e->nfcache |= NFC_UNKNOWN;
#ifdef NFC_IP_DST_PT
e->nfcache |= NFC_IP_DST_PT;
#endif
tmp = realloc(e, sizeof(struct ipt_entry)
+ match->u.match_size
+ target->u.target_size);