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

make rdr_name_type enum values more unique

This commit is contained in:
Paul Chambers 2019-10-02 13:29:29 -07:00 committed by Thomas Bernard
parent b36a6e94f8
commit 7ea314412c
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
miniupnpd/commonrdr.h
View File

@ -65,17 +65,23 @@ update_portmapping_desc_timestamp(const char * ifname,
const char * desc, unsigned int timestamp);
#ifdef USE_NFTABLES
/* only provided by nftables implementation at the moment */
/*
* only provided by nftables implementation at the moment.
* Should be implemented for iptables too, for consistency
*/
typedef enum {
TABLE_NAME,
TABLE4_NAME,
TABLE6_NAME,
NAT_CHAIN_NAME,
NAT_POSTROUTING_CHAIN_NAME,
FORWARD_CHAIN_NAME,
RDR_TABLE_NAME,
RDR_NAT_PREROUTING_CHAIN_NAME,
RDR_NAT_POSTROUTING_CHAIN_NAME,
RDR_FORWARD_CHAIN_NAME,
} rdr_name_type;
/*
* used by the config file parsing in the core
* to set
*/
int set_rdr_name( rdr_name_type param, const char * string );
#endif

6
miniupnpd/miniupnpd.c
View File

@ -1269,13 +1269,13 @@ init(int argc, char * * argv, struct runtime_vars * v)
#ifdef USE_NETFILTER
#ifdef USE_NFTABLES
case UPNPFORWARDCHAIN:
set_rdr_name(FORWARD_CHAIN_NAME, ary_options[i].value);
set_rdr_name(RDR_FORWARD_CHAIN_NAME, ary_options[i].value);
break;
case UPNPNATCHAIN:
set_rdr_name(NAT_CHAIN_NAME, ary_options[i].value);
set_rdr_name(RDR_NAT_PREROUTING_CHAIN_NAME, ary_options[i].value);
break;
case UPNPNATPOSTCHAIN:
set_rdr_name(NAT_POSTROUTING_CHAIN_NAME, ary_options[i].value);
set_rdr_name(RDR_NAT_POSTROUTING_CHAIN_NAME, ary_options[i].value);
break;
#else
case UPNPFORWARDCHAIN:

8
miniupnpd/netfilter_nft/nftnlrdr.c
View File

@ -155,16 +155,16 @@ set_rdr_name(rdr_name_type param, const char *string) {
return -1;
}
switch (param) {
case TABLE_NAME:
case RDR_TABLE_NAME:
nft_table = string;
break;
case NAT_CHAIN_NAME:
case RDR_NAT_PREROUTING_CHAIN_NAME:
nft_prerouting_chain = string;
break;
case NAT_POSTROUTING_CHAIN_NAME:
case RDR_NAT_POSTROUTING_CHAIN_NAME:
nft_postrouting_chain = string;
break;
case FORWARD_CHAIN_NAME:
case RDR_FORWARD_CHAIN_NAME:
nft_forward_chain = string;
break;
default: