patch-2.1.68 linux/include/net/ip_masq.h
Next file: linux/include/net/ipconfig.h
Previous file: linux/include/net/ip_fib.h
Back to the patch index
Back to the overall index
- Lines: 42
- Date:
Sun Nov 30 14:12:51 1997
- Orig file:
v2.1.67/linux/include/net/ip_masq.h
- Orig date:
Mon Jul 7 16:04:18 1997
diff -u --recursive --new-file v2.1.67/linux/include/net/ip_masq.h linux/include/net/ip_masq.h
@@ -88,14 +88,14 @@
/*
* functions called from ip layer
*/
-extern int ip_fw_masquerade(struct sk_buff **, struct device *);
-extern int ip_fw_masq_icmp(struct sk_buff **, struct device *);
-extern int ip_fw_demasquerade(struct sk_buff **, struct device *);
+extern int ip_fw_masquerade(struct sk_buff **, __u32 maddr);
+extern int ip_fw_masq_icmp(struct sk_buff **);
+extern int ip_fw_demasquerade(struct sk_buff **);
/*
* ip_masq obj creation/deletion functions.
*/
-extern struct ip_masq *ip_masq_new(struct device *dev, int proto, __u32 saddr, __u16 sport, __u32 daddr, __u16 dport, unsigned flags);
+extern struct ip_masq *ip_masq_new(__u32 maddr, int proto, __u32 saddr, __u16 sport, __u32 daddr, __u16 dport, unsigned flags);
extern void ip_masq_set_expire(struct ip_masq *ms, unsigned long tout);
@@ -116,9 +116,9 @@
int (*masq_done_1) /* ip_masq fin. */
(struct ip_masq_app *, struct ip_masq *);
int (*pkt_out) /* output (masquerading) hook */
- (struct ip_masq_app *, struct ip_masq *, struct sk_buff **, struct device *);
+ (struct ip_masq_app *, struct ip_masq *, struct sk_buff **, __u32);
int (*pkt_in) /* input (demasq) hook */
- (struct ip_masq_app *, struct ip_masq *, struct sk_buff **, struct device *);
+ (struct ip_masq_app *, struct ip_masq *, struct sk_buff **);
};
/*
@@ -147,8 +147,8 @@
* output and input app. masquerading hooks.
*
*/
-extern int ip_masq_app_pkt_out(struct ip_masq *, struct sk_buff **skb_p, struct device *dev);
-extern int ip_masq_app_pkt_in(struct ip_masq *, struct sk_buff **skb_p, struct device *dev);
+extern int ip_masq_app_pkt_out(struct ip_masq *, struct sk_buff **skb_p, __u32 maddr);
+extern int ip_masq_app_pkt_in(struct ip_masq *, struct sk_buff **skb_p);
/*
* service routine(s).
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov