Merge branch 'master' of git://1984.lsi.us.es/nf
This commit is contained in:
commit
0dcd5052c8
|
@ -18,6 +18,7 @@ struct nf_conntrack_ecache {
|
|||
u16 ctmask; /* bitmask of ct events to be delivered */
|
||||
u16 expmask; /* bitmask of expect events to be delivered */
|
||||
u32 pid; /* netlink pid of destroyer */
|
||||
struct timer_list timeout;
|
||||
};
|
||||
|
||||
static inline struct nf_conntrack_ecache *
|
||||
|
|
|
@ -502,7 +502,10 @@ static unsigned int ip_nat_sdp_media(struct sk_buff *skb, unsigned int dataoff,
|
|||
ret = nf_ct_expect_related(rtcp_exp);
|
||||
if (ret == 0)
|
||||
break;
|
||||
else if (ret != -EBUSY) {
|
||||
else if (ret == -EBUSY) {
|
||||
nf_ct_unexpect_related(rtp_exp);
|
||||
continue;
|
||||
} else if (ret < 0) {
|
||||
nf_ct_unexpect_related(rtp_exp);
|
||||
port = 0;
|
||||
break;
|
||||
|
|
|
@ -1171,8 +1171,10 @@ ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u,
|
|||
goto out_err;
|
||||
}
|
||||
svc->stats.cpustats = alloc_percpu(struct ip_vs_cpu_stats);
|
||||
if (!svc->stats.cpustats)
|
||||
if (!svc->stats.cpustats) {
|
||||
ret = -ENOMEM;
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
/* I'm the first user of the service */
|
||||
atomic_set(&svc->usecnt, 0);
|
||||
|
|
|
@ -249,12 +249,15 @@ static void death_by_event(unsigned long ul_conntrack)
|
|||
{
|
||||
struct nf_conn *ct = (void *)ul_conntrack;
|
||||
struct net *net = nf_ct_net(ct);
|
||||
struct nf_conntrack_ecache *ecache = nf_ct_ecache_find(ct);
|
||||
|
||||
BUG_ON(ecache == NULL);
|
||||
|
||||
if (nf_conntrack_event(IPCT_DESTROY, ct) < 0) {
|
||||
/* bad luck, let's retry again */
|
||||
ct->timeout.expires = jiffies +
|
||||
ecache->timeout.expires = jiffies +
|
||||
(random32() % net->ct.sysctl_events_retry_timeout);
|
||||
add_timer(&ct->timeout);
|
||||
add_timer(&ecache->timeout);
|
||||
return;
|
||||
}
|
||||
/* we've got the event delivered, now it's dying */
|
||||
|
@ -268,6 +271,9 @@ static void death_by_event(unsigned long ul_conntrack)
|
|||
void nf_ct_insert_dying_list(struct nf_conn *ct)
|
||||
{
|
||||
struct net *net = nf_ct_net(ct);
|
||||
struct nf_conntrack_ecache *ecache = nf_ct_ecache_find(ct);
|
||||
|
||||
BUG_ON(ecache == NULL);
|
||||
|
||||
/* add this conntrack to the dying list */
|
||||
spin_lock_bh(&nf_conntrack_lock);
|
||||
|
@ -275,10 +281,10 @@ void nf_ct_insert_dying_list(struct nf_conn *ct)
|
|||
&net->ct.dying);
|
||||
spin_unlock_bh(&nf_conntrack_lock);
|
||||
/* set a new timer to retry event delivery */
|
||||
setup_timer(&ct->timeout, death_by_event, (unsigned long)ct);
|
||||
ct->timeout.expires = jiffies +
|
||||
setup_timer(&ecache->timeout, death_by_event, (unsigned long)ct);
|
||||
ecache->timeout.expires = jiffies +
|
||||
(random32() % net->ct.sysctl_events_retry_timeout);
|
||||
add_timer(&ct->timeout);
|
||||
add_timer(&ecache->timeout);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(nf_ct_insert_dying_list);
|
||||
|
||||
|
|
|
@ -2790,7 +2790,8 @@ static int __init ctnetlink_init(void)
|
|||
goto err_unreg_subsys;
|
||||
}
|
||||
|
||||
if (register_pernet_subsys(&ctnetlink_net_ops)) {
|
||||
ret = register_pernet_subsys(&ctnetlink_net_ops);
|
||||
if (ret < 0) {
|
||||
pr_err("ctnetlink_init: cannot register pernet operations\n");
|
||||
goto err_unreg_exp_subsys;
|
||||
}
|
||||
|
|
|
@ -480,7 +480,7 @@ __build_packet_message(struct nfulnl_instance *inst,
|
|||
}
|
||||
|
||||
if (indev && skb_mac_header_was_set(skb)) {
|
||||
if (nla_put_be32(inst->skb, NFULA_HWTYPE, htons(skb->dev->type)) ||
|
||||
if (nla_put_be16(inst->skb, NFULA_HWTYPE, htons(skb->dev->type)) ||
|
||||
nla_put_be16(inst->skb, NFULA_HWLEN,
|
||||
htons(skb->dev->hard_header_len)) ||
|
||||
nla_put(inst->skb, NFULA_HWHEADER, skb->dev->hard_header_len,
|
||||
|
@ -996,8 +996,10 @@ static int __init nfnetlink_log_init(void)
|
|||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
if (!proc_create("nfnetlink_log", 0440,
|
||||
proc_net_netfilter, &nful_file_ops))
|
||||
proc_net_netfilter, &nful_file_ops)) {
|
||||
status = -ENOMEM;
|
||||
goto cleanup_logger;
|
||||
}
|
||||
#endif
|
||||
return status;
|
||||
|
||||
|
|
Loading…
Reference in a new issue