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

diff --git a/print-sunatm.c b/print-sunatm.c
index a7ebe067..fad2859f 100644
--- a/print-sunatm.c
+++ b/print-sunatm.c
@@ -29,29 +29,20 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sunatm.c,v 1.5 2002-12-19 09:39:16 guy Exp $ (LBL)";
-#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
- 
+#include <netdissect-stdinc.h>
+
 struct mbuf;
 struct rtentry;
- 
-#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) */
@@ -66,11 +57,12 @@ struct rtentry;
 /*
  * 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->length' is the length of the packet off the wire, and 'h->caplen'
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
 u_int
-sunatm_if_print(const struct pcap_pkthdr *h, const u_char *p)
+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;
@@ -79,15 +71,12 @@ sunatm_if_print(const struct pcap_pkthdr *h, const u_char *p)
 	u_int traftype;
 
 	if (caplen < PKT_BEGIN_POS) {
-		printf("[|atm]");
+		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) {
@@ -111,7 +100,7 @@ sunatm_if_print(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);
 
 	return (PKT_BEGIN_POS);
 }