diff options
| author | Phil Sutter <phil@nwl.cc> | 2019-02-12 23:35:06 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2019-11-12 22:12:17 +0100 |
| commit | ea9f896ed6a9b47b3a9a32bf594f57e6f6da97df (patch) | |
| tree | fd8ce06fad6d0791fc70b5a7a0a0583950ac82dc /src | |
| parent | f09b07f26c2bc15f59e64cc393c003966d7ca217 (diff) | |
helpers: Fix for warning when compiling against libtirpc
Fix for the following warning:
In file included from rpc.c:29:
/usr/include/tirpc/rpc/rpc_msg.h:214:52: warning: 'struct rpc_err' declared inside parameter list will not be visible outside of this definition or declaration
214 | extern void _seterr_reply(struct rpc_msg *, struct rpc_err *);
| ^~~~~~~
Struct rpc_err is declared in rpc/clnt.h which also declares rpc_call(),
therefore rename the local version.
Fixes: 5ededc4476f27 ("conntrackd: search for RPC headers")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Arturo Borrero Gonzalez <arturo@netfilter.org>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/helpers/rpc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/helpers/rpc.c b/src/helpers/rpc.c index 3a7b337..bd24dd3 100644 --- a/src/helpers/rpc.c +++ b/src/helpers/rpc.c @@ -26,6 +26,7 @@ #include <errno.h> +#include <rpc/clnt.h> #include <rpc/rpc_msg.h> #include <rpc/pmap_prot.h> #define _GNU_SOURCE @@ -114,8 +115,8 @@ nf_nat_rpc(struct pkt_buff *pkt, int dir, struct nf_expect *exp, #define ROUNDUP(n) ((((n) + 3)/4)*4) static int -rpc_call(const uint32_t *data, uint32_t offset, uint32_t datalen, - struct rpc_info *rpc_info) +rpc_parse_call(const uint32_t *data, uint32_t offset, uint32_t datalen, + struct rpc_info *rpc_info) { uint32_t p, r; @@ -393,7 +394,7 @@ rpc_helper_cb(struct pkt_buff *pkt, uint32_t protoff, } if (rm_dir == CALL) { - if (rpc_call(data, offset, datalen, rpc_info) < 0) + if (rpc_parse_call(data, offset, datalen, rpc_info) < 0) goto out; rpc_info->xid = xid; |