Commit d3d6dd3a authored by Masahide NAKAMURA's avatar Masahide NAKAMURA Committed by David S. Miller
Browse files

[XFRM]: Add module alias for transformation type. 



It is clean-up for XFRM type modules and adds aliases with its
protocol:
 ESP, AH, IPCOMP, IPIP and IPv6 for IPsec
 ROUTING and DSTOPTS for MIPv6

It is almost the same thing as XFRM mode alias, but it is added
new defines XFRM_PROTO_XXX for preprocessing since some protocols
are defined as enum.

Signed-off-by: default avatarMasahide NAKAMURA <nakam@linux-ipv6.org>
Acked-by: default avatarIngo Oeser <netdev@axxeo.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59fbb3a6

include/net/xfrm.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -19,9 +19,19 @@ 
#include <net/ipv6.h>

#include <net/ipv6.h>

#include <net/ip6_fib.h>

#include <net/ip6_fib.h>





#define XFRM_PROTO_ESP		50

#define XFRM_PROTO_AH		51

#define XFRM_PROTO_COMP		108

#define XFRM_PROTO_IPIP		4

#define XFRM_PROTO_IPV6		41

#define XFRM_PROTO_ROUTING	IPPROTO_ROUTING

#define XFRM_PROTO_DSTOPTS	IPPROTO_DSTOPTS



#define XFRM_ALIGN8(len)	(((len) + 7) & ~7)

#define XFRM_ALIGN8(len)	(((len) + 7) & ~7)

#define MODULE_ALIAS_XFRM_MODE(family, encap) \

#define MODULE_ALIAS_XFRM_MODE(family, encap) \

	MODULE_ALIAS("xfrm-mode-" __stringify(family) "-" __stringify(encap))

	MODULE_ALIAS("xfrm-mode-" __stringify(family) "-" __stringify(encap))

#define MODULE_ALIAS_XFRM_TYPE(family, proto) \

	MODULE_ALIAS("xfrm-type-" __stringify(family) "-" __stringify(proto))





extern struct sock *xfrm_nl;

extern struct sock *xfrm_nl;

extern u32 sysctl_xfrm_aevent_etime;

extern u32 sysctl_xfrm_aevent_etime;

net/ipv4/ah4.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -339,3 +339,4 @@ static void __exit ah4_fini(void) 
module_init(ah4_init);

module_init(ah4_init);

module_exit(ah4_fini);

module_exit(ah4_fini);

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_AH);

net/ipv4/esp4.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -481,3 +481,4 @@ static void __exit esp4_fini(void) 
module_init(esp4_init);

module_init(esp4_init);

module_exit(esp4_fini);

module_exit(esp4_fini);

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_ESP);

net/ipv4/ipcomp.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -485,3 +485,4 @@ MODULE_LICENSE("GPL"); 
MODULE_DESCRIPTION("IP Payload Compression Protocol (IPComp) - RFC3173");

MODULE_DESCRIPTION("IP Payload Compression Protocol (IPComp) - RFC3173");

MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>");

MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>");





MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_COMP);

net/ipv4/xfrm4_tunnel.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -109,3 +109,4 @@ static void __exit ipip_fini(void) 
module_init(ipip_init);

module_init(ipip_init);

module_exit(ipip_fini);

module_exit(ipip_fini);

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_ALIAS_XFRM_TYPE(AF_INET, XFRM_PROTO_IPIP);

CRA Git | Maintained and supported by SUSTech CRA and CCSE