Default to first interface from pcap_findalldevs()

[tcpdump] / print-cip.c

diff --git a/print-cip.c b/print-cip.c
index 1a8d1054c63ba6bf43f17066344b4e9f031da75b..2ea50bc040952e202ac736fcbbb0e6686a9e798f 100644 (file)
--- a/print-cip.c
+++ b/print-cip.c
@@ -20,26 +20,16 @@
  *
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cip.c,v 1.26 2005-07-07 01:22:17 guy Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <string.h>
 
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <pcap.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
-#include "ethertype.h"
-#include "ether.h"
 
 #define RFC1483LLC_LEN 8
 
@@ -52,12 +42,12 @@ static const unsigned char rfcllc[] = {
        0x00 };
 
 static inline void
-cip_print(int length)
+cip_print(netdissect_options *ndo, int length)
 {
        /*
         * There is no MAC-layer header, so just print the length.
         */
-       printf("%d: ", length);
+       ND_PRINT((ndo, "%d: ", length));
 }
 
 /*
@@ -67,44 +57,40 @@ cip_print(int length)
  * is the number of bytes actually captured.
  */
 u_int
-cip_if_print(const struct pcap_pkthdr *h, const u_char *p)
+cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
        u_int caplen = h->caplen;
        u_int length = h->len;
-       u_short extracted_ethertype;
+       int llc_hdrlen;
 
        if (memcmp(rfcllc, p, sizeof(rfcllc))==0 && caplen < RFC1483LLC_LEN) {
-               printf("[|cip]");
+               ND_PRINT((ndo, "[|cip]"));
                return (0);
        }
 
-       if (eflag)
-               cip_print(length);
+       if (ndo->ndo_eflag)
+               cip_print(ndo, length);
 
        if (memcmp(rfcllc, p, sizeof(rfcllc)) == 0) {
                /*
                 * LLC header is present.  Try to print it & higher layers.
                 */
-               if (llc_print(p, length, caplen, NULL, NULL,
-                   &extracted_ethertype) == 0) {
-                       /* ether_type not known, print raw packet */
-                       if (!eflag)
-                               cip_print(length);
-                       if (extracted_ethertype) {
-                               printf("(LLC %s) ",
-                              etherproto_string(htons(extracted_ethertype)));
-                       }
-                       if (!suppress_default_print)
-                               default_print(p, caplen);
+               llc_hdrlen = llc_print(ndo, p, length, caplen, NULL, NULL);
+               if (llc_hdrlen < 0) {
+                       /* packet type not known, print raw packet */
+                       if (!ndo->ndo_suppress_default_print)
+                               ND_DEFAULTPRINT(p, caplen);
+                       llc_hdrlen = -llc_hdrlen;
                }
        } else {
                /*
                 * LLC header is absent; treat it as just IP.
                 */
-               ip_print(gndo, p, length);
+               llc_hdrlen = 0;
+               ip_print(ndo, p, length);
        }
 
-       return (0);
+       return (llc_hdrlen);
 }