X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/464c44fbd1394ac006d8d99f16e80ead423c1c47..refs/pull/482/head:/print-sunatm.c

diff --git a/print-sunatm.c b/print-sunatm.c
index 0f9f6f58..fad2859f 100644
--- a/print-sunatm.c
+++ b/print-sunatm.c
@@ -34,24 +34,15 @@
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
- 
+#include <netdissect-stdinc.h>
+
 struct mbuf;
 struct rtentry;
- 
-#include <netinet/in.h>
- 
-#include <stdio.h>
-#include <pcap.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
-#include "addrtoname.h"
 
 #include "atm.h"
-#include "atmuni31.h"
 
 /* SunATM header for ATM packet */
 #define DIR_POS		0	/* Direction (0x80 = transmit, 0x00 = receive) */
@@ -64,13 +55,14 @@ struct rtentry;
 #define PT_LLC		0x02	/* LLC encapsulation */
 
 /*
- * This is the top level routine of the printer.  'p' is the points
- * to the SunATM pseudo-header for the packet, 'h->tv' is the timestamp,
- * 'h->length' is the length of the packet off the wire, and 'h->caplen'
+ * This is the top level routine of the printer.  'p' points
+ * to the SunATM pseudo-header for the packet, 'h->ts' is the timestamp,
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-void
-sunatm_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+u_int
+sunatm_if_print(netdissect_options *ndo,
+                const struct pcap_pkthdr *h, const u_char *p)
 {
 	u_int caplen = h->caplen;
 	u_int length = h->len;
@@ -78,18 +70,13 @@ sunatm_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 	u_char vpi;
 	u_int traftype;
 
- 	ts_print(&h->ts);
-
 	if (caplen < PKT_BEGIN_POS) {
-		printf("[|atm]");
-		goto out;
+		ND_PRINT((ndo, "[|atm]"));
+		return (caplen);
 	}
 
-	if (eflag) {
-		if (p[DIR_POS] & 0x80)
-			printf("Tx: ");
-		else
-			printf("Rx: ");
+	if (ndo->ndo_eflag) {
+		ND_PRINT((ndo, p[DIR_POS] & 0x80 ? "Tx: " : "Rx: "));
 	}
 
 	switch (p[DIR_POS] & 0x0f) {
@@ -113,11 +100,7 @@ sunatm_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 	p += PKT_BEGIN_POS;
 	caplen -= PKT_BEGIN_POS;
 	length -= PKT_BEGIN_POS;
-	atm_print(vpi, vci, traftype, p, length, caplen);
+	atm_print(ndo, vpi, vci, traftype, p, length, caplen);
 
- out:
-	putchar('\n');
-	--infodelay;
-	if (infoprint)
-		info(0);
+	return (PKT_BEGIN_POS);
 }