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
ofp-msgs: Update for OpenFlow 1.1 & 1.2 Port Desc Stats
[sliver-openvswitch.git]
/
lib
/
mac-learning.h
diff --git
a/lib/mac-learning.h
b/lib/mac-learning.h
index
51a7ac7
..
8f8fd45
100644
(file)
--- a/
lib/mac-learning.h
+++ b/
lib/mac-learning.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011
Nicira Networks
.
+ * Copyright (c) 2008, 2009, 2010, 2011
, 2012 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-18,19
+18,18
@@
#define MAC_LEARNING_H 1
#include <time.h>
#define MAC_LEARNING_H 1
#include <time.h>
+#include "hmap.h"
#include "list.h"
#include "packets.h"
#include "tag.h"
#include "timeval.h"
#include "list.h"
#include "packets.h"
#include "tag.h"
#include "timeval.h"
-#define MAC_HASH_BITS 10
-#define MAC_HASH_MASK (MAC_HASH_SIZE - 1)
-#define MAC_HASH_SIZE (1u << MAC_HASH_BITS)
+struct mac_learning;
#define MAC_MAX 2048
/* Time, in seconds, before expiring a mac_entry due to inactivity. */
#define MAC_MAX 2048
/* Time, in seconds, before expiring a mac_entry due to inactivity. */
-#define MAC_ENTRY_
IDLE_TIME 6
0
+#define MAC_ENTRY_
DEFAULT_IDLE_TIME 30
0
/* Time, in seconds, to lock an entry updated by a gratuitous ARP to avoid
* relearning based on a reflection from a bond slave. */
/* Time, in seconds, to lock an entry updated by a gratuitous ARP to avoid
* relearning based on a reflection from a bond slave. */
@@
-38,8
+37,8
@@
/* A MAC learning table entry. */
struct mac_entry {
/* A MAC learning table entry. */
struct mac_entry {
- struct
list hash_node; /* Element in a mac_learning 'table' list
. */
- struct list lru_node; /* Element in 'lrus'
or 'free'
list. */
+ struct
hmap_node hmap_node; /* Node in a mac_learning hmap
. */
+ struct list lru_node; /* Element in 'lrus' list. */
time_t expires; /* Expiration time. */
time_t grat_arp_lock; /* Gratuitous ARP lock expiration time. */
uint8_t mac[ETH_ADDR_LEN]; /* Known MAC address. */
time_t expires; /* Expiration time. */
time_t grat_arp_lock; /* Gratuitous ARP lock expiration time. */
uint8_t mac[ETH_ADDR_LEN]; /* Known MAC address. */
@@
-53,7
+52,7
@@
struct mac_entry {
} port;
};
} port;
};
-int mac_entry_age(const struct mac_entry *);
+int mac_entry_age(const struct mac_
learning *, const struct mac_
entry *);
/* Returns true if mac_learning_insert() just created 'mac' and the caller has
* not yet properly initialized it. */
/* Returns true if mac_learning_insert() just created 'mac' and the caller has
* not yet properly initialized it. */
@@
-78,17
+77,16
@@
static inline bool mac_entry_is_grat_arp_locked(const struct mac_entry *mac)
/* MAC learning table. */
struct mac_learning {
/* MAC learning table. */
struct mac_learning {
- struct
list free; /* Not-in-use entries
. */
+ struct
hmap table; /* Learning table
. */
struct list lrus; /* In-use entries, least recently used at the
front, most recently used at the back. */
struct list lrus; /* In-use entries, least recently used at the
front, most recently used at the back. */
- struct list table[MAC_HASH_SIZE]; /* Hash table. */
- struct mac_entry entries[MAC_MAX]; /* All entries. */
uint32_t secret; /* Secret for randomizing hash table. */
unsigned long *flood_vlans; /* Bitmap of learning disabled VLANs. */
uint32_t secret; /* Secret for randomizing hash table. */
unsigned long *flood_vlans; /* Bitmap of learning disabled VLANs. */
+ unsigned int idle_time; /* Max age before deleting an entry. */
};
/* Basics. */
};
/* Basics. */
-struct mac_learning *mac_learning_create(
void
);
+struct mac_learning *mac_learning_create(
unsigned int idle_time
);
void mac_learning_destroy(struct mac_learning *);
void mac_learning_run(struct mac_learning *, struct tag_set *);
void mac_learning_destroy(struct mac_learning *);
void mac_learning_run(struct mac_learning *, struct tag_set *);
@@
-96,7
+94,8
@@
void mac_learning_wait(struct mac_learning *);
/* Configuration. */
bool mac_learning_set_flood_vlans(struct mac_learning *,
/* Configuration. */
bool mac_learning_set_flood_vlans(struct mac_learning *,
- unsigned long *bitmap);
+ const unsigned long *bitmap);
+void mac_learning_set_idle_time(struct mac_learning *, unsigned int idle_time);
/* Learning. */
bool mac_learning_may_learn(const struct mac_learning *,
/* Learning. */
bool mac_learning_may_learn(const struct mac_learning *,
@@
-114,6
+113,6
@@
struct mac_entry *mac_learning_lookup(const struct mac_learning *,
/* Flushing. */
void mac_learning_expire(struct mac_learning *, struct mac_entry *);
/* Flushing. */
void mac_learning_expire(struct mac_learning *, struct mac_entry *);
-void mac_learning_flush(struct mac_learning *);
+void mac_learning_flush(struct mac_learning *
, struct tag_set *
);
#endif /* mac-learning.h */
#endif /* mac-learning.h */