mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-29 15:28:56 +00:00
Code Issues Releases Wiki Activity

cfm: Immediately signal fault on bad CCM reception.

Browse Source 
Commit af5739857a (cfm: Immediately signal a fault upon receiving
an unexpected MPID.) caused the CFM library to immediately signal a
fault upon reception of an unexpected remote MPID.  This commit
does the same for MAIDs, and remote maintenance points with invalid
CCM intervals.
This commit is contained in:
Ethan Jackson
2011-03-24 19:04:21 -07:00
parent 2a899f6e8a
commit f805c4cc6e
1 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lib/cfm.c
View File

@@ -110,6 +110,21 @@ lookup_remote_mp(const struct hmap *hmap, uint16_t mpid)
return NULL; return NULL;
} }
static struct remote_maid *
lookup_remote_maid(const struct hmap *hmap, uint8_t maid[CCM_MAID_LEN])
{
uint32_t hash;
struct remote_maid *rmaid;
hash = hash_bytes(maid, CCM_MAID_LEN, 0);
HMAP_FOR_EACH_WITH_HASH (rmaid, node, hash, hmap) {
if (memcmp(rmaid->maid, maid, CCM_MAID_LEN) == 0) {
return rmaid;
}
}
return NULL;
}
/* Allocates a 'cfm' object. This object should have its 'mpid', 'maid', /* Allocates a 'cfm' object. This object should have its 'mpid', 'maid',
* 'eth_src', and 'interval' filled out. When changes are made to the 'cfm' * 'eth_src', and 'interval' filled out. When changes are made to the 'cfm'
* object, cfm_configure should be called before using it. */ * object, cfm_configure should be called before using it. */
@@ -392,25 +407,20 @@ cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf *p)
} }
if (memcmp(ccm->maid, cfm->maid, sizeof ccm->maid)) { if (memcmp(ccm->maid, cfm->maid, sizeof ccm->maid)) {
uint32_t hash;
struct remote_maid *rmaid; struct remote_maid *rmaid;
hash = hash_bytes(ccm->maid, sizeof ccm->maid, 0); rmaid = lookup_remote_maid(&cfm->x_remote_maids, ccm->maid);
if (rmaid) {
HMAP_FOR_EACH_IN_BUCKET (rmaid, node, hash, &cfm->x_remote_maids) {
if (memcmp(rmaid->maid, ccm->maid, sizeof rmaid->maid) == 0) {
rmaid->recv_time = time_msec(); rmaid->recv_time = time_msec();
return; } else {
}
}
rmaid = xzalloc(sizeof *rmaid); rmaid = xzalloc(sizeof *rmaid);
rmaid->recv_time = time_msec(); rmaid->recv_time = time_msec();
memcpy(rmaid->maid, ccm->maid, sizeof rmaid->maid); memcpy(rmaid->maid, ccm->maid, sizeof rmaid->maid);
hmap_insert(&cfm->x_remote_maids, &rmaid->node, hash); hmap_insert(&cfm->x_remote_maids, &rmaid->node,
return; hash_bytes(ccm->maid, CCM_MAID_LEN, 0));
} }
cfm->fault = true;
} else {
ccm_mpid = ntohs(ccm->mpid); ccm_mpid = ntohs(ccm->mpid);
ccm_seq = ntohl(ccm->seq); ccm_seq = ntohl(ccm->seq);
ccm_interval = ccm->flags & 0x7; ccm_interval = ccm->flags & 0x7;
@@ -425,9 +435,14 @@ cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf *p)
rmp = xzalloc(sizeof *rmp); rmp = xzalloc(sizeof *rmp);
rmp->mpid = ccm_mpid; rmp->mpid = ccm_mpid;
hmap_insert(&cfm->x_remote_mps, &rmp->node, hash_mpid(ccm_mpid)); hmap_insert(&cfm->x_remote_mps, &rmp->node, hash_mpid(ccm_mpid));
cfm->fault = true; rmp->fault = true;
} }
rmp->recv_time = time_msec(); rmp->recv_time = time_msec();
rmp->fault = ccm_interval != cfmi->ccm_interval; rmp->fault = ccm_interval != cfmi->ccm_interval;
if (rmp->fault) {
cfm->fault = true;
}
}
} }