Commit graph

2384 commits

Author SHA1 Message Date
Ulf Lamping
b828a6e09d bugfix: don't crash, if pinfo->match_string == NULL
svn path=/trunk/; revision=15969
2005-09-22 21:21:29 +00:00
Ulf Lamping
d3b3e5fe16 bugfix: don't crash, if tag_save_literal == NULL
svn path=/trunk/; revision=15968
2005-09-22 21:19:23 +00:00
Ulf Lamping
a9e1c71b7a bugfix: don't crash, if current_frame->ns == NULL
svn path=/trunk/; revision=15967
2005-09-22 21:18:19 +00:00
Ulf Lamping
5305988e3d enhance heuristics:
some Siemens SIMATIC protocols also use COTP, and shouldn't be 
misinterpreted as SES.
the starter in this case is fixed to 0x32 (SES_MINOR_SYNC_ACK for SES), 
so if the following parameter type is unknown, it's probably SIMATIC and not SES

svn path=/trunk/; revision=15966
2005-09-22 21:16:54 +00:00
Ulf Lamping
ca662b74b0 change ConnectCR flag item sequence, so the "most significant" bit will come first (as done in the other req/responses)
svn path=/trunk/; revision=15964
2005-09-22 21:12:51 +00:00
Ulf Lamping
6f98654a6a bugfix: don't simply use length field value from packet data, ensure the bytes really exist
svn path=/trunk/; revision=15963
2005-09-22 21:09:02 +00:00
Ulf Lamping
9d1af7d6fb add two more bind reject reasons from the specs
svn path=/trunk/; revision=15962
2005-09-22 21:07:25 +00:00
Luis Ontanon
88dd585d23 in register_dtd() do not leak the elements hash
svn path=/trunk/; revision=15959
2005-09-22 16:41:53 +00:00
Tomas Kukosa
81a2feddab Call H245 decoding and tunelled protocols decoding at the end of H225 dissector. I makes less confusion in info column.
svn path=/trunk/; revision=15958
2005-09-22 14:40:26 +00:00
Jörg Mayer
1c0667858e Add the cisco url as well
svn path=/trunk/; revision=15957
2005-09-22 10:07:26 +00:00
Jörg Mayer
41911c041a Add a comment on packets with opcode 3
svn path=/trunk/; revision=15956
2005-09-22 10:00:40 +00:00
Ulf Lamping
6af80b98cb replace match_strval with val_to_str, where the output was used by string output, but not expecting NULL
svn path=/trunk/; revision=15954
2005-09-22 02:18:19 +00:00
Guy Harris
23661240d7 Squelch some compiler warnings.
svn path=/trunk/; revision=15953
2005-09-22 02:08:03 +00:00
Ulf Lamping
031d7beea0 prevent output of NULL strings
svn path=/trunk/; revision=15950
2005-09-22 01:16:25 +00:00
Ulf Lamping
714c04d3a8 replace match_strval with val_to_str in several places, where the output was used by string output, but not expecting NULL
svn path=/trunk/; revision=15949
2005-09-22 01:09:01 +00:00
Guy Harris
c5b0fc27d7 Fix a bunch of places where we were calling "dissect_ber_octet_string()"
with a non-null pointer-to-pointer-to-tvbuff and not checking whether
the returned tvbuff pointer was non-null.

svn path=/trunk/; revision=15948
2005-09-22 00:51:11 +00:00
Guy Harris
341a2f503d dissect_ber_octet_string() can return a null tvbuff pointer, if the
putative octet string isn't one; always check before using it to
dissect, and don't call the dissector if the tvbuff is null.  This
should fix bug 472.

svn path=/trunk/; revision=15946
2005-09-21 23:23:58 +00:00
Guy Harris
ced076f8d4 OIDs are put into the protocol tree as strings containing a textual
representation of the OID, so the fields for them should be of type
FT_STRING.  This should fix bug 470.

svn path=/trunk/; revision=15945
2005-09-21 23:07:07 +00:00
Ronnie Sahlberg
8b32f13476 get rid of strcpy in packet-ntp.c
at the same time  change ntp_fmt_ts to return a pointer to ian ep-allocated buffer.
remove the redundant buffer parameter in the signature and change all callers.


svn path=/trunk/; revision=15939
2005-09-21 20:05:13 +00:00
Guy Harris
4e09b5e0b3 Some compilers don't allow a static declaration of a function inside
another function, so move the declaration of
dissect_spnego_PrincipalSeq() to the top of the file.

svn path=/trunk/; revision=15938
2005-09-21 18:27:28 +00:00
Guy Harris
0fb81e221e An InnerContextToken comes with an OID for the mechanism, which is what
we use to determine how to interpret the token; don't bother fetching
the OID attached to the frame or conversation, as we're not using it.

Indent code in the .cnf file to match the code generated by asn2eth.

The mechListMIC in a NegTokenInit is sometimes a sequence containing a
string; check the header of the mechListMIC and dissect it as such a
sequence or as a regular item depending on whether it's a sequence or
not.

If we see a supportedMech in a NegTokenTarg, save next_level_value for
that OID with the conversation.

Dissect a responseToken in a NegTokenTarg, and a mechListMIC in a
NegTokenTarg, appropriately.

Get rid of "gssapi_dissector_handle()", and just use
next_level_value->handle - it was never being called if next_level_value
was null.

When we're dissecting a KRB5 blob, just use get_ber_identifier() to get
the header, so we don't report an ASN.1 error if there isn't a BER
identifier there; dissect the identifier and length only if we know we
have them.

svn path=/trunk/; revision=15937
2005-09-21 17:42:11 +00:00
Guy Harris
fa2779e00d Don't fill in a data structure for the packet while dissecting; we use
almost none of the data - fill in only variables for what we need, and
use proto_tree_add_item() in most cases.

Move what's left of the packet-winsrepl.h header into packet-winsrepl.c,
and get rid of the header.

Dissect the name flags field in detail, as per the Samba code.

We don't do any checks for whether the packet is a valid WINS
replication packet, so don't make the dissector a new-style dissector.

svn path=/trunk/; revision=15936
2005-09-21 17:33:04 +00:00
Guy Harris
6c0328f7f3 Don't fill in a data structure for the packet while dissecting; we use
almost none of the data - fill in only variables for what we need, and
use proto_tree_add_item() in most cases.

