Commit graph

418 commits

Author SHA1 Message Date
Luis Ontanon
ff20ed3e10 Some cleanup,
- Improve expert info
- Remove the debug tree (one warning unused function, will go)
- Make Sure Pending messages have a cmdmsg (and so a colinfo label)


svn path=/trunk/; revision=16383
2005-11-02 23:01:15 +00:00
Luis Ontanon
b10fcd969a - terminate a value_string
- wildcard field subdissector


svn path=/trunk/; revision=16378
2005-11-02 19:46:47 +00:00
Anders Broman
6eb18470f8 From Tim
A small patch for camel and inap, where the linkedid doesn't get dissected correctly in camel or inap
and some tidy up in the camel asn.1 which now compiles with no warnings.

also fix the copy_file target (/y)

svn path=/trunk/; revision=16376
2005-11-02 07:51:55 +00:00
Luis Ontanon
c5ff846c22 - add a counter for pending messages
- do not use a value string for context ids
- remove the plugin registration as it is not supposedd to be a plugin


svn path=/trunk/; revision=16375
2005-11-01 21:09:28 +00:00
Luis Ontanon
f100a33216 - Embryonic Transaction & Context tracing
svn path=/trunk/; revision=16372
2005-11-01 16:28:13 +00:00
Ronnie Sahlberg
deaf5edaaf register 1.2.840.113533.7.66.13 as passwordbasedmac from CRMF
svn path=/trunk/; revision=16344
2005-10-27 11:54:55 +00:00
Ronnie Sahlberg
6d964caa1e updates to CMP
implement the glue to dissect CMP oer TCP


svn path=/trunk/; revision=16323
2005-10-26 20:17:40 +00:00
Anders Broman
159963a270 Add the rest of the IE:s
svn path=/trunk/; revision=16322
2005-10-26 19:52:00 +00:00
Anders Broman
85cd6d8dc7 Set correct offset fore some signals, use dummy funtion to get hf fields auto generated.
svn path=/trunk/; revision=16319
2005-10-26 18:52:46 +00:00
Anders Broman
78ed339b3d Tags should be implicit.
svn path=/trunk/; revision=16316
2005-10-25 20:30:43 +00:00
Anders Broman
c8d3cd483b As there are more Procedure codes the hueristics need to be updated.
svn path=/trunk/; revision=16315
2005-10-25 20:29:50 +00:00
Guy Harris
859ccfa6cb Check in re-generated version from Graeme Lunt's fix to asn2eth.
svn path=/trunk/; revision=16313
2005-10-25 19:39:50 +00:00
Guy Harris
7e874fc9dd Don't declare "dissect_rtse_EXTERNAL()" in "packet-rtse.c" - let it get
it from "packet-rtse.h" (which, at least on some platforms, doesn't
declare it as static, so GCC 4.0, at least, fails because the static and
non-static declarations collide).

svn path=/trunk/; revision=16312
2005-10-25 19:37:38 +00:00
Luis Ontanon
8c28eb9648 Avoid a conflict in global symbols by declaring some variables static.
svn path=/trunk/; revision=16310
2005-10-25 18:38:47 +00:00
Guy Harris
7ca1457f35 We don't have an SS-Operations.asn file, and don't use one.
svn path=/trunk/; revision=16309
2005-10-25 17:49:08 +00:00
Anders Broman
314c36da9a From Graeme Lunt:
The ftbp.patch file includes:
a) A fix to acse.cnf which works around an asn2eth bug (it is the AE-qualifier EXPORT I want, but asn2eth doesn't generate the appropriate extern for the values). Also a small cosmetic change for EXTERNAL decodings.
b) New EXPORTs for the FTAM dissector for use in FTBP.
c) A fix to asn2eth to solve the problem if you EXPORT types that include a '-' character in the name (e.g. "AE-qualifier" from acse.cnf, "Date-and-Time-Attribute" from ftam.cnf). The problem is that asn2eth generates the "xxxx-exp.cnf" file using the 'C' name (which has replaced '-' with '_') rather than the original 'ASN' name. The fix just undoes the replacement as I couldn't see the original name being preserved anywhere. There still remains a problem if the type has a '.' in the name - but generally I don't think they do.

* Better ROS handling and registration
* Simplified RTSE registration
* X411 column information, extension naming and use of new RTSE/ROS registration
* X420 notification extensions, warnings removal and export of ExtensionsField (missed from recent FTBP patch).
* Better highlighting of S4406 protocol.


svn path=/trunk/; revision=16296
2005-10-24 21:42:19 +00:00
Anders Broman
c38e1002dd UMTS Node B Application Part(NBAP) packet dissection(3GPP TS 25.433 version 6.6.0 Release 6)
All IE:s not dissected yet.

svn path=/trunk/; revision=16293
2005-10-24 21:16:44 +00:00
Gerald Combs
f4eaf40648 Don't pass a null value to strcmp(). Fixes bug 540.
svn path=/trunk/; revision=16262
2005-10-18 13:36:32 +00:00
Guy Harris
6e759b47f2 .FN_BODY text gets printf-style expansion done on it, so format strings
in the code have to have %'s escaped.  Do so.

svn path=/trunk/; revision=16260
2005-10-18 00:07:49 +00:00
Gerald Combs
5cadbb4de4 When dissecting an ACSE APDU make sure our OID isn't for an ACSE APDU
(which would make us recurse until we crashed).

