7 years agoGOOSE Messages don't use the length field to perform the dissection.
etxrab [Sun, 5 Feb 2012 18:25:01 +0000 (18:25 +0000)]
GOOSE Messages don't use the length field to perform the dissection.



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

7 years agoFrom walter schmid:
etxrab [Sun, 5 Feb 2012 16:19:21 +0000 (16:19 +0000)]
From walter schmid:
wrong reassemble of T30 msg if more data fields in T38 packet.


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

7 years ago[Automatic manuf, services and enterprise-numbers update for 2012-02-05]
gerald [Sun, 5 Feb 2012 15:03:28 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-02-05]

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

7 years agoFrom Xiao Xiangquan:
etxrab [Sun, 5 Feb 2012 13:51:50 +0000 (13:51 +0000)]
From Xiao Xiangquan:
bt-dht and bt-utp should also be common dissectors while not only heuristic
ones. So we can use them with "Decode As..." command.

Applying the missing part as this seems to be an owerlapping patch.

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

7 years agoFrom Tony Trinh:
etxrab [Sun, 5 Feb 2012 13:30:27 +0000 (13:30 +0000)]
From Tony Trinh:
"matches" operator fails to match hex.


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

7 years agoFrom Alexander Koeppe:
etxrab [Sun, 5 Feb 2012 13:25:36 +0000 (13:25 +0000)]
From Alexander Koeppe:
Eliminate Mixture of libc and glibc in editcap.c


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

7 years agoFix comments.
etxrab [Sun, 5 Feb 2012 13:24:04 +0000 (13:24 +0000)]
Fix comments.

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

7 years agoTry to fix the compile errors on OS X:
jmayer [Sun, 5 Feb 2012 13:17:39 +0000 (13:17 +0000)]
Try to fix the compile errors on  OS X:

cc1: warnings being treated as errors
packet-aastra-aasp.c: In function 'dissect_a_binary_command':
packet-aastra-aasp.c:142: warning: unused parameter 'pinfo'
packet-aastra-aasp.c:428:25: error: "/*" within comment
packet-aastra-aasp.c:429:25: error: "/*" within comment
packet-aastra-aasp.c:430:25: error: "/*" within comment
packet-aastra-aasp.c:431:25: error: "/*" within comment
packet-aastra-aasp.c:432:25: error: "/*" within comment
packet-aastra-aasp.c:433:25: error: "/*" within comment
packet-aastra-aasp.c:434:25: error: "/*" within comment
packet-aastra-aasp.c:435:25: error: "/*" within comment
packet-aastra-aasp.c:436:25: error: "/*" within comment
packet-aastra-aasp.c:437:25: error: "/*" within comment
packet-aastra-aasp.c:438:25: error: "/*" within comment

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

7 years agoFrom billyjeans:
etxrab [Sun, 5 Feb 2012 13:09:10 +0000 (13:09 +0000)]
From billyjeans:
EAP-TLS cannot re-initialize properly if previous EAP-TLS conversation is not properly finished.


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

7 years agoFrom Michael Mann:
etxrab [Sun, 5 Feb 2012 13:05:15 +0000 (13:05 +0000)]
From Michael Mann:
Went through all stderr cases within tshark trying to make tshark "quieter".  I
basically ended up agreeing with the submitted in terms of what should be
switched to stdout from stderr.  The attached patch does that.


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

7 years agoForgot to commit the CMakeList.txt changes
jmayer [Sun, 5 Feb 2012 12:55:30 +0000 (12:55 +0000)]
Forgot to commit the CMakeList.txt changes

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

7 years agoFrom Marek Tews:
etxrab [Sun, 5 Feb 2012 12:54:21 +0000 (12:54 +0000)]
From Marek Tews:
Aastra Signalling Protocol (AASP).


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

7 years agoTry to get rid of non-ASCII characters.
etxrab [Sun, 5 Feb 2012 12:47:43 +0000 (12:47 +0000)]
Try to get rid of non-ASCII characters.

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