Move what's left of the packet-winsrepl.h header into packet-winsrepl.c,
and get rid of the header.

Dissect the name flags field in detail, as per the Samba code.

We don't do any checks for whether the packet is a valid WINS
replication packet, so don't make the dissector a new-style dissector.

svn path=/trunk/; revision=15935
2005-09-21 17:32:21 +00:00
Gerald Combs
a493fdd54b Use a proper length for booleans. If we have a malformed packet, throw an
exception.  Fixes bug 468.

svn path=/trunk/; revision=15934
2005-09-21 16:18:30 +00:00
Ronnie Sahlberg
7e2eed2a30 remove some strcpy() with g_snprintf()
svn path=/trunk/; revision=15931
2005-09-21 15:38:12 +00:00
Gerald Combs
71f16f2a3f If pinfo->match_string is null (e.g. when we're called from the Jabber
dissector), don't try to look it up in a hash table.  Fixes the current
Buildbot failure.

svn path=/trunk/; revision=15929
2005-09-21 15:03:19 +00:00
Ulf Lamping
85ae3a8086 fix #372: the bug raised a "division by zero" exception. I've add a check for this and simply replaced the expression with 0 in that case. Don't know if it's correct to do so, but fixes the exception at least :-)
svn path=/trunk/; revision=15927
2005-09-21 10:29:22 +00:00
Ulf Lamping
853067c739 bugfix: break out of an endless loop, if dissect_sip_common() returns 0 or -2, found in a file send to me by david martin in an attempt to fix #372
svn path=/trunk/; revision=15926
2005-09-21 10:22:14 +00:00
Jörg Mayer
8e8d66c2a9 manpages are now done automagically
svn path=/trunk/; revision=15925
2005-09-21 09:50:09 +00:00
Guy Harris
13e99476e6 Use BASE_DEC_HEX for the identifier field; that means we don't have to
use "proto_tree_add_uint_format()", we can just let the Ethereal core
format it.

svn path=/trunk/; revision=15922
2005-09-21 02:12:24 +00:00
Guy Harris
c952476658 Squelch some compiler wranings, and fix up the creation of a subset
tvbuff.

Fix indentation.

svn path=/trunk/; revision=15921
2005-09-21 01:47:46 +00:00
Guy Harris
eecbe6a8de Squelch a compiler warning.
svn path=/trunk/; revision=15920
2005-09-21 01:39:39 +00:00
Guy Harris
551f589cb9 Fix a compiler warning.
svn path=/trunk/; revision=15916
2005-09-21 01:33:16 +00:00
Guy Harris
7ae7aaf75c Fix a comment.
svn path=/trunk/; revision=15915
2005-09-21 01:15:32 +00:00
Guy Harris
81a1fbfcd7 Put in some comments based on stuff seen in the Samba code
(include/nameserv.h, code in wrepld).

svn path=/trunk/; revision=15914
2005-09-21 00:00:43 +00:00
Guy Harris
52c5f6f07b Give it an RCS ID.
svn path=/trunk/; revision=15913
2005-09-20 22:55:48 +00:00
Guy Harris
c4e374785e Fix the name in the comment.
Give it an RCS ID.

svn path=/trunk/; revision=15912
2005-09-20 22:53:31 +00:00
Guy Harris
2f6530246c Give them RCS IDs.
svn path=/trunk/; revision=15911
2005-09-20 22:52:31 +00:00
Guy Harris
c4d9915be6 Give them RCS IDs.
svn path=/trunk/; revision=15910
2005-09-20 22:51:42 +00:00
Guy Harris
0a93fcdcd3 Give it an RCS ID.
svn path=/trunk/; revision=15909
2005-09-20 22:49:54 +00:00
Anders Broman
df21536710 From Hannes Gredler:
patch to support 4 additional juniper DLTs.

all those are wrappers for exisiting media types augmented with meta-information which gets also displayed using this patch;

svn path=/trunk/; revision=15908
2005-09-20 20:25:55 +00:00
Anders Broman
ff34f18d67 From Kaul:
Jabber traffic is XML, attached patch dissects it as such

svn path=/trunk/; revision=15907
2005-09-20 20:20:08 +00:00
Anders Broman
1bb6396a93 Fix bug #404 Decoding of MSISDN on GSM is incomplete.
svn path=/trunk/; revision=15906
2005-09-20 20:04:01 +00:00
Ronnie Sahlberg
5d98676745 from francesco
update to remove sprintf()



svn path=/trunk/; revision=15905
2005-09-20 19:42:40 +00:00
Ronnie Sahlberg
8088098ce6 make options field filterable
remove silly rotating buffers



svn path=/trunk/; revision=15904
2005-09-20 19:36:38 +00:00
Gerald Combs
ba83bf145f Don't try to reassemble a zero-length fragment. Add a comment to
reassemble.c about the handling of zero-length fragments.

svn path=/trunk/; revision=15899
2005-09-20 17:23:19 +00:00
Jörg Mayer
27a1e92489 Francesco Fondelli: Add dcp support (forgot this file)
svn path=/trunk/; revision=15898
2005-09-20 15:19:11 +00:00
Jörg Mayer
e6194537b3 Francesco Fondelli; Add dcp support
svn path=/trunk/; revision=15897
2005-09-20 15:18:28 +00:00
Tomas Kukosa
300f1231cd get rid of few warnings
svn path=/trunk/; revision=15895
2005-09-20 14:14:07 +00:00
Tomas Kukosa
d3492e684a asn2eth
- #.FN_BODY accepts parameters too
 - single line variant of #.FN_PAR is possible
 - new parameter FN_VARIANT for OBJECT IDENTIFIER
packet-per.c
 - dissect_per_object_identifier() returns value as tvb
 - new dissect_per_object_identifier_str() function
PER dissectors adapted and regenerated

