mac-learning: New function mac_entry_age().

This function will be used as part of printing the MAC learning table at
user request.

diff --git a/lib/mac-learning.c b/lib/mac-learning.c
index eeebce86629b32b3e66b0481866cdc8bf29a0b61..c9b7d3e73d65c65cab5c33fbf1334f2fcaf8a292 100644 (file)
--- a/lib/mac-learning.c
+++ b/lib/mac-learning.c
@@ -32,6 +32,14 @@
 #define THIS_MODULE VLM_mac_learning
 #include "vlog.h"
 
+/* Returns the number of seconds since 'e' was last learned. */
+int
+mac_entry_age(const struct mac_entry *e)
+{
+    time_t remaining = e->expires - time_now();
+    return MAC_ENTRY_IDLE_TIME - remaining;
+}
+
 static uint32_t
 mac_table_hash(const uint8_t mac[ETH_ADDR_LEN], uint16_t vlan)
 {
@@ -174,7 +182,7 @@ mac_learning_learn(struct mac_learning *ml,
     /* Make the entry most-recently-used. */
     list_remove(&e->lru_node);
     list_push_back(&ml->lrus, &e->lru_node);
-    e->expires = time_now() + 60;
+    e->expires = time_now() + MAC_ENTRY_IDLE_TIME;
 
     /* Did we learn something? */
     if (e->port != src_port) {

diff --git a/lib/mac-learning.h b/lib/mac-learning.h
index aa164d3ba762bc4b66534ec8090698cedf36e27c..6a2d30b4b935fa4f4653281d5af4dcbca9413702 100644 (file)
--- a/lib/mac-learning.h
+++ b/lib/mac-learning.h
@@ -28,6 +28,9 @@
 
 #define MAC_MAX 1024
 
+/* Time, in seconds, before expiring a mac_entry due to inactivity. */
+#define MAC_ENTRY_IDLE_TIME 60
+
 /* A MAC learning table entry. */
 struct mac_entry {
     struct list hash_node;      /* Element in a mac_learning 'table' list. */
@@ -39,6 +42,8 @@ struct mac_entry {
     tag_type tag;               /* Tag for this learning entry. */
 };
 
+int mac_entry_age(const struct mac_entry *);
+
 /* MAC learning table. */
 struct mac_learning {
     struct list free;           /* Not-in-use entries. */