leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Use sk_mark for routing lookup in more places

Browse Source 
This patch against v2.6.31 adds support for route lookup using sk_mark in some 
more places. The benefits from this patch are the following.
First, SO_MARK option now has effect on UDP sockets too.
Second, ip_queue_xmit() and inet_sk_rebuild_header() could fail to do routing 
lookup correctly if TCP sockets with SO_MARK were used.

Signed-off-by: Atis Elsts <atis@mikrotik.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
This commit is contained in:
Atis Elsts 2009-10-01 15:16:49 -07:00 committed by David S. Miller
parent 66466797c7
commit 914a9ab386
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/ipv4/af_inet.c
View File

@ -1119,6 +1119,7 @@ int inet_sk_rebuild_header(struct sock *sk)
{ {
struct flowi fl = { struct flowi fl = {
.oif = sk->sk_bound_dev_if, .oif = sk->sk_bound_dev_if,
.mark = sk->sk_mark,
.nl_u = { .nl_u = {
.ip4_u = { .ip4_u = {
.daddr = daddr, .daddr = daddr,

1
net/ipv4/ip_output.c
View File

@ -335,6 +335,7 @@ int ip_queue_xmit(struct sk_buff *skb, int ipfragok)
{ {
struct flowi fl = { .oif = sk->sk_bound_dev_if, struct flowi fl = { .oif = sk->sk_bound_dev_if,
.mark = sk->sk_mark,
.nl_u = { .ip4_u = .nl_u = { .ip4_u =
{ .daddr = daddr, { .daddr = daddr,
.saddr = inet->saddr, .saddr = inet->saddr,

1
net/ipv4/udp.c
View File

@ -696,6 +696,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
if (rt == NULL) { if (rt == NULL) {
struct flowi fl = { .oif = ipc.oif, struct flowi fl = { .oif = ipc.oif,
.mark = sk->sk_mark,
.nl_u = { .ip4_u = .nl_u = { .ip4_u =
{ .daddr = faddr, { .daddr = faddr,
.saddr = saddr, .saddr = saddr,