svn path=/trunk/; revision=15894
2005-09-20 10:56:08 +00:00
Ulf Lamping
dce67e2bbe fix: packet-lldp.c(2071) : warning C4761: integral size mismatch in argument; conversion supplied
svn path=/trunk/; revision=15893
2005-09-20 09:02:38 +00:00
Ulf Lamping
e8dd2e9279 fix: packet-dcerpc.c(4019) : warning C4018: '<' : signed/unsigned mismatch
svn path=/trunk/; revision=15892
2005-09-20 08:55:50 +00:00
Jörg Mayer
7f48c561d2 Jim Young: LLDP improvements
svn path=/trunk/; revision=15879
2005-09-19 21:24:07 +00:00
Luis Ontanon
9597f669bd display something useful in the radius VSA item
svn path=/trunk/; revision=15875
2005-09-19 19:48:55 +00:00
Gerald Combs
876ce82beb Don't dereference a null pointer. Fixes bug 460.
svn path=/trunk/; revision=15874
2005-09-19 19:46:25 +00:00
Luis Ontanon
fbc222f41a Change "Value" into "VSA" for Vendor SPecific Attributes
svn path=/trunk/; revision=15873
2005-09-19 19:36:32 +00:00
Anders Broman
d54a6094b3 Add a preference to decode different types of AMR payload.
svn path=/trunk/; revision=15872
2005-09-19 19:11:50 +00:00
Gerald Combs
0e802a164b Throw an exception if our ACL length is flat-out wrong.
svn path=/trunk/; revision=15871
2005-09-19 17:50:38 +00:00
Luis Ontanon
a6ff6fb97c - allow multiple attributes inside one VSA (fixes bug 438)
- preference to choose whether to add the AVP's payload length items
- preference to add an alternate UDP port


svn path=/trunk/; revision=15870
2005-09-19 17:42:02 +00:00
Gerald Combs
d2e3d45042 In the SPNEGO dissector, don't call a subdissector if we don't have a TVB.
Fixes bugs 448, 449, 451, 452, 454, 456, and 461.

Add similar TVB checks to the BER dissector.

svn path=/trunk/; revision=15869
2005-09-19 16:23:05 +00:00
Jörg Mayer
f10f911bce Change README to reflect the fact that tools/pidl is now a
svn:externals reference.

svn path=/trunk/; revision=15868
2005-09-19 14:59:32 +00:00
Jörg Mayer
31c136e937 Add idl_types.h from samba to fix warning
svn path=/trunk/; revision=15865
2005-09-19 13:26:49 +00:00
Jörg Mayer
ec750054cc Point to tools/pidl/README.ethereal
svn path=/trunk/; revision=15864
2005-09-19 09:23:52 +00:00
Guy Harris
7a7f0be69b Fix a typo.
svn path=/trunk/; revision=15863
2005-09-19 08:09:41 +00:00
Ronnie Sahlberg
eba5b5b225 sometimes it seems that we have the text based h248/megaco running ontop of
m3ua  and not the binary one.


make the binary dissector check if it is really the text based one to be used and if so
call that dissector instead.



svn path=/trunk/; revision=15862
2005-09-19 08:06:25 +00:00
Tomas Kukosa
ee8d53adf5 remove unused parameter 'name' from dissect_per_choice()
svn path=/trunk/; revision=15861
2005-09-19 07:35:05 +00:00
Anders Broman
7981470317 Change some of the asn1 functions to use packet-ber ones.
svn path=/trunk/; revision=15857
2005-09-18 20:04:04 +00:00
Guy Harris
138e7409d3 If the tag field is a bitfield, always show it as such, otherwise always
show the value of 1 1111 as "Continued" in the bitfield and the actual
tag value in the following bytes.

Show the BER identifier data before an OID if we're showing internal BER
fields.

svn path=/trunk/; revision=15856
2005-09-18 16:54:00 +00:00
Ulf Lamping
497478bc99 as discussed in the Users list: replace "Short Frame" by "Packet size limited during capture" message
svn path=/trunk/; revision=15855
2005-09-18 11:18:42 +00:00
Anders Broman
7ef861a9a9 If unkown Tag's are found in a set add length.
svn path=/trunk/; revision=15853
2005-09-17 21:02:51 +00:00
Luis Ontanon
4c14b12c25 Because there's more than just text in XML...
DTDs are imported to create fields


svn path=/trunk/; revision=15851
2005-09-17 17:05:46 +00:00
Ulf Lamping
8ace2749f3 using heur_dissector_add("cotp_is") doesn't seem to be enough, if H1 is used over TCP/TPKT (RFC1006). Add heur_dissector_add("cotp") so it will be dissected correctly, hopefully this won't introduce new problems with other "cotp" heuristics ...
svn path=/trunk/; revision=15850
2005-09-17 14:14:24 +00:00
Ronnie Sahlberg
f00c521c19 remove some strcpy()
svn path=/trunk/; revision=15849
2005-09-17 12:16:11 +00:00
Ronnie Sahlberg
97bf84d37b remove some strcpy()
svn path=/trunk/; revision=15848
2005-09-17 12:09:36 +00:00
Guy Harris
ab2dca9114 Move some headers for stuff defined by a dissector into epan/dissectors
- and rename smb.h to packet-smb.h, as it's packet-smb.c's header file.

svn path=/trunk/; revision=15845
2005-09-17 00:31:15 +00:00
Guy Harris
b7b80d94be Move a pile of protocol-related headers from the top-level source
directory to the epan directory.  Some of them should perhaps ultimately
be moved to epan/dissectors, if they pertain only to stuff exported by a
particular dissector.

Fix Gerald's e-mail address in files we're moving.

svn path=/trunk/; revision=15844
2005-09-17 00:02:31 +00:00
Ulf Lamping
ef461aa94b add an expert info based on QualityCode and a COL_INFO output
svn path=/trunk/; revision=15843
2005-09-16 22:17:50 +00:00
Ulf Lamping
4469693560 slightly shrink COL_INFO output
svn path=/trunk/; revision=15842
2005-09-16 22:14:33 +00:00
Ulf Lamping
485d75946c split call id's with a #, if more than one DCE/RPC call is in a data PDU
svn path=/trunk/; revision=15841
2005-09-16 22:05:50 +00:00
Tim Potter
092c0c20ed Aargh - undo r15838 as I missed jmayer's commit of r15835.
svn path=/trunk/; revision=15839
2005-09-16 12:30:33 +00:00
Tim Potter
301279b840 Comment out pidl dissectors for the moment to get the win32 build
going again.  I have most of a patch to get it working but I don't
think it will be finished tonight.

svn path=/trunk/; revision=15838
2005-09-16 12:11:17 +00:00
Guy Harris
b8ae3f1988 If we've enabled the display of BER encapsulation tokens, only put them
into the protocol tree once.

