obnox/wireshark/wip.git
12 years agomonitor_mode_enabled is only available on WIN32 or if we HAVE_PCAP_CREATE.
morriss [Wed, 25 Jan 2012 14:29:09 +0000 (14:29 +0000)]
monitor_mode_enabled is only available on WIN32 or if we HAVE_PCAP_CREATE.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40717 f5534014-38df-0310-8fa8-9805f1628bb7

12 years ago'error' is only used when we HAVE_LIBPCAP so only define it when that is the case.
morriss [Wed, 25 Jan 2012 14:26:09 +0000 (14:26 +0000)]
'error' is only used when we HAVE_LIBPCAP so only define it when that is the case.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40716 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoThird try. This time pipes and stdin are supported and the
tuexen [Wed, 25 Jan 2012 13:04:32 +0000 (13:04 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40715 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoUse sizeof(buff) as length argument when calling g_snprintf().
martinm [Wed, 25 Jan 2012 04:01:33 +0000 (04:01 +0000)]
Use sizeof(buff) as length argument when calling g_snprintf().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40714 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoDelete a TODO comment (now that there is an equivalent tshark tap).
martinm [Wed, 25 Jan 2012 04:00:25 +0000 (04:00 +0000)]
Delete a TODO comment (now that there is an equivalent tshark tap).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40713 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoTidy up comments / deleted commented-out code.
martinm [Wed, 25 Jan 2012 03:40:07 +0000 (03:40 +0000)]
Tidy up comments / deleted commented-out code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40712 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix a couple of cut-n-pasteos.
morriss [Wed, 25 Jan 2012 01:24:25 +0000 (01:24 +0000)]
Fix a couple of cut-n-pasteos.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40711 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoPut back an "explicit" for now. I'm not sure it's necessary but Qt
gerald [Wed, 25 Jan 2012 01:16:36 +0000 (01:16 +0000)]
Put back an "explicit" for now. I'm not sure it's necessary but Qt
Creator put it there as I recall.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40710 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAdd a comment discussing what it will take to have native file dialogs
gerald [Wed, 25 Jan 2012 01:13:04 +0000 (01:13 +0000)]
Add a comment discussing what it will take to have native file dialogs
on Windows and OS X.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40709 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoCompile PortAudio if it's available.
gerald [Tue, 24 Jan 2012 21:26:22 +0000 (21:26 +0000)]
Compile PortAudio if it's available.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40708 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix typo.
guy [Tue, 24 Jan 2012 20:49:52 +0000 (20:49 +0000)]
Fix typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40707 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoGet rid of a non-ASCII char
morriss [Tue, 24 Jan 2012 20:44:49 +0000 (20:44 +0000)]
Get rid of a non-ASCII char

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40706 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoNote that INIT_DELAY is .1 second.
guy [Tue, 24 Jan 2012 20:32:01 +0000 (20:32 +0000)]
Note that INIT_DELAY is .1 second.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40705 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoMention the other integer accessors.
cmaynard [Tue, 24 Jan 2012 20:31:35 +0000 (20:31 +0000)]
Mention the other integer accessors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40704 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoThe AT dissector is not really USB-specific, so rename it from packet-usb-at.c to...
cmaynard [Tue, 24 Jan 2012 20:29:32 +0000 (20:29 +0000)]
The AT dissector is not really USB-specific, so rename it from packet-usb-at.c to packet-at.c.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40703 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agomax_ul_ext isn't printed/decoded to the packet details log in GTP protocol packet...
etxrab [Tue, 24 Jan 2012 19:23:05 +0000 (19:23 +0000)]
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40702 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoUpate a few more entries and add links to where the information can be found.
etxrab [Tue, 24 Jan 2012 19:17:44 +0000 (19:17 +0000)]
Upate a few more entries and add links to where the information can be found.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40701 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoRestructure the code abit.
etxrab [Tue, 24 Jan 2012 19:16:32 +0000 (19:16 +0000)]
Restructure the code abit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40700 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFrom Pascal Quantin:
etxrab [Tue, 24 Jan 2012 19:09:12 +0000 (19:09 +0000)]
From Pascal Quantin:
Dissect operator-specific QCI values in EPS quality of service IE

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40699 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoUse wtap_get_file_extensions_list(), and prepare to use
guy [Tue, 24 Jan 2012 19:04:05 +0000 (19:04 +0000)]
Use wtap_get_file_extensions_list(), and prepare to use
wtap_get_savable_file_types(), in the Qt file dialogs.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40698 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoIt seems that we need Unix line endings also on Windows for these
tuexen [Tue, 24 Jan 2012 18:34:26 +0000 (18:34 +0000)]
It seems that we need Unix line endings also on Windows for these
files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40697 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix a duplicate display filter name.
cmaynard [Tue, 24 Jan 2012 18:19:35 +0000 (18:19 +0000)]
Fix a duplicate display filter name.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40696 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoWe need a 3rd try. (After learning how to run the testuite on Windows locally).
tuexen [Tue, 24 Jan 2012 17:12:56 +0000 (17:12 +0000)]
We need a 3rd try. (After learning how to run the testuite on Windows locally).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40695 f5534014-38df-0310-8fa8-9805f1628bb7

12 years ago(Try to) make the buildbot happy.
tuexen [Tue, 24 Jan 2012 16:40:16 +0000 (16:40 +0000)]
(Try to) make the buildbot happy.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40694 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoSecond try. This time pipes and stdin are supported.
tuexen [Tue, 24 Jan 2012 16:05:26 +0000 (16:05 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40693 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAdd Free Mobile (Iliad) Mobile Network Code (the French Mobile Revolution...)
alagoutte [Tue, 24 Jan 2012 13:30:20 +0000 (13:30 +0000)]
Add Free Mobile (Iliad) Mobile Network Code (the French Mobile Revolution...)
http://www.arcep.fr/uploads/tx_gsavis/10-0264.pdf

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40692 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix -v for QtShark
alagoutte [Tue, 24 Jan 2012 13:08:07 +0000 (13:08 +0000)]
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] ?

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40691 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agobuild_file_save_type_list() isn't called if there are no savable file
guy [Tue, 24 Jan 2012 09:29:02 +0000 (09:29 +0000)]
build_file_save_type_list() isn't called if there are no savable file
types.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40690 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoOnly free the file extensions list if there is one to free.
guy [Tue, 24 Jan 2012 09:18:06 +0000 (09:18 +0000)]
Only free the file extensions list if there is one to free.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40689 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoDon't free the list of savable file types in build_file_save_type_list()
guy [Tue, 24 Jan 2012 08:20:37 +0000 (08:20 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40688 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix warnings.
guy [Tue, 24 Jan 2012 08:09:33 +0000 (08:09 +0000)]
Fix warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40687 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoUse wtap_get_savable_file_types() for the Win32 file save dialog.
guy [Tue, 24 Jan 2012 05:55:00 +0000 (05:55 +0000)]
Use wtap_get_savable_file_types() for the Win32 file save dialog.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40686 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAdd a routine to Wiretap that takes a file type value and an
guy [Tue, 24 Jan 2012 04:33:23 +0000 (04:33 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40685 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6737
morriss [Tue, 24 Jan 2012 03:16:33 +0000 (03:16 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40684 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoUse bitfields to make channel_hash_key struct fit into one word.
martinm [Tue, 24 Jan 2012 03:05:21 +0000 (03:05 +0000)]
Use bitfields to make channel_hash_key struct fit into one word.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40683 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6738 :
morriss [Tue, 24 Jan 2012 02:42:01 +0000 (02:42 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40682 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFrom Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6739 :
morriss [Tue, 24 Jan 2012 02:30:57 +0000 (02:30 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40681 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFrom njtaylor0101 [AT] gmail.com via https://bugs.wireshark.org/bugzilla/show_bug...
morriss [Tue, 24 Jan 2012 02:20:46 +0000 (02:20 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40680 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoDon't treate WTAP_FILE_UNKNOWN as a real file type.
guy [Tue, 24 Jan 2012 00:48:48 +0000 (00:48 +0000)]
Don't treate WTAP_FILE_UNKNOWN as a real file type.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40679 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoIn the table of capture file types, have:
guy [Mon, 23 Jan 2012 23:17:03 +0000 (23:17 +0000)]
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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40678 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoRevert 40675 and set 'protocol' appropriately when IPv6 is used.
morriss [Mon, 23 Jan 2012 22:37:53 +0000 (22:37 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40677 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agog_string_append_printf() returns nothing.
guy [Mon, 23 Jan 2012 22:23:37 +0000 (22:23 +0000)]
g_string_append_printf() returns nothing.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40676 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoInitialize 'protocol' to something, at least until it can be properly assigned in...
morriss [Mon, 23 Jan 2012 22:20:15 +0000 (22:20 +0000)]
Initialize 'protocol' to something, at least until it can be properly assigned in the IPv6 and default cases.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40675 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoHave wtap_file_extension_default_string() return the extension in the
guy [Mon, 23 Jan 2012 21:57:45 +0000 (21:57 +0000)]
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 ".".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40674 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoOnly continue dissection if protocol is UDP.
etxrab [Mon, 23 Jan 2012 21:13:10 +0000 (21:13 +0000)]
Only continue dissection if protocol is UDP.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40673 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix some duplicate display filter names.
cmaynard [Mon, 23 Jan 2012 20:42:54 +0000 (20:42 +0000)]
Fix some duplicate display filter names.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40672 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFinish wrapping heuristic dissector functions in #if conditionals; change the conditi...
morriss [Mon, 23 Jan 2012 20:40:16 +0000 (20:40 +0000)]
Finish wrapping heuristic dissector functions in #if conditionals; change the condition to check if HEUR_DISSECTOR_LIST is defined.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40671 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoPut back the #include changes from a previous commit.
guy [Mon, 23 Jan 2012 20:31:42 +0000 (20:31 +0000)]
Put back the #include changes from a previous commit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40670 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix some duplicate display filter names.
cmaynard [Mon, 23 Jan 2012 20:14:37 +0000 (20:14 +0000)]
Fix some duplicate display filter names.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40669 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoRemove a debug statement.
etxrab [Mon, 23 Jan 2012 19:48:05 +0000 (19:48 +0000)]
Remove a debug statement.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40668 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAdd the code to add a Heuristics protocol page.
etxrab [Mon, 23 Jan 2012 19:47:13 +0000 (19:47 +0000)]
Add the code to add a Heuristics protocol page.
#if 0:d out for now.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40667 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFrom Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6743 :
morriss [Mon, 23 Jan 2012 19:41:35 +0000 (19:41 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40666 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoRoman Donchenko → Роман Донченко
gerald [Mon, 23 Jan 2012 19:18:50 +0000 (19:18 +0000)]
Roman Donchenko → Роман Донченко

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40665 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix some duplicate display filter names.
cmaynard [Mon, 23 Jan 2012 19:17:42 +0000 (19:17 +0000)]
Fix some duplicate display filter names.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40664 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFrom Pascal Quantin:
etxrab [Mon, 23 Jan 2012 19:10:50 +0000 (19:10 +0000)]
From Pascal Quantin:
Use the private data if available, call the data dissector for data.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40663 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFrom Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6754 :
morriss [Mon, 23 Jan 2012 18:54:02 +0000 (18:54 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40662 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoNot working Conversation Filter in (analyse menu)
etxrab [Mon, 23 Jan 2012 17:55:52 +0000 (17:55 +0000)]
Not working Conversation Filter in (analyse menu)
(Fix the path to the fileter menu.)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6751

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40661 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoUpdate command codes.
etxrab [Mon, 23 Jan 2012 17:52:12 +0000 (17:52 +0000)]
Update command codes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40660 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoUse plane rather than channelType as part of key for looking up channel
martinm [Mon, 23 Jan 2012 14:39:38 +0000 (14:39 +0000)]
Use plane rather than channelType as part of key for looking up channel
state for sequence analysis.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40659 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFrom Michael Mann:
etxrab [Mon, 23 Jan 2012 07:48:53 +0000 (07:48 +0000)]
From Michael Mann:
help page update (pcapng is now the default file format).

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40658 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAdd default extension names for all file types for which we have
guy [Mon, 23 Jan 2012 02:38:56 +0000 (02:38 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40657 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoPDCP:
martinm [Mon, 23 Jan 2012 02:36:46 +0000 (02:36 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40656 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoUse detailed key for sequence analysis results to avoid overwriting with
martinm [Sun, 22 Jan 2012 20:31:09 +0000 (20:31 +0000)]
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'

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40655 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAdd a note as to how I was able to build & successfully use a Debug Qt Wireshark.
wmeier [Sun, 22 Jan 2012 19:52:40 +0000 (19:52 +0000)]
Add a note as to how I was able to build & successfully use a Debug Qt Wireshark.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40654 f5534014-38df-0310-8fa8-9805f1628bb7

12 years ago[Automatic manuf, services and enterprise-numbers update for 2012-01-22]
gerald [Sun, 22 Jan 2012 15:03:30 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-01-22]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40651 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAll valid file types should have file type strings (and, currently, they
guy [Sun, 22 Jan 2012 11:37:33 +0000 (11:37 +0000)]
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).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40650 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAllow sequence analysis to be done either for PDCP frames found in RLC
martinm [Sun, 22 Jan 2012 03:02:10 +0000 (03:02 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40649 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoVarious small tweaks to sequence analysis/re-assembly, plus implement
martinm [Sun, 22 Jan 2012 02:55:47 +0000 (02:55 +0000)]
Various small tweaks to sequence analysis/re-assembly, plus implement
function to check for a frame being a retx as used by pdcp.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40648 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoCheck for DL HARQ retx before calling RLC dissector to avoid sequence
martinm [Sun, 22 Jan 2012 02:52:50 +0000 (02:52 +0000)]
Check for DL HARQ retx before calling RLC dissector to avoid sequence
number analysis problems.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40647 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoGoogle translate suggested a different spelling for Roman's name, so use it instead.
cmaynard [Sun, 22 Jan 2012 02:14:55 +0000 (02:14 +0000)]
Google translate suggested a different spelling for Roman's name, so use it instead.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40646 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAdded Roman Dontsenko to the authors list for his contribution to fixing bug 5687...
cmaynard [Sun, 22 Jan 2012 02:11:54 +0000 (02:11 +0000)]
Added Roman Dontsenko to the authors list for his contribution to fixing bug 5687.  I did my best with the Cyrillic translation, but for the actual Cyrillic spelling of his name, refer to bug 5687.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40645 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoPatch from DXDragon [AT] yandex.ru (using e-mail address instead of name because...
cmaynard [Sun, 22 Jan 2012 01:59:00 +0000 (01:59 +0000)]
Patch from DXDragon [AT] yandex.ru (using e-mail address instead of name because I don't know how to enter Cyrillic letters) to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5687 - Some PGM options are not parsed correctly.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40644 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoWe already added the separator *if* we needed it; don't add it again.
guy [Sat, 21 Jan 2012 23:50:06 +0000 (23:50 +0000)]
We already added the separator *if* we needed it; don't add it again.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40643 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoWell, yeah, you can leave the list of patterns out, but then they don't
guy [Sat, 21 Jan 2012 23:48:03 +0000 (23:48 +0000)]
Well, yeah, you can leave the list of patterns out, but then they don't
show up in the UI, and they appear to show up in the UI in the Windows
apps I've seen, so I guess Windows apps put the list of patterns into
the description.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40642 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix calls to g_string_free() (added so as not to leak memory).
guy [Sat, 21 Jan 2012 23:45:15 +0000 (23:45 +0000)]
Fix calls to g_string_free() (added so as not to leak memory).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40641 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAt least according to the Microsoft documentation, you don't duplicate
guy [Sat, 21 Jan 2012 23:44:19 +0000 (23:44 +0000)]
At least according to the Microsoft documentation, you don't duplicate
the list of patterns; see what happens.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40640 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoWhat you get from wtap_get_file_extensions_list() are extensions, not
guy [Sat, 21 Jan 2012 23:23:18 +0000 (23:23 +0000)]
What you get from wtap_get_file_extensions_list() are extensions, not
patterns; add the "*.".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40639 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix print call.
guy [Sat, 21 Jan 2012 23:09:40 +0000 (23:09 +0000)]
Fix print call.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40638 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAppend the trailing ), don't overwrite the string.
guy [Sat, 21 Jan 2012 22:07:49 +0000 (22:07 +0000)]
Append the trailing ), don't overwrite the string.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40637 f5534014-38df-0310-8fa8-9805f1628bb7

12 years ago#define VENDOR_AT_AND_T 74
etxrab [Sat, 21 Jan 2012 21:59:37 +0000 (21:59 +0000)]
#define VENDOR_AT_AND_T 74

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40636 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoTry to fix
etxrab [Sat, 21 Jan 2012 21:45:33 +0000 (21:45 +0000)]
Try to fix
packet-csn1.c:179: warning: 'pui8' may be used uninitialized in this function

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40635 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAdd the missing file from
etxrab [Sat, 21 Jan 2012 20:26:46 +0000 (20:26 +0000)]
Add the missing file from
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=40627

Patch was whining about csn1.h fixing that i must have missed that csn1.c did not get patched.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40634 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix -v for QtShark
alagoutte [Sat, 21 Jan 2012 18:56:01 +0000 (18:56 +0000)]
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] ?

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40633 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoUpdate gitignore after the change of gtk directory
alagoutte [Sat, 21 Jan 2012 16:59:11 +0000 (16:59 +0000)]
Update gitignore after the change of gtk directory

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40632 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoRevert a recent spelling change back to its UK variant.
cmaynard [Sat, 21 Jan 2012 16:09:08 +0000 (16:09 +0000)]
Revert a recent spelling change back to its UK variant.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40631 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoSync checkapi target with Makefile.common.
tuexen [Sat, 21 Jan 2012 12:29:05 +0000 (12:29 +0000)]
Sync checkapi target with Makefile.common.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40630 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoSync checkapi target with Makefile.nmake.
tuexen [Sat, 21 Jan 2012 12:22:01 +0000 (12:22 +0000)]
Sync checkapi target with Makefile.nmake.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40629 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFrom Martin Lutz:
etxrab [Sat, 21 Jan 2012 12:21:29 +0000 (12:21 +0000)]
From Martin Lutz:
Updated the GOOSE dissector ASN.1 file to be able to display data for UTC timestamps.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40628 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFrom Mike Morrin:
etxrab [Sat, 21 Jan 2012 12:08:14 +0000 (12:08 +0000)]
From Mike Morrin:
a patch which improves several aspects of GSM RLS/MAC
dissection.

Generic improvements to the csn.1 dissector include:
•    Added a flag to the type descriptor structure so that any type can
(potentially) flagged as xxx_OR_NULL.  This was specifically needed for
UINT_OR_NULL for the ms capabilities struct.
•    Corrected the octet calculation in app of the proto_tree_add_text() and
proto_item_set_len() calls.
•    Changed the CSN_SERIALIZE so that the length of the length field can be
specified.
•    For CSN_NEXT_EXIST removed the requirement that the next type be CSN_END,
to allow truncation of multiple IEs.
•    For CSN_LEFT_ALIGNED_VAR_BITMAP corrected the handling of bit_offset.
•    Added a new type CSN_PADDING_BITS to make inspection of padding bits more
convenient.
•    Improved the CSN_RECURSIVE_TARRAY_1 to show the array index.

Improvements to the gsm_rlcmac dissector include:
•    Comment out a couple of unused hf variables.
•    Rework the definition of EGPRS Ack/Nack Description so that the length IE
(and absence thereof) is handled correctly.  This is the original issue for
which the bug was raised.
•    Added Padding Bits definitions to all PDUs
•    Change the Multislot_capability_t and Content_t definitions to allow
truncation at any IE
•    Added proto_tree_add_protocol_format() calls so that the protocol can be
added to a display filter
•    Append Protocol to the PROTOCOL column and PDU type to the INFO column.

From me get rid of C++ style comments.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40627 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoSync checkapi target with Makefile.nmake.
tuexen [Sat, 21 Jan 2012 12:06:31 +0000 (12:06 +0000)]
Sync checkapi target with Makefile.nmake.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40626 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoGet make checkapi working again.
tuexen [Sat, 21 Jan 2012 11:45:57 +0000 (11:45 +0000)]
Get make checkapi working again.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40625 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAdd missing variable.
guy [Sat, 21 Jan 2012 11:27:59 +0000 (11:27 +0000)]
Add missing variable.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40624 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoReplace wtap_file_extensions_string() with a routine that returns a
guy [Sat, 21 Jan 2012 08:59:21 +0000 (08:59 +0000)]
Replace wtap_file_extensions_string() with a routine that returns a
GSList of extensions for a file type, including extensions for the
compressed versions of those file types that we can read.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40623 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoIt's the Xoraya file type, not the Xoraya encapsulation, that was bogus.
guy [Sat, 21 Jan 2012 04:00:43 +0000 (04:00 +0000)]
It's the Xoraya file type, not the Xoraya encapsulation, that was bogus.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40622 f5534014-38df-0310-8fa8-9805f1628bb7

12 years ago"*.*" as a pattern for a given file type is pointless, as it doesn't
guy [Sat, 21 Jan 2012 03:55:40 +0000 (03:55 +0000)]
"*.*" as a pattern for a given file type is pointless, as it doesn't
select only files of that type; you might as well use "All Files (*.*)"
for that.

The default suffix is a suffix, not a pattern, so it shouldn't be
"*.{something}".

We only use the patterns on Windows, where file names are
case-insensitive, so there's no point in capital letters in suffixes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40621 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoGet rid of an unused file type. If somebody wants it in the official
guy [Sat, 21 Jan 2012 03:52:19 +0000 (03:52 +0000)]
Get rid of an unused file type.  If somebody wants it in the official
Wireshark distribution, give us code to read it.  If somebody wants it
in their private version of Wireshark, they can manage that themselves.
(We should support plugins for file types at some point; I think we
already have support for Lua file readers.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40620 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoFix a comment and some typos.
cmaynard [Sat, 21 Jan 2012 02:39:59 +0000 (02:39 +0000)]
Fix a comment and some typos.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40619 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoOr maybe we should just act as if QMake didn't exist and just try
guy [Sat, 21 Jan 2012 01:52:11 +0000 (01:52 +0000)]
Or maybe we should just act as if QMake didn't exist and just try
letting Boring Old Make do it; I have that autotools+make working with a
--with-qt option, albeit in a not-yet-ready-for-prime-time state.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40618 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoSet next pointer to NULL to avoid chasing non-existent UEs in list.
martinm [Sat, 21 Jan 2012 01:38:04 +0000 (01:38 +0000)]
Set next pointer to NULL to avoid chasing non-existent UEs in list.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40617 f5534014-38df-0310-8fa8-9805f1628bb7

12 years agoAvoid a potential infinite loop by stopping dissection when a message has no tlvblock...
cmaynard [Fri, 20 Jan 2012 22:03:52 +0000 (22:03 +0000)]
Avoid a potential infinite loop by stopping dissection when a message has no tlvblock.  Patch from Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6687

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40616 f5534014-38df-0310-8fa8-9805f1628bb7