git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vxlan: Correct comments and NEWS to reflect IANA port assigment.
[sliver-openvswitch.git]
/
lib
/
netdev-vport.c
diff --git
a/lib/netdev-vport.c
b/lib/netdev-vport.c
index
88817ac
..
08169a1
100644
(file)
--- a/
lib/netdev-vport.c
+++ b/
lib/netdev-vport.c
@@
-41,8
+41,8
@@
VLOG_DEFINE_THIS_MODULE(netdev_vport);
VLOG_DEFINE_THIS_MODULE(netdev_vport);
-/* Default to the OTV port, per the VXLAN IETF draft. */
-#define
VXLAN_DST_PORT 8472
+#define VXLAN_DST_PORT 4789
+#define
LISP_DST_PORT 4341
#define DEFAULT_TTL 64
#define DEFAULT_TTL 64
@@
-112,14
+112,13
@@
netdev_vport_is_patch(const struct netdev *netdev)
}
static bool
}
static bool
-netdev_vport_
is_vxlan(const struct netdev *net
dev)
+netdev_vport_
needs_dst_port(const struct netdev_dev *
dev)
{
{
- const struct netdev_dev *dev = netdev_get_dev(netdev);
const struct netdev_class *class = netdev_dev_get_class(dev);
const char *type = netdev_dev_get_type(dev);
const struct netdev_class *class = netdev_dev_get_class(dev);
const char *type = netdev_dev_get_type(dev);
- return (class->get_config == get_tunnel_config
-
&& !strcmp("vxlan", type
));
+ return (class->get_config == get_tunnel_config
&&
+
(!strcmp("vxlan", type) || !strcmp("lisp", type)
));
}
const char *
}
const char *
@@
-129,20
+128,21
@@
netdev_vport_get_dpif_port(const struct netdev *netdev)
const struct netdev_class *class = netdev_dev_get_class(dev);
const char *dpif_port;
const struct netdev_class *class = netdev_dev_get_class(dev);
const char *dpif_port;
- if (netdev_vport_
is_vxlan(net
dev)) {
+ if (netdev_vport_
needs_dst_port(
dev)) {
const struct netdev_dev_vport *vport = netdev_vport_get_dev(netdev);
const char *type = netdev_dev_get_type(dev);
const struct netdev_dev_vport *vport = netdev_vport_get_dev(netdev);
const char *type = netdev_dev_get_type(dev);
- static char dpif_port_
vxlan
[IFNAMSIZ];
+ static char dpif_port_
combined
[IFNAMSIZ];
/*
* Note: IFNAMSIZ is 16 bytes long. The maximum length of a VXLAN
/*
* Note: IFNAMSIZ is 16 bytes long. The maximum length of a VXLAN
- * port name below is 15 bytes. Still, assert here on the size of
- * strlen(type) in case that changes in the future.
+ * or LISP port name below is 15 or 14 bytes respectively. Still,
+ * assert here on the size of strlen(type) in case that changes
+ * in the future.
*/
ovs_assert(strlen(type) + 10 < IFNAMSIZ);
*/
ovs_assert(strlen(type) + 10 < IFNAMSIZ);
- snprintf(dpif_port_
vxlan
, IFNAMSIZ, "%s_sys_%d", type,
+ snprintf(dpif_port_
combined
, IFNAMSIZ, "%s_sys_%d", type,
ntohs(vport->tnl_cfg.dst_port));
ntohs(vport->tnl_cfg.dst_port));
- return dpif_port_
vxlan
;
+ return dpif_port_
combined
;
} else {
dpif_port = (is_vport_class(class)
? vport_class_cast(class)->dpif_port
} else {
dpif_port = (is_vport_class(class)
? vport_class_cast(class)->dpif_port
@@
-318,7
+318,7
@@
set_tunnel_config(struct netdev_dev *dev_, const struct smap *args)
ipsec_mech_set = false;
memset(&tnl_cfg, 0, sizeof tnl_cfg);
ipsec_mech_set = false;
memset(&tnl_cfg, 0, sizeof tnl_cfg);
- needs_dst_port =
!strcmp(type, "vxlan"
);
+ needs_dst_port =
netdev_vport_needs_dst_port(dev_
);
tnl_cfg.ipsec = strstr(type, "ipsec");
tnl_cfg.dont_fragment = true;
tnl_cfg.ipsec = strstr(type, "ipsec");
tnl_cfg.dont_fragment = true;
@@
-327,6
+327,10
@@
set_tunnel_config(struct netdev_dev *dev_, const struct smap *args)
struct in_addr in_addr;
if (lookup_ip(node->value, &in_addr)) {
VLOG_WARN("%s: bad %s 'remote_ip'", name, type);
struct in_addr in_addr;
if (lookup_ip(node->value, &in_addr)) {
VLOG_WARN("%s: bad %s 'remote_ip'", name, type);
+ } else if (ip_is_multicast(in_addr.s_addr)) {
+ VLOG_WARN("%s: multicast remote_ip="IP_FMT" not allowed",
+ name, IP_ARGS(in_addr.s_addr));
+ return EINVAL;
} else {
tnl_cfg.ip_dst = in_addr.s_addr;
}
} else {
tnl_cfg.ip_dst = in_addr.s_addr;
}
@@
-403,10
+407,15
@@
set_tunnel_config(struct netdev_dev *dev_, const struct smap *args)
}
/* Add a default destination port for VXLAN if none specified. */
}
/* Add a default destination port for VXLAN if none specified. */
- if (
needs_dst_port
&& !tnl_cfg.dst_port) {
+ if (
!strcmp(type, "vxlan")
&& !tnl_cfg.dst_port) {
tnl_cfg.dst_port = htons(VXLAN_DST_PORT);
}
tnl_cfg.dst_port = htons(VXLAN_DST_PORT);
}
+ /* Add a default destination port for LISP if none specified. */
+ if (!strcmp(type, "lisp") && !tnl_cfg.dst_port) {
+ tnl_cfg.dst_port = htons(LISP_DST_PORT);
+ }
+
if (tnl_cfg.ipsec) {
static pid_t pid = 0;
if (pid <= 0) {
if (tnl_cfg.ipsec) {
static pid_t pid = 0;
if (pid <= 0) {
@@
-439,14
+448,6
@@
set_tunnel_config(struct netdev_dev *dev_, const struct smap *args)
name, type);
return EINVAL;
}
name, type);
return EINVAL;
}
-
- if (tnl_cfg.ip_src) {
- if (ip_is_multicast(tnl_cfg.ip_dst)) {
- VLOG_WARN("%s: remote_ip is multicast, ignoring local_ip", name);
- tnl_cfg.ip_src = 0;
- }
- }
-
if (!tnl_cfg.ttl) {
tnl_cfg.ttl = DEFAULT_TTL;
}
if (!tnl_cfg.ttl) {
tnl_cfg.ttl = DEFAULT_TTL;
}
@@
-514,7
+515,10
@@
get_tunnel_config(struct netdev_dev *dev, struct smap *args)
if (tnl_cfg->dst_port) {
uint16_t dst_port = ntohs(tnl_cfg->dst_port);
if (tnl_cfg->dst_port) {
uint16_t dst_port = ntohs(tnl_cfg->dst_port);
- if (dst_port != VXLAN_DST_PORT) {
+ const char *type = netdev_dev_get_type(dev);
+
+ if ((!strcmp("vxlan", type) && dst_port != VXLAN_DST_PORT) ||
+ (!strcmp("lisp", type) && dst_port != LISP_DST_PORT)) {
smap_add_format(args, "dst_port", "%d", dst_port);
}
}
smap_add_format(args, "dst_port", "%d", dst_port);
}
}
@@
-686,7
+690,8
@@
netdev_vport_tunnel_register(void)
TUNNEL_CLASS("ipsec_gre", "gre_system"),
TUNNEL_CLASS("gre64", "gre64_system"),
TUNNEL_CLASS("ipsec_gre64", "gre64_system"),
TUNNEL_CLASS("ipsec_gre", "gre_system"),
TUNNEL_CLASS("gre64", "gre64_system"),
TUNNEL_CLASS("ipsec_gre64", "gre64_system"),
- TUNNEL_CLASS("vxlan", "vxlan_system")
+ TUNNEL_CLASS("vxlan", "vxlan_system"),
+ TUNNEL_CLASS("lisp", "lisp_system")
};
int i;
};
int i;