Fix the offsets and lengths used to put the variable binding values into
the protocol tree.

svn path=/trunk/; revision=15837
2005-09-16 09:47:18 +00:00
Jörg Mayer
f6264ee8d2 Move the packet-dcerpc-*.[hc] from pidl/ back to dissectors.
This makes Ethereal build again - there's no real reason that
ethereal fails to build for such a long time on so many platforms.


svn path=/trunk/; revision=15835
2005-09-16 08:55:51 +00:00
Guy Harris
806a9d66ac Note problems with some values that appear in, for example, some SNMP
captures.

svn path=/trunk/; revision=15833
2005-09-16 08:30:35 +00:00
Guy Harris
5502846e7b Fix a type.
svn path=/trunk/; revision=15832
2005-09-16 07:50:02 +00:00
Tim Potter
447b09df0b Add conformance file used for building winreg dissector.
svn path=/trunk/; revision=15831
2005-09-16 04:25:12 +00:00
Guy Harris
f91d140cc9 Don't use u_char - not all platforms define it, and even those that do
might require other files to be included to get it.

svn path=/trunk/; revision=15828
2005-09-15 23:39:08 +00:00
Luis Ontanon
756421af73 Add more information regarding call legs.
Make the release cause value filterable.


svn path=/trunk/; revision=15826
2005-09-15 19:30:44 +00:00
Gerald Combs
e777958eb6 Fix fragment length checks. Fixes bugs 440 and 442-446.
svn path=/trunk/; revision=15824
2005-09-15 18:42:04 +00:00
Ronnie Sahlberg
46276102d9 remove some redundant strcpy()
svn path=/trunk/; revision=15823
2005-09-15 13:41:56 +00:00
Ronnie Sahlberg
04661f4a90 remove some redundant strcpy()
svn path=/trunk/; revision=15822
2005-09-15 13:36:31 +00:00
Ronnie Sahlberg
fef5af249e remove a whole bunch of strcpy() fix minor bug where whe checked the wrong string before we display it
svn path=/trunk/; revision=15821
2005-09-15 13:31:05 +00:00
Ronnie Sahlberg
a61a1ac05c update for ospf from Senthil Kumar Nagappan
svn path=/trunk/; revision=15820
2005-09-15 13:20:32 +00:00
Ronnie Sahlberg
b7f996e628 delete the old dissector
svn path=/trunk/; revision=15819
2005-09-15 10:20:08 +00:00
Ronnie Sahlberg
4801112f37 delete the old dissector and point the makefile to the new dissector
svn path=/trunk/; revision=15818
2005-09-15 10:19:25 +00:00
Ronnie Sahlberg
e90bbf8256 new pidl generated atsvc dissector and its conformance file
svn path=/trunk/; revision=15817
2005-09-15 10:18:08 +00:00
Guy Harris
ed1d188018 Move OUIs from LLDP dissector to oui.h.
Get rid of remaining sprintf'ing into on-the-stack buffers.

Note where some items came from.

svn path=/trunk/; revision=15815
2005-09-15 08:57:51 +00:00
Tim Potter
7cc2d21bc7 A first go at importing some pidl generated code into ethereal. This
commit replaces the hand written dcerpc initshutdown and winreg 
interfaces with autogenerated ones.  

The pidl generated code is still a bit rought around the edges but will 
hopefully improve with time.

svn path=/trunk/; revision=15812
2005-09-15 07:34:52 +00:00
Anders Broman
0060eaf390 Replace the spnego dissector with an asn2eth generated one.
svn path=/trunk/; revision=15810
2005-09-15 05:38:37 +00:00
Guy Harris
11a05a318a Rename TLV_INFO_MASK to TLV_INFO_LEN_MASK, to match TLV_TYPE_MASK.
Use "tvb_format_stringzpad()" rather than "tvb_format_text()" on
strings, as some of them are null-padded.  (XXX - are they null-padded
or null-terminated?)

Clean up the TLV length checks, and do many more such checks.

svn path=/trunk/; revision=15809
2005-09-15 05:22:20 +00:00
Guy Harris
e06f0436a4 We already define ETHERTYPE_LLDP in "etypes.h" - use that, don't define
our own.

Get rid of MAC_to_str() - ether_to_str() suffices.

Don't copy to on-the-stack fixed-size string buffers, just save the
results of various formatting calls as pointers.

Use tvb_format_text() to get displayable versions of text strings.

Use tvb_get_ipv4() and tvb_get_ipv6().

Don't put an item into the protocol tree as text and then put in a
hidden item that, if unhidden, would display the same or almost exactly
the same; just put the item into the tree unhidden.

svn path=/trunk/; revision=15808
2005-09-15 04:08:53 +00:00
Guy Harris
eece5cf199 Properly handle 64-bit integer constants (they don't happen by magic,
and the stuff you have to do is compiler-dependent, so use
G_GINT64_CONSTANT()).

Properly handle formatting 64-bit quantities (they don't format
correctly by magic, and the stuff you have to do is compiler-dependent,
so use PRI[duoxX]64).

Don't copy the result of tvb_bytes_to_str() to a string buffer and then
only use it as an argument to a "%s" - just use the result directly. 

Don't copy constant strings to a buffer - just use the strings directly.

Fetch 64-bit integral quantities with tvb_get_ntoh64(); they're
presumably in a standard byte order, which is probably big-endian for
Internet-family protocols, and using tvb_memcpy() is *guaranteed* to be
wrong on some platforms.

Fix up a format string.

Fix up indentation a bit.

svn path=/trunk/; revision=15807
2005-09-15 03:09:40 +00:00
Guy Harris
c079107c61 Squelch some warnings, fix some typoes.
svn path=/trunk/; revision=15806
2005-09-15 03:03:29 +00:00
Ulf Lamping
1d0e5b105c add E_OUTOFMEMORY
svn path=/trunk/; revision=15803
2005-09-14 20:09:17 +00:00
Anders Broman
6e979407ef Fix a warning.
svn path=/trunk/; revision=15801
2005-09-14 19:11:23 +00:00
Anders Broman
8da9371eb2 From Brian Bogora:
Our company (Mitel) has developed an LLDP-MED plug-in for Ethereal.

svn path=/trunk/; revision=15800
2005-09-14 19:06:54 +00:00
Anders Broman
402b0480f7 From Dinesh G Dutt
Support some new messages and fix a couple of bugs.