7 years agoFrom Jakub Zawadzki:
etxrab [Sun, 5 Feb 2012 12:15:12 +0000 (12:15 +0000)]
From Jakub Zawadzki:
Minimal version of Gadu-Gadu dissector (header only).


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

7 years agoFrom Tyson Key:
etxrab [Sun, 5 Feb 2012 12:02:27 +0000 (12:02 +0000)]
From Tyson Key:
I've just finished writing a dissector for parts of the Sony FeliCa smartcard
application layer protocol, as documented in JIS X 6319-4, (partially in) ISO
18092, and in various documents made publicly available at


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

7 years agoCast it away.
etxrab [Sun, 5 Feb 2012 11:46:52 +0000 (11:46 +0000)]
Cast it away.

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

7 years agoTry to fix some of the build problems, it still bumms out on:
etxrab [Sun, 5 Feb 2012 11:41:43 +0000 (11:41 +0000)]
Try to fix some of the build problems, it still bumms out on:
tap-follow.c(464) : error C2220: warning treated as error - no 'object' file gen
tap-follow.c(464) : warning C4267: '=' : conversion from 'size_t' to 'guint32',
possible loss of data
tap-follow.c(610) : warning C4267: '=' : conversion from 'size_t' to 'guint32',
possible loss of data
tap-follow.c(639) : warning C4267: 'initializing' : conversion from 'size_t' to
'int', possible loss of data
NMAKE : fatal error U1077: '"c:\Program Files (x86)\Microsoft Visual Studio 10.0
\VC\BIN\x86_amd64\cl.EXE"' : return code '0x2'

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

7 years agoChecked in, with the following changes:
jmayer [Sun, 5 Feb 2012 11:34:04 +0000 (11:34 +0000)]
Checked in, with the following changes:

- Adapted packet-gsm_sim.c and CmakeLists.txt to match current content (trivial)
- Fixed warnings about //-style comments that were found running
   ../../tools/checkAPIs.pl -g deprecated -g prohibited -g abort -g termoutput packet-gsm_sim.c packet-etsi_card_app_toolkit.c
    Error: Found C++ style comments in packet-gsm_sim.c
- Not fixed (will lead to dissector abort if in a packet):
   ../../tools/checkhf.pl packet-gsm_sim.c packet-etsi_card_app_toolkit.c
    ERROR: NO ARRAY: packet-gsm_sim.c, hf_tprof_b19
    ERROR: NO ARRAY: packet-gsm_sim.c, hf_tprof_b18
    ERROR: NO ARRAY: packet-etsi_card_app_toolkit.c, hf_ctlv_bearer_descr
  Please provide the necessary element entries for the hf[] array in a
  followup patch.

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

7 years agoThere is a logic bug in this dissector that is exposed
jmayer [Sun, 5 Feb 2012 11:24:06 +0000 (11:24 +0000)]
There is a logic bug in this dissector that is exposed
by a set but unused warning. Hack around this for now.
Someone who knows the protocol should fix this.

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

7 years agoFrom QA Cafe:
etxrab [Sun, 5 Feb 2012 10:39:12 +0000 (10:39 +0000)]
From QA Cafe:
Add support to follow UDP and TCP streams like wireshark does. UDP streams are
selected with IP address/port pairs. TCP stream are selected with either the
stream index or IP address/port pairs.


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

7 years agoFrom Harald Welte:
etxrab [Sun, 5 Feb 2012 10:23:56 +0000 (10:23 +0000)]
From Harald Welte:
TThis is a new dissector for the GSM A-bis OML protocol as specified in TS
including some Siemens and ip.access vendor-specific extensions.

The protocol is called from both classic ISDN (LAPD) based A-bis as well as the
gsm_ipa dissector.

- Fixed the encoding argument to proto_add_item()
- Removed Attribute as that does not compile on windows.


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

7 years agoFrom Harald Welte:
etxrab [Sun, 5 Feb 2012 10:03:05 +0000 (10:03 +0000)]
From Harald Welte:
This is an enhancement for the existing A-bis RSL protocol dissector for GSM
networks (as specified in Technical Specification 12.21 of the 3GPP).
this patch adds ip.access vendor-specific RSL extensions.

