Commit 628529b6 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

[XFRM] Introduce standalone SAD lookup 



This allows other in-kernel functions to do SAD lookups.
The only known user at the moment is pktgen.

Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 007a531b

include/net/xfrm.h

+4 −0
Original line number Diff line number Diff line
@@ -928,6 +928,10 @@ extern struct xfrm_state *xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t 
					  struct flowi *fl, struct xfrm_tmpl *tmpl,

					  struct xfrm_policy *pol, int *err,

					  unsigned short family);

extern struct xfrm_state * xfrm_stateonly_find(xfrm_address_t *daddr,

					       xfrm_address_t *saddr,

					       unsigned short family,

					       u8 mode, u8 proto, u32 reqid);

extern int xfrm_state_check_expire(struct xfrm_state *x);

extern void xfrm_state_insert(struct xfrm_state *x);

extern int xfrm_state_add(struct xfrm_state *x);

net/xfrm/xfrm_state.c

+31 −0
Original line number Diff line number Diff line
@@ -686,6 +686,37 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, 
	return x;

}



struct xfrm_state *

xfrm_stateonly_find(xfrm_address_t *daddr, xfrm_address_t *saddr,

		    unsigned short family, u8 mode, u8 proto, u32 reqid)

{

	unsigned int h = xfrm_dst_hash(daddr, saddr, reqid, family);

	struct xfrm_state *rx = NULL, *x = NULL;

	struct hlist_node *entry;



	spin_lock(&xfrm_state_lock);

	hlist_for_each_entry(x, entry, xfrm_state_bydst+h, bydst) {

		if (x->props.family == family &&

		    x->props.reqid == reqid &&

		    !(x->props.flags & XFRM_STATE_WILDRECV) &&

		    xfrm_state_addr_check(x, daddr, saddr, family) &&

		    mode == x->props.mode &&

		    proto == x->id.proto &&

		    x->km.state == XFRM_STATE_VALID) {

			rx = x;

			break;

		}

	}



	if (rx)

		xfrm_state_hold(rx);

	spin_unlock(&xfrm_state_lock);





	return rx;

}

EXPORT_SYMBOL(xfrm_stateonly_find);



static void __xfrm_state_insert(struct xfrm_state *x)

{

	unsigned int h;