From: André Hentschel Subject: [5/15] wpcap: Implement pcap_dispatch Message-Id: <53EE6585.3080101@dawncrow.de> Date: Fri, 15 Aug 2014 21:54:45 +0200 --- dlls/wpcap/wpcap.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 29aa08c..3c75cdc 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -1,7 +1,7 @@ /* * WPcap.dll Proxy. * - * Copyright 2011 André Hentschel + * Copyright 2011, 2014 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +19,8 @@ */ #include +#include "windef.h" +#include "winbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wpcap); @@ -37,6 +39,40 @@ int CDECL wine_pcap_datalink(pcap_t *p) return pcap_datalink(p); } +typedef struct +{ + void CALLBACK (*pfn_cb)(u_char *, const struct pcap_pkthdr *, const u_char *); + void *user_data; +} PCAP_HANDLER_CALLBACK; + +static void pcap_handler_callback(u_char *user_data, const struct pcap_pkthdr *h, const u_char *p) +{ + PCAP_HANDLER_CALLBACK *pcb; + TRACE("(%p %p %p)\n", user_data, h, p); + pcb = (PCAP_HANDLER_CALLBACK *)user_data; + pcb->pfn_cb(pcb->user_data, h, p); + HeapFree(GetProcessHeap(), 0, pcb); + TRACE("Callback COMPLETED\n"); +} + +int CDECL wine_pcap_dispatch(pcap_t *p, int cnt, + void CALLBACK (*callback)(u_char *, const struct pcap_pkthdr *, const u_char *), + unsigned char *user) +{ + TRACE("(%p %i %p %p)\n", p, cnt, callback, user); + + if (callback) + { + PCAP_HANDLER_CALLBACK *pcb; + pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); + pcb->pfn_cb = callback; + pcb->user_data = user; + return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char*)pcb); + } + + return pcap_dispatch(p, cnt, NULL, user); +} + int CDECL wine_pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf) { int ret; diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 6dd67a1..6f673b9 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -15,7 +15,7 @@ @ stub pcap_datalink_name_to_val @ stub pcap_datalink_val_to_description @ stub pcap_datalink_val_to_name -@ stub pcap_dispatch +@ cdecl pcap_dispatch(ptr long long str) wine_pcap_dispatch @ stub pcap_dump @ stub pcap_dump_close @ stub pcap_dump_file