According to the 802.1ag specification, reception of a CCM from an
unexpected source should trigger a fault. This patch causes the CFM
module to simply warn instead. There are several reasons for this
change outlined below.
- Faults can cause controllers to make potentially expensive
changes to the network topology.
- Faults can be maliciously triggered by crafting invalid CCMs.
- With this patch, cfm->fault and rmp->fault are only updated in
cfm_run() making the code easier to debug and reason about.
---
lib/cfm.c | 24 +++---------------------
1 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/lib/cfm.c b/lib/cfm.c
index 3a053ef..c89efb3 100644
--- a/lib/cfm.c
+++ b/lib/cfm.c
@@ -45,8 +45,6 @@ struct cfm_internal {
struct timer tx_timer; /* Send CCM when expired. */
struct timer fault_timer; /* Check for faults when expired. */
-
- long long x_recv_time;
};
static int
@@ -139,7 +137,6 @@ cfm_create(void)
cfmi = xzalloc(sizeof *cfmi);
cfm = &cfmi->cfm;
- cfmi->x_recv_time = LLONG_MIN;
hmap_init(&cfm->remote_mps);
return cfm;
@@ -168,17 +165,13 @@ cfm_destroy(struct cfm *cfm)
void
cfm_run(struct cfm *cfm)
{
- long long now = time_msec();
struct cfm_internal *cfmi = cfm_to_internal(cfm);
if (timer_expired(&cfmi->fault_timer)) {
- bool fault;
+ long long int interval = cfm_fault_interval(cfmi);
struct remote_mp *rmp;
- long long int interval;
-
- interval = cfm_fault_interval(cfmi);
- fault = now < cfmi->x_recv_time + interval;
+ cfm->fault = false;
HMAP_FOR_EACH (rmp, node, &cfm->remote_mps) {
if (rmp->recv_time < timer_enabled_at(&cfmi->fault_timer, interval)
|| timer_expired_at(&cfmi->fault_timer, rmp->recv_time)) {
@@ -186,11 +179,10 @@ cfm_run(struct cfm *cfm)
}
if (rmp->fault) {
- fault = true;
+ cfm->fault = true;
}
}
- cfm->fault = fault;
timer_set_duration(&cfmi->fault_timer, interval);
}
}
@@ -379,8 +371,6 @@ cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf
*p)
}
if (memcmp(ccm->maid, cfm->maid, sizeof ccm->maid)) {
- cfmi->x_recv_time = time_msec();
- cfm->fault = true;
VLOG_WARN_RL(&rl, "Received unexpected remote MAID from MAC "
ETH_ADDR_FMT, ETH_ADDR_ARGS(eth->eth_src));
} else {
@@ -400,8 +390,6 @@ cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf
*p)
rmp->mpid);
}
} else {
- cfmi->x_recv_time = time_msec();
- cfm->fault = true;
VLOG_WARN_RL(&rl, "Received unexpected remote MPID %d from MAC "
ETH_ADDR_FMT, ccm_mpid, ETH_ADDR_ARGS(eth->eth_src));
}
@@ -412,7 +400,6 @@ void
cfm_dump_ds(const struct cfm *cfm, struct ds *ds)
{
const struct cfm_internal *cfmi = cfm_to_internal(cfm);
- long long int now = time_msec();
struct remote_mp *rmp;
ds_put_format(ds, "MPID %"PRIu16": %s\n", cfm->mpid,
@@ -424,11 +411,6 @@ cfm_dump_ds(const struct cfm *cfm, struct ds *ds)
ds_put_format(ds, "\tnext fault check: %lldms\n",
timer_msecs_until_expired(&cfmi->fault_timer));
- if (cfmi->x_recv_time != LLONG_MIN) {
- ds_put_format(ds, "\ttime since bad CCM rx: %lldms\n",
- now - cfmi->x_recv_time);
- }
-
ds_put_cstr(ds, "\n");
HMAP_FOR_EACH (rmp, node, &cfm->remote_mps) {
ds_put_format(ds, "Remote MPID %"PRIu16": %s\n", rmp->mpid,
--
1.7.4.4
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
