From: vivek <vivek@cumulusnetworks.com>
Date: Mon, 18 Apr 2016 18:02:26 +0000 (+0000)
Subject: Quagga: Fix memcmp usage for MPLS
X-Git-Tag: frr-2.0-rc1~274
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ea6bebb83c855430adc9c64c399ec9c840ebb4fd;p=matthieu%2Ffrr.git

Quagga: Fix memcmp usage for MPLS

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

Ticket: CM-6611
Reviewed By: Trivial
Testing Done: Manual in SE-1
---

diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c
index 688585d6da..096f576a4c 100644
--- a/zebra/zebra_mpls.c
+++ b/zebra/zebra_mpls.c
@@ -604,20 +604,20 @@ nhlfe_nhop_match (zebra_nhlfe_t *nhlfe, enum nexthop_types_t gtype,
                   union g_addr *gate, char *ifname, ifindex_t ifindex)
 {
   struct nexthop *nhop;
-  u_char cmp = -1;
+  int cmp = 1;
 
   nhop = nhlfe->nexthop;
   if (!nhop)
-    return -1;
+    return 1;
 
   if (nhop->type != gtype)
-    return -1;
+    return 1;
 
   switch (nhop->type)
     {
     case NEXTHOP_TYPE_IPV4:
       cmp = memcmp(&(nhop->gate.ipv4), &(gate->ipv4),
-		   sizeof(struct in_addr));
+                   sizeof(struct in_addr));
       break;
     case NEXTHOP_TYPE_IPV6:
     case NEXTHOP_TYPE_IPV6_IFINDEX:
@@ -1086,10 +1086,10 @@ static int
 snhlfe_match (zebra_snhlfe_t *snhlfe, enum nexthop_types_t gtype,
               union g_addr *gate, char *ifname, ifindex_t ifindex)
 {
-  u_char cmp = -1;
+  int cmp = 1;
 
   if (snhlfe->gtype != gtype)
-    return -1;
+    return 1;
 
   switch (snhlfe->gtype)
     {