/*
- * Copyright (c) 2014, 2015 Nicira, Inc.
+ * Copyright (c) 2014, 2015, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "cmap.h"
#include "coverage.h"
#include "dpif-netdev.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "errno.h"
#include "flow.h"
#include "netdev.h"
#include "ovs-thread.h"
#include "packets.h"
-#include "poll-loop.h"
+#include "openvswitch/poll-loop.h"
#include "seq.h"
#include "socket-util.h"
#include "timeval.h"
char br_name[IFNAMSIZ];
};
-static struct cmap table;
+static struct cmap table = CMAP_INITIALIZER;
static struct ovs_mutex mutex = OVS_MUTEX_INITIALIZER;
static uint32_t
hash = tnl_neigh_hash(dst);
CMAP_FOR_EACH_WITH_HASH (neigh, cmap_node, hash, &table) {
if (ipv6_addr_equals(&neigh->ip, dst) && !strcmp(neigh->br_name, br_name)) {
+ if (neigh->expires <= time_now()) {
+ return NULL;
+ }
+
neigh->expires = time_now() + NEIGH_ENTRY_DEFAULT_IDLE_TIME;
return neigh;
}
return NULL;
}
-int
-tnl_arp_lookup(const char br_name[IFNAMSIZ], ovs_be32 dst,
- struct eth_addr *mac)
-{
- struct tnl_neigh_entry *neigh;
- int res = ENOENT;
- struct in6_addr dst6 = in6_addr_mapped_ipv4(dst);
-
- neigh = tnl_neigh_lookup__(br_name, &dst6);
- if (neigh) {
- *mac = neigh->mac;
- res = 0;
- }
-
- return res;
-}
-
int
tnl_neigh_lookup(const char br_name[IFNAMSIZ], const struct in6_addr *dst,
struct eth_addr *mac)
static void
tnl_neigh_set__(const char name[IFNAMSIZ], const struct in6_addr *dst,
- const struct eth_addr mac)
+ const struct eth_addr mac)
{
ovs_mutex_lock(&mutex);
struct tnl_neigh_entry *neigh = tnl_neigh_lookup__(name, dst);
return;
}
tnl_neigh_delete(neigh);
- seq_change(tnl_conf_seq);
}
+ seq_change(tnl_conf_seq);
neigh = xmalloc(sizeof *neigh);
tnl_arp_snoop(const struct flow *flow, struct flow_wildcards *wc,
const char name[IFNAMSIZ])
{
- if (flow->dl_type != htons(ETH_TYPE_ARP)) {
+ /* Snoop normal ARP replies and gratuitous ARP requests/replies only */
+ if (!is_arp(flow)
+ || (!is_garp(flow, wc) &&
+ FLOW_WC_GET_AND_MASK_WC(flow, wc, nw_proto) != ARP_OP_REPLY)
+ || eth_addr_is_zero(FLOW_WC_GET_AND_MASK_WC(flow, wc, arp_sha))) {
return EINVAL;
}
- /* Exact Match on all ARP flows. */
- memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto);
- memset(&wc->masks.nw_src, 0xff, sizeof wc->masks.nw_src);
- memset(&wc->masks.arp_sha, 0xff, sizeof wc->masks.arp_sha);
-
- tnl_arp_set(name, flow->nw_src, flow->arp_sha);
+ tnl_arp_set(name, FLOW_WC_GET_AND_MASK_WC(flow, wc, nw_src), flow->arp_sha);
return 0;
}
static int
tnl_nd_snoop(const struct flow *flow, struct flow_wildcards *wc,
- const char name[IFNAMSIZ])
+ const char name[IFNAMSIZ])
{
- if (flow->dl_type != htons(ETH_TYPE_IPV6) ||
- flow->nw_proto != IPPROTO_ICMPV6 ||
- flow->tp_dst != htons(0) ||
- flow->tp_src != htons(ND_NEIGHBOR_ADVERT)) {
+ if (!is_nd(flow, wc) || flow->tp_src != htons(ND_NEIGHBOR_ADVERT)) {
+ return EINVAL;
+ }
+ /* - RFC4861 says Neighbor Advertisements sent in response to unicast Neighbor
+ * Solicitations SHOULD include the Target link-layer address. However, Linux
+ * doesn't. So, the response to Solicitations sent by OVS will include the
+ * TLL address and other Advertisements not including it can be ignored.
+ * - OVS flow extract can set this field to zero in case of packet parsing errors.
+ * For details refer miniflow_extract()*/
+ if (eth_addr_is_zero(FLOW_WC_GET_AND_MASK_WC(flow, wc, arp_tha))) {
return EINVAL;
}
memset(&wc->masks.ipv6_src, 0xff, sizeof wc->masks.ipv6_src);
memset(&wc->masks.ipv6_dst, 0xff, sizeof wc->masks.ipv6_dst);
memset(&wc->masks.nd_target, 0xff, sizeof wc->masks.nd_target);
- memset(&wc->masks.arp_tha, 0xff, sizeof wc->masks.arp_tha);
tnl_neigh_set__(name, &flow->nd_target, flow->arp_tha);
return 0;
}
}
+void
+tnl_neigh_flush(const char br_name[IFNAMSIZ])
+{
+ struct tnl_neigh_entry *neigh;
+ bool changed = false;
+
+ ovs_mutex_lock(&mutex);
+ CMAP_FOR_EACH (neigh, cmap_node, &table) {
+ if (!strcmp(neigh->br_name, br_name)) {
+ tnl_neigh_delete(neigh);
+ changed = true;
+ }
+ }
+ ovs_mutex_unlock(&mutex);
+
+ if (changed) {
+ seq_change(tnl_conf_seq);
+ }
+}
+
static void
tnl_neigh_cache_flush(struct unixctl_conn *conn, int argc OVS_UNUSED,
const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
need_ws = INET6_ADDRSTRLEN - (ds.length - start_len);
ds_put_char_multiple(&ds, ' ', need_ws);
- ds_put_format(&ds, ETH_ADDR_FMT" %s\n",
+ ds_put_format(&ds, ETH_ADDR_FMT" %s",
ETH_ADDR_ARGS(neigh->mac), neigh->br_name);
+ if (neigh->expires <= time_now()) {
+ ds_put_format(&ds, " STALE");
+ }
+ ds_put_char(&ds, '\n');
}
ovs_mutex_unlock(&mutex);
void
tnl_neigh_cache_init(void)
{
- cmap_init(&table);
-
unixctl_command_register("tnl/arp/show", "", 0, 0, tnl_neigh_cache_show, NULL);
unixctl_command_register("tnl/arp/set", "BRIDGE IP MAC", 3, 3, tnl_neigh_cache_add, NULL);
unixctl_command_register("tnl/arp/flush", "", 0, 0, tnl_neigh_cache_flush, NULL);
projects / mirror_ovs.git / blobdiff