packet-fc.h - Added a #define for a Cisco MDS-specific frame called OHMS (online health mgmt srv) packet-fc.c - Support for OHMS frame, fixed an incorrect "malformed frame" error caused on ACK1 frames (they
                   don't contain anything but (encap hdr + FC hdr + encap trailer), fixed incorrect detection of
                   last-data-frame

packet-fcct.h - Support for new service type, "Fabric Controller", used in conjunction with FC-SW3 ESS message,
                     exported the service name value string definitions and  
packet-fcct.c - Support for recognizing "Fabric Controller" service type and "vendor-specific" service

packet-fcswils.h - Support for ESS & MRRA messages, defined as part of FC-SW3 packet-fcswils.c - Support for ESS & MRRA messages, defined as part of FC-SW3

packet-scsi.c - Support for Verify and Write&Verify SBC commands.

svn path=/trunk/; revision=15799
2005-09-14 18:40:16 +00:00
Anders Broman
9a7de2ab43 Do the variable binding with dissect_ber_x() routines rather than asn1 ones.
svn path=/trunk/; revision=15798
2005-09-14 17:08:41 +00:00
Anders Broman
1f0fec3e78 Dont't carsh if dissect_ber_null() isn't passed a hf_id.
svn path=/trunk/; revision=15797
2005-09-14 17:04:36 +00:00
Ronnie Sahlberg
6f8fbd169d Allow dissection of dcerpc of short frames instead of aborting as soon as it is detected the pdu is "short"
svn path=/trunk/; revision=15796
2005-09-14 16:06:11 +00:00
Ronnie Sahlberg
4b11d44d11 for octet strings that span beyond the end of a "short" tvb, create a new subset tvb of what we have and use that instead of bailing out completely.
svn path=/trunk/; revision=15795
2005-09-14 16:04:59 +00:00
Ronnie Sahlberg
40cf0a8c80 when we have raw keberos inside the spnego blob, pass it as is over to
the kerberos dissector  and do not strip the ber tag and lengths off


svn path=/trunk/; revision=15794
2005-09-14 16:02:54 +00:00
Gerald Combs
a242f1926b In smb_trans_defragment(), throw an exception if we encounter a too-large
fragment size.  The limit is conservatively set at 65536 bytes.  It may
have to be increased.  Fixes bug 421.

Add an entry to the release notes.

svn path=/trunk/; revision=15789
2005-09-13 19:01:01 +00:00
Ulf Lamping
7cc57ec40c add to the protocol item a short description what a "Short Frame" is
svn path=/trunk/; revision=15786
2005-09-13 18:40:58 +00:00
Ulf Lamping
1c6e71542d increment index of IID's in COL_INFO
svn path=/trunk/; revision=15785
2005-09-13 18:39:26 +00:00
Anders Broman
542a623f34 Get application ID from the packet.
svn path=/trunk/; revision=15783
2005-09-13 16:56:28 +00:00
Ulf Lamping
de0d7959ca don't simply remove the expert_info output at BoundsError, but add the comment from Guy why this (usually) isn't a bug (because of a short snapshot length).
svn path=/trunk/; revision=15781
2005-09-13 08:03:16 +00:00
Anders Broman
b1d165da12 From Ankur Aggarwal:
First phase of testing revealed the following errors

svn path=/trunk/; revision=15780
2005-09-13 05:05:19 +00:00
Anders Broman
3048e7b7d4 From Stefan Metzmacher
Some updates to the winsrepl-dssector to add COL_INFO strings...

svn path=/trunk/; revision=15779
2005-09-13 05:00:17 +00:00
Anders Broman
c0657dce3a From Piros Lucian:
A new dissector - cimd dissector. CIMD stands for Computer Interface to Message Distribution and it's used to transfer short messages between applications and Nokia Short Message Service Center.

svn path=/trunk/; revision=15777
2005-09-13 04:51:49 +00:00
Guy Harris
aba53424dd Move the definition of GNUC_FORMAT_CHECK() to its own header, use it in
column-utils.h, and add it to expert.h, so we check the arguments to
"expert_add_info_format()", at least if the format argument is a
constant string.

Fix some more calls to "expert_add_info_format()" to pass it a format
string.

