Message ID | 4FBB51D9.1020602@elitecore.com |
---|---|
State | Accepted |
Headers | show |
On Tue, May 22, 2012 at 02:14:09PM +0530, Jagdish Motwani wrote: [...] > Thanks. Updating the patch Applied, thanks. Please, next time don't forget to include the patch description (even if you already in the previous version of your patch). I cannot apply this with `git am' and that's annoying. > -- > > 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 */ > 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 -- 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
On 06/06/2012 05:14 AM, Pablo Neira Ayuso wrote: > On Tue, May 22, 2012 at 02:14:09PM +0530, Jagdish Motwani wrote: > [...] >> Thanks. Updating the patch > Applied, thanks. > > Please, next time don't forget to include the patch description (even > if you already in the previous version of your patch). > > I cannot apply this with `git am' and that's annoying. Thanks, will keep this in mind next time. >> -- >> >> 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 */ >> 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 -- 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 */