Skip to content

Commit fd38441

Browse files
azhou-niciradavem330
azhou-nicira
authored and
davem330
committed
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>
1 parent 79ba2b4 commit fd38441

File tree

4 files changed

+111
-66
lines changed

4 files changed

+111
-66
lines changed

‎include/net/udp_tunnel.h‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,31 @@ struct udp_port_cfg {
2626
use_udp6_rx_checksums:1;
2727
};
2828

29-
int udp_sock_create(struct net *net, struct udp_port_cfg *cfg,
30-
struct socket **sockp);
29+
int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg,
30+
struct socket **sockp);
31+
32+
#if IS_ENABLED(CONFIG_IPV6)
33+
int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
34+
struct socket **sockp);
35+
#else
36+
static inline int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
37+
struct socket **sockp)
38+
{
39+
return 0;
40+
}
41+
#endif
42+
43+
static inline int udp_sock_create(struct net *net,
44+
struct udp_port_cfg *cfg,
45+
struct socket **sockp)
46+
{
47+
if (cfg->family == AF_INET)
48+
return udp_sock_create4(net, cfg, sockp);
49+
50+
if (cfg->family == AF_INET6)
51+
return udp_sock_create6(net, cfg, sockp);
52+
53+
return -EPFNOSUPPORT;
54+
}
3155

3256
#endif

‎net/ipv4/udp_tunnel.c‎

Lines changed: 21 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -8,83 +8,40 @@
88
#include <net/udp_tunnel.h>
99
#include <net/net_namespace.h>
1010

