From: Patrick McHardy <kaber@trash.net>
To: davem@davemloft.net
Cc: netfilter-devel@lists.netfilter.org, Patrick McHardy <kaber@trash.net>
Subject: [NETFILTER 07/07]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook
Date: Fri, 25 May 2007 00:02:15 +0200 (MEST) [thread overview]
Message-ID: <20070524215843.14308.46250.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20070524215833.14308.60841.sendpatchset@localhost.localdomain>
[NETFILTER]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook
They're the same.
Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit ed22d6f07f4ac4b69b915df2d1798e171b501a47
tree 1accab86c105558c5ac6a9c094ac6bc9aef3288d
parent 9a545fc8e2ac3c8c7bbb7315469d96bb4e7d8748
author Jing Min Zhao <zhaojingmin@vivecode.com> Thu, 24 May 2007 23:50:52 +0200
committer Patrick McHardy <kaber@trash.net> Thu, 24 May 2007 23:50:52 +0200
net/ipv4/netfilter/nf_nat_h323.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c
index fcebc96..c5d2a2d 100644
--- a/net/ipv4/netfilter/nf_nat_h323.c
+++ b/net/ipv4/netfilter/nf_nat_h323.c
@@ -455,9 +455,9 @@ static int nat_q931(struct sk_buff **pskb, struct nf_conn *ct,
if (idx > 0 &&
get_h225_addr(ct, *data, &taddr[0], &addr, &port) &&
(ntohl(addr.ip) & 0xff000000) == 0x7f000000) {
- set_h225_addr_hook(pskb, data, 0, &taddr[0],
- &ct->tuplehash[!dir].tuple.dst.u3,
- info->sig_port[!dir]);
+ set_h225_addr(pskb, data, 0, &taddr[0],
+ &ct->tuplehash[!dir].tuple.dst.u3,
+ info->sig_port[!dir]);
}
} else {
nf_conntrack_unexpect_related(exp);
next prev parent reply other threads:[~2007-05-24 22:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-24 22:02 [NETFILTER 00/07]: Netfilter fixes Patrick McHardy
2007-05-24 22:02 ` [NETFILTER 01/07]: nf_conntrack_ftp: fix newline sequence number update Patrick McHardy
2007-05-24 23:41 ` David Miller
2007-05-24 22:02 ` [NETFILTER 02/07]: nf_conntrack_ftp: fix newline sequence number calculation Patrick McHardy
2007-05-24 23:41 ` David Miller
2007-05-24 22:02 ` [NETFILTER 03/07]: nf_conntrack_h323: fix ASN.1 types Patrick McHardy
2007-05-24 23:42 ` David Miller
2007-05-24 22:02 ` [NETFILTER 04/07]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access Patrick McHardy
2007-05-24 23:43 ` David Miller
2007-05-24 22:02 ` [NETFILTER 05/07]: nf_conntrack_h323: remove unnecessary process of Information signal Patrick McHardy
2007-05-24 23:43 ` David Miller
2007-05-24 22:02 ` [NETFILTER 06/07]: nf_conntrack_h323: add missing T.120 address in OLCA Patrick McHardy
2007-05-24 23:44 ` David Miller
2007-05-24 22:02 ` Patrick McHardy [this message]
2007-05-24 23:44 ` [NETFILTER 07/07]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook David Miller
2007-05-24 23:45 ` [NETFILTER 00/07]: Netfilter fixes David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070524215843.14308.46250.sendpatchset@localhost.localdomain \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=netfilter-devel@lists.netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.