X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b87c2e45492a77b258d8f47a17b8614c01c5f707..4feed5c7ec01c904059f5caa14827c1d61d7d3ac:/tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 009839e2..578b8654 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -30,7 +30,7 @@ static const char copyright[] _U_ =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.3 2005-05-12 07:23:04 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.6 2005-06-03 22:10:18 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -238,11 +238,20 @@ static struct printer printers[] = {
 #ifdef DLT_JUNIPER_PPPOE
 	{ juniper_pppoe_print,	DLT_JUNIPER_PPPOE },
 #endif
-#ifdef DLT_JUNIPER_PPPOE
-	{ juniper_pppoe_print,	DLT_JUNIPER_PPPOE },
-#endif
 #ifdef DLT_JUNIPER_PPPOE_ATM
 	{ juniper_pppoe_atm_print, DLT_JUNIPER_PPPOE_ATM },
+#endif
+#ifdef DLT_JUNIPER_GGSN
+	{ juniper_ggsn_print,	DLT_JUNIPER_GGSN },
+#endif
+#ifdef DLT_JUNIPER_ES
+	{ juniper_es_print,	DLT_JUNIPER_ES },
+#endif
+#ifdef DLT_JUNIPER_MONITOR
+	{ juniper_monitor_print, DLT_JUNIPER_MONITOR },
+#endif
+#ifdef DLT_JUNIPER_SERVICES
+	{ juniper_services_print, DLT_JUNIPER_SERVICES },
 #endif
 	{ NULL,			0 },
 };
@@ -1142,7 +1151,7 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
 	 * larger than Cflag - the last packet written to the
 	 * file could put it over Cflag.
 	 */
-	if (ftell((FILE *)dump_info->p) > Cflag) {
+	if (pcap_dump_ftell(dump_info->p) > Cflag) {
 		/*
 		 * Close the current file and open a new one.
 		 */