7 years agoFrom Tom Brezinski:
etxrab [Sat, 28 Jan 2012 17:10:50 +0000 (17:10 +0000)]
From Tom Brezinski:
includes radio data from the capture.


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

7 years agoFrom Claudio:
etxrab [Sat, 28 Jan 2012 17:04:48 +0000 (17:04 +0000)]
From Claudio:
linear white space (LWS) not ignored after HTTP header field content.


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

7 years agoFrom Andreas Heise:
etxrab [Sat, 28 Jan 2012 16:48:06 +0000 (16:48 +0000)]
From Andreas Heise:
option ssl_ignore_mac_failed.


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

7 years agoFrom Tobias Witek:
etxrab [Sat, 28 Jan 2012 16:37:50 +0000 (16:37 +0000)]
From Tobias Witek:
Add support for a new dissector (MTP2) to the 'meta' dissector.


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

7 years agoFrom Tobias Witek:
etxrab [Sat, 28 Jan 2012 16:34:22 +0000 (16:34 +0000)]
From Tobias Witek:
Allow dissectors to indicate that an ATM AAL5 frame contains SSCOP.


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

7 years agoFrom Michal Labedzki:
etxrab [Sat, 28 Jan 2012 16:24:12 +0000 (16:24 +0000)]
From Michal Labedzki:

Fix:Wrong bluetooth PSM detected when parse the L2CAP packet.


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

7 years agoFrom Michael:
etxrab [Sat, 28 Jan 2012 15:50:59 +0000 (15:50 +0000)]
From Michael:
Enhance SSL Key Exchange dissection.


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

7 years agoFrom Martin Kaiser:
etxrab [Sat, 28 Jan 2012 15:13:28 +0000 (15:13 +0000)]
From Martin Kaiser:
Unused variable in rtp_analysis.c


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

7 years agoAdd CMakeCache.txt, CPackSourceConfig.cmake and CPackConfig.cmake to svn:ignore ...
alagoutte [Sat, 28 Jan 2012 11:24:37 +0000 (11:24 +0000)]
Add CMakeCache.txt, CPackSourceConfig.cmake and CPackConfig.cmake to svn:ignore (when build with Cmake)

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

7 years agoAdd the Qt files to the tarball.
etxrab [Sat, 28 Jan 2012 09:18:26 +0000 (09:18 +0000)]
Add the Qt files to the tarball.

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

7 years agoAdd CMakeFiles and cmake_install.cmake to svn:ignore (when build with Cmake)
alagoutte [Sat, 28 Jan 2012 03:22:34 +0000 (03:22 +0000)]
Add CMakeFiles and cmake_install.cmake to svn:ignore (when build with Cmake)

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

7 years agoWell, we *did* go to a widget that invokes callback to get the text for
guy [Sat, 28 Jan 2012 02:21:03 +0000 (02:21 +0000)]
Well, we *did* go to a widget that invokes callback to get the text for
the columns, so we *can* clean up the exporting of col_set_fmt_time() by
not exporting it any more.

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

7 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6712 :
morriss [Fri, 27 Jan 2012 22:59:25 +0000 (22:59 +0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6712 :

Since SMPP knows the time zone of its (absolute) times and since we don't
have access to a mktime() routine that doesn't take into account the local
time zone (and since I don't think repeatedly setting the TZ environment
variable is a healthy choice):

1) subtract the 'timezone' (or '_timezone' on Windows) back out after calling
2) then adjust the time to take into the protocol-specified time zone
3) and (finally) display the time in UTC (since we don't have the
   infrastructure to display it in the protocol-specified time zone).

(I *think* (1) is portable: POSIX says that variable should exist...)

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

7 years agoFix
alagoutte [Fri, 27 Jan 2012 16:49:54 +0000 (16:49 +0000)]
main_window.cpp: In function ‘QStringList build_file_open_type_list()’:
main_window.cpp:249:50: error: cannot call constructor ‘QString::QString’ directly [-fpermissive]
main_window.cpp:249:50: error:   for a function-style cast, remove the redundant ‘::QString’ [-fpermissive]

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

7 years agoSince we know the version of WinPcap we're compiling against, go ahead and display...
cmaynard [Fri, 27 Jan 2012 03:41:20 +0000 (03:41 +0000)]
Since we know the version of WinPcap we're compiling against, go ahead and display it instead of displaying "version unknown".

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

7 years agoPer https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6765#c3, don't display "...
cmaynard [Fri, 27 Jan 2012 03:00:47 +0000 (03:00 +0000)]
Per https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6765#c3, don't display "(version unknown)" anymore.

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

7 years agoFrom Mike Morrin:
etxrab [Thu, 26 Jan 2012 23:13:31 +0000 (23:13 +0000)]
From Mike Morrin:
The gsmtap patch related to
Add dissectors for GSM and UMTS Cell Broadcast protocols.


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

7 years agoAdd a format string and remove a couple of unused variables.
gerald [Thu, 26 Jan 2012 22:14:19 +0000 (22:14 +0000)]
Add a format string and remove a couple of unused variables.

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

7 years agomake-dissector-reg.py doesn't always open its cache file.
gerald [Thu, 26 Jan 2012 21:38:53 +0000 (21:38 +0000)]
make-dissector-reg.py doesn't always open its cache file.

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