- Fixed the encoding argument to proto_add_item()
- Do not default to ip.accsess RSL.
- u_int8_t -> guint8


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

7 years agoFrom Holger Hans Peter Freyther:
etxrab [Sun, 5 Feb 2012 09:09:51 +0000 (09:09 +0000)]
From Holger Hans Peter Freyther:
Begin new dissector for DVB/ETSI IP Data Cast (IPDC) Electronic Service Guide (ESG) dissector.


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

7 years agoFrom Stipe Tolj:
etxrab [Sun, 5 Feb 2012 08:56:27 +0000 (08:56 +0000)]
From Stipe Tolj:
Ensure that ALL response PDUs are displayed, and the corresponding description text for the reserved or vendor-specific error code is displayed.


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

7 years agoFrom Sylvain Munaut:
etxrab [Sun, 5 Feb 2012 08:14:09 +0000 (08:14 +0000)]
From Sylvain Munaut:


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

7 years agoFix long standing but that prevented installation to
jmayer [Sun, 5 Feb 2012 07:41:53 +0000 (07:41 +0000)]
Fix long standing but that prevented installation to
work at all.
Next step ist to move docbook installation back into docbook/

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

7 years agoDocument which external files are used by the packet-x11.c generator
jmayer [Sun, 5 Feb 2012 07:37:32 +0000 (07:37 +0000)]
Document which external files are used by the packet-x11.c generator

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

7 years agoAdd note about unifying a4 and letter format builds.
jmayer [Sat, 4 Feb 2012 23:30:38 +0000 (23:30 +0000)]
Add note about unifying a4 and letter format builds.

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

7 years agoUpdate .gitignore with the last change in svn:ignore for Qt
alagoutte [Sat, 4 Feb 2012 17:36:10 +0000 (17:36 +0000)]
Update .gitignore with the last change in svn:ignore for Qt

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

7 years agoFrom Harald Welte:
etxrab [Sat, 4 Feb 2012 15:44:10 +0000 (15:44 +0000)]
From Harald Welte:
lapdm dissector tries to defragment segment of different streams.


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

7 years agoAdd the magic incantation to get icons into the cmake build.
jmayer [Sat, 4 Feb 2012 14:27:14 +0000 (14:27 +0000)]
Add the magic incantation to get icons into the cmake build.
No idea why the qtcreate build worked without this.
See http://developer.qt.nokia.com/doc/qt-4.8/resources.html

@Gerald: I've most likely put this into the wrong place, please

Thanks to Alexander Neundorf for spotting this and proposing a

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

7 years ago- Add a comment how to improve the output of supported features later on.
jmayer [Sat, 4 Feb 2012 14:19:38 +0000 (14:19 +0000)]
- Add a comment how to improve the output of supported features later on.
- Move docbook pdf installation to toplevel.

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

7 years agoFrom Francesco Fondelli:
etxrab [Sat, 4 Feb 2012 14:01:46 +0000 (14:01 +0000)]
From Francesco Fondelli:
Fix indentation.
(I restored "lost code")


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

7 years agoFrom Colin O'Flynn:
etxrab [Sat, 4 Feb 2012 13:43:58 +0000 (13:43 +0000)]
From Colin O'Flynn:
Fix name of wpan (IEEE 802.15.4) fields to be more consistent, add in generic wpan.length field.


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

7 years agoFrom Cristian Constantin:
etxrab [Sat, 4 Feb 2012 12:23:51 +0000 (12:23 +0000)]
From Cristian Constantin:
Slow loading/processing of conversations with over 500k frames.


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

7 years agoFrom Cristian Constantin:
etxrab [Sat, 4 Feb 2012 12:22:06 +0000 (12:22 +0000)]
From Cristian Constantin:
Dissable sorting while storing the data.

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

7 years agoFrom Tobias Witek:
etxrab [Sat, 4 Feb 2012 12:13:59 +0000 (12:13 +0000)]
From Tobias Witek:
Improved filtering for TBCD values (IMSI and IMEI) in packet-meta.


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

