Commit Graph

400 Commits

Author SHA1 Message Date
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
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
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
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
Guy Harris c6cb7b6367 Add a Makefile.
svn path=/trunk/; revision=15827
2005-09-15 23:17:42 +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 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
Anders Broman bb18a56bbd Dissect "nbs-9".
svn path=/trunk/; revision=15742
2005-09-09 19:46:57 +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
Gerald Combs adce5ed6a5 Set "COPYCMD=/Y" and remove the "/Y" from each XCOPY command in order
to fix compilation under Windows NT.  This should fix bug 403.

The changes were made using "find . -name Makefile.nmake | xargs perl
-pi.bak -e 's: /y::i'".  They appear to work under XP, but if anything
broke I blame Larry Wall.

svn path=/trunk/; revision=15710
2005-09-07 13:26:23 +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
Tomas Kukosa b9b159713a get rid of few warnings
svn path=/trunk/; revision=15700
2005-09-06 14:18:49 +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
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
Anders Broman 1888e9439c Add some OID:s as we now use the Presentation context and use FN_PARS.
svn path=/trunk/; revision=15688
2005-09-05 16:41:11 +00:00