|
@@ -1361,36 +1361,29 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, const struct flowi *fl,
|
|
struct net *net = xp_net(policy);
|
|
struct net *net = xp_net(policy);
|
|
int nx;
|
|
int nx;
|
|
int i, error;
|
|
int i, error;
|
|
- xfrm_address_t *daddr = xfrm_flowi_daddr(fl, family);
|
|
|
|
- xfrm_address_t *saddr = xfrm_flowi_saddr(fl, family);
|
|
|
|
xfrm_address_t tmp;
|
|
xfrm_address_t tmp;
|
|
|
|
|
|
for (nx = 0, i = 0; i < policy->xfrm_nr; i++) {
|
|
for (nx = 0, i = 0; i < policy->xfrm_nr; i++) {
|
|
struct xfrm_state *x;
|
|
struct xfrm_state *x;
|
|
- xfrm_address_t *remote = daddr;
|
|
|
|
- xfrm_address_t *local = saddr;
|
|
|
|
|
|
+ xfrm_address_t *local;
|
|
|
|
+ xfrm_address_t *remote;
|
|
struct xfrm_tmpl *tmpl = &policy->xfrm_vec[i];
|
|
struct xfrm_tmpl *tmpl = &policy->xfrm_vec[i];
|
|
|
|
|
|
- if (tmpl->mode == XFRM_MODE_TUNNEL ||
|
|
|
|
- tmpl->mode == XFRM_MODE_BEET) {
|
|
|
|
- remote = &tmpl->id.daddr;
|
|
|
|
- local = &tmpl->saddr;
|
|
|
|
- if (xfrm_addr_any(local, tmpl->encap_family)) {
|
|
|
|
- error = xfrm_get_saddr(net, fl->flowi_oif,
|
|
|
|
- &tmp, remote,
|
|
|
|
- tmpl->encap_family, 0);
|
|
|
|
- if (error)
|
|
|
|
- goto fail;
|
|
|
|
- local = &tmp;
|
|
|
|
- }
|
|
|
|
|
|
+ remote = &tmpl->id.daddr;
|
|
|
|
+ local = &tmpl->saddr;
|
|
|
|
+ if (xfrm_addr_any(local, tmpl->encap_family)) {
|
|
|
|
+ error = xfrm_get_saddr(net, fl->flowi_oif,
|
|
|
|
+ &tmp, remote,
|
|
|
|
+ tmpl->encap_family, 0);
|
|
|
|
+ if (error)
|
|
|
|
+ goto fail;
|
|
|
|
+ local = &tmp;
|
|
}
|
|
}
|
|
|
|
|
|
x = xfrm_state_find(remote, local, fl, tmpl, policy, &error, family);
|
|
x = xfrm_state_find(remote, local, fl, tmpl, policy, &error, family);
|
|
|
|
|
|
if (x && x->km.state == XFRM_STATE_VALID) {
|
|
if (x && x->km.state == XFRM_STATE_VALID) {
|
|
xfrm[nx++] = x;
|
|
xfrm[nx++] = x;
|
|
- daddr = remote;
|
|
|
|
- saddr = local;
|
|
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
if (x) {
|
|
if (x) {
|