[conntrack-tools PATCH] helpers: Fix for warning when compiling against libtirpc

[conntrack-tools PATCH] helpers: Fix for warning when compiling against libtirpc

[Phil Sutter]

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>
---
 src/helpers/rpc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/helpers/rpc.c b/src/helpers/rpc.c
index 3a7b337135f04..bd24dd3269c8e 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;
-- 
2.24.0

Re: [conntrack-tools PATCH] helpers: Fix for warning when compiling against libtirpc

[Arturo Borrero Gonzalez]

On 11/11/19 6:20 PM, Phil Sutter wrote:
> 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>
> ---
>  src/helpers/rpc.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 

Acked-by: Arturo Borrero Gonzalez <arturo@netfilter.org>

Re: [conntrack-tools PATCH] helpers: Fix for warning when compiling against libtirpc

[Pablo Neira Ayuso]

On Tue, Nov 12, 2019 at 11:58:30AM +0100, Arturo Borrero Gonzalez wrote:
> On 11/11/19 6:20 PM, Phil Sutter wrote:
> > 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>
> > ---
> >  src/helpers/rpc.c | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> > 
> 
> Acked-by: Arturo Borrero Gonzalez <arturo@netfilter.org>

Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>