Skip to content

Commit

Permalink
[IPSEC]: Add xfrm_state_afinfo->init_flags
Browse files Browse the repository at this point in the history
This patch adds the xfrm_state_afinfo->init_flags hook which allows
each address family to perform any common initialisation that does
not require a corresponding destructor call.

It will be used subsequently to set the XFRM_STATE_NOPMTUDISC flag
in IPv4.

It also fixes up the error codes returned by xfrm_init_state.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: James Morris <jmorris@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Herbert Xu authored and David S. Miller committed Jun 20, 2005
1 parent 72cb696 commit d094cd8
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
1 change: 1 addition & 0 deletions include/net/xfrm.h
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ struct xfrm_state_afinfo {
rwlock_t lock;
struct list_head *state_bydst;
struct list_head *state_byspi;
int (*init_flags)(struct xfrm_state *x);
void (*init_tempsel)(struct xfrm_state *x, struct flowi *fl,
struct xfrm_tmpl *tmpl,
xfrm_address_t *daddr, xfrm_address_t *saddr);
Expand Down
20 changes: 18 additions & 2 deletions net/xfrm/xfrm_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -1058,10 +1058,26 @@ EXPORT_SYMBOL(xfrm_state_mtu);

int xfrm_init_state(struct xfrm_state *x)
{
struct xfrm_state_afinfo *afinfo;
int family = x->props.family;
int err;

err = -ENOENT;
x->type = xfrm_get_type(x->id.proto, x->props.family);
err = -EAFNOSUPPORT;
afinfo = xfrm_state_get_afinfo(family);
if (!afinfo)
goto error;

err = 0;
if (afinfo->init_flags)
err = afinfo->init_flags(x);

xfrm_state_put_afinfo(afinfo);

if (err)
goto error;

err = -EPROTONOSUPPORT;
x->type = xfrm_get_type(x->id.proto, family);
if (x->type == NULL)
goto error;

Expand Down

0 comments on commit d094cd8

Please sign in to comment.