* [H.323 Helper 4/5]: Put expect after use
@ 2006-06-09 4:24 Jing Min Zhao
0 siblings, 0 replies; 3+ messages in thread
From: Jing Min Zhao @ 2006-06-09 4:24 UTC (permalink / raw)
To: Netfilter Development Mailinglist; +Cc: Patrick McHardy
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="GB18030", Size: 97 bytes --]
Bugfix: Put expect after use.
Signed-off-by: Jing Min Zhao <zhaojingmin@users.sourceforge.net>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [H.323 Helper 4/5]: Put expect after use
@ 2006-06-09 4:26 Jing Min Zhao
2006-06-17 15:24 ` Patrick McHardy
0 siblings, 1 reply; 3+ messages in thread
From: Jing Min Zhao @ 2006-06-09 4:26 UTC (permalink / raw)
To: Netfilter Development Mailinglist; +Cc: Patrick McHardy
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="GB18030", Size: 97 bytes --]
Bugfix: Put expect after use.
Signed-off-by: Jing Min Zhao <zhaojingmin@users.sourceforge.net>
[-- Attachment #2: patch4-put-expect --]
[-- Type: application/octet-stream, Size: 1006 bytes --]
diff -pruN linux-2.6.17.orig/net/ipv4/netfilter/ip_conntrack_helper_h323.c linux-2.6.17/net/ipv4/netfilter/ip_conntrack_helper_h323.c
--- linux-2.6.17.orig/net/ipv4/netfilter/ip_conntrack_helper_h323.c 2006-06-08 20:59:43.000000000 -0400
+++ linux-2.6.17/net/ipv4/netfilter/ip_conntrack_helper_h323.c 2006-06-08 21:02:37.000000000 -0400
@@ -1323,7 +1323,7 @@ static int process_rcf(struct sk_buff **
ip_ct_refresh_acct(ct, ctinfo, NULL, info->timeout * HZ);
/* Set expect timeout */
- read_lock_bh(&ip_conntrack_lock);
+ write_lock_bh(&ip_conntrack_lock);
exp = find_expect(ct, ct->tuplehash[dir].tuple.dst.ip,
info->sig_port[!dir]);
if (exp) {
@@ -1336,8 +1336,9 @@ static int process_rcf(struct sk_buff **
ntohs(exp->tuple.dst.u.tcp.port),
info->timeout);
set_expect_timeout(exp, info->timeout);
+ ip_conntrack_expect_put(exp);
}
- read_unlock_bh(&ip_conntrack_lock);
+ write_unlock_bh(&ip_conntrack_lock);
}
return 0;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [H.323 Helper 4/5]: Put expect after use
2006-06-09 4:26 [H.323 Helper 4/5]: Put expect after use Jing Min Zhao
@ 2006-06-17 15:24 ` Patrick McHardy
0 siblings, 0 replies; 3+ messages in thread
From: Patrick McHardy @ 2006-06-17 15:24 UTC (permalink / raw)
To: Jing Min Zhao; +Cc: Netfilter Development Mailinglist
Jing Min Zhao wrote:
> Bugfix: Put expect after use.
I'll try to get this one in 2.6.17 - will take until tommorrow
though since I'm currently travelling.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-06-17 15:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-09 4:26 [H.323 Helper 4/5]: Put expect after use Jing Min Zhao
2006-06-17 15:24 ` Patrick McHardy
-- strict thread matches above, loose matches on Subject: below --
2006-06-09 4:24 Jing Min Zhao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.