Commit Graph

38733 Commits

Author SHA1 Message Date
Gerald Combs b58510cc31 The proper scope / spec name for OS X is "macx".
svn path=/trunk/; revision=40724
2012-01-25 18:06:25 +00:00
Bill Meier 36209e8773 Fix error when building QtShark:
...\capture_opts.h(94) : error C2461: 'remote_host' : constructor syntax missing formal parameters


svn path=/trunk/; revision=40723
2012-01-25 18:03:50 +00:00
Chris Maynard 048744e701 Added billyjeans [AT] gmail.com to the authors list. (No known real name.)
svn path=/trunk/; revision=40722
2012-01-25 17:10:57 +00:00
Chris Maynard 30b6674a90 From billyjeans [AT] gmail.com via bug 6184: "S1AP dissector COL_INFO should display different message status?", with changes from me to use col_append_str() and comma-separate the strings instead of using col_append_fstr() and pipe-separate them.
svn path=/trunk/; revision=40721
2012-01-25 17:05:22 +00:00
Michael Tüxen 1f2cb55d2c Use a bitwise & when checking with a mask.
svn path=/trunk/; revision=40720
2012-01-25 16:45:22 +00:00
Michael Tüxen 7b368e3895 Remove redundant ().
svn path=/trunk/; revision=40719
2012-01-25 16:43:04 +00:00
Michael Tüxen eca83b8a0c Address warnings reported by Bill.
svn path=/trunk/; revision=40718
2012-01-25 16:32:51 +00:00
Jeff Morriss 91b873184f monitor_mode_enabled is only available on WIN32 or if we HAVE_PCAP_CREATE.
svn path=/trunk/; revision=40717
2012-01-25 14:29:09 +00:00
Jeff Morriss a122d4616e 'error' is only used when we HAVE_LIBPCAP so only define it when that is the case.
svn path=/trunk/; revision=40716
2012-01-25 14:26:09 +00:00
Michael Tüxen 14b1a44c0f Third try. This time pipes and stdin are supported and the
test scripts are passed.

Use a global list containing all interfaces and only change
properties of the entries when changes are made in the GUI.
Do not misuse the list of interfaces specified on the command
line anymore.

This patch does not provide any new functionality, it just
provides the base for future extensions like removing
remote interface, mulitple airpcap devices and multiple
pipes.

This patch was provided by Irene Ruengeler.

svn path=/trunk/; revision=40715
2012-01-25 13:04:32 +00:00
Martin Mathieson 93ac5f499e Use sizeof(buff) as length argument when calling g_snprintf().
svn path=/trunk/; revision=40714
2012-01-25 04:01:33 +00:00
Martin Mathieson cf60b35576 Delete a TODO comment (now that there is an equivalent tshark tap).
svn path=/trunk/; revision=40713
2012-01-25 04:00:25 +00:00
Martin Mathieson 656af01617 Tidy up comments / deleted commented-out code.
svn path=/trunk/; revision=40712
2012-01-25 03:40:07 +00:00
Jeff Morriss 2f240acc2e Fix a couple of cut-n-pasteos.
svn path=/trunk/; revision=40711
2012-01-25 01:24:25 +00:00
Gerald Combs 84151d4737 Put back an "explicit" for now. I'm not sure it's necessary but Qt
Creator put it there as I recall.

svn path=/trunk/; revision=40710
2012-01-25 01:16:36 +00:00
Gerald Combs 9a14284b5b Add a comment discussing what it will take to have native file dialogs
on Windows and OS X.

svn path=/trunk/; revision=40709
2012-01-25 01:13:04 +00:00
Gerald Combs 377322404f Compile PortAudio if it's available.
svn path=/trunk/; revision=40708
2012-01-24 21:26:22 +00:00
Guy Harris abb8c5ef08 Fix typo.
svn path=/trunk/; revision=40707
2012-01-24 20:49:52 +00:00
Jeff Morriss e537085847 Get rid of a non-ASCII char
svn path=/trunk/; revision=40706
2012-01-24 20:44:49 +00:00
Guy Harris 13bd3bfbaa Note that INIT_DELAY is .1 second.
svn path=/trunk/; revision=40705
2012-01-24 20:32:01 +00:00
Chris Maynard 77e062c425 Mention the other integer accessors.
svn path=/trunk/; revision=40704
2012-01-24 20:31:35 +00:00
Chris Maynard 5b5f05c081 The AT dissector is not really USB-specific, so rename it from packet-usb-at.c to packet-at.c.
svn path=/trunk/; revision=40703
2012-01-24 20:29:32 +00:00
Anders Broman e9ab825ba5 max_ul_ext isn't printed/decoded to the packet details log in GTP protocol packet.(Wrong length check)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6761

