Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
2ab3b6f8
Commit
2ab3b6f8
authored
May 11, 2003
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5
into kernel.bkbits.net:/home/davem/net-2.5
parents
5f2d71d6
e2ee1b88
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
16 deletions
+16
-16
net/ipv4/netfilter/ip_fw_compat_masq.c
net/ipv4/netfilter/ip_fw_compat_masq.c
+7
-15
net/ipv4/netfilter/ip_nat_core.c
net/ipv4/netfilter/ip_nat_core.c
+6
-1
net/ipv4/protocol.c
net/ipv4/protocol.c
+1
-0
net/ipv6/protocol.c
net/ipv6/protocol.c
+2
-0
No files found.
net/ipv4/netfilter/ip_fw_compat_masq.c
View file @
2ab3b6f8
...
...
@@ -35,16 +35,15 @@
unsigned
int
do_masquerade
(
struct
sk_buff
**
pskb
,
const
struct
net_device
*
dev
)
{
struct
iphdr
*
iph
=
(
*
pskb
)
->
nh
.
iph
;
struct
ip_nat_info
*
info
;
enum
ip_conntrack_info
ctinfo
;
struct
ip_conntrack
*
ct
;
unsigned
int
ret
;
/* Sorry, only ICMP, TCP and UDP. */
if
(
iph
->
protocol
!=
IPPROTO_ICMP
&&
iph
->
protocol
!=
IPPROTO_TCP
&&
iph
->
protocol
!=
IPPROTO_UDP
)
if
(
(
*
pskb
)
->
nh
.
iph
->
protocol
!=
IPPROTO_ICMP
&&
(
*
pskb
)
->
nh
.
iph
->
protocol
!=
IPPROTO_TCP
&&
(
*
pskb
)
->
nh
.
iph
->
protocol
!=
IPPROTO_UDP
)
return
NF_DROP
;
/* Feed it to connection tracking; in fact we're in NF_IP_FORWARD,
...
...
@@ -68,7 +67,7 @@ do_masquerade(struct sk_buff **pskb, const struct net_device *dev)
/* Setup the masquerade, if not already */
if
(
!
info
->
initialized
)
{
u_int32_t
newsrc
;
struct
flowi
fl
=
{
.
nl_u
=
{
.
ip4_u
=
{
.
daddr
=
iph
->
daddr
}
}
};
struct
flowi
fl
=
{
.
nl_u
=
{
.
ip4_u
=
{
.
daddr
=
(
*
pskb
)
->
nh
.
iph
->
daddr
}
}
};
struct
rtable
*
rt
;
struct
ip_nat_multi_range
range
;
...
...
@@ -124,19 +123,18 @@ unsigned int
check_for_demasq
(
struct
sk_buff
**
pskb
)
{
struct
ip_conntrack_tuple
tuple
;
struct
iphdr
*
iph
=
(
*
pskb
)
->
nh
.
iph
;
struct
ip_conntrack_protocol
*
protocol
;
struct
ip_conntrack_tuple_hash
*
h
;
enum
ip_conntrack_info
ctinfo
;
struct
ip_conntrack
*
ct
;
int
ret
;
protocol
=
ip_ct_find_proto
(
iph
->
protocol
);
protocol
=
ip_ct_find_proto
(
(
*
pskb
)
->
nh
.
iph
->
protocol
);
/* We don't feed packets to conntrack system unless we know
they're part of an connection already established by an
explicit masq command. */
switch
(
iph
->
protocol
)
{
switch
(
(
*
pskb
)
->
nh
.
iph
->
protocol
)
{
case
IPPROTO_ICMP
:
/* ICMP errors. */
ct
=
icmp_error_track
(
*
pskb
,
&
ctinfo
,
NF_IP_PRE_ROUTING
);
...
...
@@ -146,12 +144,6 @@ check_for_demasq(struct sk_buff **pskb)
server here (== DNAT). Do SNAT icmp manips
in POST_ROUTING handling. */
if
(
CTINFO2DIR
(
ctinfo
)
==
IP_CT_DIR_REPLY
)
{
/* FIXME: Remove once NAT handled non-linear.
*/
if
(
skb_is_nonlinear
(
*
pskb
)
&&
skb_linearize
(
*
pskb
,
GFP_ATOMIC
)
!=
0
)
return
NF_DROP
;
icmp_reply_translation
(
pskb
,
ct
,
NF_IP_PRE_ROUTING
,
CTINFO2DIR
(
ctinfo
));
...
...
@@ -166,7 +158,7 @@ check_for_demasq(struct sk_buff **pskb)
case
IPPROTO_UDP
:
IP_NF_ASSERT
(((
*
pskb
)
->
nh
.
iph
->
frag_off
&
htons
(
IP_OFFSET
))
==
0
);
if
(
!
get_tuple
(
iph
,
*
pskb
,
iph
->
ihl
*
4
,
&
tuple
,
protocol
))
{
if
(
!
get_tuple
(
(
*
pskb
)
->
nh
.
iph
,
*
pskb
,
(
*
pskb
)
->
nh
.
iph
->
ihl
*
4
,
&
tuple
,
protocol
))
{
if
(
net_ratelimit
())
printk
(
"ip_fw_compat_masq: Can't get tuple
\n
"
);
return
NF_ACCEPT
;
...
...
net/ipv4/netfilter/ip_nat_core.c
View file @
2ab3b6f8
...
...
@@ -717,10 +717,13 @@ manip_pkt(u_int16_t proto,
iph
=
(
void
*
)(
*
pskb
)
->
data
+
iphdroff
;
/* Manipulate protcol part. */
if
(
!
find_nat_proto
(
proto
)
->
manip_pkt
(
pskb
,
iphdroff
+
iph
->
ihl
*
4
,
if
(
!
find_nat_proto
(
proto
)
->
manip_pkt
(
pskb
,
iphdroff
+
iph
->
ihl
*
4
,
manip
,
maniptype
))
return
0
;
iph
=
(
void
*
)(
*
pskb
)
->
data
+
iphdroff
;
if
(
maniptype
==
IP_NAT_MANIP_SRC
)
{
iph
->
check
=
ip_nat_cheat_check
(
~
iph
->
saddr
,
manip
->
ip
,
iph
->
check
);
...
...
@@ -953,6 +956,8 @@ icmp_reply_translation(struct sk_buff **pskb,
hdrlen
=
(
*
pskb
)
->
nh
.
iph
->
ihl
*
4
;
inside
=
(
void
*
)(
*
pskb
)
->
data
+
(
*
pskb
)
->
nh
.
iph
->
ihl
*
4
;
inside
->
icmp
.
checksum
=
0
;
inside
->
icmp
.
checksum
=
csum_fold
(
skb_checksum
(
*
pskb
,
hdrlen
,
(
*
pskb
)
->
len
-
hdrlen
,
...
...
net/ipv4/protocol.c
View file @
2ab3b6f8
...
...
@@ -91,6 +91,7 @@ int inet_del_protocol(struct inet_protocol *prot, unsigned char protocol)
}
spin_unlock_bh
(
&
inet_proto_lock
);
synchronize_net
();
return
ret
;
}
net/ipv6/protocol.c
View file @
2ab3b6f8
...
...
@@ -80,5 +80,7 @@ int inet6_del_protocol(struct inet6_protocol *prot, unsigned char protocol)
spin_unlock_bh
(
&
inet6_proto_lock
);
synchronize_net
();
return
ret
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment