Re: tcpdump: patches required for OpenSolaris/SXCE

[Darren Reed <Darren.Reed () Sun COM>]

On 11/24/09 18:31, Michael Richardson wrote:
> Darren, thanks!
>
> Please pull from the git tree, and run "./configure; make check"
> I would appreciate it if you have any pcap files of formats:
>   DOCSIS (DOCSIS) (printing not supported)
>   

This seems to be an inherent part of libpcap?
BPF on Solaris doesn't report that, pcap adds it...
See pcap-bpf.c:get_dlt_list()


>   IPNET (Solaris IPNET)
>
> (I realize that the DOCSIS won't print. But, I care that it does not
> crash)
>
> Ideally, you'll place the files into tests/ and add a new test case.
>
> I updated print-ipnet.c to use netdissect_options as well.
>   

I've attached two files:
e1000g0 is an IPNET capture file from e1000g0 of some ICMP traffic (i.e. 
ping)
tcpdmp.patches are the changes I needed to make to stop tcpdump core 
dumping when reading that file.

Cheers,
Darren

diff --git a/netdissect.h b/netdissect.h
index ecd0824..aa02793 100644
--- a/netdissect.h
+++ b/netdissect.h
@@ -437,9 +437,9 @@ extern void lwres_print(netdissect_options *,const u_char *, u_int);
 extern void pptp_print(netdissect_options *,const u_char *, u_int);
 #endif
 
-extern void ipnet_print(netdissect_options *,const u_char *, u_int, u_int);
-extern u_int ipnet_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);
-extern int ipnet_encap_print(netdissect_options *,u_short, const u_char *, u_int, u_int);
+extern void ipnet_print(const u_char *, u_int, u_int);
+extern u_int ipnet_if_print(const struct pcap_pkthdr *, const u_char *);
+extern int ipnet_encap_print(u_short, const u_char *, u_int, u_int);
 
 #if 0
 #ifdef INET6
diff --git a/print-ipnet.c b/print-ipnet.c
index d60d981..044f23b 100644
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -7,13 +7,13 @@
 #include <stdio.h>
 #include <pcap.h>
 
-#include "netdissect.h"
+#include "interface.h"
 #include "addrtoname.h"
 #include "ipnet.h"
 
 #ifdef DLT_IPNET
 
-int ipnet_encap_print(netdissect_options *,u_short, const u_char *, u_int, u_int);
+int ipnet_encap_print(u_short, const u_char *, u_int, u_int);
 
 const struct tok ipnet_values[] = {
        { IPH_AF_INET,          "IPv4" },
@@ -22,53 +22,53 @@ const struct tok ipnet_values[] = {
 };
 
 static inline void
-ipnet_hdr_print(struct netdissect_options *ndo, const u_char *bp, u_int length)
+ipnet_hdr_print(const u_char *bp, u_int length)
 {
        const ipnet_hdr_t *hdr;
        hdr = (const ipnet_hdr_t *)bp;
 
-       ND_PRINT((ndo, "%d > %d", hdr->iph_zsrc, hdr->iph_zdst));
+       (void)printf("%d > %d", hdr->iph_zsrc, hdr->iph_zdst);
 
-       if (!ndo->ndo_qflag) {
-               ND_PRINT((ndo,", family %s (%d)",
+       if (!qflag) {
+               (void)printf(", family %s (%d)",
                           tok2str(ipnet_values, "Unknown",
                                   hdr->iph_family),
-                          hdr->iph_family));
+                          hdr->iph_family);
         } else {
-               ND_PRINT((ndo,", %s",
+               (void)printf(", %s",
                           tok2str(ipnet_values,
                                   "Unknown Ethertype (0x%04x)",
-                                  hdr->iph_family)));
+                                  hdr->iph_family));
         }
 
-       ND_PRINT((ndo, ", length %u: ", length));
+       (void)printf(", length %u: ", length);
 }
 
 void
-ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
+ipnet_print(const u_char *p, u_int length, u_int caplen)
 {
        ipnet_hdr_t *hdr;
 
        if (caplen < sizeof(ipnet_hdr_t)) {
-               ND_PRINT((ndo, "[|ipnet]"));
+               (void)printf("[|ipnet]");
                return;
        }
 
-       if (ndo->ndo_eflag)
-               ipnet_hdr_print(ndo, p, length);
+       if (eflag)
+               ipnet_hdr_print(p, length);
 
        length -= sizeof(ipnet_hdr_t);
        caplen -= sizeof(ipnet_hdr_t);
        hdr = (ipnet_hdr_t *)p;
        p += sizeof(ipnet_hdr_t);
 
-       if (ipnet_encap_print(ndo, hdr->iph_family, p, length, caplen) == 0) {
-               if (!ndo->ndo_eflag)
-                       ipnet_hdr_print(ndo, (u_char *)hdr,
+       if (ipnet_encap_print(hdr->iph_family, p, length, caplen) == 0) {
+               if (!eflag)
+                       ipnet_hdr_print((u_char *)hdr,
                                        length + sizeof(ipnet_hdr_t));
 
-               if (!ndo->ndo_suppress_default_print)
-                       ndo->ndo_default_print(ndo, p, caplen);
+               if (!gndo->ndo_suppress_default_print)
+                       gndo->ndo_default_print(gndo, p, caplen);
        } 
 }
 
@@ -79,9 +79,9 @@ ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int
  * is the number of bytes actually captured.
  */
 u_int
-ipnet_if_print(struct netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
+ipnet_if_print(const struct pcap_pkthdr *h, const u_char *p)
 {
-       ipnet_print(ndo, p, h->len, h->caplen);
+       ipnet_print(p, h->len, h->caplen);
 
        return (sizeof(ipnet_hdr_t));
 }
@@ -99,15 +99,14 @@ ipnet_if_print(struct netdissect_options *ndo, const struct pcap_pkthdr *h, cons
  */
 
 int
-ipnet_encap_print(struct netdissect_options *ndo, u_short family, const u_char *p,
-    u_int length, u_int caplen)
+ipnet_encap_print(u_short family, const u_char *p, u_int length, u_int caplen)
 {
  recurse:
 
        switch (family) {
 
        case IPH_AF_INET:
-               ip_print(ndo, p, length);
+               ip_print(gndo, p, length);
                return (1);
 
 #ifdef INET6

-
This is the tcpdump-workers list.
Visit https://cod.sandelman.ca/ to unsubscribe.