7 years agoFrom mdesharnais:
etxrab [Sat, 4 Feb 2012 11:59:37 +0000 (11:59 +0000)]
From mdesharnais:
RTP header extensions not correctly implement.

From me remove the old table based on payload type, this
implementation is more in line with RFC 3551.


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

7 years agoUpdate ignore list for in-tree builds with qtcreate
jmayer [Sat, 4 Feb 2012 10:04:04 +0000 (10:04 +0000)]
Update ignore list for in-tree builds with qtcreate

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

7 years agoRename the binary Wireshark -> qtshark
jmayer [Sat, 4 Feb 2012 10:02:40 +0000 (10:02 +0000)]
Rename the binary Wireshark -> qtshark

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

7 years agoFrom David Wei:
etxrab [Sat, 4 Feb 2012 09:41:21 +0000 (09:41 +0000)]
From David Wei:
Update the latest IE's

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

7 years agoIgnore some more build-files
jmayer [Sat, 4 Feb 2012 08:07:00 +0000 (08:07 +0000)]
Ignore some more build-files

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

7 years agoFrom Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6786 :
morriss [Fri, 3 Feb 2012 22:12:04 +0000 (22:12 +0000)]
From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6786 :

Rare messages can be malformed as such, that the first part is valid, the
second part fails. For SNMT messages, this patch fixes the problem as such that
it displays a correct column header and adds an expert info explaining the

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

7 years agoCreate a list of MTP Service Indicator macros and use them.
morriss [Fri, 3 Feb 2012 18:26:37 +0000 (18:26 +0000)]
Create a list of MTP Service Indicator macros and use them.

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

7 years agoRegister a frame-end routine to reset mtp3_standard back to the preference
morriss [Fri, 3 Feb 2012 18:16:21 +0000 (18:16 +0000)]
Register a frame-end routine to reset mtp3_standard back to the preference
value even if an exception was thrown.

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

7 years agoDon't forget about the .qrc files.
jmayer [Fri, 3 Feb 2012 17:40:55 +0000 (17:40 +0000)]
Don't forget about the .qrc files.
There is nothing to install for the qt gui right now.

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

7 years agoFrom Martin Kaiser.. FIX subdissector selection
sake [Fri, 3 Feb 2012 17:30:55 +0000 (17:30 +0000)]
From Martin Kaiser.. FIX subdissector selection


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

7 years agoFinish the heuristic standard detection logic by adding support (untested)
morriss [Fri, 3 Feb 2012 16:55:27 +0000 (16:55 +0000)]
Finish the heuristic standard detection logic by adding support (untested)
for LUDT and LUDTS messages.

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

7 years agoDissect and check reserved bits at start of signalling format.
martinm [Fri, 3 Feb 2012 16:44:56 +0000 (16:44 +0000)]
Dissect and check reserved bits at start of signalling format.

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

7 years agoAdd a link back to previous frame for UM sequence number analysis.
martinm [Fri, 3 Feb 2012 10:42:01 +0000 (10:42 +0000)]
Add a link back to previous frame for UM sequence number analysis.
Change a couple of filter names to use "-" rather than "_".  Update
stats window to use changed filter name.

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

7 years agoUpdate the list of problems with gtk3 and where to find
jmayer [Fri, 3 Feb 2012 10:27:26 +0000 (10:27 +0000)]
Update the list of problems with gtk3 and where to find
win32 builds of gtk3

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

7 years agoThe libpcap puts pcap-filter into the misc section (which seems to be 7).
jmayer [Fri, 3 Feb 2012 09:07:24 +0000 (09:07 +0000)]
The libpcap puts pcap-filter into the misc section (which seems to be 7).
Refer to pcap-filter and mention tcpdump only as a fallback.

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