Don't record BoundsError exceptions as expert events - they merely
reflect a capture done with a snapshot length too short to capture all
of the packet (any case where it's caused by something else is a bug).

svn path=/trunk/; revision=15776
2005-09-13 04:00:47 +00:00
Guy Harris
fcc31e309f Don't pass an arbitrary string from a packet to a routine expecting a
format string - the arbitrary string might contain "%" characters, so
the routine might then fetch arbitrary junk and try to use it as, for
example, a string pointer.

svn path=/trunk/; revision=15775
2005-09-13 02:39:37 +00:00
Guy Harris
973920e91d Convert some more "tvb_memcpy()"s fetching IPv4 and IPv6 addresses to
calls to "tvb_get_ipv4()" and "tvb_get_ipv6()".

Fix a call in the BGP dissector to properly fetch an IEEE floating-point
number.

Update some I-D info.

svn path=/trunk/; revision=15774
2005-09-13 00:50:43 +00:00
Ulf Lamping
ff50ef8490 add number of defragmented bytes to the expert info output
svn path=/trunk/; revision=15771
2005-09-12 20:02:58 +00:00
Guy Harris
45e8a4c579 "g_strdown()" doesn't return a value in GLib 1.2[.x]; don't depend on it
doing so.

svn path=/trunk/; revision=15767
2005-09-12 07:55:14 +00:00
Guy Harris
346e5e211c The previous checkin for packet-isup.c was accidentally checked in along
with some unrelated changes; it got rid of some calls to get IPv4/IPv6
addresses and add them to the protocol tree, replacing them with
proto_tree_add_item() calls, and fixed up the length of one protocol
tree item.

Note that we have (at least) three count 'em three different routines
for dissecting/displaying NSAPs (there might be more - I might have
missed some), and suggest that we might want to reduce that to one.

Update the URL for ICP values for IPv{4,6} addresses inside NSAPs.

Fix the offset in the call to add the IPv6 address part of an NSAP
containing such an address, and the length in the call adding the DSP
for an NSAP containing an IPv4 address.

Fix up indentation a bit.

svn path=/trunk/; revision=15766
2005-09-12 07:44:11 +00:00
Michael Tüxen
fec9c0ec2b In now supports also:
- http://www.ietf.org/internet-drafts/draft-ietf-tsvwg-sctpimpguide-15.txt
  - http://www.ietf.org/internet-drafts/draft-ietf-tsvwg-addip-sctp-13.txt
  - http://www.ietf.org/internet-drafts/draft-stewart-sctp-pktdrprep-02.txt
  - http://www.ietf.org/internet-drafts/draft-ietf-tsvwg-sctp-auth-01.txt
  - http://www.ietf.org/internet-drafts/draft-ladha-sctp-nonce-02.txt


svn path=/trunk/; revision=15765
2005-09-12 06:24:02 +00:00
Guy Harris
39fd819fb4 Don't collide with the "regular" IPv6 defintions in at least some
platforms in ipv6-utils.h.

svn path=/trunk/; revision=15764
2005-09-12 06:21:35 +00:00
Ulf Lamping
f9b1686883 fix fault defragmentation the same way as in the request/response path
Unfortunately, I don't have a capture file to test this...

svn path=/trunk/; revision=15763
2005-09-12 00:29:19 +00:00
Ulf Lamping
55c3e85a95 fix reassembling problem I've introduced yesterday, by using fragment_add_seq_next() function instead of fragment_add()
in addition, I had to implement fragment_get_reassembled() in addition to fragment_get(), which works with reassembled_table

svn path=/trunk/; revision=15762
2005-09-12 00:16:57 +00:00
Guy Harris
aee0e1600b Fix a typo.
svn path=/trunk/; revision=15761
2005-09-11 22:31:36 +00:00
Guy Harris
51875708f2 Add some braces to squelch a compiler warning.
Fix up indentation.

svn path=/trunk/; revision=15759
2005-09-11 22:19:41 +00:00
Guy Harris
25c4bc9379 Replace tvb_memcpy() calls that extract IPv4 addresses into a guint32,
and that extract IPv6 addresses into a "struct e_in6_addr", with
tvb_get_ipv4() and tvb_get_ipv6() calls - except for some that we
remove, by using proto_tree_add_item(), rather than replacing.

Have epan/tvbuff.h include epan/ipv6-utils.h, to define "struct
e_in6_addr" (not necessary to declare the tvbuff routines, but including
it there means "struct e_in6_addr" is guaranteed to be defined before
those declarations, so we don't get compiler complaints if we define it
*after* those declarations).

svn path=/trunk/; revision=15758
2005-09-11 21:25:37 +00:00
Ulf Lamping
0bb7a6e003 rename fragment_add_dcerpc -> fragment_add_dcerpc_dg to avoid confusion a bit,
as connection oriented (cn) and connectionless (dg) DCE/RPC uses different ways to handle defragmentation and this function is only used for dg

svn path=/trunk/; revision=15757
2005-09-11 21:10:26 +00:00
Anders Broman
a665e35a38 Get rid of dependency on format-oid.h
svn path=/trunk/; revision=15756
2005-09-11 21:10:20 +00:00
Ulf Lamping
57d099a0c2 some things fixed, leftover from code cleanup (thanks to the buggy MSVC dependencies)
svn path=/trunk/; revision=15755
2005-09-11 17:15:00 +00:00
Ulf Lamping
642467ad5c I'm adding the "Expert Info" prototype now, as it seems to be in a state where others might have a look and probably already find it useful :-). Anyway, we can easily disable it at one or two places in the code if it get's in our way of a new release.
Please see: http://wiki.ethereal.com/Development/ExpertInfo for a complete overview of the intended feature and it's current state of implementation.

While I'm working on this, I've also added some more status result codes to the DCE/RPC and DCOM dissectors.

svn path=/trunk/; revision=15754
2005-09-11 16:55:34 +00:00
Guy Harris
266e1a3491 Add "tvb_get_ipv4()" and "tvb_get_ipv6()" addresses, to fetch IPv4 and
IPv6 addresses.  Use "tvb_get_ipv4()" in the WINS Replication dissector,
so that it gets the right answer on little-endian *AND* big-endian
machines.

svn path=/trunk/; revision=15753
2005-09-10 19:43:41 +00:00
Guy Harris
c4b2c971fc In "dissect_sip()", return 0 if "dissect_sip_common()" returns a
negative value, so we reject the packet as "not SIP".

Add a "dissect_sip_tcp_heur()" that's heuristic - it'll return FALSE if
the first packet doesn't look like SIP, but once it's dissected one
packet it'll just treat subsequent SIP packets as continuations if they
don't look right.

Clean up indentation a bit.

svn path=/trunk/; revision=15752
2005-09-10 19:39:56 +00:00
Luis Ontanon
96326c0b86 the dtd parser (still missing the glue) and few fixes to packet-xml.c
svn path=/trunk/; revision=15745
2005-09-10 17:29:15 +00:00
Ulf Lamping
541fd750b8 fix DCE/RPC defragmentation, if both middle and last DCE/RPC fragments are in the same TCP desegmented data blob
reassemble.c:
I had to change the way the reassemble code works if the dissector is telling that more fragments *will* follow. In this case the reassemble code shouldn't try to reassemble already at that time ...

I've also changed the way if a fragment was already seen or not, as it's not enough to check for the frame number, in the scenario described above.

Unfortunately both changes *might* broke other protocols from reassemble properly. I've checked with excessive TCP desegmentation and it's still working without any changes :-)

packet-dcerpc.c:
use a tvb subset to limit the "end of bytes" processed in a single fragment dissect run, as each fragment has it's own DCE/RPC header (and isn't part of the stub data of the previous packet).

svn path=/trunk/; revision=15744
2005-09-10 15:11:21 +00:00
Anders Broman
bb18a56bbd Dissect "nbs-9".
svn path=/trunk/; revision=15742
2005-09-09 19:46:57 +00:00
Anders Broman
4b07f6747e Add some 3GPP AVP:s
svn path=/trunk/; revision=15741
2005-09-09 16:19:51 +00:00
Tomas Kukosa
510de327f5 - dissect_per_choice() creates now only one level tree insted of two levels tree
- dissect_per_choice() rewritten

