diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-12-15 19:29:21 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-12-15 19:29:21 +0000 |
| commit | 7871c54e99ed390e6c061d921b290d32103c3e0a (patch) | |
| tree | b29ecb8bc7b66c442d9d37087a8250bdccec5eec /capture.c | |
| parent | ae2b555a960b14cfbc1a1ce6c440dce944bc4981 (diff) | |
Behave more gracefully if WinPcap isn't installed. Don't assert if
we call pcap_open or pcap_open_live when WinPcap isn't loaded - just
return NULL. Don't display the "NPF driver isn't running" dialog if
we're capturing from stdin or a file.
Fix a cut-and-paste error in capture_pcap_linktype_list.
svn path=/trunk/; revision=31275
Diffstat (limited to 'capture.c')
| -rw-r--r-- | capture.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -759,12 +759,12 @@ capture_pcap_linktype_list(const gchar *ifname, char **err_str) gchar **raw_list, **lt_parts; data_link_info_t *data_link_info; - g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List ..."); + g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Linktype List ..."); /* Try to get our interface list */ err = sync_linktype_list_open(ifname, &msg); if (err != 0) { - g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Interface List failed!"); + g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_MESSAGE, "Capture Linktype List failed!"); if (err_str) { *err_str = msg; } else { |