NDOize OSPFv3 decoder

[tcpdump] / print-tipc.c

diff --git a/print-tipc.c b/print-tipc.c
index 69be4caab65cdccf016462f0245363d3f2716731..809c50db8f6d4c0c275acf19baa72bd4c9bc8475 100644 (file)
--- a/print-tipc.c
+++ b/print-tipc.c
@@ -19,17 +19,14 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include <stdio.h>
-#include <string.h>
-
-#include "netdissect.h"
-#include "addrtoname.h"
+#include "interface.h"
 #include "ether.h"
 #include "ethertype.h"
 #include "extract.h"                   /* must come after interface.h */
@@ -312,7 +309,6 @@ print_link_conf(netdissect_options *ndo, const struct link_conf_tipc_pkthdr *ap)
        msize = TIPC_MSIZE(w0);
        w1 = EXTRACT_32BITS(&ap->w1);
        mtype = TIPC_MTYPE(w1);
-       prev_node = EXTRACT_32BITS(&ap->prev_node);
        dest_domain = EXTRACT_32BITS(&ap->dest_domain);
        prev_node = EXTRACT_32BITS(&ap->prev_node);