From: Alexey Dobriyan <adobriyan@gmail.com>
To: davem@davemloft.net
Cc: herbert@gondor.apana.org.au, kuznet@ms2.inr.ac.ru,
netdev@vger.kernel.org, containers@lists.linux-foundation.org,
Alexey Dobriyan <adobriyan@gmail.com>
Subject: [PATCH 45/53] netns xfrm: ->get_saddr in netns
Date: Tue, 25 Nov 2008 20:27:17 +0300 [thread overview]
Message-ID: <1227634045-27534-45-git-send-email-adobriyan@gmail.com> (raw)
In-Reply-To: <1227634045-27534-44-git-send-email-adobriyan@gmail.com>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
include/net/xfrm.h | 2 +-
net/ipv4/xfrm4_policy.c | 5 +++--
net/ipv6/xfrm6_policy.c | 5 +++--
net/xfrm/xfrm_policy.c | 7 ++++---
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index b16d4c0..d076f3d 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -269,7 +269,7 @@ struct xfrm_policy_afinfo {
struct dst_entry *(*dst_lookup)(struct net *net, int tos,
xfrm_address_t *saddr,
xfrm_address_t *daddr);
- int (*get_saddr)(xfrm_address_t *saddr, xfrm_address_t *daddr);
+ int (*get_saddr)(struct net *net, xfrm_address_t *saddr, xfrm_address_t *daddr);
struct dst_entry *(*find_bundle)(struct flowi *fl, struct xfrm_policy *policy);
void (*decode_session)(struct sk_buff *skb,
struct flowi *fl,
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index e1cf9ed..2ad24ba 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -44,12 +44,13 @@ static struct dst_entry *xfrm4_dst_lookup(struct net *net, int tos,
return dst;
}
-static int xfrm4_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr)
+static int xfrm4_get_saddr(struct net *net,
+ xfrm_address_t *saddr, xfrm_address_t *daddr)
{
struct dst_entry *dst;
struct rtable *rt;
- dst = xfrm4_dst_lookup(&init_net, 0, NULL, daddr);
+ dst = xfrm4_dst_lookup(net, 0, NULL, daddr);
if (IS_ERR(dst))
return -EHOSTUNREACH;
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index d7a5b8b..97ab068 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -50,12 +50,13 @@ static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos,
return dst;
}
-static int xfrm6_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr)
+static int xfrm6_get_saddr(struct net *net,
+ xfrm_address_t *saddr, xfrm_address_t *daddr)
{
struct dst_entry *dst;
struct net_device *dev;
- dst = xfrm6_dst_lookup(&init_net, 0, NULL, daddr);
+ dst = xfrm6_dst_lookup(net, 0, NULL, daddr);
if (IS_ERR(dst))
return -EHOSTUNREACH;
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 2b0a80b..7c7bb54 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1187,7 +1187,7 @@ int __xfrm_sk_clone_policy(struct sock *sk)
}
static int
-xfrm_get_saddr(xfrm_address_t *local, xfrm_address_t *remote,
+xfrm_get_saddr(struct net *net, xfrm_address_t *local, xfrm_address_t *remote,
unsigned short family)
{
int err;
@@ -1195,7 +1195,7 @@ xfrm_get_saddr(xfrm_address_t *local, xfrm_address_t *remote,
if (unlikely(afinfo == NULL))
return -EINVAL;
- err = afinfo->get_saddr(local, remote);
+ err = afinfo->get_saddr(net, local, remote);
xfrm_policy_put_afinfo(afinfo);
return err;
}
@@ -1207,6 +1207,7 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, struct flowi *fl,
struct xfrm_state **xfrm,
unsigned short family)
{
+ struct net *net = xp_net(policy);
int nx;
int i, error;
xfrm_address_t *daddr = xfrm_flowi_daddr(fl, family);
@@ -1225,7 +1226,7 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, struct flowi *fl,
local = &tmpl->saddr;
family = tmpl->encap_family;
if (xfrm_addr_any(local, family)) {
- error = xfrm_get_saddr(&tmp, remote, family);
+ error = xfrm_get_saddr(net, &tmp, remote, family);
if (error)
goto fail;
local = &tmp;
--
1.5.6.5
next prev parent reply other threads:[~2008-11-25 17:25 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-25 17:26 [PATCH 01/53] xfrm: initialise xfrm_policy_gc_work statically Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 02/53] netns xfrm: add netns boilerplate Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 03/53] netns xfrm: add struct xfrm_state::xs_net Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 04/53] netns xfrm: per-netns xfrm_state_all list Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 05/53] netns xfrm: per-netns xfrm_state_bydst hash Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 06/53] netns xfrm: per-netns xfrm_state_bysrc hash Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 07/53] netns xfrm: per-netns xfrm_state_byspi hash Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 08/53] netns xfrm: per-netns xfrm_state_hmask Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 09/53] netns xfrm: per-netns xfrm_state counts Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 10/53] netns xfrm: per-netns xfrm_hash_work Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 11/53] netns xfrm: per-netns state GC list Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 12/53] netns xfrm: per-netns state GC work Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 13/53] netns xfrm: per-netns km_waitq Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 14/53] netns xfrm: add struct xfrm_policy::xp_net Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 15/53] netns xfrm: per-netns policy list Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 16/53] netns xfrm: per-netns xfrm_policy_byidx hash Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 17/53] netns xfrm: per-netns xfrm_policy_byidx hashmask Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 18/53] netns xfrm: per-netns inexact policies Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 19/53] netns xfrm: per-netns xfrm_policy_bydst hash Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 20/53] netns xfrm: per-netns policy counts Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 21/53] netns xfrm: per-netns policy hash resizing work Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 22/53] netns xfrm: propagate netns into bydst/bysrc/byspi hash functions Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 23/53] netns xfrm: trivial netns propagations Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 24/53] netns xfrm: state flush in netns Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 25/53] netns xfrm: state lookup " Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 26/53] netns xfrm: fixup xfrm_alloc_spi() Alexey Dobriyan
2008-11-25 17:26 ` [PATCH 27/53] netns xfrm: finding states in netns Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 28/53] netns xfrm: state walking " Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 29/53] netns xfrm: propagate netns into policy byidx hash Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 30/53] netns xfrm: policy insertion in netns Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 31/53] netns xfrm: policy flushing " Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 32/53] netns xfrm: finding policy " Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 33/53] netns xfrm: policy walking " Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 34/53] netns xfrm: lookup " Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 35/53] netns xfrm: xfrm_policy_check " Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 36/53] netns xfrm: xfrm_route_forward() " Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 37/53] netns xfrm: flushing/pruning bundles " Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 38/53] netns xfrm: dst garbage-collecting " Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 39/53] netns xfrm: xfrm_input() fixup Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 40/53] netns xfrm: per-netns NETLINK_XFRM socket Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 41/53] netns xfrm: xfrm_user module in netns Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 42/53] netns xfrm: pass netns with KM notifications Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 43/53] netns xfrm: KM reporting in netns Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 44/53] netns xfrm: ->dst_lookup " Alexey Dobriyan
2008-11-25 17:27 ` Alexey Dobriyan [this message]
2008-11-25 17:27 ` [PATCH 46/53] netns xfrm: flush SA/SPDs on netns stop Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 47/53] netns PF_KEY: part 1 Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 48/53] netns PF_KEY: part 2 Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 49/53] netns PF_KEY: per-netns /proc/pfkey Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 50/53] netns xfrm: AH/ESP in netns! Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 51/53] netns xfrm: per-netns MIBs Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 52/53] netns xfrm: /proc/net/xfrm_stat in netns Alexey Dobriyan
2008-11-25 17:27 ` [PATCH 53/53] netns xfrm: per-netns sysctls Alexey Dobriyan
2008-11-26 2:00 ` David Miller
2008-11-26 2:00 ` [PATCH 52/53] netns xfrm: /proc/net/xfrm_stat in netns David Miller
2008-11-26 1:59 ` [PATCH 51/53] netns xfrm: per-netns MIBs David Miller
2008-11-26 1:59 ` [PATCH 50/53] netns xfrm: AH/ESP in netns! David Miller
2008-11-26 1:59 ` [PATCH 49/53] netns PF_KEY: per-netns /proc/pfkey David Miller
2008-11-26 1:58 ` [PATCH 48/53] netns PF_KEY: part 2 David Miller
2008-11-26 1:58 ` [PATCH 47/53] netns PF_KEY: part 1 David Miller
2008-11-26 1:57 ` [PATCH 46/53] netns xfrm: flush SA/SPDs on netns stop David Miller
2008-11-26 1:56 ` [PATCH 45/53] netns xfrm: ->get_saddr in netns David Miller
2008-11-26 1:51 ` [PATCH 44/53] netns xfrm: ->dst_lookup " David Miller
2008-11-26 1:51 ` [PATCH 43/53] netns xfrm: KM reporting " David Miller
2008-11-26 1:50 ` [PATCH 42/53] netns xfrm: pass netns with KM notifications David Miller
[not found] ` <1227634045-27534-41-git-send-email-adobriyan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2008-11-26 1:50 ` [PATCH 41/53] netns xfrm: xfrm_user module in netns David Miller
2008-11-26 1:38 ` [PATCH 40/53] netns xfrm: per-netns NETLINK_XFRM socket David Miller
2008-11-26 1:38 ` [PATCH 39/53] netns xfrm: xfrm_input() fixup David Miller
2008-11-26 1:37 ` [PATCH 38/53] netns xfrm: dst garbage-collecting in netns David Miller
2008-11-26 1:36 ` [PATCH 37/53] netns xfrm: flushing/pruning bundles " David Miller
2008-11-26 1:36 ` [PATCH 36/53] netns xfrm: xfrm_route_forward() " David Miller
2008-11-26 1:35 ` [PATCH 35/53] netns xfrm: xfrm_policy_check " David Miller
2008-11-26 1:35 ` [PATCH 34/53] netns xfrm: lookup " David Miller
2008-11-26 1:34 ` [PATCH 33/53] netns xfrm: policy walking " David Miller
2008-11-26 1:34 ` [PATCH 32/53] netns xfrm: finding policy " David Miller
2008-11-26 1:33 ` [PATCH 31/53] netns xfrm: policy flushing " David Miller
2008-11-26 1:33 ` [PATCH 30/53] netns xfrm: policy insertion " David Miller
2008-11-26 1:32 ` [PATCH 29/53] netns xfrm: propagate netns into policy byidx hash David Miller
2008-11-26 1:32 ` [PATCH 28/53] netns xfrm: state walking in netns David Miller
2008-11-26 1:31 ` [PATCH 27/53] netns xfrm: finding states " David Miller
2008-11-26 1:31 ` [PATCH 26/53] netns xfrm: fixup xfrm_alloc_spi() David Miller
2008-11-26 1:30 ` [PATCH 25/53] netns xfrm: state lookup in netns David Miller
2008-11-26 1:30 ` [PATCH 24/53] netns xfrm: state flush " David Miller
2008-11-26 1:29 ` [PATCH 23/53] netns xfrm: trivial netns propagations David Miller
2008-11-26 1:29 ` [PATCH 22/53] netns xfrm: propagate netns into bydst/bysrc/byspi hash functions David Miller
2008-11-26 1:29 ` [PATCH 21/53] netns xfrm: per-netns policy hash resizing work David Miller
2008-11-26 1:24 ` [PATCH 20/53] netns xfrm: per-netns policy counts David Miller
2008-11-26 1:23 ` [PATCH 19/53] netns xfrm: per-netns xfrm_policy_bydst hash David Miller
2008-11-26 1:23 ` [PATCH 18/53] netns xfrm: per-netns inexact policies David Miller
2008-11-26 1:23 ` [PATCH 17/53] netns xfrm: per-netns xfrm_policy_byidx hashmask David Miller
2008-11-26 1:22 ` [PATCH 16/53] netns xfrm: per-netns xfrm_policy_byidx hash David Miller
2008-11-26 1:22 ` [PATCH 15/53] netns xfrm: per-netns policy list David Miller
2008-11-26 1:21 ` [PATCH 14/53] netns xfrm: add struct xfrm_policy::xp_net David Miller
2008-11-26 1:21 ` [PATCH 13/53] netns xfrm: per-netns km_waitq David Miller
2008-11-26 1:20 ` [PATCH 12/53] netns xfrm: per-netns state GC work David Miller
2008-11-26 1:20 ` [PATCH 11/53] netns xfrm: per-netns state GC list David Miller
2008-11-26 1:19 ` [PATCH 10/53] netns xfrm: per-netns xfrm_hash_work David Miller
2008-11-26 1:18 ` [PATCH 09/53] netns xfrm: per-netns xfrm_state counts David Miller
2008-11-26 1:18 ` [PATCH 08/53] netns xfrm: per-netns xfrm_state_hmask David Miller
2008-11-26 1:17 ` [PATCH 07/53] netns xfrm: per-netns xfrm_state_byspi hash David Miller
2008-11-26 1:17 ` [PATCH 06/53] netns xfrm: per-netns xfrm_state_bysrc hash David Miller
2008-11-26 1:17 ` [PATCH 05/53] netns xfrm: per-netns xfrm_state_bydst hash David Miller
2008-11-26 1:16 ` [PATCH 04/53] netns xfrm: per-netns xfrm_state_all list David Miller
2008-11-26 1:15 ` [PATCH 03/53] netns xfrm: add struct xfrm_state::xs_net David Miller
2008-11-26 4:25 ` Alexey Dobriyan
2008-11-26 1:14 ` [PATCH 02/53] netns xfrm: add netns boilerplate David Miller
2008-11-26 1:14 ` [PATCH 01/53] xfrm: initialise xfrm_policy_gc_work statically 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=1227634045-27534-45-git-send-email-adobriyan@gmail.com \
--to=adobriyan@gmail.com \
--cc=containers@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=kuznet@ms2.inr.ac.ru \
--cc=netdev@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).