Commit Graph

1117 Commits

Author SHA1 Message Date
Alexis La Goutte 126c3f8b88 From report of Joerg Wunsch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7973 QRC files are missing in 1.8.3/SVN release tarball
Fix :
CMake Error at /usr/share/cmake-2.8/Modules/Qt4Macros.cmake:187 (FILE):
  file Internal CMake error when trying to open file:
  /wireshark-1.9.0-SVN/ui/qt/i18n.qrc for reading.
Call Stack (most recent call first):
  ui/qt/CMakeLists.txt:139 (QT4_ADD_RESOURCES)
...

From me:
Add missing files (*.qrc, qtshark.pro...) to ui/qt/Makefile.common

svn path=/trunk/; revision=46217
2012-11-27 09:18:42 +00:00
Guy Harris bd976ae6c0 On UN*X, if an interface has a description, use it as the "friendly
name".  If it doesn't have a description, on OS X, use the System
Configuration framework to attempt to get a "friendly name" for
interfaces.

If a loopback device doesn't have a friendly name, give it "Loopback" as
the friendly name.

Move the "turn a CFString into a mallocated C string" routine into
common code, as it's used in more than one place.

svn path=/trunk/; revision=46131
2012-11-22 06:02:49 +00:00
Guy Harris 24d4323da6 Assume, at least for now, that "Darwin" means "OS X"; don't bother
checking whether the relevant frameworks are available.  (An iOS port's
going to require a *lot* more work, and I don't know whether
Darwin-the-pure-OS even builds and runs any more.)

We don't need Core Services any more, as we're no longer using
Gestalt().  We just need Core Foundation for getting the OS version and
Application Services for firing up Web browser or file manager windows.

svn path=/trunk/; revision=46129
2012-11-22 05:46:49 +00:00
Guy Harris 69a454c744 Fix indentation.
svn path=/trunk/; revision=46126
2012-11-22 02:02:08 +00:00
Anders Broman 28474fe8ef From Mike Garratt:
Friendly Names for interfaces on Windows

Notes on the changes the patch covers:
* if_info_t struct: addition of friendly_name
* Dumpcap Interface list format changes:
  + Win32: "dumpcap -D" shows friendly_name in place of descript if known
  + All: machine interface "dumpcap -D -Z none" includes friendly_name in the
list in addition to the existing parameters
* interface_options struct: addition of console_display_name
  + When an interface name is displayed in a console, it will typically be the
console_display_name (instead of name). 
  + console_display_name is used as the basis of the autogenerated temp
filenames
  + console_display_name is typically set to the friendly_name if known,
otherwise it is set to the interface name
* Enhancements to capture_opts_add_iface_opt() (the function which process -i
options).
  + Can now specify the interface using its name and friendly_name
  + Interface name matching is case insenstive
  + Name matching first attempts exact matching, then falls back to prefix
matching
    (e.g. dumpcap -i local)
  + Validates interface names, instead of blindly sending them off to
winpcap/libpcap
  + Interface specification by number is still supported.
* capture_opts_trim_iface() has been refactored:
  + Instead of repeating a decent chunk of the cost in
capture_opts_add_iface_opt(), it calls capture_opts_trim_iface() to specify the
interface.
* introduction of capture_win_ifnames.[ch] (windows only code)
  + Implements static function GetInterfaceFriendlyNameFromDeviceGuid() - a
windows version independant function to convert an interface guid into its
friendly name.  Uses published api functions on windows vista and higher, but
falls back to unpublished API functions on older windows releases.
  + void get_windows_interface_friendlyname(/* IN */ char
*interface_devicename, /* OUT */char **interface_friendlyname); - extracts the
GUID from the interface_devicename, then uses
GetInterfaceFriendlyNameFromDeviceGuid() to do the resolution
* Auto temp filename generation:
  + Now uses wireshark_pcapng_* or  wireshark_pcap_* depending on file format
  + Basis temp filename format on console_display_name
  + Win32: if console_display_name is a windows interface guid, extracts
numbers from GUID here (instead of in interface option processing) 

GUI CHANGES:
* Dialog that displays when you click the "Manage Interfaces" button (within
Capture Options dialog) has been renamed from "Add new interfaces" to
"Interface Management"
* ui/gtk/capture_dlg.c: new_interfaces_w variable renamed to
interface_management_w
* Win32: Local Interfaces tab on Interface Management dialog, shows includes
friendly name as far left column
* Interface Management dialog defaults to larger size on win32 - so it fits
without resizing local interfaces tab
* Interface Management dialog now saves preferences when you click the apply
button (local hidden interfaces was not persisting across restarts)
* Tweaks: "Interface Details" dialog (Interface list->Capture Interfaces ->
Details):
  + "Friendly Name" renamed to "NDIS Friendly Name"
  + Added "OS Friendly Name" to the top of the list
* Win32: The "Capture Interfaces" dialog now shows the friendly name instead of
device guid
* Welcome screen:
  + The height of the interface list scrollbox dynamically adjusts & updates to
