Set mtp3_standard back to the preference value after each packet (in addition
to in the frame-end function) in case there are multiple packets of different
standards in the same frame.
svn path=/trunk/; revision=40910
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.
svn path=/trunk/; revision=40868
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
svn path=/trunk/; revision=40864
- 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.
svn path=/trunk/; revision=40854
TThis is a new dissector for the GSM A-bis OML protocol as specified in TS
12.21,
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.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5784
svn path=/trunk/; revision=40851
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).
Basically,
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
https://bugs.wireshark.org/bugzilla/attachment.cgi?id=7549
svn path=/trunk/; revision=40850
Ensure that ALL response PDUs are displayed, and the corresponding description text for the reserved or vendor-specific error code is displayed.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6108
svn path=/trunk/; revision=40848
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.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6783
svn path=/trunk/; revision=40834
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
issue.
svn path=/trunk/; revision=40829
- 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
octets.
- Handle XUDTS.
- Reject messages whose mandatory variable pointers are 0 (meaning not
present).
- 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.
svn path=/trunk/; revision=40819
they're signed, but that's only to handle "offset from the end" - we
should probably get rid of that and make them unsigned.)
svn path=/trunk/; revision=40785
- 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.
svn path=/trunk/; revision=40784
- 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)
svn path=/trunk/; revision=40780
catch a DissectorError exception.
(I found this useful when debugging a "More than 1000000 items in the tree"
DissectorError.)
svn path=/trunk/; revision=40772
SDP_CRYPTO: Give up (and display an expert info) if we don't find the colon
separating the key-method and the key-info.
Reindent this area of code a bit.
Remove tabs in some places for consistency.
svn path=/trunk/; revision=40771
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
mktime()
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...)
svn path=/trunk/; revision=40742
./Wireshark -v
wireshark 1.7.1 (SVN Rev Unknown from unknown)
Copyright 1998-2012 Gerald Combs <gerald@wireshark.org> and contributors.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Compiled (64-bit) with Qt 4.7.4 with GLib 2.30.0, with libpcap (version
unknown), with libz 1.2.3.4, with POSIX capabilities (Linux), with SMI 0.4.8,
with c-ares 1.7.4, with Lua 5.1, without Python, with GnuTLS 2.10.5, with Gcrypt
1.5.0, with MIT Kerberos, with GeoIP, with PortAudio V19-devel (built Jul 27
2011 11:52:20), without AirPcap.
Running on Linux 3.0.0-13-generic, with locale fr_FR.UTF-8, with libpcap version
1.1.1, with libz 1.2.3.4, GnuTLS 2.10.5, Gcrypt 1.5.0.
Built using gcc 4.6.1.
get_gui_compiled_info & get_gui_runtime_info copied from ../gtk/main.c
the function is common to GTK and Qt need to put in version_info.[ch] ?
svn path=/trunk/; revision=40691
Initialize it to something other than UDP if we can't determine the protocol.
Reindent parts of the subject function.
Replace tabs with spaces (for consistency).
Remove trailing white space.
svn path=/trunk/; revision=40677
The dissection [added with the previous patch on this bug] was not complete.
Attaching a diff on top of the existing SVN to properly dissect small
packets with mini header.
svn path=/trunk/; revision=40666
Due to the variable remaining_bits_len getting out of sync with bit_offset (in
one case due to a mistake in the patch for bug 6375, and in another case
pre-existing).
I have shuffled the decrements of remaining_bits_len so that they always occur
next to an increment of bit_offset, so that this type of problem is easier to
spot.
From me: convert tabs to spaces to match the rest of the file.
svn path=/trunk/; revision=40662
- Pass is_retx flag to PDCP from RLC in struct instead of calling function
RLC:
- use full key to look up sequence analysis results
- avoids overwriting and attaching result details to wrong PDU
- add links to previous and next 'OK' PDUs in channel
- shorten some long variable and type names.
svn path=/trunk/; revision=40656
other PDUs info from same frame. Also:
- initialise next-frame value to 0
- don't show expected-SN when analysis result is 'ok'
svn path=/trunk/; revision=40655
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
svn path=/trunk/; revision=40627
Some test equipments can send weird Protocol Configuration Options IE in the
Attach Accept message with an empty protocol identifier content. Wireshark
will trigger an assert when dissecting those messages because it does not
check the tvb length before calling the sub dissector.
With checking the protocol identifier length before calling the sub dissector,
the PCO is decoded correctly.
svn path=/trunk/; revision=40604
"bt-dht [...] should also be common dissectors while not only heuristic
ones. So we can use them with 'Decode As...' command."
Essentially:
-Register dissector handle so the dissector can be accessed via "decode-as".
From me:
1. Given that the current heuristic is much too weak and
causes 'false positives':
Add a preference to allow enabling/disabling of heuristic dissection.
The default is 'disabled' since the current heuristic is quite weak.
(For example: The heuristic incorrectly dissects about 40
files in menagerie/public as being the BT-DHT protocol).
Note: only heuristic dissection is disabled; 'decode-as' remains
enabled.
Also:
1. Fix some bugs wherein bytes in the hex pane were not highlighted
when a field was selected in the details pane.
2. Do some minor re-formatting of the source code.
svn path=/trunk/; revision=40603
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-rohc.c: In function ‘dissect_rohc_ir_rtp_profile_dynamic’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-rohc.c:775:21: error: variable ‘cc’ set but not used [-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors
svn path=/trunk/; revision=40593
the existing "mac-lte" UDP heuristic dissector. It is hoped that it will be
possible to register a DLT for use with this format.
svn path=/trunk/; revision=40580
[PATCH] Enhance the Spice dissector to deal with mini headers
Spice recently gained the ability to use smaller packet headers.
This patch adds support to it, along with small other fixes/enhancements - none of which really interesting.
From me :
Fix a Clang Warning :
packet-spice.c:1303:5: warning: Value stored to 'offset' is never read
svn path=/trunk/; revision=40573
The ANSI C12.22 protocol is a smart grid protocol for utility meters, including
gas, water and electric. The dissector implemented in the patch file includes
full support for all EPSEM (Extended Protocol Specification for Electricity
Metering) services and includes a full implementation of the C12.22 security
modes.
[...]
To decrypt the attached sample file, you need to set up the key table in the
preferences to include key 0 with a value of 6624C7E23034E4036FE5CB3A8B5DAB44.
Me: Fixes for:
[ 64%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o
../../asn1/c1222/packet-c1222-template.c: In function ‘dissect_epsem’:
../../asn1/c1222/packet-c1222-template.c:860:15: error: variable ‘ft’ set but not used [-Werror=unused-but-set-variable]
[ 5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o
../../asn1/c1222/packet-c1222-template.c:103:19: error: ‘c1222_flags’ defined but not used [-Werror=unused-variable]
svn path=/trunk/; revision=40500
please.
Move some generated DCERPC dissectors back to the clean list; if they
actually *do* generate warnings, move them back.
svn path=/trunk/; revision=40479
Jörg Mayer