diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-24 21:16:22 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-06-24 21:16:22 +0000 |
| commit | 41d07f9f84f4325237b29dd0b828d98df1349f82 (patch) | |
| tree | 60cc1c723684e959f0a1efdea5712607b26428c3 /capture-wpcap.c | |
| parent | 68c2c0c23f9fd6b01ffb4ffdadab0ac5233e3b16 (diff) | |
Add TurboCap-related changes from /trunk-1.0:
From Dustin Johnson: Add support for TurboCap.
- packet-ppi.c: Add aggregation and 802.3 extended information.
- capture-wpcap.c: Add support for pcap_list_datalinks and pcap_set_datalink.
Make pcap_list_datalinks and pcap_set_datalink mandatory on Windows.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25593 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'capture-wpcap.c')
| -rw-r--r-- | capture-wpcap.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/capture-wpcap.c b/capture-wpcap.c index a70116826d..66bfc3652a 100644 --- a/capture-wpcap.c +++ b/capture-wpcap.c @@ -103,6 +103,14 @@ static int (*p_pcap_createsrcstr) (char *, int, const char *, const char *, static struct pcap_samp* (*p_pcap_setsampling)(pcap_t *); #endif +#ifdef HAVE_PCAP_LIST_DATALINKS +static int (*p_pcap_list_datalinks)(pcap_t *, int **); +#endif + +#ifdef HAVE_PCAP_SET_DATALINK +static int (*p_pcap_set_datalink)(pcap_t *, int); +#endif + typedef struct { const char *name; gpointer *ptr; @@ -160,6 +168,12 @@ load_wpcap(void) SYM(pcap_lib_version, TRUE), SYM(pcap_setbuff, TRUE), SYM(pcap_next_ex, TRUE), +#ifdef HAVE_PCAP_LIST_DATALINKS + SYM(pcap_list_datalinks, FALSE), +#endif +#ifdef HAVE_PCAP_SET_DATALINK + SYM(pcap_set_datalink, FALSE), +#endif { NULL, NULL, FALSE } }; @@ -237,6 +251,15 @@ pcap_datalink(pcap_t *a) return p_pcap_datalink(a); } +#ifdef HAVE_PCAP_SET_DATALINK +int +pcap_set_datalink(pcap_t *p, int dlt) +{ + g_assert(has_wpcap); + return p_pcap_set_datalink(p, dlt); +} +#endif + int pcap_setfilter(pcap_t *a, struct bpf_program *b) { @@ -471,6 +494,15 @@ pcap_datalink_name_to_val(const char *name) } #endif +#ifdef HAVE_PCAP_LIST_DATALINKS +int +pcap_list_datalinks(pcap_t *p, int **ddlt) +{ + g_assert(has_wpcap); + return p_pcap_list_datalinks(p, ddlt); +} +#endif + #ifdef HAVE_PCAP_DATALINK_VAL_TO_NAME const char * pcap_datalink_val_to_name(int dlt) |