Commit Graph

43535 Commits

Author SHA1 Message Date
Anders Broman 64c46ea482 Make it easier to switch between GTK2 and GTK3.
svn path=/trunk/; revision=46082
2012-11-19 19:29:36 +00:00
Anders Broman 66c34f3c7b From l.wachowski:
- 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-19 18:59:09 +00:00
Jeff Morriss 2e487add27 If tshark doesn't fail when building the tree, try again without -V.
svn path=/trunk/; revision=46080
2012-11-19 00:04:08 +00:00
Martin Mathieson f4c90e138d Was not allocating a large enough element array for tput graphs.
svn path=/trunk/; revision=46079
2012-11-18 19:52:48 +00:00
Stig Bjørlykke a875f6a6e8 Added check for missing/empty ProtoField abbrev.
svn path=/trunk/; revision=46078
2012-11-18 19:15:34 +00:00
Anders Broman 94fb28dfa1 Check if we have a filter name.
svn path=/trunk/; revision=46077
2012-11-18 18:12:50 +00:00
Anders Broman 45e9735b09 Enhance error output.
svn path=/trunk/; revision=46076
2012-11-18 18:10:48 +00:00
Martin Kaiser 0e2f874a24 From Wido Kelling
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 17:52:55 +00:00
Martin Mathieson 1a1e7f38b7 - Make perform_zoom() quickly return if graph already fully zoomed out
- Restore zooming out with middle-button + shift
- Lose unused graph->next and register_tap_listener_tcp_graph()
- Fix up some whitespace

svn path=/trunk/; revision=46072
2012-11-18 15:56:29 +00:00
Gerald Combs 5b8bf9669f [Automatic manuf, services and enterprise-numbers update for 2012-11-18]
svn path=/trunk/; revision=46070
2012-11-18 15:03:31 +00:00
Guy Harris 5788ca7c88 Fix some blurbs that matched the field tag.
De-RTMP-ize more AMF-related names and move more of the AMF stuff
together.

svn path=/trunk/; revision=46069
2012-11-18 08:03:05 +00:00
Guy Harris 2f9292c1ea Move all the AMF stuff under the AMF protocol, as AMF, while it's used
with RTMP, can be sent over HTTP, for example, as well.

svn path=/trunk/; revision=46068
2012-11-18 04:30:10 +00:00
Guy Harris 06ce5d1571 More TODOs:
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-18 01:59:05 +00:00
Guy Harris e5c2f19eab You can't return from inside a TRY/CATCH/ENDTRY block (see
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-18 01:39:32 +00:00
Martin Mathieson de2aa05555 Support the older format of SR failure for a while longer.
svn path=/trunk/; revision=46065
2012-11-18 01:33:43 +00:00
Guy Harris 2254dcaa00 In the heuristic T.124 dissector, catch BoundsError and
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-18 01:32:31 +00:00
Martin Mathieson ae41031fa4 Add channel type & ID to sequence analysis expert item strings.
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-17 23:41:07 +00:00
Guy Harris bdb30c63bf Squelch another warning.
svn path=/trunk/; revision=46062
2012-11-17 23:05:03 +00:00
Guy Harris 8b2de024bf Squelch a warning (not enough data flow analysis is done to know that
cotp_tree actually never will be used uninitialized).

svn path=/trunk/; revision=46061
2012-11-17 22:35:13 +00:00
Guy Harris 7ef91b394d Handle the pseudo-trailer for the ATN extended checksums by passing in
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-17 22:12:37 +00:00
Guy Harris 9aaa01039b Fix tpyoes.
svn path=/trunk/; revision=46059
2012-11-17 19:46:33 +00:00
Evan Huus 0d46c5a82b There's no point in initializing variables to 0 when we unconditionally assign
a new value to them on the very next line. Caught by cppcheck.

svn path=/trunk/; revision=46058
2012-11-17 13:58:02 +00:00
Jaap Keuter a803419321 From Stephen Wall:
This patch allows one to specify telnet or syslog as the protocol in an SSL Decrypt profile.