svn path=/trunk/; revision=15740
2005-09-09 15:36:39 +00:00
Guy Harris
5886bb20ad From Didier Gautheron: pass error replies to the tap.
svn path=/trunk/; revision=15738
2005-09-09 08:29:10 +00:00
Luis Ontanon
3023b8f229 some content-types are now handled by xml
svn path=/trunk/; revision=15733
2005-09-08 22:51:12 +00:00
Luis Ontanon
e6f9a5ce11 forgot the Id
svn path=/trunk/; revision=15730
2005-09-08 21:21:05 +00:00
Luis Ontanon
3dece7b495 Let's migrate the xml dissector...
svn path=/trunk/; revision=15729
2005-09-08 21:18:58 +00:00
Luis Ontanon
c7d06bc63f a new version of the xml dissector, look ma no lex!
mmh  still missing the dtd parser...


svn path=/trunk/; revision=15728
2005-09-08 21:14:24 +00:00
Gerald Combs
e0331bbb1c Fix more problems found by Steve Grubb, along with other changes:
Camel: Fix an off-by-one error.  Don't alloc and free where it's not
needed.  Remove an unused variable.

PPP and K12: Fix memory leaks.

svn path=/trunk/; revision=15725
2005-09-08 15:01:16 +00:00
Ronnie Sahlberg
d9c63f0fdd start making winsrepl into a new style dissector and use tcp_dissect_pdus()
also fix bugs 417 / 418


this dissector still needs to have heuristics to be added to it.


svn path=/trunk/; revision=15724
2005-09-08 12:39:02 +00:00
Ronnie Sahlberg
d970ca81a6 from M&Y Kaul
rename Wins to WINS

add some new decodes



svn path=/trunk/; revision=15723
2005-09-08 10:12:12 +00:00
Ronnie Sahlberg
8bdc79d8f4 from Michal & Yaniv Kaul
Updates to prettify the Bind ACK context handles



svn path=/trunk/; revision=15722
2005-09-08 10:08:01 +00:00
Ulf Lamping
11dc88286a MSVC don't like empty structs, add a dummy element to rsvp_session_ipv6_info
svn path=/trunk/; revision=15717
2005-09-07 20:50:03 +00:00
Ronnie Sahlberg
ac5f9b239f From Manu Pathak
Make RSVP tappable

add hostlist and conversation listing for RSVP conversations



svn path=/trunk/; revision=15714
2005-09-07 19:52:44 +00:00
Gerald Combs
a151e8cc6a If dissect_ber_octet_string() gives us a null tvb, assume we have a malformed
packet and throw an exception.  Don't pass the null tvb to tvb_length().

svn path=/trunk/; revision=15713
2005-09-07 15:40:59 +00:00
Ronnie Sahlberg
a33ff649df From Metze with minor changes.
New protocol
NBNS Replication support



svn path=/trunk/; revision=15711
2005-09-07 13:29:44 +00:00
Tomas Kukosa
cd88fb82d8 SIP reassembly using req_resp_hdrs_do_reassembly()
svn path=/trunk/; revision=15709
2005-09-07 10:08:13 +00:00
Anders Broman
4029a91b8b Ftam - Use some mofe FN_PAR:s
PRES Dissect PDU type based on SS-user data from SES(Info from asn1 file).

svn path=/trunk/; revision=15703
2005-09-06 18:08:45 +00:00
Guy Harris
75dc6f1a66 Make sure we don't overflow the dialedDigits array.
svn path=/trunk/; revision=15702
2005-09-06 17:44:20 +00:00
Guy Harris
33d72d3b9d Fail somewhat gracefully if malloc() fails.
svn path=/trunk/; revision=15701
2005-09-06 17:43:22 +00:00
Tomas Kukosa
b9b159713a get rid of few warnings
svn path=/trunk/; revision=15700
2005-09-06 14:18:49 +00:00
Tomas Kukosa
92015a695f reassembly improvements
svn path=/trunk/; revision=15699
2005-09-06 10:38:25 +00:00
Anders Broman
6b28d6063e From Graeme Lunt:
Attached is a patch to solve the CHOICE problem for review. 

Problem was two-fold:
1) not passing original class/tag to sub-choice we had matched BER_CLASS_ANY
2) not handling a count==0 if we had matched BER_CLASS_ANY 

The patch also includes a my constructed octet string fix again.

svn path=/trunk/; revision=15698
2005-09-06 05:30:06 +00:00
Guy Harris
6978ce0759 Squelch compiler warnings.
svn path=/trunk/; revision=15697
2005-09-05 22:39:09 +00:00
Guy Harris
184aa03350 Squelch compiler warnings.
svn path=/trunk/; revision=15696
2005-09-05 22:38:13 +00:00
Guy Harris
3008628138 Squelch a compiler warning.
svn path=/trunk/; revision=15695
2005-09-05 22:36:52 +00:00
Gerald Combs
efdef9c5aa For SNMP, malloc memory that we're going to free later. Fixes bug 406.
For RTP, don't free se_allocated memory.

svn path=/trunk/; revision=15694
2005-09-05 21:38:10 +00:00
Guy Harris
4995b14fa3 Use the same string for the protocol's filter name as is used in the
names of its filterable fields.

svn path=/trunk/; revision=15693
2005-09-05 21:30:15 +00:00
Guy Harris
459327da14 Include "packet-tcp.h" to declare tcp_dissect_pdus().
svn path=/trunk/; revision=15692
2005-09-05 21:21:29 +00:00
Anders Broman
60ff3e4b75 Add some OID:s as we now use the Presentation context and use FN_PARS.
svn path=/trunk/; revision=15689
2005-09-05 16:41:46 +00:00
Anders Broman
4e9a8fc4fa branch_taken got lost in the recent changes.
svn path=/trunk/; revision=15687
2005-09-05 16:31:24 +00:00
Anders Broman
fba662fa2a Add a missing include
svn path=/trunk/; revision=15686
2005-09-05 16:30:31 +00:00
Tomas Kukosa
03a6f6286b the first attempt at SIP reassembly
svn path=/trunk/; revision=15685
2005-09-05 13:25:49 +00:00
Tomas Kukosa
44b2d9d828 buffer where parameters variable pointed into was freed
it is necessary to make a copy

svn path=/trunk/; revision=15684
2005-09-05 13:20:56 +00:00
Tomas Kukosa
4887fe9bf1 - set length for "Encapsulated multipart part" tree item
- pass right content type to media subdissectors