11-
int udp_sock_create(struct net *net, struct udp_port_cfg *cfg,
12-
struct socket **sockp)
11+
int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg,
12+
struct socket **sockp)
1313
{
1414
int err = -EINVAL;
1515
struct socket *sock = NULL;
16+
struct sockaddr_in udp_addr;
1617

17-
#if IS_ENABLED(CONFIG_IPV6)
18-
if (cfg->family == AF_INET6) {
19-
struct sockaddr_in6 udp6_addr;
18+
err = sock_create_kern(AF_INET, SOCK_DGRAM, 0, &sock);
19+
if (err < 0)
20+
goto error;
2021

21-
err = sock_create_kern(AF_INET6, SOCK_DGRAM, 0, &sock);
22-
if (err < 0)
23-
goto error;
24-
25-
sk_change_net(sock->sk, net);
26-
27-
udp6_addr.sin6_family = AF_INET6;
28-
memcpy(&udp6_addr.sin6_addr, &cfg->local_ip6,
29-
sizeof(udp6_addr.sin6_addr));
30-
udp6_addr.sin6_port = cfg->local_udp_port;
31-
err = kernel_bind(sock, (struct sockaddr *)&udp6_addr,
32-
sizeof(udp6_addr));
33-
if (err < 0)
34-
goto error;
35-
36-
if (cfg->peer_udp_port) {
37-
udp6_addr.sin6_family = AF_INET6;
38-
memcpy(&udp6_addr.sin6_addr, &cfg->peer_ip6,
39-
sizeof(udp6_addr.sin6_addr));
40-
udp6_addr.sin6_port = cfg->peer_udp_port;
41-
err = kernel_connect(sock,
42-
(struct sockaddr *)&udp6_addr,
43-
sizeof(udp6_addr), 0);
44-
}
45-
if (err < 0)
46-
goto error;
47-
48-
udp_set_no_check6_tx(sock->sk, !cfg->use_udp6_tx_checksums);
49-
udp_set_no_check6_rx(sock->sk, !cfg->use_udp6_rx_checksums);
50-
} else
51-
#endif
52-
if (cfg->family == AF_INET) {
53-
struct sockaddr_in udp_addr;
54-
55-
err = sock_create_kern(AF_INET, SOCK_DGRAM, 0, &sock);
56-
if (err < 0)
57-
goto error;
22+
sk_change_net(sock->sk, net);
5823

59-
sk_change_net(sock->sk, net);
24+
udp_addr.sin_family = AF_INET;
25+
udp_addr.sin_addr = cfg->local_ip;
26+
udp_addr.sin_port = cfg->local_udp_port;
27+
err = kernel_bind(sock, (struct sockaddr *)&udp_addr,
28+
sizeof(udp_addr));
29+
if (err < 0)
30+
goto error;
6031

32+
if (cfg->peer_udp_port) {
6133
udp_addr.sin_family = AF_INET;
62-
udp_addr.sin_addr = cfg->local_ip;
63-
udp_addr.sin_port = cfg->local_udp_port;
64-
err = kernel_bind(sock, (struct sockaddr *)&udp_addr,
65-
sizeof(udp_addr));
34+
udp_addr.sin_addr = cfg->peer_ip;
35+
udp_addr.sin_port = cfg->peer_udp_port;
36+
err = kernel_connect(sock, (struct sockaddr *)&udp_addr,
37+
sizeof(udp_addr), 0);
6638
if (err < 0)
6739
goto error;
68-
69-
if (cfg->peer_udp_port) {
70-
udp_addr.sin_family = AF_INET;
71-
udp_addr.sin_addr = cfg->peer_ip;
72-
udp_addr.sin_port = cfg->peer_udp_port;
73-
err = kernel_connect(sock,
74-
(struct sockaddr *)&udp_addr,
75-
sizeof(udp_addr), 0);
76-
if (err < 0)
77-
goto error;
78-
}
79-
80-
sock->sk->sk_no_check_tx = !cfg->use_udp_checksums;
81-
} else {
82-
return -EPFNOSUPPORT;
8340
}
8441

42+
sock->sk->sk_no_check_tx = !cfg->use_udp_checksums;
8543

8644
*sockp = sock;
87-
8845
return 0;
8946

9047
error:
@@ -95,6 +52,6 @@ int udp_sock_create(struct net *net, struct udp_port_cfg *cfg,
9552
*sockp = NULL;
9653
return err;
9754
}
98-
EXPORT_SYMBOL(udp_sock_create);
55+
EXPORT_SYMBOL(udp_sock_create4);
9956

10057
MODULE_LICENSE("GPL");

‎net/ipv6/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ obj-$(CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION) += xfrm6_mode_ro.o
3535
obj-$(CONFIG_INET6_XFRM_MODE_BEET) += xfrm6_mode_beet.o
3636
obj-$(CONFIG_IPV6_MIP6) += mip6.o
3737
obj-$(CONFIG_NETFILTER) += netfilter/
38+
obj-$(CONFIG_NET_UDP_TUNNEL) += ip6_udp_tunnel.o
3839

3940
obj-$(CONFIG_IPV6_VTI) += ip6_vti.o
4041
obj-$(CONFIG_IPV6_SIT) += sit.o

‎net/ipv6/ip6_udp_tunnel.c‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
#include <linux/module.h>
2+
#include <linux/errno.h>
3+
#include <linux/socket.h>
4+
#include <linux/udp.h>
5+
#include <linux/types.h>
6+
#include <linux/kernel.h>
7+
#include <linux/in6.h>
8+
#include <net/udp.h>
9+
#include <net/udp_tunnel.h>
10+
#include <net/net_namespace.h>
11+
#include <net/netns/generic.h>
12+
#include <net/ip6_tunnel.h>
13+
#include <net/ip6_checksum.h>
14+
15+
int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
16+
struct socket **sockp)
17+
{
18+
struct sockaddr_in6 udp6_addr;
19+
int err;
20+
struct socket *sock = NULL;
21+
22+
err = sock_create_kern(AF_INET6, SOCK_DGRAM, 0, &sock);
23+
if (err < 0)
24+
goto error;
25+
26+
sk_change_net(sock->sk, net);
27+
28+
udp6_addr.sin6_family = AF_INET6;
29+
memcpy(&udp6_addr.sin6_addr, &cfg->local_ip6,
30+
sizeof(udp6_addr.sin6_addr));
31+
udp6_addr.sin6_port = cfg->local_udp_port;
32+
err = kernel_bind(sock, (struct sockaddr *)&udp6_addr,
33+
sizeof(udp6_addr));
34+
if (err < 0)
35+
goto error;
36+
37+
if (cfg->peer_udp_port) {
38+
udp6_addr.sin6_family = AF_INET6;
39+
memcpy(&udp6_addr.sin6_addr, &cfg->peer_ip6,
40+
sizeof(udp6_addr.sin6_addr));
41+
udp6_addr.sin6_port = cfg->peer_udp_port;
42+
err = kernel_connect(sock,
43+
(struct sockaddr *)&udp6_addr,
44+
sizeof(udp6_addr), 0);
45+
}
46+
if (err < 0)
47+
goto error;
48+
49+
udp_set_no_check6_tx(sock->sk, !cfg->use_udp6_tx_checksums);
50+
udp_set_no_check6_rx(sock->sk, !cfg->use_udp6_rx_checksums);
51+
52+
*sockp = sock;
53+
return 0;
54+
55+
error:
56+
if (sock) {
57+
kernel_sock_shutdown(sock, SHUT_RDWR);
58+
sk_release_kernel(sock->sk);
59+
}
60+
*sockp = NULL;
61+
return err;
62+
}
63+
EXPORT_SYMBOL_GPL(udp_sock_create6);

0 commit comments

Comments
 (0)