summaryrefslogtreecommitdiff
path: root/pfinet/linux-src/net/ipv4/ip_masq.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2000-02-05 12:13:22 +0000
committerRoland McGrath <roland@gnu.org>2000-02-05 12:13:22 +0000
commitb39cd08347c72483a4521a55301a0fa147a2a2b1 (patch)
treeb2e07976bbfca079fa686ce436b8028cf180b4ae /pfinet/linux-src/net/ipv4/ip_masq.c
parent9fd51e9b0ad33a89a83fdbbb66bd20d85f7893fb (diff)
Import of Linux 2.2.13 subset (ipv4 stack and related)
Diffstat (limited to 'pfinet/linux-src/net/ipv4/ip_masq.c')
-rw-r--r--pfinet/linux-src/net/ipv4/ip_masq.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/pfinet/linux-src/net/ipv4/ip_masq.c b/pfinet/linux-src/net/ipv4/ip_masq.c
index 0187c58d..6d0588c0 100644
--- a/pfinet/linux-src/net/ipv4/ip_masq.c
+++ b/pfinet/linux-src/net/ipv4/ip_masq.c
@@ -880,6 +880,8 @@ static __u16 get_next_mport(void)
* Be careful, it can be called from u-space
*/
+extern int sysctl_ip_always_defrag;
+
struct ip_masq * ip_masq_new(int proto, __u32 maddr, __u16 mport, __u32 saddr, __u16 sport, __u32 daddr, __u16 dport, unsigned mflags)
{
struct ip_masq *ms, *mst;
@@ -910,6 +912,7 @@ struct ip_masq * ip_masq_new(int proto, __u32 maddr, __u16 mport, __u32 saddr, _
return NULL;
}
MOD_INC_USE_COUNT;
+ sysctl_ip_always_defrag++;
memset(ms, 0, sizeof(*ms));
INIT_LIST_HEAD(&ms->s_list);
INIT_LIST_HEAD(&ms->m_list);
@@ -1057,6 +1060,7 @@ struct ip_masq * ip_masq_new(int proto, __u32 maddr, __u16 mport, __u32 saddr, _
mport_nono:
kfree_s(ms, sizeof(*ms));
+ sysctl_ip_always_defrag--;
MOD_DEC_USE_COUNT;
return NULL;
}
@@ -2280,7 +2284,7 @@ static int ip_msqhst_procinfo(char *buffer, char **start, off_t offset,
* nor cli() 8)
*/
- sprintf(temp,"%s %08lX:%04X %08lX:%04X %04X %08X %6d %6d %7lu",
+ sprintf(temp,"%s %08X:%04X %08X:%04X %04X %08X %6d %6d %7lu",
masq_proto_name(ms->protocol),
ntohl(ms->saddr), ntohs(ms->sport),
ntohl(ms->daddr), ntohs(ms->dport),