Win32 pcapif: use pcap_findalldevs(), not pcap_findalldevs_ex() (we don't capture remotely), added missing casts

This commit is contained in:
goldsimon 2012-02-23 08:46:55 +01:00
parent 72e48fada0
commit 79761834da
2 changed files with 5 additions and 4 deletions

View File

@ -154,7 +154,7 @@ get_adapter_index_from_addr(struct in_addr *netaddr, char *guid, size_t guid_len
memset(guid, 0, guid_len);
/* Retrieve the interfaces list */
if (pcap_findalldevs_ex(PCAP_SRC_IF_STRING, NULL, &alldevs, errbuf) == -1) {
if (pcap_findalldevs(&alldevs, errbuf) == -1) {
printf("Error in pcap_findalldevs: %s\n", errbuf);
return -1;
}
@ -398,9 +398,10 @@ pcapif_init_adapter(int adapter_num, void *arg)
#if PCAPIF_HANDLE_LINKSTATE
void
pcapif_check_linkstate(void *netif)
pcapif_check_linkstate(void *netif_ptr)
{
struct pcapif_private *pa = (struct pcapif_private*)((struct netif *)netif)->state;
struct netif *netif = (struct netif*)netif_ptr;
struct pcapif_private *pa = (struct pcapif_private*)netif->state;
enum pcapifh_link_event le;
le = pcapifh_linkstate_get(pa->link_state);

View File

@ -28,7 +28,7 @@ struct pcapifh_linkstate {
struct pcapifh_linkstate* pcapifh_linkstate_init(const char *adapter_name)
{
struct pcapifh_linkstate* state = malloc(sizeof(struct pcapifh_linkstate));
struct pcapifh_linkstate* state = (struct pcapifh_linkstate*)malloc(sizeof(struct pcapifh_linkstate));
if (state != NULL) {
memset(state, 0, sizeof(struct pcapifh_linkstate));
state->ppacket_oid_data = (PPACKET_OID_DATA)malloc(sizeof(PACKET_OID_DATA) + sizeof(NDIS_MEDIA_STATE));