svn path=/trunk/; revision=40702
2012-01-24 19:23:05 +00:00
Anders Broman 5e00d09f64 Upate a few more entries and add links to where the information can be found.
svn path=/trunk/; revision=40701
2012-01-24 19:17:44 +00:00
Anders Broman 4caa84610d Restructure the code abit.
svn path=/trunk/; revision=40700
2012-01-24 19:16:32 +00:00
Anders Broman f00ac880ca From Pascal Quantin:
Dissect operator-specific QCI values in EPS quality of service IE

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

svn path=/trunk/; revision=40699
2012-01-24 19:09:12 +00:00
Guy Harris 3caea2d5ca Use wtap_get_file_extensions_list(), and prepare to use
wtap_get_savable_file_types(), in the Qt file dialogs.

svn path=/trunk/; revision=40698
2012-01-24 19:04:05 +00:00
Michael Tüxen d02ccc6b37 It seems that we need Unix line endings also on Windows for these
files.

svn path=/trunk/; revision=40697
2012-01-24 18:34:26 +00:00
Chris Maynard b0326c9b9a Fix a duplicate display filter name.
svn path=/trunk/; revision=40696
2012-01-24 18:19:35 +00:00
Michael Tüxen 4fece25e7f We need a 3rd try. (After learning how to run the testuite on Windows locally).
svn path=/trunk/; revision=40695
2012-01-24 17:12:56 +00:00
Michael Tüxen b0819f5a80 (Try to) make the buildbot happy.
svn path=/trunk/; revision=40694
2012-01-24 16:40:16 +00:00
Michael Tüxen 08d6785412 Second try. This time pipes and stdin are supported.
Use a global list containing all interfaces and only change
properties of the entries when changes are made in the GUI.
Do not misuse the list of interfaces specified on the command
line anymore.

This patch does not provide any new functionality, it just
provides the base for future extensions like removing
remote interface, mulitple airpcap devices and multiple
pipes.

This patch was provided by Irene Ruengeler.


svn path=/trunk/; revision=40693
2012-01-24 16:05:26 +00:00
Alexis La Goutte 73cefbad15 Add Free Mobile (Iliad) Mobile Network Code (the French Mobile Revolution...)
http://www.arcep.fr/uploads/tx_gsavis/10-0264.pdf

svn path=/trunk/; revision=40692
2012-01-24 13:30:20 +00:00
Alexis La Goutte 4ebdb40338 Fix -v for QtShark
./Wireshark -v
wireshark 1.7.1 (SVN Rev Unknown from unknown)

Copyright 1998-2012 Gerald Combs <gerald@wireshark.org> and contributors.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Compiled (64-bit) with Qt 4.7.4 with GLib 2.30.0, with libpcap (version
unknown), with libz 1.2.3.4, with POSIX capabilities (Linux), with SMI 0.4.8,
with c-ares 1.7.4, with Lua 5.1, without Python, with GnuTLS 2.10.5, with Gcrypt
1.5.0, with MIT Kerberos, with GeoIP, with PortAudio V19-devel (built Jul 27
2011 11:52:20), without AirPcap.

Running on Linux 3.0.0-13-generic, with locale fr_FR.UTF-8, with libpcap version
1.1.1, with libz 1.2.3.4, GnuTLS 2.10.5, Gcrypt 1.5.0.

Built using gcc 4.6.1.

get_gui_compiled_info & get_gui_runtime_info copied from ../gtk/main.c 
the function is common to GTK and Qt need to put in version_info.[ch] ?

svn path=/trunk/; revision=40691
2012-01-24 13:08:07 +00:00
Guy Harris a127e69037 build_file_save_type_list() isn't called if there are no savable file
types.

svn path=/trunk/; revision=40690
2012-01-24 09:29:02 +00:00
Guy Harris c3d2108e32 Only free the file extensions list if there is one to free.
svn path=/trunk/; revision=40689
2012-01-24 09:18:06 +00:00
Guy Harris 313d2c583a Don't free the list of savable file types in build_file_save_type_list()
- we use it later, and we're freeing it later.