the number visible interfaces.
    Up to 10 interfaces can be listed without a scroll bar, the minimum height
is for 2 interfaces. 
  + Win32: now shows just the Friendly Name if known - in place of
"Interfacename_Guid:(Description)"

svn path=/trunk/; revision=46083
2012-11-19 20:07:27 +00:00
Pascal Quantin b439ae0d6a Revert r45692 and try to fix link failure another way: console_win32.[ch] definitely belong to ui/win32
Add console_win32.[ch] to Makefile.am

svn path=/trunk/; revision=45693
2012-10-21 19:12:18 +00:00
Anders Broman 1f867e7901 Include setup.ini in the tarball.
Copy setup.ini to etc/gtk-3.0

svn path=/trunk/; revision=45497
2012-10-12 12:36:22 +00:00
Anders Broman f0472792e2 - Add Nokai Siemens Networks AVP.
- Add a few enums to Event-Trigger
- Reformat the Nokia file a bit.

svn path=/trunk/; revision=45427
2012-10-09 14:10:31 +00:00
Anders Broman 9f38a46974 From GeorgiaK:
Add Nokia AVP:s

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7799

svn path=/trunk/; revision=45385
2012-10-08 14:20:34 +00:00
Gerald Combs 113d731ed8 Remove the previous distribution file.
svn path=/trunk/; revision=45328
2012-10-04 22:51:23 +00:00
Gerald Combs 361063457e Add a "patch-bzip2" target which creates a patch from the previous micro
release.

svn path=/trunk/; revision=45323
2012-10-04 19:37:03 +00:00
Martin Mathieson 60fb63783a From Jim Young, bug 7745.
Add Makefile support for reordercap.

svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
Gerald Combs f6c7b3e533 libgtkui_dirty → libui_dirty.
svn path=/trunk/; revision=44907
2012-09-14 21:06:26 +00:00
Gerald Combs 5e68ebc9b0 Make sure osx-dmg.sh is executable.
svn path=/trunk/; revision=44573
2012-08-19 01:16:42 +00:00
Guy Harris 9d4ab6a4f4 Patching configure.in files and regenerating them is a bag of hurt, as
it can depend on, among other things, having the the relevant .pc files
in one of the directories in PKG_CONFIG_PATH.  Instead, just don't
request a fat build of PortAudio.

svn path=/trunk/; revision=44457
2012-08-12 19:32:46 +00:00
Guy Harris 8bec02eb33 Add some patches to make PortAudio build with the macosx-setup.sh
script.

svn path=/trunk/; revision=44446
2012-08-11 23:03:06 +00:00
Anders Broman 5aad9e0d93 Add diameter/AlcatelLucent.xml to the distribution.
svn path=/trunk/; revision=44424
2012-08-10 15:30:42 +00:00
Jeff Morriss d1bb5b5860 (Attempt to) reflect the file moves from r44165.
svn path=/trunk/; revision=44174
2012-07-31 22:57:04 +00:00
Jeff Morriss 97964aae64 README.dfilter is no more.
svn path=/trunk/; revision=43943
2012-07-23 19:02:32 +00:00
Michael Mann 1ec2f43f2c WiMAX OFDMA PHY SAP dissector plugin (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695)
svn path=/trunk/; revision=43844
2012-07-20 01:21:27 +00:00
Guy Harris 5d18b53bda Expand that comment to note that there's no guarantee that GLIB_LIBS has
-gmodule or that GTK_LIBS doesn't have it.

svn path=/trunk/; revision=43564
2012-07-03 22:42:14 +00:00
Guy Harris d889046e5f As per Gentoo bug 423743
https://bugs.gentoo.org/show_bug.cgi?id=423743

"The Makefile.am claims including GLIB_LIBS when linking wireshark is
unnecessary, because wireshark links to GTK_LIBS which is a superset.
It is not actually a superset: gmodule is included in GLIB_LIBS but
not in GTK_LIBS (unless accidentally on older glibs/gtks)."

so we must explicitly link with GLIB_LIBS.

Update the comment to reflect that - and to reflect that GTK+ doesn't
necessarily run atop X11 - while we're at it.

Fixes bug 7427.

#BACKPORT

svn path=/trunk/; revision=43561
2012-07-03 20:12:50 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Jeff Morriss 9e1359e2fa Revert 43481: linking dftest against libui was not the problem.
svn path=/trunk/; revision=43488
2012-06-25 22:21:58 +00:00
Jeff Morriss 8eeebf73e0 Move get_args_as_string from ui/util.c into wsutil (maybe not to the best
module, but...).

This makes dftest no longer dependent on libui, so stop linking against it.

svn path=/trunk/; revision=43481
2012-06-25 20:38:45 +00:00
Jeff Morriss 5a89cfdebf It's FindNL.cmake not FindLIBNL.cmake
svn path=/trunk/; revision=43423
2012-06-21 00:15:11 +00:00
Jörg Mayer c0da019caa Complete cmake support for netlink detection
svn path=/trunk/; revision=43421
2012-06-20 20:59:43 +00:00
Guy Harris d50353013b AAAAARGH. Making the UI libs platform-dependent breaks dependency
checking, so if a UI library changes Wireshark won't be relinked with
it.  Revert the change that made them platform-dependent; we may end up
having to have separate targets for GTK+ Wireshark and Qt Wireshark.

