From 765156b04adb839f10810c6aed2732d2166cacd3 Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Tue, 4 Jun 2019 23:02:52 +0200 Subject: [PATCH] nftnlrdr.c: fix indent and spaces before eol --- miniupnpd/netfilter_nft/nftnlrdr.c | 72 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/miniupnpd/netfilter_nft/nftnlrdr.c b/miniupnpd/netfilter_nft/nftnlrdr.c index 2b3bebe..e548750 100644 --- a/miniupnpd/netfilter_nft/nftnlrdr.c +++ b/miniupnpd/netfilter_nft/nftnlrdr.c @@ -1,8 +1,9 @@ /* + * vim: tabstop=4 shiftwidth=4 noexpandtab * MiniUPnP project * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * (c) 2015 Tomofumi Hayashi - * + * * This software is subject to the conditions detailed * in the LICENCE file provided within the distribution. */ @@ -127,18 +128,19 @@ add_redirect_rule2(const char * ifname, struct nftnl_rule *r; UNUSED(rhost); UNUSED(timestamp); - d_printf(("add redirect rule2(%s, %s, %u, %s, %u, %d, %s)!\n", + + d_printf(("add redirect rule2(%s, %s, %u, %s, %u, %d, %s)!\n", ifname, rhost, eport, iaddr, iport, proto, desc)); r = rule_set_dnat(NFPROTO_IPV4, ifname, proto, - 0, eport, + 0, eport, inet_addr(iaddr), iport, desc, NULL); return nft_send_request(r, NFT_MSG_NEWRULE); } /* - * This function submit the rule as following: - * nft add rule nat miniupnpd-pcp-peer ip - * saddr ip daddr tcp sport + * This function submit the rule as following: + * nft add rule nat miniupnpd-pcp-peer ip + * saddr ip daddr tcp sport * tcp dport snat : */ int @@ -151,20 +153,20 @@ add_peer_redirect_rule2(const char * ifname, struct nftnl_rule *r; UNUSED(ifname); UNUSED(timestamp); - d_printf(("add peer redirect rule2()!\n")); - r = rule_set_snat(NFPROTO_IPV4, proto, - inet_addr(rhost), rport, - inet_addr(eaddr), eport, + d_printf(("add peer redirect rule2()!\n")); + r = rule_set_snat(NFPROTO_IPV4, proto, + inet_addr(rhost), rport, + inet_addr(eaddr), eport, inet_addr(iaddr), iport, desc, NULL); return nft_send_request(r, NFT_MSG_NEWRULE); } /* - * This function submit the rule as following: - * nft add rule filter miniupnpd + * This function submit the rule as following: + * nft add rule filter miniupnpd * ip daddr tcp dport accept - * + * */ int add_filter_rule2(const char * ifname, @@ -178,8 +180,8 @@ add_filter_rule2(const char * ifname, d_printf(("add_filter_rule2(%s, %s, %s, %d, %d, %d, %s)\n", ifname, rhost, iaddr, eport, iport, proto, desc)); if (rhost != NULL && strcmp(rhost, "") != 0) { - rhost_addr = inet_addr(rhost); - } + rhost_addr = inet_addr(rhost); + } r = rule_set_filter(NFPROTO_IPV4, ifname, proto, rhost_addr, inet_addr(iaddr), eport, iport, desc, 0); @@ -197,7 +199,7 @@ add_peer_dscp_rule2(const char * ifname, const char * iaddr, unsigned short iport, int proto, const char * desc, unsigned int timestamp) { - UNUSED(ifname); UNUSED(rhost); UNUSED(rport); + UNUSED(ifname); UNUSED(rhost); UNUSED(rport); UNUSED(dscp); UNUSED(iaddr); UNUSED(iport); UNUSED(proto); UNUSED(desc); UNUSED(timestamp); syslog(LOG_ERR, "add_peer_dscp_rule2: not supported"); @@ -232,14 +234,14 @@ delete_redirect_and_filter_rules(unsigned short eport, int proto) { rule_t *p; struct nftnl_rule *r = NULL; - in_addr_t iaddr = 0; - uint16_t iport = 0; - extern void print_rule(rule_t *r) ; + in_addr_t iaddr = 0; + uint16_t iport = 0; + extern void print_rule(rule_t *r) ; d_printf(("delete_redirect_and_filter_rules(%d %d)\n", eport, proto)); reflesh_nft_cache(NFPROTO_IPV4); LIST_FOREACH(p, &head, entry) { - if (p->eport == eport && p->proto == proto && + if (p->eport == eport && p->proto == proto && (p->type == RULE_NAT || p->type == RULE_SNAT)) { iaddr = p->iaddr; iport = p->iport; @@ -256,7 +258,7 @@ delete_redirect_and_filter_rules(unsigned short eport, int proto) } reflesh_nft_cache(NFPROTO_IPV4); LIST_FOREACH(p, &head, entry) { - if (p->eport == iport && + if (p->eport == iport && p->iaddr == iaddr && p->type == RULE_FILTER) { r = rule_del_handle(p); /* Todo: send bulk request */ @@ -268,8 +270,8 @@ delete_redirect_and_filter_rules(unsigned short eport, int proto) return 0; } -/* - * get peer by index as array. +/* + * get peer by index as array. * return -1 when not found. */ int @@ -287,7 +289,7 @@ get_peer_rule_by_index(int index, rule_t *r; UNUSED(timestamp); UNUSED(packets); UNUSED(bytes); - d_printf(("get_peer_rule_by_index()\n")); + d_printf(("get_peer_rule_by_index()\n")); reflesh_nft_cache(NFPROTO_IPV4); if (peer_cache == NULL) { return -1; @@ -325,8 +327,8 @@ get_peer_rule_by_index(int index, strncpy(desc, r->desc, desclen); } - /* - * TODO: Implement counter in case of add {nat,filter} + /* + * TODO: Implement counter in case of add {nat,filter} */ return 0; } @@ -334,9 +336,9 @@ get_peer_rule_by_index(int index, return -1; } -/* +/* * get_redirect_rule() - * returns -1 if the rule is not found + * returns -1 if the rule is not found */ int get_redirect_rule(const char * ifname, unsigned short eport, int proto, @@ -356,7 +358,7 @@ get_redirect_rule(const char * ifname, unsigned short eport, int proto, /* * get_redirect_rule_by_index() - * return -1 when the rule was not found + * return -1 when the rule was not found */ int get_redirect_rule_by_index(int index, @@ -412,7 +414,7 @@ get_redirect_rule_by_index(int index, *timestamp = get_timestamp(*eport, *proto); } - /* + /* * TODO: Implement counter in case of add {nat,filter} */ return 0; @@ -471,9 +473,9 @@ get_nat_redirect_rule(const char * nat_chain_name, const char * ifname, return -1; } -/* +/* * return an (malloc'ed) array of "external" port for which there is - * a port mapping. number is the size of the array + * a port mapping. number is the size of the array */ unsigned short * get_portmappings_in_range(unsigned short startport, unsigned short endport, @@ -496,11 +498,11 @@ get_portmappings_in_range(unsigned short startport, unsigned short endport, LIST_FOREACH(p, &head, entry) { if (p->proto == proto && - startport <= p->eport && + startport <= p->eport && p->eport <= endport) { if (*number >= capacity) { - tmp = realloc(array, + tmp = realloc(array, sizeof(unsigned short)*capacity); if (tmp == NULL) { syslog(LOG_ERR, @@ -509,7 +511,7 @@ get_portmappings_in_range(unsigned short startport, unsigned short endport, (unsigned)sizeof(unsigned short)*capacity); *number = 0; free(array); - return NULL; + return NULL; } array = tmp; }