diff options
| author | Gerald Combs <gerald@wireshark.org> | 2007-06-11 03:58:58 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2007-06-11 03:58:58 +0000 |
| commit | e9f1a0b692e19854f9e550e56e6a4dd392d316ac (patch) | |
| tree | 34b32715c097282a72bc20784529bf82c5e01b0e /gtk/capture_if_dlg.c | |
| parent | f07a01dd510a6ae5fb963123195c4f0e203216aa (diff) | |
One more step in privilege separation.
Add a capture_interface_list(), which works similar to
get_interface_list() except that it forks dumpcap instead of calling
the pcap routines directly. Use it in the GUI.
Add a "-I" flag to dumpcap, which prints out verbose interface
information.
Tested under Windows and Linux.
svn path=/trunk/; revision=22071
Diffstat (limited to 'gtk/capture_if_dlg.c')
| -rw-r--r-- | gtk/capture_if_dlg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c index 37eb732303..b2114b481c 100644 --- a/gtk/capture_if_dlg.c +++ b/gtk/capture_if_dlg.c @@ -397,7 +397,7 @@ combo_channel_new(void) gint if_list_comparator_alph (const void *first_arg, const void *second_arg){ const if_info_t *first = first_arg, *second = second_arg; - if (first != NULL && first->description != NULL && + if (first != NULL && first->description != NULL && second != NULL && second->description != NULL) { return g_strcasecmp(first->description, second->description); } else { @@ -458,7 +458,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_) #endif /* LOAD THE INTERFACES */ - if_list = get_interface_list(&err, &err_str); + if_list = capture_interface_list(&err, &err_str); if_list = g_list_sort (if_list, if_list_comparator_alph); if (if_list == NULL && err == CANT_GET_INTERFACE_LIST) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_str); |