---
I've applied the following incremental to the patch.
---
 lib/cfm.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/lib/cfm.c b/lib/cfm.c
index 00365e6..5cbbd2b 100644
--- a/lib/cfm.c
+++ b/lib/cfm.c
@@ -345,10 +345,12 @@ cfm_process_heartbeat(struct cfm *cfm, const struct 
ofpbuf *p)
     uint32_t ccm_seq;
     uint8_t ccm_interval;
     struct remote_mp *rmp;
+    struct eth_header *eth;
 
     struct cfm_internal *cfmi        = cfm_to_internal(cfm);
     static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
 
+    eth = ofpbuf_at(p, (uint8_t *)p->l2 - (uint8_t *)p->data, ETH_HEADER_LEN);
     ccm = ofpbuf_at(p, (uint8_t *)p->l3 - (uint8_t *)p->data, CCM_LEN);
 
     if (!ccm) {
@@ -365,6 +367,8 @@ 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 {
         ccm_mpid = ntohs(ccm->mpid);
         ccm_seq = ntohl(ccm->seq);
@@ -379,6 +383,8 @@ cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf 
*p)
         } 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));
         }
     }
 }
-- 
1.7.4.1

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to