From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Fri, 25 May 2018 12:53:08 +0000 (+0200)
Subject: ES-IS,IS-IS: Add two missing return
X-Git-Tag: tcpdump-4.99-bp~1152
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/74d0778d0ce7f2b87efb1790d90b800cc119f141

ES-IS,IS-IS: Add two missing return

Update the output of some tests accordingly.
---

diff --git a/print-isoclns.c b/print-isoclns.c
index 246b681b..38bdd833 100644
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -1386,6 +1386,8 @@ esis_print(netdissect_options *ndo,
                 print_unknown_data(ndo, pptr, "\n\t  ", opli);
             pptr += opli;
         }
+        return;
+
 trunc:
 	nd_print_trunc(ndo);
 }
@@ -1408,6 +1410,7 @@ isis_print_mcid(netdissect_options *ndo,
 
   for(i=0;i<16;i++)
     ND_PRINT("%.2x ", mcid->digest[i]);
+  return;
 
 trunc:
   nd_print_trunc(ndo);
diff --git a/tests/esis_snpa_asan-4.out b/tests/esis_snpa_asan-4.out
index f5f4604c..8c2b3284 100644
--- a/tests/esis_snpa_asan-4.out
+++ b/tests/esis_snpa_asan-4.out
@@ -7,7 +7,7 @@ UI 22! ES-IS, length 65565
 	redirect (6), v: 1, checksum: 0x7034 (incorrect should be 0x44ec), holding time: 21315s, length indicator: 16
 	  02.0400
 	  SNPA (length: 0): <empty>
-	  Unknown Option #0, length 0, value:  [|esis]
+	  Unknown Option #0, length 0, value: 
 UI 32! ES-IS, length 65565
 	ESH (2), v: 1, checksum: 0x70a1 (incorrect should be 0xfb4e), holding time: 21315s, length indicator: 17
 	  Number of Source Addresses: 2
diff --git a/tests/esis_snpa_asan-5.out b/tests/esis_snpa_asan-5.out
index d54bed3d..bd8c30dd 100644
--- a/tests/esis_snpa_asan-5.out
+++ b/tests/esis_snpa_asan-5.out
@@ -3,7 +3,7 @@ UI 22! ES-IS, length 65565
 	  Number of Source Addresses: 3
 	  NET (length: 0): isonsap_string: illegal length
 	  NET (length: 4): ec.ff00.00
-	  NET (length: 0): isonsap_string: illegal length [|esis]
+	  NET (length: 0): isonsap_string: illegal length
 UI 22! ES-IS, length 65565
 	redirect (6), v: 1, checksum: 0x7034 (incorrect should be 0x3ff0), holding time: 21315s, length indicator: 17
 	  04
diff --git a/tests/isis-extd-ipreach-oobr.out b/tests/isis-extd-ipreach-oobr.out
index 6d16be3d..2b323285 100644
--- a/tests/isis-extd-ipreach-oobr.out
+++ b/tests/isis-extd-ipreach-oobr.out
@@ -20,9 +20,9 @@
 	       RES: 0, MTID(s): 0
 	       SPB MCID subTLV #4, length: 102
 	         MCID: ID: 0, Name: IEEEIEEEIEEEIEEEIEEEIEEEIEEEIEEE
-	              Lvl: 18757, Digest: 45 45 49 45 45 45 49 45 45 45 49 45 45 45 49 45  [|isis]
+	              Lvl: 18757, Digest: 45 45 49 45 45 45 49 45 45 45 49 45 45 45 49 45 
 	         AUX-MCID: ID: 69, Name: EIEEEIEEEIEEEIEEEIEEEIEEEIEEEIEE
-	              Lvl: 17737, Digest: 45 45 45 49 45 45 45 49 45 45 45 49 45 45 45 49  [|isis]
+	              Lvl: 17737, Digest: 45 45 45 49 45 45 45 49 45 45 45 49 45 45 45 49 
 	       unknown subTLV #69, length: 69 [|isis]
 	      0x0000:  0000 0466 0049 4545 4549 4545 4549 4545
 	      0x0010:  4549 4545 4549 4545 4549 4545 4549 4545