osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Irene Ruengeler 2014-06-12 09:22:01 +02:00 committed by Alexis La Goutte
parent 30480da87a
commit e14357032f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmakeconfig.h.in
View File

@ -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

4
ui/qt/capture_interfaces_dialog.cpp
View File

@ -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) {