From patchwork Tue May 22 08:44:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: netfilter conntrack helper: nf_ct_h323: fix bug in rtcp natting Date: Mon, 21 May 2012 22:44:09 -0000 From: Jagdish Motwani X-Patchwork-Id: 160565 Message-Id: <4FBB51D9.1020602@elitecore.com> To: Eric Dumazet Cc: 'Patrick McHardy' , netfilter-devel@vger.kernel.org On 05/22/2012 11:58 AM, Eric Dumazet wrote: > On Tue, 2012-05-22 at 11:30 +0530, Jagdish Motwani wrote: >> The nat_rtp_rtcp hook takes two separate parameters port and rtp_port. >> >> port is expected to be the real h245 address(found inside the packet). >> rtp_port is the even number closest to port (RTP ports are even and >> RTCP ports are odd) >> >> However currently, both port and rtp_port are having same value(both are >> rounded to nearest even numbers). >> >> This works well in case of openlogicalchannel with media (RTP/even) port. >> >> But in case of openlogicalchannel for media control (RTCP/odd) port, >> h245 address in the packet is wrongly modified to have an even port. >> >> I am attaching a pcap demonstrating the problem, for any further analysis. >> >> This behavior was introduced around v2.6.19 while rewriting the helper. >> >> >> >> Signed-off-by: Jagdish Motwani >> Signed-off-by: Sanket Shah >> >> -- >> diff --git a/net/netfilter/nf_conntrack_h323_main.c >> b/net/netfilter/nf_conntrack_h323_main.c >> index 46d69d7..7f0de36 100644 >> --- a/net/netfilter/nf_conntrack_h323_main.c >> +++ b/net/netfilter/nf_conntrack_h323_main.c >> @@ -270,9 +270,8 @@ static int expect_rtp_rtcp(struct sk_buff *skb, >> struct nf_conn *ct, >> return 0; >> >> /* RTP port is even */ >> - port&= htons(~1); >> - rtp_port = port; >> - rtcp_port = htons(ntohs(port) + 1); >> + rtp_port = port& htons(~1); >> + rtcp_port = htons(ntohs(rtp_port) + 1); > seems better to use : > > rtp_port = port& ~htons(1); > rtcp_port = port | htons(1); > > > Thanks. Updating the patch --- if ((rtp_exp = nf_ct_expect_alloc(ct)) == NULL) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index 46d69d7..31f50bc 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c @@ -270,9 +270,8 @@ static int expect_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct, return 0; /* RTP port is even */ - port &= htons(~1); - rtp_port = port; - rtcp_port = htons(ntohs(port) + 1); + rtp_port = port & ~htons(1); + rtcp_port = port | htons(1); /* Create expect for RTP */