7 years agoFrom Mike Morrin:
etxrab [Thu, 26 Jan 2012 19:51:48 +0000 (19:51 +0000)]
From Mike Morrin:
Add dissectors for GSM and UMTS Cell Broadcast protocols.
( - the patch for gsmtap )


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

7 years agoApply changes from the "2to3" conversion utility. Print cache information.
gerald [Thu, 26 Jan 2012 19:38:27 +0000 (19:38 +0000)]
Apply changes from the "2to3" conversion utility. Print cache information.

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

7 years agoOh dear, had that test the wrong way around...
martinm [Thu, 26 Jan 2012 19:25:08 +0000 (19:25 +0000)]
Oh dear, had that test the wrong way around...

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

7 years agoDissect the crypto attribute.
etxrab [Thu, 26 Jan 2012 17:52:13 +0000 (17:52 +0000)]
Dissect the crypto attribute.

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

7 years agoAdd an 3gpp xml entry.
etxrab [Thu, 26 Jan 2012 17:51:19 +0000 (17:51 +0000)]
Add an 3gpp xml entry.

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

7 years agoFix memory leaks involving tvb_get_stringz() by replacing it with tvb_get_ephemeral_s...
cmaynard [Thu, 26 Jan 2012 15:51:05 +0000 (15:51 +0000)]
Fix memory leaks involving tvb_get_stringz() by replacing it with tvb_get_ephemeral_stringz().

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

7 years agoWhen telling RLC whether a frame is a retx, use direct setting if set
martinm [Thu, 26 Jan 2012 15:19:32 +0000 (15:19 +0000)]
When telling RLC whether a frame is a retx, use direct setting if set
for DL.
Also, check limits during subheader loop.

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

7 years agoFix Coverity CID 1371: UNINIT.
cmaynard [Thu, 26 Jan 2012 15:11:20 +0000 (15:11 +0000)]
Fix Coverity CID 1371: UNINIT.

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

7 years agoFix usage of g_ascii_strdown() and g_ascii_strup() - they do *not*
guy [Wed, 25 Jan 2012 23:03:33 +0000 (23:03 +0000)]
Fix usage of g_ascii_strdown() and g_ascii_strup() - they do *not*
modify the string in place, they return a g_mallocated modified version
of the string passed into them.

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

7 years agoTry to make the buildbots happy.
tuexen [Wed, 25 Jan 2012 20:26:34 +0000 (20:26 +0000)]
Try to make the buildbots happy.

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

7 years agoActually, you only have monitor mode support if you have pcap_create() -
guy [Wed, 25 Jan 2012 19:40:22 +0000 (19:40 +0000)]
Actually, you only have monitor mode support if you have pcap_create() -
without pcap_create() and pcap_activate() you don't have any API to turn
it on.

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

7 years agoThe proper scope / spec name for OS X is "macx".
gerald [Wed, 25 Jan 2012 18:06:25 +0000 (18:06 +0000)]
The proper scope / spec name for OS X is "macx".

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

7 years agoFix error when building QtShark:
wmeier [Wed, 25 Jan 2012 18:03:50 +0000 (18:03 +0000)]
Fix error when building QtShark:

...\capture_opts.h(94) : error C2461: 'remote_host' : constructor syntax missing formal parameters

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

7 years agoAdded billyjeans [AT] gmail.com to the authors list. (No known real name.)
cmaynard [Wed, 25 Jan 2012 17:10:57 +0000 (17:10 +0000)]
Added billyjeans [AT] gmail.com to the authors list.  (No known real name.)

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

7 years agoFrom billyjeans [AT] gmail.com via bug 6184: "S1AP dissector COL_INFO should display...
cmaynard [Wed, 25 Jan 2012 17:05:22 +0000 (17:05 +0000)]
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.

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

7 years agoUse a bitwise & when checking with a mask.
tuexen [Wed, 25 Jan 2012 16:45:22 +0000 (16:45 +0000)]
Use a bitwise & when checking with a mask.

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

7 years agoRemove redundant ().
tuexen [Wed, 25 Jan 2012 16:43:04 +0000 (16:43 +0000)]
Remove redundant ().

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

7 years agoAddress warnings reported by Bill.
tuexen [Wed, 25 Jan 2012 16:32:51 +0000 (16:32 +0000)]
Address warnings reported by Bill.

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

7 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

7 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

7 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

This patch was provided by Irene Ruengeler.

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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

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


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

7 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

7 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

7 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


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

7 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

7 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

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

7 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

7 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

7 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

7 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

This patch was provided by Irene Ruengeler.

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

7 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...)

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

7 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

Compiled (64-bit) with Qt 4.7.4 with GLib 2.30.0, with libpcap (version
unknown), with libz, 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, 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

7 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

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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

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

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

7 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

7 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

7 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

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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

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

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

7 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.)

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

7 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

7 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

7 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).


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

7 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

7 years agoPDCP:
martinm [Mon, 23 Jan 2012 02:36:46 +0000 (02:36 +0000)]
- Pass is_retx flag to PDCP from RLC in struct instead of calling function
- 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

7 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