Define INET6 for all platforms.

Show the addresses as a tooltip in capture interfaces.

Change-Id: I911784e09ed9479229a7d6f8a7f1476e2e1e6224
Reviewed-on: https://code.wireshark.org/review/2155
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index aa2acbc469da5cc2d1e1fe67484dea79b672e9ff..94c3df43be252efcd7f54b6960553df466f0373b 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -385,6 +385,8 @@
    However, we do need it for some headers that are shared between C and C++. */
 #define _U_ ${C_UNUSED}
 
+#  define INET6 1
+
 #if defined(_WIN32)
 
    /* WpdPack/INclude/pcap/pcap.h checks for "#if defined(WIN32)" */
@@ -423,7 +425,7 @@
 #  define UNICODE 1
 #  define _UNICODE 1
 
-#  define INET6 1
+/*#  define INET6 1*/
 #  define NEED_INET_V6DEFS_H 1
 #  define NEED_STRPTIME_H 1
 #endif

diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp
index 14df410b3bdf53e38e969c8bc7a8e7cef5cf31fa..5cc02e8c04681ba44c8c8e35c50ae27546767cda 100644 (file)
--- a/ui/qt/capture_interfaces_dialog.cpp
+++ b/ui/qt/capture_interfaces_dialog.cpp
@@ -299,6 +299,10 @@ void CaptureInterfacesDialog::UpdateInterfaces()
             ui->tbInterfaces->setItemDelegateForColumn(INTERFACE, &combobox_item_delegate_);
             output = QString(device.display_name);
             ui->tbInterfaces->setItem(ui->tbInterfaces->rowCount()-1, INTERFACE, new QTableWidgetItem(output));
+            if (strcmp(device.addresses,""))
+                ui->tbInterfaces->item(ui->tbInterfaces->rowCount()-1, INTERFACE)->setToolTip(tr("Addresses:\n%1").arg(device.addresses));
+            else
+                ui->tbInterfaces->item(ui->tbInterfaces->rowCount()-1, INTERFACE)->setToolTip(tr("no address"));
 
             linkname = NULL;
             if(capture_dev_user_linktype_find(device.name) != -1) {