36c36
< "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.88.2.8 2005/08/13 22:29:46 hannes Exp $ (LBL)";
---
> "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.88.2.19 2007/09/19 02:50:52 guy Exp $ (LBL)";
243c243
< *dlt_buffer = (int*)malloc(sizeof(**dlt_buffer) * p->dlt_count);
---
> *dlt_buffer = (int*)calloc(sizeof(**dlt_buffer), p->dlt_count);
356a357
> DLT_CHOICE(DLT_LINUX_LAPD, "Linux vISDN LAPD"),
362,369c363,370
< DLT_CHOICE(DLT_PPP_PPPD, "PPP for pppd, with direction flag"),
< DLT_CHOICE(DLT_JUNIPER_PPPOE, "Juniper PPPoE"),
< DLT_CHOICE(DLT_JUNIPER_PPPOE_ATM, "Juniper PPPoE/ATM"),
< DLT_CHOICE(DLT_GPRS_LLC, "GPRS LLC"),
< DLT_CHOICE(DLT_GPF_T, "GPF-T"),
< DLT_CHOICE(DLT_GPF_F, "GPF-F"),
< DLT_CHOICE(DLT_JUNIPER_PIC_PEER, "Juniper PIC Peer"),
< DLT_CHOICE(DLT_JUNIPER_MLFR, "Juniper Multi-Link Frame Relay"),
---
> DLT_CHOICE(DLT_PPP_PPPD, "PPP for pppd, with direction flag"),
> DLT_CHOICE(DLT_JUNIPER_PPPOE, "Juniper PPPoE"),
> DLT_CHOICE(DLT_JUNIPER_PPPOE_ATM, "Juniper PPPoE/ATM"),
> DLT_CHOICE(DLT_GPRS_LLC, "GPRS LLC"),
> DLT_CHOICE(DLT_GPF_T, "GPF-T"),
> DLT_CHOICE(DLT_GPF_F, "GPF-F"),
> DLT_CHOICE(DLT_JUNIPER_PIC_PEER, "Juniper PIC Peer"),
> DLT_CHOICE(DLT_JUNIPER_MLFR, "Juniper Multi-Link Frame Relay"),
376,380c377,390
< DLT_CHOICE(DLT_JUNIPER_MFR, "Juniper FRF.16 Frame Relay"),
< DLT_CHOICE(DLT_JUNIPER_ETHER, "Juniper Ethernet"),
< DLT_CHOICE(DLT_JUNIPER_PPP, "Juniper PPP"),
< DLT_CHOICE(DLT_JUNIPER_FRELAY, "Juniper Frame Relay"),
< DLT_CHOICE(DLT_JUNIPER_CHDLC, "Juniper C-HDLC"),
---
> DLT_CHOICE(DLT_JUNIPER_MFR, "Juniper FRF.16 Frame Relay"),
> DLT_CHOICE(DLT_JUNIPER_ETHER, "Juniper Ethernet"),
> DLT_CHOICE(DLT_JUNIPER_PPP, "Juniper PPP"),
> DLT_CHOICE(DLT_JUNIPER_FRELAY, "Juniper Frame Relay"),
> DLT_CHOICE(DLT_JUNIPER_CHDLC, "Juniper C-HDLC"),
> DLT_CHOICE(DLT_MFR, "FRF.16 Frame Relay"),
> DLT_CHOICE(DLT_JUNIPER_VP, "Juniper Voice PIC"),
> DLT_CHOICE(DLT_MTP2, "SS7 MTP2"),
> DLT_CHOICE(DLT_A429, "Arinc 429"),
> DLT_CHOICE(DLT_A653_ICM, "Arinc 653 Interpartition Communication"),
> DLT_CHOICE(DLT_USB, "USB"),
> DLT_CHOICE(DLT_BLUETOOTH_HCI_H4, "Bluetooth HCI UART transport layer"),
> DLT_CHOICE(DLT_CAN20B, "Controller Area Network (CAN) v. 2.0B"),
> DLT_CHOICE(DLT_MTP2_WITH_PHDR, "SS7 MTP2 with Pseudo-header"),
460,461c470,471
< *us1 = (u_char *)s1,
< *us2 = (u_char *)s2;
---
> *us1 = (const u_char *)s1,
> *us2 = (const u_char *)s2;
674c684
< char *
---
> const char *
810c820
< static const char pcap_version_string[] = "libpcap version 0.9[.x]";
---
> static const char pcap_version_string[] = "libpcap version 0.9.8";
819c829
< static const char wpcap_version_string[] = "3.1";
---
> static const char wpcap_version_string[] = "4.0";