Commit Graph

38708 Commits

Author SHA1 Message Date
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
Guy Harris bb98263aa4 Have wtap_file_extension_default_string() return the extension in the
sense of "what follows the last . in the file name", i.e. not including
the ".".

svn path=/trunk/; revision=40674
2012-01-23 21:57:45 +00:00
Anders Broman 4e30aece3a Only continue dissection if protocol is UDP.
svn path=/trunk/; revision=40673
2012-01-23 21:13:10 +00:00
Chris Maynard 58cab4f107 Fix some duplicate display filter names.
svn path=/trunk/; revision=40672
2012-01-23 20:42:54 +00:00
Jeff Morriss c5be5ec99c Finish wrapping heuristic dissector functions in #if conditionals; change the condition to check if HEUR_DISSECTOR_LIST is defined.
svn path=/trunk/; revision=40671
2012-01-23 20:40:16 +00:00
Guy Harris 77005f2a8c Put back the #include changes from a previous commit.
svn path=/trunk/; revision=40670
2012-01-23 20:31:42 +00:00
Chris Maynard fb6cce75d9 Fix some duplicate display filter names.
svn path=/trunk/; revision=40669
2012-01-23 20:14:37 +00:00
Anders Broman 008dd26ff5 Remove a debug statement.
svn path=/trunk/; revision=40668
2012-01-23 19:48:05 +00:00
Anders Broman 2b95c6601e Add the code to add a Heuristics protocol page.
#if 0:d out for now.

svn path=/trunk/; revision=40667
2012-01-23 19:47:13 +00:00
Jeff Morriss cea1ad9500 From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6743 :
The dissection [added with the previous patch on this bug] was not complete.
Attaching a diff on top of the existing SVN to properly dissect small
packets with mini header.

svn path=/trunk/; revision=40666
2012-01-23 19:41:35 +00:00
Gerald Combs 9d1459a796 Roman Donchenko → Роман Донченко
svn path=/trunk/; revision=40665
2012-01-23 19:18:50 +00:00
Chris Maynard ae9c9a3906 Fix some duplicate display filter names.
svn path=/trunk/; revision=40664
2012-01-23 19:17:42 +00:00
Anders Broman 088723a512 From Pascal Quantin:
Use the private data if available, call the data dissector for data.

svn path=/trunk/; revision=40663
2012-01-23 19:10:50 +00:00
Jeff Morriss 1c81971d42 From Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6754 :
Due to the variable remaining_bits_len getting out of sync with bit_offset (in
one case due to a mistake in the patch for bug 6375, and in another case
pre-existing).

I have shuffled the decrements of remaining_bits_len so that they always occur
next to an increment of bit_offset, so that this type of problem is easier to
spot.

From me: convert tabs to spaces to match the rest of the file.

svn path=/trunk/; revision=40662
2012-01-23 18:54:02 +00:00
Anders Broman dcf10c7c10 Not working Conversation Filter in (analyse menu)
(Fix the path to the fileter menu.)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6751

svn path=/trunk/; revision=40661
2012-01-23 17:55:52 +00:00
Anders Broman b458bdfe98 Update command codes.
svn path=/trunk/; revision=40660
2012-01-23 17:52:12 +00:00
Martin Mathieson 26d6d4ce8a Use plane rather than channelType as part of key for looking up channel
state for sequence analysis.

svn path=/trunk/; revision=40659
2012-01-23 14:39:38 +00:00
Anders Broman e553c70fe8 From Michael Mann:
help page update (pcapng is now the default file format).

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

svn path=/trunk/; revision=40658
2012-01-23 07:48:53 +00:00
Guy Harris ef2bf47e32 Add default extension names for all file types for which we have
extensions at all.

For file types that are plain text and that don't already have
extensions, add "txt" as the extension.

svn path=/trunk/; revision=40657
2012-01-23 02:38:56 +00:00
Martin Mathieson 7e5f6d9fc1 PDCP:
- Pass is_retx flag to PDCP from RLC in struct instead of calling function
RLC:
- use full key to look up sequence analysis results
    - avoids overwriting and attaching result details to wrong PDU
- add links to previous and next 'OK' PDUs in channel
- shorten some long variable and type names.

svn path=/trunk/; revision=40656
2012-01-23 02:36:46 +00:00
Martin Mathieson 7a17238dab Use detailed key for sequence analysis results to avoid overwriting with
other PDUs info from same frame.  Also:
- initialise next-frame value to 0
- don't show expected-SN when analysis result is 'ok'

svn path=/trunk/; revision=40655
2012-01-22 20:31:09 +00:00
Bill Meier 7ff47a2a32 Add a note as to how I was able to build & successfully use a Debug Qt Wireshark.
svn path=/trunk/; revision=40654
2012-01-22 19:52:40 +00:00
Gerald Combs e10723aa96 [Automatic manuf, services and enterprise-numbers update for 2012-01-22]
svn path=/trunk/; revision=40651
2012-01-22 15:03:30 +00:00
Guy Harris 340d882fba All valid file types should have file type strings (and, currently, they
all do); get rid of the test for a null return from
wtap_file_type_string().)

If wtap_get_file_extensions_list() returns NULL, include the file type
in the list of filters, and use "*.*" as the filter.  That way the list
of filters will include all file types, even if you can't really ask
only for files of that type (actually, you can't really ask only for
files of *any* type unless you're running under a desktop environment
where file types are specified by, for example, looking for magic
numbers, as there's no guarantee that, for example, a pcap file will
have an extension at all, given that it might come from a command-line
tool that doesn't default to any extension).

svn path=/trunk/; revision=40650
2012-01-22 11:37:33 +00:00
Martin Mathieson c585d8de24 Allow sequence analysis to be done either for PDCP frames found in RLC
frames, or logged at the PDCP level.  Provide a forward link to the next
SN frame for a channel.

svn path=/trunk/; revision=40649
2012-01-22 03:02:10 +00:00
Martin Mathieson 02e8a91a35 Various small tweaks to sequence analysis/re-assembly, plus implement
function to check for a frame being a retx as used by pdcp.

svn path=/trunk/; revision=40648
2012-01-22 02:55:47 +00:00