Merge "Cherry-pick of 29438 to R3.1" into R3.1

Juniper · Apr 4, 2017 · b1fee00 · b1fee00
2 parents f865f1e + 7ce3dc7
commit b1fee00
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/utils/nh.c b/utils/nh.c
@@ -292,6 +292,9 @@ vr_nexthop_req_process(void *s_req)
     printf("\n\n");
     if (req->nhr_type == NH_COMPOSITE && command == SANDESH_OP_GET) {
         for (i = 0; i < req->nhr_nh_list_size; i++) {
+            // Skip expanding sub-nh for -1 index
+            if (req->nhr_nh_list[i] == -1)
+                continue;
             vr_nh_op(cl, command, type, req->nhr_nh_list[i], if_id, vrf_id,
                      dst_mac, src_mac, sip, dip, flags);
         }