udp_tunnel: Seperate ipv6 functions into its own file.

Add ip6_udp_tunnel.c for ipv6 UDP tunnel functions to avoid ifdefs
in udp_tunnel.c

Signed-off-by: Andy Zhou <azhou@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h
index ffd69cbded3529717d4d5567a804c5dd952502de..0b9e017c9038d1efea3e02523e4d08d4f75db59f 100644 (file)
--- a/include/net/udp_tunnel.h
+++ b/include/net/udp_tunnel.h
@@ -26,7 +26,31 @@ struct udp_port_cfg {
                                use_udp6_rx_checksums:1;
 };
 
-int udp_sock_create(struct net *net, struct udp_port_cfg *cfg,
-                   struct socket **sockp);
+int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg,
+                    struct socket **sockp);
+
+#if IS_ENABLED(CONFIG_IPV6)
+int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
+                    struct socket **sockp);
+#else
+static inline int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
+                                  struct socket **sockp)
+{
+       return 0;
+}
+#endif
+
+static inline int udp_sock_create(struct net *net,
+                                 struct udp_port_cfg *cfg,
+                                 struct socket **sockp)
+{
+       if (cfg->family == AF_INET)
+               return udp_sock_create4(net, cfg, sockp);
+
+       if (cfg->family == AF_INET6)
+               return udp_sock_create6(net, cfg, sockp);
+
+       return -EPFNOSUPPORT;
+}
 
 #endif

diff --git a/net/ipv4/udp_tunnel.c b/net/ipv4/udp_tunnel.c
index 61ec1a65207efe07155f4e259a31659d3d183f9d..7fccf6c3417a16267f7849588219b6b2abf2f608 100644 (file)
--- a/net/ipv4/udp_tunnel.c
+++ b/net/ipv4/udp_tunnel.c
@@ -8,83 +8,40 @@
 #include <net/udp_tunnel.h>
 #include <net/net_namespace.h>
 