svn path=/trunk/; revision=15683
2005-09-05 11:59:22 +00:00
Anders Broman
76183d5644 Fix a typo, should make the buildbot hapy again.
svn path=/trunk/; revision=15681
2005-09-05 05:29:14 +00:00
Anders Broman
bbf0fb6dde From Graeme Lunt
I attach my RTSE dissector (in tar file) which requires the included ROS dissector, as well as a patch to the latest pres.{cnf,asn}. The ROS dissector uses a new field in the SESSION_DATA_STRUCTURE to pass the ROS operation to the sub-dissector, though this is also set by other dissectors (RTSE uses it in X.410 mode). 
 
 Note that X.400 P1 in X.410 mode doesn't use ROS, so it is useful not to explicitly include ROS in my X411 dissector. However, the inclusion of a ROS dissector won't effect any dissectors that currently implement their own ROS.
 
 I also include dissectors for:
 
 X.411 	(P1) 		X.400 OSI Message Transfer Service
 X.420 	(P22) 	X.400 OSI Information Object
 STANAG 4406	(P772)	STANAG 4406 Military Message Extensions (to P22)
 
 These rely on the RTSE and ROS dissectors.

Withs some changes to remove various warnings and errors.

svn path=/trunk/; revision=15680
2005-09-04 20:30:31 +00:00
Anders Broman
bc4b6481b4 From Graeme Lunt:
Basically the changes are:
a) [pres] make the find_oid_by_[pres_]ctx_id (I changed the name to make it more specific) non-static so it can be called from other dissectors (see acse.cnf changes). I also call it from RTSE and ROS dissectors
b) [acse] remove (#ifdef NOT_NEEDED) the oid lookup table and any reference to acse_handle - as these are no longer needed
c) [acse] register the acse dissector on 2.2.1.0.1
with some modifications: -#ifdef:ed code removed
- renamed aco -> pco

svn path=/trunk/; revision=15678
2005-09-04 09:00:01 +00:00
Anders Broman
60eb171f7a Make Objekt Key a HEX string.
svn path=/trunk/; revision=15677
2005-09-04 08:53:04 +00:00
Ronnie Sahlberg
63b909db6a another switch that should be a value_string
svn path=/trunk/; revision=15669
2005-09-02 09:28:30 +00:00
Ronnie Sahlberg
4256decaf2 make two thigs that should be value_strings value_strings
svn path=/trunk/; revision=15668
2005-09-02 09:16:50 +00:00
Guy Harris
f63f048929 A PDU dissector called by tcp_dissect_pdus() can't return anything.
A PDU length routine called by tcp_dissect_pdus() should use the offset
passed to it as the offset of the beginning of the PDU.

In the heuristic GIOP dissector, if we're running over TCP, and accept
the packet, call "dissect_giop_tcp()" so that we handle multiple PDUs
within the segment or PDUs split across segments.

svn path=/trunk/; revision=15667
2005-09-02 08:19:15 +00:00
Anders Broman
ad5fab657d From Steve Karg
svn path=/trunk/; revision=15666
2005-09-02 05:49:25 +00:00
Anders Broman
3b949ac5a4 From ouli:
- Add version 2 CancelLocation decoding

svn path=/trunk/; revision=15665
2005-09-02 05:46:10 +00:00
Guy Harris
92e0e21362 Regenerate dissectors with the current asn2eth.
svn path=/trunk/; revision=15664
2005-09-02 05:43:49 +00:00
Anders Broman
b9c5fe14d6 It looks like there might not always be a body, check if there is.
svn path=/trunk/; revision=15663
2005-09-01 19:44:26 +00:00
Gerald Combs
d3d87f3c66 Normalize our hf_id checks and make sure our hf_ids are valid before we
try to use them.  This should fix bugs 399 and 401.

svn path=/trunk/; revision=15662
2005-09-01 19:35:23 +00:00
Anders Broman
d18a7233f9 Re-assemble GIOP over TCP.
svn path=/trunk/; revision=15661
2005-09-01 19:31:48 +00:00
Guy Harris
0ab779b04c Get rid of a no-longer-used #define.
svn path=/trunk/; revision=15659
2005-09-01 18:03:02 +00:00
Guy Harris
802dc99d45 Use "proto_item_append_text()" rather than filling up an allocated
buffer.  This fixes one place where the "NLPID(s):" wasn't being put
into the protocol tree item.

svn path=/trunk/; revision=15658
2005-09-01 11:34:10 +00:00
Guy Harris
471fa4924d Use "proto_tree_append_text()" rather than appending to an ep_alloced
buffer (that buffer wasn't getting cleared for each item).

svn path=/trunk/; revision=15655
2005-09-01 10:38:41 +00:00
Guy Harris
69ce025a0b Get rid of a trailing comma.
svn path=/trunk/; revision=15654
2005-09-01 09:56:23 +00:00
Anders Broman
85c29a030d From Martin Mathieson
These small patches:

- add RTSP header 'RDTFeatureLevel  as a proper field
- show feature level in RDT stream setup info
- tidy up RDT info column text

svn path=/trunk/; revision=15647
2005-09-01 05:34:52 +00:00
Anders Broman
5dd3862875 Upadte to call Data dissector from PRES based on OID in Presentation Context,
based on the code in ACSE.

svn path=/trunk/; revision=15643
2005-08-31 20:20:56 +00:00
Guy Harris
50a0cfd477 Give it an RCS ID.
svn path=/trunk/; revision=15641
2005-08-31 19:51:53 +00:00
Anders Broman
59829053fb udvm: initialise a variable
sigcomp: implement RFC 4077

svn path=/trunk/; revision=15640
2005-08-31 19:51:24 +00:00
Tomas Kukosa
fd99f48371 - more standard way for FastStart item dissection
- protocol names fixed

svn path=/trunk/; revision=15636
2005-08-31 15:03:12 +00:00
Tomas Kukosa
bcdfd08b84 internal length field for constrained SEQUNCE/SET OF was not hidden
svn path=/trunk/; revision=15635
2005-08-31 14:53:15 +00:00
Michael Tüxen
7eb99253e6 Make ses_vals extern. Required to get it linked on Mac OS X.
svn path=/trunk/; revision=15633
2005-08-31 13:52:43 +00:00