X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fb1b6d808f19faae76526a2e3eed52a75fb22ff1..ffa1470e5c7ff0e50028d085a481dc797b0b51ed:/print-symantec.c?ds=sidebyside

diff --git a/print-symantec.c b/print-symantec.c
index 8dc0040a..1b0f2ec5 100644
--- a/print-symantec.c
+++ b/print-symantec.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-symantec.c,v 1.2 2004-03-17 23:24:38 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-symantec.c,v 1.4.2.1 2005-07-07 01:24:39 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -38,8 +38,6 @@ static const char rcsid[] _U_ =
 
 #include "ether.h"
 
-const u_char *snapend;
-
 struct symantec_header {
 	u_int8_t  stuff1[6];
 	u_int16_t ether_type;
@@ -57,16 +55,16 @@ symantec_hdr_print(register const u_char *bp, u_int length)
 	etype = ntohs(sp->ether_type);
 	if (!qflag) {
 	        if (etype <= ETHERMTU)
-		          (void)printf(", invalid ethertype %u", etype);
+		          (void)printf("invalid ethertype %u", etype);
                 else 
-		          (void)printf(", ethertype %s (0x%04x)",
+		          (void)printf("ethertype %s (0x%04x)",
 				       tok2str(ethertype_values,"Unknown", etype),
                                        etype);
         } else {
                 if (etype <= ETHERMTU)
-                          (void)printf(", invalid ethertype %u", etype);
+                          (void)printf("invalid ethertype %u", etype);
                 else 
-                          (void)printf(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", etype));  
+                          (void)printf("%s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", etype));  
         }
 
 	(void)printf(", length %u: ", length);
@@ -88,7 +86,7 @@ symantec_if_print(const struct pcap_pkthdr *h, const u_char *p)
 	u_short extracted_ether_type;
 
 	if (caplen < sizeof (struct symantec_header)) {
-		printf("[|syhmantec]");
+		printf("[|symantec]");
 		return caplen;
 	}
 
@@ -107,7 +105,7 @@ symantec_if_print(const struct pcap_pkthdr *h, const u_char *p)
 		if (!eflag)
 			symantec_hdr_print((u_char *)sp, length + sizeof (struct symantec_header));
 
-		if (!xflag && !qflag)
+		if (!suppress_default_print)
 			default_print(p, caplen);
 	} else if (ether_encap_print(ether_type, p, length, caplen,
 	    &extracted_ether_type) == 0) {
@@ -115,7 +113,7 @@ symantec_if_print(const struct pcap_pkthdr *h, const u_char *p)
 		if (!eflag)
 			symantec_hdr_print((u_char *)sp, length + sizeof (struct symantec_header));
 
-		if (!xflag && !qflag)
+		if (!suppress_default_print)
 			default_print(p, caplen);
 	}