aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2012-11-21From Stephen Tarr: Fix 'misspelling (typo) in display filter field name'.Bill Meier1-1/+1
ipv6.framgent --> ipv6.fragment #BACKPORT svn path=/trunk/; revision=46098
2012-11-20SCSI: Sense buffers come in two flavors. Start decoding the descriptor format.Ronnie Sahlberg1-7/+35
svn path=/trunk/; revision=46097
2012-11-19From Roland Knall:Anders Broman1-0/+41
Allow for specific enabling and disabling of heuristic dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7997 svn path=/trunk/; revision=46085
2012-11-19From Krishnamurthy Mayya:Anders Broman6-14/+377
Enhancement to support MPLS-TP FM and LI payloads as per RFC 6427 and RFC 6435 Fixed some errors found by checkapi, changed filter names to use proto abbr. svn path=/trunk/; revision=46084
2012-11-19From l.wachowski:Anders Broman1-4/+2
- In de_bssgp_pdu_in_error() use current_offset isof 0. - in function de_bssgp_ran_inf_error_rim_cont. Error rim container doesn't have field rim sequence number. This field exists in the rest of containers but not in this one. So I have removed this field. In this function we have field pdu in error and this field is mandatory, not optional https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8000 svn path=/trunk/; revision=46081
2012-11-18Added check for missing/empty ProtoField abbrev.Stig Bjørlykke1-0/+4
svn path=/trunk/; revision=46078
2012-11-18Check if we have a filter name.Anders Broman1-0/+5
svn path=/trunk/; revision=46077
2012-11-18From Wido KellingMartin Kaiser1-4/+5
updated Port3 status values to conform to IEC 61158 added decoding of some more values https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7996 svn path=/trunk/; revision=46075
2012-11-18[Automatic manuf, services and enterprise-numbers update for 2012-11-18]Gerald Combs1-10/+158
svn path=/trunk/; revision=46070
2012-11-18Fix some blurbs that matched the field tag.Guy Harris1-194/+194
De-RTMP-ize more AMF-related names and move more of the AMF stuff together. svn path=/trunk/; revision=46069
2012-11-18Move all the AMF stuff under the AMF protocol, as AMF, while it's usedGuy Harris1-241/+236
with RTMP, can be sent over HTTP, for example, as well. svn path=/trunk/; revision=46068
2012-11-18More TODOs:Guy Harris1-0/+8
We hand the user data in a CR or CC packet to the subdissectors, but don't tell the subdissectors that - do we need to? We don't hand the data in an ED packet to the subdissectors - should we, and do we need to tell them that it's an ED packet? svn path=/trunk/; revision=46067
2012-11-18You can't return from inside a TRY/CATCH/ENDTRY block (seeGuy Harris1-14/+34
epan/exceptions.h; it crashes). Try BER first, including both the test dissection and the check of the results. If that fails due to an exception being thrown, or due to the results not indicating that it's a BER-encoded T.125 packet, try PER, so that if the BER dissection doesn't work we don't just give up. Get rid of some _U_s attached to parameters that are, in fact, used. svn path=/trunk/; revision=46066
2012-11-18Support the older format of SR failure for a while longer.Martin Mathieson1-2/+6
svn path=/trunk/; revision=46065
2012-11-18In the heuristic T.124 dissector, catch BoundsError andGuy Harris1-11/+23
ReportedBoundsError exceptions when attempting to dissect the first bit of the packet and, if either is thrown, assume the packet isn't a packet for what we were trying to dissect, rather than just completely failing. Return TRUE if the heuristic T.124 dissector recognizes the packet. Get rid of some _U_s attached to parameters that are, in fact, used. svn path=/trunk/; revision=46064
2012-11-17Add channel type & ID to sequence analysis expert item strings.Martin Mathieson1-33/+63
Also simplify a hash function - haven't measured collisions, but before change sometimes wrong results would get attached. Don't think I fixed it, and don't understand how equality function could have matched even if hash function were colliding... svn path=/trunk/; revision=46063
2012-11-17Squelch another warning.Guy Harris1-1/+1
svn path=/trunk/; revision=46062
2012-11-17Squelch a warning (not enough data flow analysis is done to know thatGuy Harris1-1/+1
cotp_tree actually never will be used uninitialized). svn path=/trunk/; revision=46061
2012-11-17Handle the pseudo-trailer for the ATN extended checksums by passing inGuy Harris4-181/+231
the source and destination address lengths and data, and adding them in, rather than by copying those fields to a fixed-size static buffer - that gets rid of a global variable (global variables considered harmful), and also means that we don't try to copy 24 bytes of length+address from packets that don't *have* 24 bytes of length+address (which caused exceptions to be thrown on some OSI captures I have). Construct some LI #defines out of other LI #defines, to make it a bit clearer why they have the values they do. Support the "additional information related to the clearing of the connection" variable part parameter of the COTP DR packet (which just means giving it a name, as its contents are user-defined - some HP-UX OSI stack appears to just stick in a string saying that it's said stack). Make the code that decodes the variable part of a DR packet look like the code that decodes the variable part of most other packets. For COTP CR packets, determine the class up front by checking whether the length is > 2. (At some point we might want to associate a class indication with the COTP connection, if we see the connection setup, and, if we have that indication, use it in preference to the heuristics.) Make the code to handle various length indicator values in the ATN case more like the code in the non-ATN case. Dissect the variable part of COTP ER packets. Fix tpyos (TDPU->TPDU, tdpu->tpdu) and typpoes (accross->across). Clean up white space. svn path=/trunk/; revision=46060
2012-11-17Fix tpyoes.Guy Harris1-2/+2
svn path=/trunk/; revision=46059
2012-11-17There's no point in initializing variables to 0 when we unconditionally assignEvan Huus1-2/+2
a new value to them on the very next line. Caught by cppcheck. svn path=/trunk/; revision=46058
2012-11-17From Stephen Wall:Jaap Keuter2-0/+4
This patch allows one to specify telnet or syslog as the protocol in an SSL Decrypt profile. svn path=/trunk/; revision=46057
2012-11-17Default to *not* decoding the ATN flavor of COTP, so that, for example,Guy Harris1-1/+1
we don't, by default, break the dissection of RDP (or anything else that happens to run atop class 0 or 1). svn path=/trunk/; revision=46056
2012-11-17dissect ask_release_reply apduMartin Kaiser1-0/+17
svn path=/trunk/; revision=46055
2012-11-17Get rid of extra blank lines and trailing white space.Guy Harris1-11/+6
svn path=/trunk/; revision=46054
2012-11-17Clean up white space.Guy Harris1-556/+562
Add a comment noting that the value of the length indicator in a DT TPDU is not as constrained as one might think. svn path=/trunk/; revision=46053
2012-11-17Get rid of /* FALLTHROUGH */ comments that don't refer to fallingGuy Harris1-19/+31
through a clause in a switch statement to the following clause (that's what /* FALLTHROUGH */ is for - it was originally a comment to tell lint not to complain about the lack of a break statement). Use guint8 rather than guchar for an 8-bit binary value. Add a comment noting the weird stuff Microsoft does with RDP atop ISO COTP atop TPKT. svn path=/trunk/; revision=46052
2012-11-17Fix checksum handling (using val_to_str() on a Boolean is overkill, andGuy Harris1-36/+57
calc_checksum() doesn't return a Boolean, it returns a cksum_status_t, which has more values than just "checksum OK" and "checksum not OK", such as "not enough data available to check the checksum). Fix typoes (Transport Protocol Data Unit is TPDU/tpdu, not TDPU/tdpu). svn path=/trunk/; revision=46051
2012-11-17Note that:Guy Harris1-3/+3
the OSI connectionless network protocol is both ISO 8473 and ITU-T Recommendation X.233; the OSI connection-oriented transport protocol is both ISO 8073 and ITU-T Recommendation X.224; the OSI connectionless transport protocol is both ISO 8602 and ITU-T Recommendation X.234. (Yes, this means that the "X.224" dissector we have is redundant, as we have an OSI transport protocol dissector already.) svn path=/trunk/; revision=46050
2012-11-16Add casts to let the compiler know that we know what we're doing here.Guy Harris1-4/+4
svn path=/trunk/; revision=46049
2012-11-16Thank you, llvm-gcc, for eliminating much of the dataflow analysis thatGuy Harris1-1/+1
regular gcc does. Time to start using clang, I guess.... svn path=/trunk/; revision=46048
2012-11-16Add support for dissecting AMF messages; register the dissector for themGuy Harris1-300/+1037
as handling the application/x-amf media type. Add support for dissecting AMF3. Dissect AMF0 dates as milliseconds-since-the-Epoch. Dissect AMF0 typed objects. Add URLs for various Adobe specs for RTMP, AMF0 and AMF3. svn path=/trunk/; revision=46047
2012-11-16Missed a ","Anders Broman1-1/+1
svn path=/trunk/; revision=46045
2012-11-16Fix:Anders Broman1-0/+1
Error: packet-ositp.c : {..., NULL} is required as the last XXX_string array entry: value_string tp_vpart_checksum_vals[] svn path=/trunk/; revision=46044
2012-11-16From guettler:Anders Broman5-175/+997
ATN decoding fixes for CLNP and COTP dissectors (configurable by option). ATN decoding fixes for CLNP and COTP dissectors (configurable by option). ATN specifics may be selected/deseleted per CLNP/COTP dissector configuration (as requested). CLNP dissector 1) configurable decoding of "ATN security label" COTP dissector 1) configurable decoding of ATN TPDU's 2) checksum calculation (none,OSI,ATN 16-bit, ATN 32-bit) 3) VP decoding for DR TPDU's https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5622 svn path=/trunk/; revision=46043
2012-11-16From Jérôme LAFORGE:Anders Broman1-67/+158
Improvement option 120 : RFC 3396 add split option & RFC 1035 full support compression pointer https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7969 svn path=/trunk/; revision=46042
2012-11-16From Jérôme LAFORGE:Anders Broman1-0/+15
[BOOTP] Add control on option length and UC_Len for option 77 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7974 svn path=/trunk/; revision=46041
2012-11-16From Dirk:Anders Broman4-24/+13
print decrypted SSL application data as hexdump in ssl debug file. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7975 svn path=/trunk/; revision=46040
2012-11-16From Chris Bontje:Anders Broman1-5/+24
DNP3 - Incorrect Information Column Display for "Read" Function Code. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7977 svn path=/trunk/; revision=46039
2012-11-16Added a try-catch in the heuristics to avoid a false malformed packetStig Bjørlykke1-10/+14
error when having no data (occurs in COTP CR and CC). svn path=/trunk/; revision=46038
2012-11-16Higlight the Header bytes.Anders Broman1-1/+3
svn path=/trunk/; revision=46037
2012-11-16If we have an com_context_id entry reuse that.Anders Broman1-206/+274
svn path=/trunk/; revision=46036
2012-11-15Include channel details in PDCP sequence analysis expert info strings.Martin Mathieson1-8/+17
svn path=/trunk/; revision=46035
2012-11-14f_teid_interface_type is 6 bits from Rel 10Anders Broman1-2/+10
svn path=/trunk/; revision=46031
2012-11-14Dissable code causing a crash. Add debug printouts and add a few more ↵Anders Broman1-69/+128
visited checks. svn path=/trunk/; revision=46029
2012-11-14Revert 46018. Needs rethinking.Anders Broman1-4/+7
svn path=/trunk/; revision=46028
2012-11-13Display text in subtreePascal Quantin1-1/+1
svn path=/trunk/; revision=46026
2012-11-13Use proto_tree_add_<signed integer> functions for signed giop datatypesMichael Mann2-910/+910
svn path=/trunk/; revision=46021
2012-11-13ENIP/CIPMichael Mann3-111/+884
Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13Try to fix dissection with g_nas_eps_dissect_plain == TRUE.Anders Broman1-7/+4
svn path=/trunk/; revision=46018