diff options
| author | Harald Welte <laforge@netfilter.org> | 2003-09-12 07:06:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-09-12 07:06:59 -0700 |
| commit | 3cf50294e9020fe2153d0fc7d40cb4ff3a5b7e68 (patch) | |
| tree | 56ae30fb470c680afab9667017d82630dbd654fd | |
| parent | e64931d2915d8a719a3d4c36b7d5ae25c11da77b (diff) | |
[NETFILTER]: Use u16 for port numbers.
| -rw-r--r-- | net/ipv4/netfilter/ip_nat_amanda.c | 4 | ||||
| -rw-r--r-- | net/ipv4/netfilter/ip_nat_irc.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/ip_nat_amanda.c b/net/ipv4/netfilter/ip_nat_amanda.c index 1e6b16394341..d3afbbd08a95 100644 --- a/net/ipv4/netfilter/ip_nat_amanda.c +++ b/net/ipv4/netfilter/ip_nat_amanda.c @@ -101,7 +101,7 @@ static int amanda_data_fixup(struct ip_conntrack *ct, struct ip_conntrack_expect *exp = expect; struct ip_ct_amanda_expect *ct_amanda_info = &exp->help.exp_amanda_info; struct ip_conntrack_tuple t = exp->tuple; - int port; + u_int16_t port; MUST_BE_LOCKED(&ip_amanda_lock); @@ -115,7 +115,7 @@ static int amanda_data_fixup(struct ip_conntrack *ct, writable */ t.dst.ip = newip; - for (port = ct_amanda_info->port + 10; port != 0; port++) { + for (port = ct_amanda_info->port; port != 0; port++) { t.dst.u.tcp.port = htons(port); if (ip_conntrack_change_expect(exp, &t) == 0) break; diff --git a/net/ipv4/netfilter/ip_nat_irc.c b/net/ipv4/netfilter/ip_nat_irc.c index a9865b9141e9..52b2e532568f 100644 --- a/net/ipv4/netfilter/ip_nat_irc.c +++ b/net/ipv4/netfilter/ip_nat_irc.c @@ -99,7 +99,7 @@ static int irc_data_fixup(const struct ip_ct_irc_expect *ct_irc_info, struct ip_conntrack_tuple t; struct iphdr *iph = (*pskb)->nh.iph; struct tcphdr *tcph = (void *) iph + iph->ihl * 4; - int port; + u_int16_t port; /* "4294967296 65635 " */ char buffer[18]; |