-int udp_sock_create(struct net *net, struct udp_port_cfg *cfg,
-                   struct socket **sockp)
+int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg,
+                    struct socket **sockp)
 {
        int err = -EINVAL;
        struct socket *sock = NULL;
+       struct sockaddr_in udp_addr;
 
-#if IS_ENABLED(CONFIG_IPV6)
-       if (cfg->family == AF_INET6) {
-               struct sockaddr_in6 udp6_addr;
+       err = sock_create_kern(AF_INET, SOCK_DGRAM, 0, &sock);
+       if (err < 0)
+               goto error;
 
-               err = sock_create_kern(AF_INET6, SOCK_DGRAM, 0, &sock);
-               if (err < 0)
-                       goto error;
-
-               sk_change_net(sock->sk, net);
-
-               udp6_addr.sin6_family = AF_INET6;
-               memcpy(&udp6_addr.sin6_addr, &cfg->local_ip6,
-                      sizeof(udp6_addr.sin6_addr));
-               udp6_addr.sin6_port = cfg->local_udp_port;
-               err = kernel_bind(sock, (struct sockaddr *)&udp6_addr,
-                                 sizeof(udp6_addr));
-               if (err < 0)
-                       goto error;
-
-               if (cfg->peer_udp_port) {
-                       udp6_addr.sin6_family = AF_INET6;
-                       memcpy(&udp6_addr.sin6_addr, &cfg->peer_ip6,
-                              sizeof(udp6_addr.sin6_addr));
-                       udp6_addr.sin6_port = cfg->peer_udp_port;
-                       err = kernel_connect(sock,
-                                            (struct sockaddr *)&udp6_addr,
-                                            sizeof(udp6_addr), 0);
-               }
-               if (err < 0)
-                       goto error;
-
-               udp_set_no_check6_tx(sock->sk, !cfg->use_udp6_tx_checksums);
-               udp_set_no_check6_rx(sock->sk, !cfg->use_udp6_rx_checksums);
-       } else
-#endif
-       if (cfg->family == AF_INET) {
-               struct sockaddr_in udp_addr;
-
-               err = sock_create_kern(AF_INET, SOCK_DGRAM, 0, &sock);
-               if (err < 0)
-                       goto error;
+       sk_change_net(sock->sk, net);
 
-               sk_change_net(sock->sk, net);
+       udp_addr.sin_family = AF_INET;
+       udp_addr.sin_addr = cfg->local_ip;
+       udp_addr.sin_port = cfg->local_udp_port;
+       err = kernel_bind(sock, (struct sockaddr *)&udp_addr,
+                         sizeof(udp_addr));
+       if (err < 0)
+               goto error;
 
+       if (cfg->peer_udp_port) {
                udp_addr.sin_family = AF_INET;
-               udp_addr.sin_addr = cfg->local_ip;
-               udp_addr.sin_port = cfg->local_udp_port;
-               err = kernel_bind(sock, (struct sockaddr *)&udp_addr,
-                                 sizeof(udp_addr));
+               udp_addr.sin_addr = cfg->peer_ip;
+               udp_addr.sin_port = cfg->peer_udp_port;
+               err = kernel_connect(sock, (struct sockaddr *)&udp_addr,
+                                    sizeof(udp_addr), 0);
                if (err < 0)
                        goto error;
-
-               if (cfg->peer_udp_port) {
-                       udp_addr.sin_family = AF_INET;
-                       udp_addr.sin_addr = cfg->peer_ip;
-                       udp_addr.sin_port = cfg->peer_udp_port;
-                       err = kernel_connect(sock,
-                                            (struct sockaddr *)&udp_addr,
-                                            sizeof(udp_addr), 0);
-                       if (err < 0)
-                               goto error;
-               }
-
-               sock->sk->sk_no_check_tx = !cfg->use_udp_checksums;
-       } else {
-               return -EPFNOSUPPORT;
        }
 
+       sock->sk->sk_no_check_tx = !cfg->use_udp_checksums;
 
        *sockp = sock;
-
        return 0;
 
 error:
@@ -95,6 +52,6 @@ error:
        *sockp = NULL;
        return err;
 }
-EXPORT_SYMBOL(udp_sock_create);
+EXPORT_SYMBOL(udp_sock_create4);
 
 MODULE_LICENSE("GPL");

diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile
index 2fe68364bb20610c39f20a21b4d32498ff5741d1..45f830e5f82001ff95f492776937c39cfe897873 100644 (file)
--- a/net/ipv6/Makefile
+++ b/net/ipv6/Makefile
@@ -35,6 +35,7 @@ obj-$(CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION) += xfrm6_mode_ro.o
 obj-$(CONFIG_INET6_XFRM_MODE_BEET) += xfrm6_mode_beet.o
 obj-$(CONFIG_IPV6_MIP6) += mip6.o
 obj-$(CONFIG_NETFILTER)        += netfilter/
+obj-$(CONFIG_NET_UDP_TUNNEL) += ip6_udp_tunnel.o
 
 obj-$(CONFIG_IPV6_VTI) += ip6_vti.o
 obj-$(CONFIG_IPV6_SIT) += sit.o

diff --git a/net/ipv6/ip6_udp_tunnel.c b/net/ipv6/ip6_udp_tunnel.c
new file mode 100644 (file)
index 0000000..bcfbb4b
--- /dev/null
+++ b/net/ipv6/ip6_udp_tunnel.c
@@ -0,0 +1,63 @@
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/socket.h>
+#include <linux/udp.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/in6.h>
+#include <net/udp.h>
+#include <net/udp_tunnel.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
+#include <net/ip6_tunnel.h>
+#include <net/ip6_checksum.h>
+
+int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
+                    struct socket **sockp)
+{
+       struct sockaddr_in6 udp6_addr;
+       int err;
+       struct socket *sock = NULL;
+
+       err = sock_create_kern(AF_INET6, SOCK_DGRAM, 0, &sock);
+       if (err < 0)
+               goto error;
+
+       sk_change_net(sock->sk, net);
+
+       udp6_addr.sin6_family = AF_INET6;
+       memcpy(&udp6_addr.sin6_addr, &cfg->local_ip6,
+              sizeof(udp6_addr.sin6_addr));
+       udp6_addr.sin6_port = cfg->local_udp_port;
+       err = kernel_bind(sock, (struct sockaddr *)&udp6_addr,
+                         sizeof(udp6_addr));
+       if (err < 0)
+               goto error;
+
+       if (cfg->peer_udp_port) {
+               udp6_addr.sin6_family = AF_INET6;
+               memcpy(&udp6_addr.sin6_addr, &cfg->peer_ip6,
+                      sizeof(udp6_addr.sin6_addr));
+               udp6_addr.sin6_port = cfg->peer_udp_port;
+               err = kernel_connect(sock,
+                                    (struct sockaddr *)&udp6_addr,
+                                    sizeof(udp6_addr), 0);
+       }
+       if (err < 0)
+               goto error;
+
+       udp_set_no_check6_tx(sock->sk, !cfg->use_udp6_tx_checksums);
+       udp_set_no_check6_rx(sock->sk, !cfg->use_udp6_rx_checksums);
+
+       *sockp = sock;
+       return 0;
+
+error:
+       if (sock) {
+               kernel_sock_shutdown(sock, SHUT_RDWR);
+               sk_release_kernel(sock->sk);
+       }
+       *sockp = NULL;
+       return err;
+}
+EXPORT_SYMBOL_GPL(udp_sock_create6);