7 years agoImprove heuristic standard detection:
morriss [Fri, 3 Feb 2012 04:09:10 +0000 (04:09 +0000)]
Improve heuristic standard detection:
 - Fix various bugs.
 - Add some optional debug.
 - Enable checking of the Calling address.
 - Check that the Called/Calling address has at least a minimum number of
 - Handle XUDTS.
 - Reject messages whose mandatory variable pointers are 0 (meaning not
 - Reject Class-2 messages whose Class-spare bits are non-zero.
 - For (Class-2) messages that have no variable parameters but an optional
   pointer, only accept messages whose optional pointer is 0 (no optional
   parameters) or 1 (optional parameter immediately follows the pointer).
 - (For some of those Class-2 messages) if there are no optional parameters,
   reject messages if we didn't reach the end of the message.

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

7 years agoFrom guettler:
etxrab [Thu, 2 Feb 2012 21:39:33 +0000 (21:39 +0000)]
From guettler:
Apply part  of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5622 to see OSI over IP.

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

7 years agodissect_gtpv2_mbms_session_duration(): 'tree' is unused but 'item' is. Mark them...
morriss [Thu, 2 Feb 2012 21:35:51 +0000 (21:35 +0000)]
dissect_gtpv2_mbms_session_duration(): 'tree' is unused but 'item' is.  Mark them as such.

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

7 years agoFrom keysandwood:
etxrab [Thu, 2 Feb 2012 21:34:23 +0000 (21:34 +0000)]
From keysandwood:
osi-options dissector : dissect_option_route wrong parsing of NET


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

7 years agoAdd a comment about automoc (but don't use it as this would
jmayer [Thu, 2 Feb 2012 21:33:37 +0000 (21:33 +0000)]
Add a comment about automoc (but don't use it as this would
force everyone to use a rather recent cmake).

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

7 years agoFix make install for qtshark.
jmayer [Thu, 2 Feb 2012 21:21:04 +0000 (21:21 +0000)]
Fix make install for qtshark.

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

7 years agoFrom keysandwood:
etxrab [Thu, 2 Feb 2012 21:10:13 +0000 (21:10 +0000)]
From keysandwood:
register by name protocol isis (to be callable from LUA).


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

7 years agoFrom David Wei:
etxrab [Thu, 2 Feb 2012 20:56:20 +0000 (20:56 +0000)]
From David Wei:
Start update with the latest signals and IE's

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

7 years agoRather than rename the remaining HI2Operations source files in asn1/ (to fix building...
morriss [Thu, 2 Feb 2012 20:35:48 +0000 (20:35 +0000)]
Rather than rename the remaining HI2Operations source files in asn1/ (to fix building of the dissector and make distcheck), revert 40803 and 40801.

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

7 years agoUpdate documentatin for the qt build to reflect the cmake work.
jmayer [Thu, 2 Feb 2012 12:38:41 +0000 (12:38 +0000)]
Update documentatin for the qt build to reflect the cmake work.

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

7 years agoMake out-of-tree builds work.
jmayer [Thu, 2 Feb 2012 12:38:04 +0000 (12:38 +0000)]
Make out-of-tree builds work.

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

7 years agoUpdate svn:ignore for the qtshark build case.
jmayer [Thu, 2 Feb 2012 12:05:44 +0000 (12:05 +0000)]
Update svn:ignore for the qtshark build case.

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

7 years ago- Move setting _U_ into config.h, because
jmayer [Thu, 2 Feb 2012 12:04:22 +0000 (12:04 +0000)]
- Move setting _U_ into config.h, because
  a) C++ has a standardized way of marking parameters as unused
  b) cmakes autoquoting magic failed when the compiler wasn't gcc
     but moc instead.
- qtshark: Don't try to compile the c source files inside ui/qt/
- qtshark: Only run moc on the files that need it.
- qtshark: It's too early to try any of the new qtshark files
  as clean.
- Make Qt detection actually work
- Add C++ to the list of languages for this project

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

7 years agoInclude config.h in preparation of moving the definition
jmayer [Thu, 2 Feb 2012 11:54:33 +0000 (11:54 +0000)]
Include config.h in preparation of moving the definition
of _U_ from the compiler command line into config.h

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

7 years agoUpdate svn:ignore for existing qtshark build process
jmayer [Thu, 2 Feb 2012 08:55:00 +0000 (08:55 +0000)]
Update svn:ignore for existing qtshark build process

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

7 years agoRevert file commited by mistake.
etxrab [Thu, 2 Feb 2012 06:54:33 +0000 (06:54 +0000)]
Revert file commited by mistake.

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

7 years agoUpdate the protocol name as per commit rev 40801.
etxrab [Thu, 2 Feb 2012 06:51:37 +0000 (06:51 +0000)]
Update the protocol name as per commit rev 40801.

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

7 years agoUpdate the protocol name as per commit rev 40801.
etxrab [Thu, 2 Feb 2012 06:50:51 +0000 (06:50 +0000)]
Update the protocol name as per commit rev 40801.

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

7 years agopacket-HI2Operations.c was sorted into the file list as if it were
jmayer [Thu, 2 Feb 2012 01:08:02 +0000 (01:08 +0000)]
packet-HI2Operations.c was sorted into the file list as if it were
spelled packet-hi2operations.c. Rename the file to represent this.

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

7 years ago- Add generated files and stuff from cmake build to svn:ignore
jmayer [Thu, 2 Feb 2012 01:03:50 +0000 (01:03 +0000)]
- Add generated files and stuff from cmake build to svn:ignore
- Run resulting list of ignored files through sort

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

7 years agoPrepare the cmake infrastucture for eventually building
jmayer [Thu, 2 Feb 2012 00:46:02 +0000 (00:46 +0000)]
Prepare the cmake infrastucture for eventually building
wireshark and qtshark simultanously.
The "only" missing thing for this is now ui/qt/CMakeLists.txt ;)

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