svn path=/trunk/; revision=40688
2012-01-24 08:20:37 +00:00
Guy Harris cbd9a418f1 Fix warnings.
svn path=/trunk/; revision=40687
2012-01-24 08:09:33 +00:00
Guy Harris e21727258c Use wtap_get_savable_file_types() for the Win32 file save dialog.
svn path=/trunk/; revision=40686
2012-01-24 05:55:00 +00:00
Guy Harris c8854a7a5f Add a routine to Wiretap that takes a file type value and an
encapsulation value and returns a GArray containing all the file types
that could be used to save a file of that file type and that
encapsulation value (which could be WTAP_ENCAP_PER_PACKET), with the
input file type first if that can be used and pcap or pcap-ng first if
not and if one of them can be used, and with pcap and pcap-ng clustered
together if they're among the file types that can be used.

Use that routine for the GTK+ file save dialog.

svn path=/trunk/; revision=40685
2012-01-24 04:33:23 +00:00
Jeff Morriss a2c21a2b53 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6737
As suggested by njtaylor0101 [AT] gmail.com: we (always) check for the gthread
module when checking glib so there's no need to check for it when checking GTK.
This prevents us, when configuring with gtk3, for checking for gthread-2.0
version 3.0.0 or later.

svn path=/trunk/; revision=40684
2012-01-24 03:16:33 +00:00
Martin Mathieson 13316398dd Use bitfields to make channel_hash_key struct fit into one word.
svn path=/trunk/; revision=40683
2012-01-24 03:05:21 +00:00
Jeff Morriss e36b1c6daf Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6738 :
size_t is sometimes an integer and sometimes a long.  To avoid compiler
warnings when formatting it, cast it to a long.

svn path=/trunk/; revision=40682
2012-01-24 02:42:01 +00:00
Jeff Morriss b415128e48 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6739 :
Update company ids and HCI/LMP versions to the latest Assigned Numbers

I made the cosmetic changes:
- simplify version description
- I updated all company ids from Assigned Numbers, so there are some very small
differences with old version (inadvertently)

Based on:
https://www.bluetooth.org/Technical/AssignedNumbers/hci.htm
https://www.bluetooth.org/Technical/AssignedNumbers/link_manager.htm
https://www.bluetooth.org/technical/assignednumbers/identifiers.htm

From me: list the above URLs in comments in the code.

svn path=/trunk/; revision=40681
2012-01-24 02:30:57 +00:00
Jeff Morriss f7e1f76659 From njtaylor0101 [AT] gmail.com via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6740 :
Fix an out-of-array-bounds warning from OpenBSD's compiler.  (Note: this is
actually a false positive since adequate memory is allocated.)

From me: some additional code simplification.

svn path=/trunk/; revision=40680
2012-01-24 02:20:46 +00:00
Guy Harris 7a3653b9c8 Don't treate WTAP_FILE_UNKNOWN as a real file type.
svn path=/trunk/; revision=40679
2012-01-24 00:48:48 +00:00
Guy Harris 3b1f82d063 In the table of capture file types, have:
a field that gives the default extension for the file type,
	*without* a leading "." (i.e., just the extension, not the "."
	that separates it from the rest of the file name), which is NULL
	if there are no known extensions;

	a field that gives a semicolon-separated list of *other*
	extensions, without "*." or ".", which is NULL if there are no
	known extensions or there are no known extensions other than the
	default.

Rename wtap_file_extension_default_string() to
wtap_default_file_extension() (matches the name of the field).

svn path=/trunk/; revision=40678
2012-01-23 23:17:03 +00:00
Jeff Morriss dc0ad2aac7 Revert 40675 and set 'protocol' appropriately when IPv6 is used.
Initialize it to something other than UDP if we can't determine the protocol.

Reindent parts of the subject function.
Replace tabs with spaces (for consistency).
Remove trailing white space.

svn path=/trunk/; revision=40677
2012-01-23 22:37:53 +00:00
Guy Harris e33f160de6 g_string_append_printf() returns nothing.
svn path=/trunk/; revision=40676
2012-01-23 22:23:37 +00:00
Jeff Morriss 4e7f5c2e8f Initialize 'protocol' to something, at least until it can be properly assigned in the IPv6 and default cases.
svn path=/trunk/; revision=40675
2012-01-23 22:20:15 +00:00