Add program_name field in the netdissect_options structure

[tcpdump] / print-eap.c

diff --git a/print-eap.c b/print-eap.c
index 5c623dc58ae3f88881df882625f9e547cef9c888..9420d110f5ef2f8bc07e92df0cec0db459dfbcde 100644 (file)
--- a/print-eap.c
+++ b/print-eap.c
@@ -21,7 +21,6 @@
  *
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -29,7 +28,6 @@
 #include <tcpdump-stdinc.h>
 
 #include "netdissect.h"
-#include "interface.h"
 #include "extract.h"
 
 #define        EAP_FRAME_TYPE_PACKET           0
@@ -193,8 +191,7 @@ eap_print(netdissect_options *ndo,
                *(tptr+1),
                len));
 
-        if (!ND_TTEST2(*tptr, len))
-            goto trunc;
+        ND_TCHECK2(*tptr, len);
 
         if (type <= 2) { /* For EAP_REQUEST and EAP_RESPONSE only */
             subtype = *(tptr+4);