Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 051966c0 authored by Patrick McHardy's avatar Patrick McHardy Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_nat: add protoff argument to packet mangling functions 



For mangling IPv6 packets the protocol header offset needs to be known
by the NAT packet mangling functions. Add a so far unused protoff argument
and convert the conntrack and NAT helpers to use it in preparation of
IPv6 NAT.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 811927cc

include/linux/netfilter/nf_conntrack_amanda.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


extern unsigned int (*nf_nat_amanda_hook)(struct sk_buff *skb,

					  enum ip_conntrack_info ctinfo,

					  unsigned int protoff,

					  unsigned int matchoff,

					  unsigned int matchlen,

					  struct nf_conntrack_expect *exp);

include/linux/netfilter/nf_conntrack_ftp.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ struct nf_conntrack_expect; 
extern unsigned int (*nf_nat_ftp_hook)(struct sk_buff *skb,

				       enum ip_conntrack_info ctinfo,

				       enum nf_ct_ftp_type type,

				       unsigned int protoff,

				       unsigned int matchoff,

				       unsigned int matchlen,

				       struct nf_conntrack_expect *exp);

include/linux/netfilter/nf_conntrack_h323.h

+10 −5
Original line number Diff line number Diff line
@@ -36,12 +36,12 @@ extern void nf_conntrack_h245_expect(struct nf_conn *new, 
				     struct nf_conntrack_expect *this);

extern void nf_conntrack_q931_expect(struct nf_conn *new,

				     struct nf_conntrack_expect *this);

extern int (*set_h245_addr_hook) (struct sk_buff *skb,

extern int (*set_h245_addr_hook) (struct sk_buff *skb, unsigned int protoff,

				  unsigned char **data, int dataoff,

				  H245_TransportAddress *taddr,

				  union nf_inet_addr *addr,

				  __be16 port);

extern int (*set_h225_addr_hook) (struct sk_buff *skb,

extern int (*set_h225_addr_hook) (struct sk_buff *skb, unsigned int protoff,

				  unsigned char **data, int dataoff,

				  TransportAddress *taddr,

				  union nf_inet_addr *addr,
@@ -49,40 +49,45 @@ extern int (*set_h225_addr_hook) (struct sk_buff *skb, 
extern int (*set_sig_addr_hook) (struct sk_buff *skb,

				 struct nf_conn *ct,

				 enum ip_conntrack_info ctinfo,

				 unsigned char **data,

				 unsigned int protoff, unsigned char **data,

				 TransportAddress *taddr, int count);

extern int (*set_ras_addr_hook) (struct sk_buff *skb,

				 struct nf_conn *ct,

				 enum ip_conntrack_info ctinfo,

				 unsigned char **data,

				 unsigned int protoff, unsigned char **data,

				 TransportAddress *taddr, int count);

extern int (*nat_rtp_rtcp_hook) (struct sk_buff *skb,

				 struct nf_conn *ct,

				 enum ip_conntrack_info ctinfo,

				 unsigned char **data, int dataoff,

				 unsigned int protoff, unsigned char **data,

				 int dataoff,

				 H245_TransportAddress *taddr,

				 __be16 port, __be16 rtp_port,

				 struct nf_conntrack_expect *rtp_exp,

				 struct nf_conntrack_expect *rtcp_exp);

extern int (*nat_t120_hook) (struct sk_buff *skb, struct nf_conn *ct,

			     enum ip_conntrack_info ctinfo,

			     unsigned int protoff,

			     unsigned char **data, int dataoff,

			     H245_TransportAddress *taddr, __be16 port,

			     struct nf_conntrack_expect *exp);

extern int (*nat_h245_hook) (struct sk_buff *skb, struct nf_conn *ct,

			     enum ip_conntrack_info ctinfo,

			     unsigned int protoff,

			     unsigned char **data, int dataoff,

			     TransportAddress *taddr, __be16 port,

			     struct nf_conntrack_expect *exp);

extern int (*nat_callforwarding_hook) (struct sk_buff *skb,

				       struct nf_conn *ct,

				       enum ip_conntrack_info ctinfo,

				       unsigned int protoff,

				       unsigned char **data, int dataoff,

				       TransportAddress *taddr,

				       __be16 port,

				       struct nf_conntrack_expect *exp);

extern int (*nat_q931_hook) (struct sk_buff *skb, struct nf_conn *ct,

			     enum ip_conntrack_info ctinfo,

			     unsigned int protoff,

			     unsigned char **data, TransportAddress *taddr,

			     int idx, __be16 port,

			     struct nf_conntrack_expect *exp);

include/linux/netfilter/nf_conntrack_irc.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


extern unsigned int (*nf_nat_irc_hook)(struct sk_buff *skb,

				       enum ip_conntrack_info ctinfo,

				       unsigned int protoff,

				       unsigned int matchoff,

				       unsigned int matchlen,

				       struct nf_conntrack_expect *exp);

include/linux/netfilter/nf_conntrack_pptp.h

+2 −0
Original line number Diff line number Diff line
@@ -303,12 +303,14 @@ struct nf_conntrack_expect; 
extern int

(*nf_nat_pptp_hook_outbound)(struct sk_buff *skb,

			     struct nf_conn *ct, enum ip_conntrack_info ctinfo,

			     unsigned int protoff,

			     struct PptpControlHeader *ctlh,

			     union pptp_ctrl_union *pptpReq);



extern int

(*nf_nat_pptp_hook_inbound)(struct sk_buff *skb,

			    struct nf_conn *ct, enum ip_conntrack_info ctinfo,

			    unsigned int protoff,

			    struct PptpControlHeader *ctlh,

			    union pptp_ctrl_union *pptpReq);