diff options
Diffstat (limited to 'pcap-dlpi.c')
| -rw-r--r-- | pcap-dlpi.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/pcap-dlpi.c b/pcap-dlpi.c index 1e7055b6..20c1fbb0 100644 --- a/pcap-dlpi.c +++ b/pcap-dlpi.c @@ -38,7 +38,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/pcap-dlpi.c,v 1.94 2003-11-21 10:19:34 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/pcap-dlpi.c,v 1.95 2003-12-18 23:32:32 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -585,6 +585,25 @@ pcap_open_live(const char *device, int snaplen, int promisc, int to_ms, case DL_ETHER: p->linktype = DLT_EN10MB; p->offset = 2; + /* + * This is (presumably) a real Ethernet capture; give it a + * link-layer-type list with DLT_EN10MB and DLT_DOCSIS, so + * that an application can let you choose it, in case you're + * capturing DOCSIS traffic that a Cisco Cable Modem + * Termination System is putting out onto an Ethernet (it + * doesn't put an Ethernet header onto the wire, it puts raw + * DOCSIS frames out on the wire inside the low-level + * Ethernet framing). + */ + p->dlt_list = (u_int *) malloc(sizeof(u_int) * 2); + /* + * If that fails, just leave the list empty. + */ + if (p->dlt_list != NULL) { + p->dlt_list[0] = DLT_EN10MB; + p->dlt_list[1] = DLT_DOCSIS; + p->dlt_count = 2; + } break; case DL_FDDI: @@ -722,6 +741,11 @@ pcap_open_live(const char *device, int snaplen, int promisc, int to_ms, bad: if (p->fd >= 0) close(p->fd); + /* + * Get rid of any link-layer type list we allocated. + */ + if (p->dlt_list != NULL) + free(p->dlt_list); free(p); return (NULL); } |