diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2017-03-24 00:26:53 +0100 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2017-03-23 23:30:19 +0000 |
| commit | 383ba15d02452ba2fefd9c6f2d43d727dba071b4 (patch) | |
| tree | 64c4d46c283a25a40473fbe2768fc2f4e1aa92fe /ui/qt/manage_interfaces_dialog.cpp | |
| parent | cbea4c02c4b154e5995ce9c9ae6978d9dd2ecad2 (diff) | |
Clean up updateRemoteInterfaceList a bit more.
Add an #if-0'ed add_interface_to_remote_list because it is present in its
gtk pendant insert_new_rows in capture_dlg.c
Change-Id: I90e8f9eaafd3d3ca31140ec8bcd6a2eeb7c849ca
Reviewed-on: https://code.wireshark.org/review/20688
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'ui/qt/manage_interfaces_dialog.cpp')
| -rw-r--r-- | ui/qt/manage_interfaces_dialog.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp index 046e14b45f..967f7207a9 100644 --- a/ui/qt/manage_interfaces_dialog.cpp +++ b/ui/qt/manage_interfaces_dialog.cpp @@ -270,8 +270,7 @@ void ManageInterfacesDialog::updateRemoteInterfaceList(GList* rlist, remote_opti GList *if_entry, *lt_entry; if_info_t *if_info; char *if_string = NULL; - gchar *descr, *str = NULL, *auth_str; - // gchar *link_type_name = NULL; + gchar *descr, *auth_str; if_capabilities_t *caps; gint linktype_count; bool monitor_mode, found = false; @@ -283,11 +282,15 @@ void ManageInterfacesDialog::updateRemoteInterfaceList(GList* rlist, remote_opti GString *ip_str; link_row *linkr = NULL; interface_t device; + guint num_interfaces; - guint num_interfaces = global_capture_opts.all_ifaces->len; + num_interfaces = global_capture_opts.all_ifaces->len; for (if_entry = g_list_first(rlist); if_entry != NULL; if_entry = g_list_next(if_entry)) { auth_str = NULL; if_info = (if_info_t *)if_entry->data; +#if 0 + add_interface_to_remote_list(if_info); +#endif for (i = 0; i < num_interfaces; i++) { device = g_array_index(global_capture_opts.all_ifaces, interface_t, i); if (device.hidden) @@ -392,18 +395,15 @@ void ManageInterfacesDialog::updateRemoteInterfaceList(GList* rlist, remote_opti * used. */ if (data_link_info->description != NULL) { - str = g_strdup(data_link_info->description); + linkr->name = g_strdup(data_link_info->description); linkr->dlt = data_link_info->dlt; } else { - str = g_strdup_printf("%s (not supported)", data_link_info->name); + linkr->name = g_strdup_printf("%s (not supported)", data_link_info->name); linkr->dlt = -1; } if (linktype_count == 0) { - // link_type_name = g_strdup(str); device.active_dlt = data_link_info->dlt; } - linkr->name = g_strdup(str); - g_free(str); device.links = g_list_append(device.links, linkr); linktype_count++; } /* for link_types */ @@ -413,7 +413,6 @@ void ManageInterfacesDialog::updateRemoteInterfaceList(GList* rlist, remote_opti device.monitor_mode_supported = FALSE; #endif device.active_dlt = -1; - // link_type_name = g_strdup("default"); } device.addresses = g_strdup(ip_str->str); device.no_addresses = ips; |