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
struct netdev_dev_vport {
- struct netdev_dev netdev_dev;
+ struct netdev_dev up;
unsigned int change_seq;
uint8_t etheraddr[ETH_ADDR_LEN];
struct netdev_stats stats;
netdev_dev_vport_cast(const struct netdev_dev *netdev_dev)
{
ovs_assert(is_vport_class(netdev_dev_get_class(netdev_dev)));
- return CONTAINER_OF(netdev_dev, struct netdev_dev_vport, netdev_dev);
+ return CONTAINER_OF(netdev_dev, struct netdev_dev_vport, up);
}
static struct netdev_dev_vport *
}
static bool
-netdev_vport_is_vxlan(const struct netdev *netdev)
+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);
- 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 struct netdev_class *class = netdev_dev_get_class(dev);
const char *dpif_port;
- if (netdev_vport_is_vxlan(netdev)) {
+ 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);
- static char dpif_port_vxlan[IFNAMSIZ];
+ static char dpif_port_combined[IFNAMSIZ];
/*
* 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);
- snprintf(dpif_port_vxlan, IFNAMSIZ, "%s_sys_%d", type,
+ snprintf(dpif_port_combined, IFNAMSIZ, "%s_sys_%d", type,
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
struct netdev_dev_vport *dev;
dev = xzalloc(sizeof *dev);
- netdev_dev_init(&dev->netdev_dev, name, netdev_class);
+ netdev_dev_init(&dev->up, name, netdev_class);
dev->change_seq = 1;
eth_addr_random(dev->etheraddr);
- *netdev_devp = &dev->netdev_dev;
+ *netdev_devp = &dev->up;
route_table_register();
return 0;
}
static int
-netdev_vport_update_flags(struct netdev *netdev OVS_UNUSED,
+netdev_vport_update_flags(struct netdev_dev *netdev_dev OVS_UNUSED,
enum netdev_flags off, enum netdev_flags on OVS_UNUSED,
enum netdev_flags *old_flagsp)
{
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;
SMAP_FOR_EACH (node, args) {
if (!strcmp(node->key, "remote_ip")) {
struct in_addr in_addr;
- if (lookup_ip(node->value, &in_addr)) {
+ if (!strcmp(node->value, "flow")) {
+ tnl_cfg.ip_dst_flow = true;
+ tnl_cfg.ip_dst = htonl(0);
+ } else 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 if (!strcmp(node->key, "local_ip")) {
struct in_addr in_addr;
- if (lookup_ip(node->value, &in_addr)) {
+ if (!strcmp(node->value, "flow")) {
+ tnl_cfg.ip_src_flow = true;
+ tnl_cfg.ip_src = htonl(0);
+ } else if (lookup_ip(node->value, &in_addr)) {
VLOG_WARN("%s: bad %s 'local_ip'", name, type);
} else {
tnl_cfg.ip_src = in_addr.s_addr;
}
/* 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);
}
+ /* 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.ip_dst) {
+ if (!tnl_cfg.ip_dst && !tnl_cfg.ip_dst_flow) {
VLOG_ERR("%s: %s type requires valid 'remote_ip' argument",
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.ip_src_flow && !tnl_cfg.ip_dst_flow) {
+ VLOG_ERR("%s: %s type requires 'remote_ip=flow' with 'local_ip=flow'",
+ name, type);
+ return EINVAL;
}
-
if (!tnl_cfg.ttl) {
tnl_cfg.ttl = DEFAULT_TTL;
}
if (tnl_cfg->ip_dst) {
smap_add_format(args, "remote_ip", IP_FMT, IP_ARGS(tnl_cfg->ip_dst));
+ } else if (tnl_cfg->ip_dst_flow) {
+ smap_add(args, "remote_ip", "flow");
}
if (tnl_cfg->ip_src) {
smap_add_format(args, "local_ip", IP_FMT, IP_ARGS(tnl_cfg->ip_src));
+ } else if (tnl_cfg->ip_src_flow) {
+ smap_add(args, "local_ip", "flow");
}
if (tnl_cfg->in_key_flow && tnl_cfg->out_key_flow) {
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);
}
}
netdev_vport_open, \
netdev_vport_close, \
\
- NULL, /* listen */ \
- NULL, /* recv */ \
- NULL, /* recv_wait */ \
- NULL, /* drain */ \
+ NULL, /* rx_open */ \
\
NULL, /* send */ \
NULL, /* send_wait */ \
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;
git://git.onelab.eu / sliver-openvswitch.git / blobdiff