7 years agoMove m3ap from clean-asn1-dissector list to dirty-asn1-dissector list.
morriss [Wed, 1 Feb 2012 22:43:27 +0000 (22:43 +0000)]
Move m3ap from clean-asn1-dissector list to dirty-asn1-dissector list.

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

7 years agoFix some Windows qmake and Qt Wireshark build issues:
wmeier [Wed, 1 Feb 2012 21:47:31 +0000 (21:47 +0000)]
Fix some Windows qmake and Qt Wireshark build issues:
If 'MANIFEST_INFO_REQUIRED' not defined in config.nmake, don't do 'mt ...' for Wireshark Qt;
Add '*.pdb' to QMAKE_CLEAN;
Fix 'Unescaped backslashes are deprecated' qmake warnings;
Remove "debug" message() statements from QtShark.pro.

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

7 years agoMove m3ap from clean-asn1-dissector list to dirty-asn1-dissector list.
morriss [Wed, 1 Feb 2012 21:42:07 +0000 (21:42 +0000)]
Move m3ap from clean-asn1-dissector list to dirty-asn1-dissector list.

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

7 years agoFix a typo
wmeier [Wed, 1 Feb 2012 21:24:08 +0000 (21:24 +0000)]
Fix a typo

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

7 years agoCollect and use some SRTP information.
etxrab [Wed, 1 Feb 2012 20:33:33 +0000 (20:33 +0000)]
Collect and use some SRTP information.

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

7 years agoSee if this makes it build cleanly.
etxrab [Wed, 1 Feb 2012 20:20:03 +0000 (20:20 +0000)]
See if this makes it build cleanly.

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

7 years agoAdd M3AP to the build.
etxrab [Wed, 1 Feb 2012 19:36:57 +0000 (19:36 +0000)]
Add M3AP to the build.

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

7 years agoAdd M3AP to the build.
etxrab [Wed, 1 Feb 2012 19:36:16 +0000 (19:36 +0000)]
Add M3AP to the build.

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

7 years agoFrom David Wei:
etxrab [Wed, 1 Feb 2012 19:27:08 +0000 (19:27 +0000)]
From David Wei:
Add a dissector for 3GPP TS 36.444 V11.0.0 (2011-12) M3AP

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

7 years agoFix warning: pci set but not used warning
jmayer [Wed, 1 Feb 2012 10:02:01 +0000 (10:02 +0000)]
Fix warning: pci set but not used warning

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

7 years agoFix some typos.
cmaynard [Wed, 1 Feb 2012 02:23:51 +0000 (02:23 +0000)]
Fix some typos.

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

