#include "tag.h"
#include "timeval.h"
#include "util.h"
+#include "vlan-bitmap.h"
#include "vlog.h"
VLOG_DEFINE_THIS_MODULE(mac_learning);
}
}
-/* Removes 'e' from the 'ml' hash table. 'e' must not already be on the free
- * list. */
-static void
-free_mac_entry(struct mac_learning *ml, struct mac_entry *e)
-{
- list_remove(&e->hash_node);
- list_remove(&e->lru_node);
- list_push_front(&ml->free, &e->lru_node);
-}
-
/* Creates and returns a new MAC learning table. */
struct mac_learning *
mac_learning_create(void)
{
if (ml) {
bitmap_free(ml->flood_vlans);
+ free(ml);
}
- free(ml);
}
/* Provides a bitmap of VLANs which have learning disabled, that is, VLANs on
- * which all packets are flooded. It takes ownership of the bitmap. Returns
- * true if the set has changed from the previous value. */
+ * which all packets are flooded. Returns true if the set has changed from the
+ * previous value. */
bool
-mac_learning_set_flood_vlans(struct mac_learning *ml, unsigned long *bitmap)
+mac_learning_set_flood_vlans(struct mac_learning *ml,
+ const unsigned long *bitmap)
{
- bool ret = (bitmap == NULL
- ? ml->flood_vlans != NULL
- : (ml->flood_vlans == NULL
- || !bitmap_equal(bitmap, ml->flood_vlans, 4096)));
-
- bitmap_free(ml->flood_vlans);
- ml->flood_vlans = bitmap;
-
- return ret;
+ if (vlan_bitmap_equal(ml->flood_vlans, bitmap)) {
+ return false;
+ } else {
+ bitmap_free(ml->flood_vlans);
+ ml->flood_vlans = vlan_bitmap_clone(bitmap);
+ return true;
+ }
}
static bool
is_learning_vlan(const struct mac_learning *ml, uint16_t vlan)
{
- return !(ml->flood_vlans && bitmap_is_set(ml->flood_vlans, vlan));
+ return vlan_bitmap_contains(ml->flood_vlans, vlan);
}
/* Returns true if 'src_mac' may be learned on 'vlan' for 'ml'.
}
}
+/* Expires 'e' from the 'ml' hash table. 'e' must not already be on the free
+ * list. */
+void
+mac_learning_expire(struct mac_learning *ml, struct mac_entry *e)
+{
+ list_remove(&e->hash_node);
+ list_remove(&e->lru_node);
+ list_push_front(&ml->free, &e->lru_node);
+}
+
/* Expires all the mac-learning entries in 'ml'. The tags in 'ml' are
* discarded, so the client is responsible for revalidating any flows that
* depend on 'ml', if necessary. */
{
struct mac_entry *e;
while (get_lru(ml, &e)){
- free_mac_entry(ml, e);
+ mac_learning_expire(ml, e);
}
}
if (set) {
tag_set_add(set, e->tag);
}
- free_mac_entry(ml, e);
+ mac_learning_expire(ml, e);
}
}