svn path=/trunk/; revision=43384
2012-06-19 19:24:50 +00:00
Jeff Morriss e54831aef1 Don't install idl2wrs except in Debian's special wireshark-dev package.
(Normal Wireshark installations can't be used to develop dissectors so there's
no need to install it or its man page.)

http://www.wireshark.org/lists/wireshark-dev/201206/msg00073.html

(The Debian changes are untested.)

svn path=/trunk/; revision=43370
2012-06-19 15:39:52 +00:00
Anders Broman 2592e50101 Don't install main-menubar-ui.xml
svn path=/trunk/; revision=43368
2012-06-19 14:54:11 +00:00
Guy Harris 5c423a4c51 The toolkit-dependent UI library, well, depends on the toolkit. Make it
so.

svn path=/trunk/; revision=43329
2012-06-18 06:38:44 +00:00
Gerald Combs 304654f688 Don't install the Qt resource images. They get converted to C arrays in
qrc_*.cpp so they shouldn't be necessary even when we're building and
installing qtshark.

svn path=/trunk/; revision=43274
2012-06-15 18:17:20 +00:00
Pascal Quantin 3be09ce941 Add TGPPS9.xml to makefile and NSIS installer
svn path=/trunk/; revision=43202
2012-06-11 13:48:11 +00:00
Anders Broman a8e8234831 Make packet-coseventcomm.c a bultin dissector
svn path=/trunk/; revision=42974
2012-06-01 15:57:05 +00:00
Jeff Morriss 2c2e024cf5 The GIOP plugin is now one big plugin (instead of 2, or was it 4?).
svn path=/trunk/; revision=42929
2012-05-30 21:32:32 +00:00
Jeff Morriss 75c3c92f19 Add a "-build" argument to checkAPIs.pl. Use that argument when building
from makefiles (and thus from the buildbot).

The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.

As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.

svn path=/trunk/; revision=41943
2012-04-04 20:46:49 +00:00
Gerald Combs b5d1f49dfc Remove the dependency on tools/make-services.pl for the services target.
This is likely the cause of unwanted "services" file build attempts.

svn path=/trunk/; revision=41853
2012-03-30 17:53:23 +00:00
Guy Harris fd72ad5e92 Automake can, at times, be a delicate fragile flower. Apparently,
having something in wireshark_LDADD that's filled in by the configure
script means that the items referred to by that string aren't treated as
dependencies.

svn path=/trunk/; revision=41709
2012-03-21 06:13:53 +00:00
Guy Harris 73ca54d870 Said hack didn't work.
svn path=/trunk/; revision=41665
2012-03-19 07:24:14 +00:00
Guy Harris 1ff3d8477f Call the UI library in the Qt directory libqtui, not libui, to match the
UI library in the GTK+ directory.

List the moc-generated and rcc-generated files as generated files.

Add main_window.ui as an EXTRA_DIST file.  Sort the EXTRA_DIST list.

svn path=/trunk/; revision=41658
2012-03-19 06:29:41 +00:00
Guy Harris 16b1d14f30 Take the source files out of uiqt_DATA.
svn path=/trunk/; revision=41649
2012-03-18 23:49:44 +00:00
Guy Harris 994d2b544e Add automake support for Qt - use --with-qt as a configure script
argument.

svn path=/trunk/; revision=41647
2012-03-18 23:35:53 +00:00
Michael Tüxen 4e58ec540f Update to glib 2.31.20.
One patch is not required anymore, since it has been included.

svn path=/trunk/; revision=41546
2012-03-14 16:56:20 +00:00
Guy Harris 7676b02551 Reflect the rename of the Xylan RADIUS dictionary.
svn path=/trunk/; revision=41476
2012-03-10 19:05:46 +00:00
Guy Harris fbfb21931f Put more stuff from images into the release tarball.
svn path=/trunk/; revision=41420
2012-03-08 06:19:09 +00:00
Guy Harris 9c2cb97d1a And one more image file.
svn path=/trunk/; revision=41408
2012-03-07 21:48:08 +00:00
Guy Harris ace51f3c9d Include the new images in the release tarball.
svn path=/trunk/; revision=41407
2012-03-07 21:46:58 +00:00
Guy Harris 4a20fd003c We need to build libui even if we're only building TShark. Fixes bug
6855.

svn path=/trunk/; revision=41131
2012-02-22 02:15:23 +00:00
Guy Harris 280f14476b ui/cli now needs to be a distribution directory.
svn path=/trunk/; revision=41072
2012-02-19 19:30:45 +00:00
Guy Harris 2ae289a62e Build the TShark taps into a static libcliui library in the ui/cli
directory, and link TShark with that; let's see if this fixes the
Windows buildbots.

svn path=/trunk/; revision=41070
2012-02-19 19:01:01 +00:00