7 years agoFix some typos.
cmaynard [Wed, 1 Feb 2012 02:05:19 +0000 (02:05 +0000)]
Fix some typos.

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

7 years agoFix some typos.
cmaynard [Wed, 1 Feb 2012 01:41:11 +0000 (01:41 +0000)]
Fix some typos.

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

7 years agoLet's make all offsets within the packet guints. (In most of the API,
guy [Tue, 31 Jan 2012 23:36:52 +0000 (23:36 +0000)]
Let's make all offsets within the packet guints.  (In most of the API,
they're signed, but that's only to handle "offset from the end" - we
should probably get rid of that and make them unsigned.)

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

7 years agoHeuristic standard tuning:
morriss [Tue, 31 Jan 2012 23:06:27 +0000 (23:06 +0000)]
Heuristic standard tuning:
 - Handle ERR and IT messages.
 - When checking variable parameter lengths, check that we have enough data
   remaining (by adding the current offset to the retrieved length).
 - Check the lengths of several more messages.
 - When checking the length, add up the values of the parameter length macros
   to make it obvious how we came to use that value.

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

morriss [Tue, 31 Jan 2012 20:40:29 +0000 (20:40 +0000)]

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

7 years agoImprove heuristic standard detection:
morriss [Tue, 31 Jan 2012 04:02:08 +0000 (04:02 +0000)]
Improve heuristic standard detection:
 - Make sccp_called_calling_looks_valid() static.
 - Reject GT-routed Class-2 (it's not used).
 - Handle UDTS.
 - Handle optional pointer on several messages.

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

7 years agoCompile .cpp files with CXXFLAGS the same as CFLAGS used for compiling .c files.
wmeier [Mon, 30 Jan 2012 23:55:34 +0000 (23:55 +0000)]
Compile .cpp files with CXXFLAGS the same as CFLAGS used for compiling .c files.

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

7 years agoHeuristic standard tuning:
morriss [Mon, 30 Jan 2012 23:15:07 +0000 (23:15 +0000)]
Heuristic standard tuning:
 - Reject all Class-3 messages (it's never used)
 - Group Class-2 and Class-1 messages closer together
 - Some code cleanup (use macros where we have them)

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

7 years agoRework optional generation of .sbr & .bsc files.
wmeier [Mon, 30 Jan 2012 22:57:09 +0000 (22:57 +0000)]
Rework optional generation of .sbr & .bsc files.

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

7 years agoRemove an unused parameter.
etxrab [Mon, 30 Jan 2012 20:03:29 +0000 (20:03 +0000)]
Remove an unused parameter.

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

7 years agoReformat a section.
etxrab [Mon, 30 Jan 2012 19:54:39 +0000 (19:54 +0000)]
Reformat a section.

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

7 years agoTry to determine MTP3 Standard heuristically, original code
etxrab [Mon, 30 Jan 2012 19:47:35 +0000 (19:47 +0000)]
Try to determine MTP3 Standard heuristically, original code
from Jeff Morris refactored a bit by me.

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

7 years agoMinor updates to debug output.
etxrab [Mon, 30 Jan 2012 19:42:21 +0000 (19:42 +0000)]
Minor updates to debug output.

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

7 years agoFrom Andreas Heise:
etxrab [Mon, 30 Jan 2012 19:41:29 +0000 (19:41 +0000)]
From Andreas Heise:
Remove a debug line.

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

7 years agoRevert 40772: the abort() needs to be pushed higher (into packet.c?) so
morriss [Mon, 30 Jan 2012 19:23:25 +0000 (19:23 +0000)]
Revert 40772: the abort() needs to be pushed higher (into packet.c?) so
checkapi remains happy; thus far my attempts at that aren't working.

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

7 years agoIf WIRESHARK_ABORT_ON_DISSECTOR_BUG is set, abort() out if we happened to
morriss [Mon, 30 Jan 2012 17:51:22 +0000 (17:51 +0000)]
If WIRESHARK_ABORT_ON_DISSECTOR_BUG is set, abort() out if we happened to
catch a DissectorError exception.

(I found this useful when debugging a "More than 1000000 items in the tree"

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