svn path=/trunk/; revision=16252
2005-10-17 16:12:24 +00:00
Ronnie Sahlberg
2824ec57be fox a static/non-static signature mismatch
svn path=/trunk/; revision=16239
2005-10-16 01:47:29 +00:00
Ronnie Sahlberg
23caf5e4d3 remove some strcpy() calls
svn path=/trunk/; revision=16228
2005-10-15 22:46:20 +00:00
Anders Broman
b67a452476 A small patch for presentation to:
a) maintain the session presentation context 
b) support SES_REFUSE

svn path=/trunk/; revision=16213
2005-10-13 05:20:40 +00:00
Guy Harris
a9c08c4421 Show internal errors with REPORT_DISSECTOR_BUG().
svn path=/trunk/; revision=16208
2005-10-13 02:21:01 +00:00
Ronnie Sahlberg
719be76291 fix for bug 529
a CHOICE might not consume any butes in teh encoding if there were no matching
choice arms found.

make the loop in acse abort with malformed packet if the choice failed to decode anything  to prevent an infinite loop in bug 529


svn path=/trunk/; revision=16207
2005-10-13 01:39:53 +00:00
Anders Broman
4686f4f2a5 Replace the current ranap dissector with an asn2eth generated one.
svn path=/trunk/; revision=16191
2005-10-11 17:48:01 +00:00
Anders Broman
6c6e9cd65a Add Id.
svn path=/trunk/; revision=16184
2005-10-11 05:24:09 +00:00
Anders Broman
24df5c368e asn2eth generated ranap dissector, there's still problems with rab-assignment and secondValue(rab-setupormodifyitem2).
svn path=/trunk/; revision=16182
2005-10-10 20:42:58 +00:00
Anders Broman
3f7ed7c2a2 Fix problems with bitstring:
- dissect_per_bitstring needs to know if extention exists or not.
- Fixes for bitstring sizes up to 16 ( where max = min ).

svn path=/trunk/; revision=16181
2005-10-10 20:38:28 +00:00
Anders Broman
15aa4d692f From Richard van der Hoff:
Extensions to the h.245 dissector to extract H.223 Multiplex Code and Logical 
Channel setup messages, and pass this information to the H.223 dissector.

svn path=/trunk/; revision=16139
2005-10-06 06:38:17 +00:00
Anders Broman
f11ef4b7a0 Add dissection of some more OID's and use the #.REGISTER function.
svn path=/trunk/; revision=16081
2005-10-03 18:18:38 +00:00
Anders Broman
8a31ec4d19 From Graeme Lunt
X420 - incorrect ExtendedBodyPart handling
ACSE - support for implicitly tagged EXTERNALs and dissection based upon direct-reference RTSE - same change for RTSE EXTERNAL handling as above CMS  - support for ContentType, MessageDigest, SigningTime and CounterSignature attributes ESS  - support for ESSSecurityLabel and EquivalentLabels attributes


svn path=/trunk/; revision=16071
2005-10-03 05:16:57 +00:00
Anders Broman
00faf71e47 From Graeme Lunt
X420 - incorrect ExtendedBodyPart handling
ACSE - support for implicitly tagged EXTERNALs and dissection based upon direct-reference RTSE - same change for RTSE EXTERNAL handling as above CMS  - support for ContentType, MessageDigest, SigningTime and CounterSignature attributes ESS  - support for ESSSecurityLabel and EquivalentLabels attributes


svn path=/trunk/; revision=16070
2005-10-03 05:14:39 +00:00
Anders Broman
2bac3e70c5 From Graeme Lunt
allows the dissection of ContentInfo based upon it's OID - something that is used for a secure X.400 messages (Protecting Content Type (PCT)).

svn path=/trunk/; revision=16069
2005-10-02 21:14:35 +00:00
Tomas Kukosa
9a66525b71 new option whether tunnelled H.245 and tunnelled protocol are displayed inside H.225 tree or outside
svn path=/trunk/; revision=16020
2005-09-27 10:05:42 +00:00
Guy Harris
0e17a773b9 A loop processing all the bytes in a tvbuff from a given offset to the
end of the data in the tvbuff should stop when the offset is >= the
total amount of data in the tvbuff, not when it's > the total amount in
the tvbuff following the starting offset.

In "unpack_digits()", return a null string, not a null pointer, if
there's nothing left in the tvbuff starting at the starting offset, so
that the caller doesn't have to check for a null pointer, and return an
ep_alloc()ed buffer, so the caller doesn't have to worry about freeing
the result.

If we see a filler digit, don't advance the offset in the string buffer;
we want to put the terminating '\0' right after the character we just
put into the string.

Fuzzed against some GSM captures.

svn path=/trunk/; revision=16002
2005-09-25 09:32:01 +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
Guy Harris
23661240d7 Squelch some compiler warnings.
svn path=/trunk/; revision=15953
2005-09-22 02:08:03 +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
7ce6e5ebcd Set svn:eol-style properly, and get rid of a bogus proprty. Fix the
line endings.

svn path=/trunk/; revision=15947
2005-09-21 23:30:26 +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
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
551f589cb9 Fix a compiler warning.
svn path=/trunk/; revision=15916
2005-09-21 01:33:16 +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
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
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
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