|
@@ -50,12 +50,12 @@ MODULE_PARM_DESC(callforward_filter, "only create call forwarding expectations "
|
|
|
int (*set_h245_addr_hook) (struct sk_buff *skb,
|
|
|
unsigned char **data, int dataoff,
|
|
|
H245_TransportAddress *taddr,
|
|
|
- union nf_conntrack_address *addr, __be16 port)
|
|
|
+ union nf_inet_addr *addr, __be16 port)
|
|
|
__read_mostly;
|
|
|
int (*set_h225_addr_hook) (struct sk_buff *skb,
|
|
|
unsigned char **data, int dataoff,
|
|
|
TransportAddress *taddr,
|
|
|
- union nf_conntrack_address *addr, __be16 port)
|
|
|
+ union nf_inet_addr *addr, __be16 port)
|
|
|
__read_mostly;
|
|
|
int (*set_sig_addr_hook) (struct sk_buff *skb,
|
|
|
struct nf_conn *ct,
|
|
@@ -214,7 +214,7 @@ static int get_tpkt_data(struct sk_buff *skb, unsigned int protoff,
|
|
|
/****************************************************************************/
|
|
|
static int get_h245_addr(struct nf_conn *ct, unsigned char *data,
|
|
|
H245_TransportAddress *taddr,
|
|
|
- union nf_conntrack_address *addr, __be16 *port)
|
|
|
+ union nf_inet_addr *addr, __be16 *port)
|
|
|
{
|
|
|
unsigned char *p;
|
|
|
int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
|
|
@@ -257,7 +257,7 @@ static int expect_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct,
|
|
|
int ret = 0;
|
|
|
__be16 port;
|
|
|
__be16 rtp_port, rtcp_port;
|
|
|
- union nf_conntrack_address addr;
|
|
|
+ union nf_inet_addr addr;
|
|
|
struct nf_conntrack_expect *rtp_exp;
|
|
|
struct nf_conntrack_expect *rtcp_exp;
|
|
|
typeof(nat_rtp_rtcp_hook) nat_rtp_rtcp;
|
|
@@ -330,7 +330,7 @@ static int expect_t120(struct sk_buff *skb,
|
|
|
int dir = CTINFO2DIR(ctinfo);
|
|
|
int ret = 0;
|
|
|
__be16 port;
|
|
|
- union nf_conntrack_address addr;
|
|
|
+ union nf_inet_addr addr;
|
|
|
struct nf_conntrack_expect *exp;
|
|
|
typeof(nat_t120_hook) nat_t120;
|
|
|
|
|
@@ -623,7 +623,7 @@ static struct nf_conntrack_helper nf_conntrack_helper_h245 __read_mostly = {
|
|
|
/****************************************************************************/
|
|
|
int get_h225_addr(struct nf_conn *ct, unsigned char *data,
|
|
|
TransportAddress *taddr,
|
|
|
- union nf_conntrack_address *addr, __be16 *port)
|
|
|
+ union nf_inet_addr *addr, __be16 *port)
|
|
|
{
|
|
|
unsigned char *p;
|
|
|
int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
|
|
@@ -662,7 +662,7 @@ static int expect_h245(struct sk_buff *skb, struct nf_conn *ct,
|
|
|
int dir = CTINFO2DIR(ctinfo);
|
|
|
int ret = 0;
|
|
|
__be16 port;
|
|
|
- union nf_conntrack_address addr;
|
|
|
+ union nf_inet_addr addr;
|
|
|
struct nf_conntrack_expect *exp;
|
|
|
typeof(nat_h245_hook) nat_h245;
|
|
|
|
|
@@ -704,8 +704,8 @@ static int expect_h245(struct sk_buff *skb, struct nf_conn *ct,
|
|
|
|
|
|
/* If the calling party is on the same side of the forward-to party,
|
|
|
* we don't need to track the second call */
|
|
|
-static int callforward_do_filter(union nf_conntrack_address *src,
|
|
|
- union nf_conntrack_address *dst,
|
|
|
+static int callforward_do_filter(union nf_inet_addr *src,
|
|
|
+ union nf_inet_addr *dst,
|
|
|
int family)
|
|
|
{
|
|
|
const struct nf_afinfo *afinfo;
|
|
@@ -772,7 +772,7 @@ static int expect_callforwarding(struct sk_buff *skb,
|
|
|
int dir = CTINFO2DIR(ctinfo);
|
|
|
int ret = 0;
|
|
|
__be16 port;
|
|
|
- union nf_conntrack_address addr;
|
|
|
+ union nf_inet_addr addr;
|
|
|
struct nf_conntrack_expect *exp;
|
|
|
typeof(nat_callforwarding_hook) nat_callforwarding;
|
|
|
|
|
@@ -828,7 +828,7 @@ static int process_setup(struct sk_buff *skb, struct nf_conn *ct,
|
|
|
int ret;
|
|
|
int i;
|
|
|
__be16 port;
|
|
|
- union nf_conntrack_address addr;
|
|
|
+ union nf_inet_addr addr;
|
|
|
typeof(set_h225_addr_hook) set_h225_addr;
|
|
|
|
|
|
pr_debug("nf_ct_q931: Setup\n");
|
|
@@ -1200,7 +1200,7 @@ static unsigned char *get_udp_data(struct sk_buff *skb, unsigned int protoff,
|
|
|
|
|
|
/****************************************************************************/
|
|
|
static struct nf_conntrack_expect *find_expect(struct nf_conn *ct,
|
|
|
- union nf_conntrack_address *addr,
|
|
|
+ union nf_inet_addr *addr,
|
|
|
__be16 port)
|
|
|
{
|
|
|
struct nf_conntrack_expect *exp;
|
|
@@ -1242,7 +1242,7 @@ static int expect_q931(struct sk_buff *skb, struct nf_conn *ct,
|
|
|
int ret = 0;
|
|
|
int i;
|
|
|
__be16 port;
|
|
|
- union nf_conntrack_address addr;
|
|
|
+ union nf_inet_addr addr;
|
|
|
struct nf_conntrack_expect *exp;
|
|
|
typeof(nat_q931_hook) nat_q931;
|
|
|
|
|
@@ -1311,7 +1311,7 @@ static int process_gcf(struct sk_buff *skb, struct nf_conn *ct,
|
|
|
int dir = CTINFO2DIR(ctinfo);
|
|
|
int ret = 0;
|
|
|
__be16 port;
|
|
|
- union nf_conntrack_address addr;
|
|
|
+ union nf_inet_addr addr;
|
|
|
struct nf_conntrack_expect *exp;
|
|
|
|
|
|
pr_debug("nf_ct_ras: GCF\n");
|
|
@@ -1471,7 +1471,7 @@ static int process_arq(struct sk_buff *skb, struct nf_conn *ct,
|
|
|
struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info;
|
|
|
int dir = CTINFO2DIR(ctinfo);
|
|
|
__be16 port;
|
|
|
- union nf_conntrack_address addr;
|
|
|
+ union nf_inet_addr addr;
|
|
|
typeof(set_h225_addr_hook) set_h225_addr;
|
|
|
|
|
|
pr_debug("nf_ct_ras: ARQ\n");
|
|
@@ -1513,7 +1513,7 @@ static int process_acf(struct sk_buff *skb, struct nf_conn *ct,
|
|
|
int dir = CTINFO2DIR(ctinfo);
|
|
|
int ret = 0;
|
|
|
__be16 port;
|
|
|
- union nf_conntrack_address addr;
|
|
|
+ union nf_inet_addr addr;
|
|
|
struct nf_conntrack_expect *exp;
|
|
|
typeof(set_sig_addr_hook) set_sig_addr;
|
|
|
|
|
@@ -1576,7 +1576,7 @@ static int process_lcf(struct sk_buff *skb, struct nf_conn *ct,
|
|
|
int dir = CTINFO2DIR(ctinfo);
|
|
|
int ret = 0;
|
|
|
__be16 port;
|
|
|
- union nf_conntrack_address addr;
|
|
|
+ union nf_inet_addr addr;
|
|
|
struct nf_conntrack_expect *exp;
|
|
|
|
|
|
pr_debug("nf_ct_ras: LCF\n");
|