Add program_name field in the netdissect_options structure

[tcpdump] / print-fddi.c

diff --git a/print-fddi.c b/print-fddi.c
index 7576b6f0d4f679ea46d7573311405e6ba0990717..4b5be5907c5fdd898943a622c3b1b2b833600665 100644 (file)
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -27,7 +27,7 @@
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "ether.h"
 
@@ -258,17 +258,11 @@ fddi_hdr_print(netdissect_options *ndo,
        srcname = etheraddr_string(ndo, fsrc);
        dstname = etheraddr_string(ndo, fdst);
 
-       if (ndo->ndo_vflag)
-               ND_PRINT((ndo, "%02x %s %s %d: ",
-                      fddip->fddi_fc,
-                      srcname, dstname,
-                      length));
-       else if (ndo->ndo_qflag)
-               ND_PRINT((ndo, "%s %s %d: ", srcname, dstname, length));
-       else {
+       if (!ndo->ndo_qflag)
                print_fddi_fc(ndo, fddip->fddi_fc);
-               ND_PRINT((ndo, "%s %s %d: ", srcname, dstname, length));
-       }
+       ND_PRINT((ndo, "%s > %s, length %u: ",
+              srcname, dstname,
+              length));
 }
 
 static inline void