X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fcfm.c;h=d232b34f18211ae95a115fbf641463932e45222a;hb=3444fdfb453d3593914cf1e18f9ac2f8b036e986;hp=b71c242a54763eb4a182b7df98af1e591f2d328f;hpb=7c690f462fec1af60d76c67fac226fc648ea9149;p=sliver-openvswitch.git diff --git a/lib/cfm.c b/lib/cfm.c index b71c242a5..d232b34f1 100644 --- a/lib/cfm.c +++ b/lib/cfm.c @@ -17,7 +17,6 @@ #include #include "cfm.h" -#include #include #include #include @@ -190,7 +189,7 @@ cfm_generate_maid(struct cfm *cfm) md_len = strlen(ovs_md_name); ma_len = strlen(ovs_ma_name); - assert(md_len && ma_len && md_len + ma_len + 4 <= CCM_MAID_LEN); + ovs_assert(md_len && ma_len && md_len + ma_len + 4 <= CCM_MAID_LEN); cfm->maid[0] = 4; /* MD name string format. */ cfm->maid[1] = md_len; /* MD name size. */ @@ -368,7 +367,7 @@ cfm_run(struct cfm *cfm) cfm->health = (rmp->num_health_ccm * 100) / exp_ccm_recvd; cfm->health = MIN(cfm->health, 100); rmp->num_health_ccm = 0; - assert(cfm->health >= 0 && cfm->health <= 100); + ovs_assert(cfm->health >= 0 && cfm->health <= 100); } cfm->health_interval = 0; } @@ -466,7 +465,7 @@ cfm_compose_ccm(struct cfm *cfm, struct ofpbuf *packet, } if (cfm->ccm_interval == 0) { - assert(cfm->extended); + ovs_assert(cfm->extended); ccm->interval_ms_x = htons(cfm->ccm_interval_ms); } else { ccm->interval_ms_x = htons(0);