DLT for Solaris ipnet, requested by Darren Reed.

diff --git a/pcap/bpf.h b/pcap/bpf.h
index afe6a046567d8fd94f4c141e5244ff21028f3082..c5a11d32033041814784a6611374a50328b51c8d 100644 (file)
--- a/pcap/bpf.h
+++ b/pcap/bpf.h
@@ -896,6 +896,51 @@ struct bpf_version {
  */
 #define DLT_FC_2_WITH_FRAME_DELIMS     225
 
+/*
+ * Solaris ipnet pseudo-header; requested by Darren Reed <[email protected]>.
+ *
+ * The pseudo-header starts with a one-byte version number; for version 2,
+ * the pseudo-header is:
+ *
+ * struct dl_ipnetinfo {
+ *     u_int8_t   dli_version;
+ *     u_int8_t   dli_family;
+ *     u_int16_t  dli_htype;
+ *     u_int32_t  dli_pktlen;
+ *     u_int32_t  dli_ifindex;
+ *     u_int32_t  dli_grifindex;
+ *     u_int32_t  dli_zsrc;
+ *     u_int32_t  dli_zdst;
+ * };
+ *
+ * dli_version is 2 for the current version of the pseudo-header.
+ *
+ * dli_family is a Solaris address family value, so it's 2 for IPv4
+ * and 26 for IPv6.
+ *
+ * dli_htype is a "hook type" - 0 for incoming packets, 1 for outgoing
+ * packets, and 2 for packets arriving from another zone on the same
+ * machine.
+ *
+ * dli_pktlen is the length of the packet data following the pseudo-header
+ * (so the captured length minus dli_pktlen is the length of the
+ * pseudo-header, assuming the entire pseudo-header was captured).
+ *
+ * dli_ifindex is the interface index of the interface on which the
+ * packet arrived.
+ *
+ * dli_grifindex is the group interface index number (for IPMP interfaces).
+ *
+ * dli_zsrc is the zone identifier for the source of the packet.
+ *
+ * dli_zdst is the zone identifier for the destination of the packet.
+ *
+ * A zone number of 0 is the global zone; a zone number of 0xffffffff
+ * means that the packet arrived from another host on the network, not
+ * from another zone on the same machine.
+ */
+#define DLT_IPNET                      226
+
 
 /*
  * DLT and savefile link type values are split into a class and

diff --git a/savefile.c b/savefile.c
index f71ef1d3aa2a2e9e5fffdcd96935196d99d2b815..de3808b0eff2e2e66caca28d8dee87d8bc7a4bda 100644 (file)
--- a/savefile.c
+++ b/savefile.c
@@ -736,6 +736,51 @@ static const char rcsid[] _U_ =
  */
 #define LINKTYPE_FC_2_WITH_FRAME_DELIMS                225
 
+/*
+ * Solaris ipnet pseudo-header; requested by Darren Reed <[email protected]>.
+ *
+ * The pseudo-header starts with a one-byte version number; for version 2,
+ * the pseudo-header is:
+ *
+ * struct dl_ipnetinfo {
+ *     u_int8_t   dli_version;
+ *     u_int8_t   dli_family;
+ *     u_int16_t  dli_htype;
+ *     u_int32_t  dli_pktlen;
+ *     u_int32_t  dli_ifindex;
+ *     u_int32_t  dli_grifindex;
+ *     u_int32_t  dli_zsrc;
+ *     u_int32_t  dli_zdst;
+ * };
+ *
+ * dli_version is 2 for the current version of the pseudo-header.
+ *
+ * dli_family is a Solaris address family value, so it's 2 for IPv4
+ * and 26 for IPv6.
+ *
+ * dli_htype is a "hook type" - 0 for incoming packets, 1 for outgoing
+ * packets, and 2 for packets arriving from another zone on the same
+ * machine.
+ *
+ * dli_pktlen is the length of the packet data following the pseudo-header
+ * (so the captured length minus dli_pktlen is the length of the
+ * pseudo-header, assuming the entire pseudo-header was captured).
+ *
+ * dli_ifindex is the interface index of the interface on which the
+ * packet arrived.
+ *
+ * dli_grifindex is the group interface index number (for IPMP interfaces).
+ *
+ * dli_zsrc is the zone identifier for the source of the packet.
+ *
+ * dli_zdst is the zone identifier for the destination of the packet.
+ *
+ * A zone number of 0 is the global zone; a zone number of 0xffffffff
+ * means that the packet arrived from another host on the network, not
+ * from another zone on the same machine.
+ */
+#define LINKTYPE_IPNET                         226
+
 
 static struct linktype_map {
        int     dlt;
@@ -1072,6 +1117,9 @@ static struct linktype_map {
        /* Fibre Channel FC-2 frames with SOF and EOF */
        { DLT_FC_2_WITH_FRAME_DELIMS, LINKTYPE_FC_2_WITH_FRAME_DELIMS },
 
+       /* Solaris IPNET */
+       { DLT_IPNET,            LINKTYPE_IPNET },
+
        { -1,                   -1 }
 };