svn path=/trunk/; revision=46057
2012-11-17 12:16:05 +00:00
Guy Harris 9e2c7a6aa9 Default to *not* decoding the ATN flavor of COTP, so that, for example,
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-17 11:24:13 +00:00
Martin Kaiser 9310cd0952 dissect ask_release_reply apdu
svn path=/trunk/; revision=46055
2012-11-17 11:19:09 +00:00
Guy Harris 04709b632f Get rid of extra blank lines and trailing white space.
svn path=/trunk/; revision=46054
2012-11-17 10:25:03 +00:00
Guy Harris 1c872788d0 Clean up white space.
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-17 09:54:51 +00:00
Guy Harris 9225f22ec5 Get rid of /* FALLTHROUGH */ comments that don't refer to falling
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-17 09:45:11 +00:00
Guy Harris cbd58e5115 Fix checksum handling (using val_to_str() on a Boolean is overkill, and
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-17 09:37:04 +00:00
Guy Harris fa031995da Note that:
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-17 05:04:26 +00:00
Guy Harris 889b302b0d Add casts to let the compiler know that we know what we're doing here.
svn path=/trunk/; revision=46049
2012-11-16 22:21:22 +00:00
Guy Harris 6578ab9975 Thank you, llvm-gcc, for eliminating much of the dataflow analysis that
regular gcc does.  Time to start using clang, I guess....

svn path=/trunk/; revision=46048
2012-11-16 22:17:37 +00:00
Guy Harris 924bb8c131 Add support for dissecting AMF messages; register the dissector for them
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-16 21:59:58 +00:00
Jörg Mayer 015cdcef78 Fix the main dissect_PROTO signature
svn path=/trunk/; revision=46046
2012-11-16 20:52:30 +00:00
Anders Broman fcfbd9f21a Missed a ","
svn path=/trunk/; revision=46045
2012-11-16 15:44:31 +00:00
Anders Broman 74065f28e1 Fix:
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-16 15:32:18 +00:00
Anders Broman c6cf5703f5 From guettler:
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-16 14:18:27 +00:00
Anders Broman 22d1aa1f6c From Jérôme LAFORGE:
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-16 13:58:51 +00:00
Anders Broman c2d6e54458 From Jérôme LAFORGE:
[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-16 11:39:46 +00:00
Anders Broman ac50d3b316 From Dirk:
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-16 11:35:01 +00:00
Anders Broman c1e5be52ad From Chris Bontje:
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-16 11:29:05 +00:00
Stig Bjørlykke d93bf350b5 Added a try-catch in the heuristics to avoid a false malformed packet
error when having no data (occurs in COTP CR and CC).

svn path=/trunk/; revision=46038
2012-11-16 10:20:36 +00:00
Anders Broman 57d3c5e260 Higlight the Header bytes.
svn path=/trunk/; revision=46037
2012-11-16 09:42:18 +00:00
Anders Broman be29436715 If we have an com_context_id entry reuse that.
svn path=/trunk/; revision=46036
2012-11-16 09:41:26 +00:00
Martin Mathieson dd3cf21124 Include channel details in PDCP sequence analysis expert info strings.
svn path=/trunk/; revision=46035
2012-11-15 21:28:21 +00:00
Anders Broman ab3111f465 Add and prettify debug info - will regenerate dissector later
svn path=/trunk/; revision=46034
2012-11-15 06:32:35 +00:00
Jeff Morriss 06d84872c9 Add SVN Id. Fix up indentation some and remove some not-very-useful comments which also made one of these files hard to read.
svn path=/trunk/; revision=46033
2012-11-14 20:50:54 +00:00
Jeff Morriss a7d5d97af1 Remove some non-ASCII chars from enum values.
svn path=/trunk/; revision=46032
2012-11-14 20:49:36 +00:00
Anders Broman 66989ad3d4 f_teid_interface_type is 6 bits from Rel 10
svn path=/trunk/; revision=46031
2012-11-14 19:41:35 +00:00
Anders Broman 02287c05d6 Dissable code causing a crash. Add debug printouts and add a few more visited checks.
svn path=/trunk/; revision=46029
2012-11-14 16:46:57 +00:00