diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-03-29 19:35:47 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-03-29 17:48:28 +0000 |
commit | 606fa969ba69f11c54ff16f89d514de8a7e0b3fb (patch) | |
tree | acc1697f02d3bf49382b25a1317805af4d0bcb39 | |
parent | 4e4de74000a9fd2435016b061e4337b90e6d4fae (diff) |
Extcap: fix USBPcap capture broken by g8204578
g8204578 was not the right way to do things: if_type is used to identify an extcap interface
Change-Id: Iead6c5e63f6874012c27ed7c1bf7152a5891ad65
Reviewed-on: https://code.wireshark.org/review/7849
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-rw-r--r-- | extcap.c | 11 | ||||
-rw-r--r-- | ui/gtk/capture_if_dlg.c | 9 |
2 files changed, 8 insertions, 12 deletions
@@ -308,16 +308,7 @@ static gboolean interfaces_cb(const gchar *extcap, gchar *output, void *data, if_info->name = g_strdup(int_iter->call); if_info->friendly_name = g_strdup(int_iter->display); -#ifdef WIN32 - if (strncmp(if_info->friendly_name, "USBPcap", 7) == 0) - { - if_info->type = IF_USB; - } - else -#endif - { - if_info->type = IF_EXTCAP; - } + if_info->type = IF_EXTCAP; if_info->extcap = g_strdup(extcap); *il = g_list_append(*il, if_info); diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c index 9188f85577..23da2d19e8 100644 --- a/ui/gtk/capture_if_dlg.c +++ b/ui/gtk/capture_if_dlg.c @@ -423,11 +423,16 @@ GtkWidget * capture_get_if_icon(interface_t *device) return xpm_to_widget(network_virtual_16_xpm); case IF_WIRED: return pixbuf_to_widget(network_wired_pb_data); - case IF_PIPE: - case IF_STDIN: #ifdef HAVE_EXTCAP case IF_EXTCAP: +#ifdef WIN32 + if (strncmp(device->friendly_name, "USBPcap", 7) == 0) { + return pixbuf_to_widget(network_usb_pb_data); + } #endif +#endif + case IF_PIPE: + case IF_STDIN: return pixbuf_to_widget(pipe_pb_data); default: printf("unknown device type\n"); |