提交 d3d6dd3a 编写于 作者: M Masahide NAKAMURA 提交者: David S. Miller

[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: NMasahide NAKAMURA <nakam@linux-ipv6.org>
Acked-by: NIngo Oeser <netdev@axxeo.de>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 59fbb3a6
...@@ -19,9 +19,19 @@ ...@@ -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;
......
...@@ -339,3 +339,4 @@ static void __exit ah4_fini(void) ...@@ -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);
...@@ -481,3 +481,4 @@ static void __exit esp4_fini(void) ...@@ -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);
...@@ -485,3 +485,4 @@ MODULE_LICENSE("GPL"); ...@@ -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);
...@@ -109,3 +109,4 @@ static void __exit ipip_fini(void) ...@@ -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);
...@@ -554,3 +554,4 @@ module_init(ah6_init); ...@@ -554,3 +554,4 @@ module_init(ah6_init);
module_exit(ah6_fini); module_exit(ah6_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_AH);
...@@ -421,3 +421,4 @@ module_init(esp6_init); ...@@ -421,3 +421,4 @@ module_init(esp6_init);
module_exit(esp6_fini); module_exit(esp6_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_ESP);
...@@ -500,4 +500,4 @@ MODULE_LICENSE("GPL"); ...@@ -500,4 +500,4 @@ MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("IP Payload Compression Protocol (IPComp) for IPv6 - RFC3173"); MODULE_DESCRIPTION("IP Payload Compression Protocol (IPComp) for IPv6 - RFC3173");
MODULE_AUTHOR("Mitsuru KANDA <mk@linux-ipv6.org>"); MODULE_AUTHOR("Mitsuru KANDA <mk@linux-ipv6.org>");
MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_COMP);
...@@ -514,3 +514,5 @@ module_init(mip6_init); ...@@ -514,3 +514,5 @@ module_init(mip6_init);
module_exit(mip6_fini); module_exit(mip6_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_DSTOPTS);
MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_ROUTING);
...@@ -379,3 +379,4 @@ static void __exit xfrm6_tunnel_fini(void) ...@@ -379,3 +379,4 @@ static void __exit xfrm6_tunnel_fini(void)
module_init(xfrm6_tunnel_init); module_init(xfrm6_tunnel_init);
module_exit(xfrm6_tunnel_fini); module_exit(xfrm6_tunnel_fini);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_IPV6);
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册