Commit Graph

168 Commits

Author SHA1 Message Date
Anders Broman a4614ab3ef Add an expert item warning if a full sequence isn't decoded.
svn path=/trunk/; revision=25484
2008-06-19 12:16:26 +00:00
Stig Bjørlykke 772b24c149 Fix the crash from bug 2432. I don't really like that we use a new tvb
and a new data source for displaying unaligned octet strings, because the
user cannot easily see where in the data package the values are from.

Maybe we should implement a "Packet Bits" pane for bit protocols?
Or just an option to turn the Bytes pane to a Bits pane?

Another problem is that the generated pdml (from the bug report) does not
generate correct data for these fields, as the "pos" value is always zero
(because we use a new tvb with offset 0).  But I suppose it's difficult to
fix this with byte values...

svn path=/trunk/; revision=24992
2008-04-13 16:42:41 +00:00
Anders Broman 052b1a488f Return value tvb if pressent from all branches.
svn path=/trunk/; revision=24698
2008-03-19 19:10:31 +00:00
Tomas Kukosa df1763c49b fix from Anders: offset->boffset
svn path=/trunk/; revision=24697
2008-03-19 09:14:47 +00:00
Anders Broman 8ad1d17b61 Handle the case where length is > remaining tvb
trace in:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1809

svn path=/trunk/; revision=24691
2008-03-18 20:10:50 +00:00
Stig Bjørlykke b091b8d26c Rewrote to use g_strlcpy and g_strlcat.
svn path=/trunk/; revision=24525
2008-03-01 17:23:39 +00:00
Guy Harris fb32ed8812 Get rid of non-ASCII characters.
svn path=/trunk/; revision=24171
2008-01-23 20:15:13 +00:00
Stig Bjørlykke 01b304a6b7 Moved a G_GINT64_CONSTANT to a more correct position.
svn path=/trunk/; revision=24108
2008-01-15 23:25:40 +00:00
Anders Broman 5bbef7d0c0 Use G_GINT64_CONSTANT(hope it makes the OS X build bot happy).
Unused variables fix to camel.

svn path=/trunk/; revision=24106
2008-01-15 22:23:57 +00:00
Anders Broman 7e572a34c0 Use G_GINT64_CONSTANT(hope it makes the build bot happy).
svn path=/trunk/; revision=24105
2008-01-15 22:07:29 +00:00
Anders Broman a49fc8640c Use G_GINT64_MODIFIER hope it makes the build bot happy.
Probbably needed in x2ap as well (needs asn2wrs support or .cnf magic).

svn path=/trunk/; revision=24104
2008-01-15 21:57:50 +00:00
Anders Broman 6cb56fba71 make per_constrained_integer handle 64bits needed for X2AP.
svn path=/trunk/; revision=24097
2008-01-15 17:59:43 +00:00
Tomas Kukosa f5614d71cd set actx->created_item for object identifier type
svn path=/trunk/; revision=23994
2008-01-03 08:19:27 +00:00
Tomas Kukosa 7529f33437 support for additionally SIZE constrained Typereference
the support is only semiautomated as this feature does not occur very often
use this feature for the TBCD-STRING in the H.225 dissector

svn path=/trunk/; revision=23958
2007-12-28 10:42:44 +00:00
Tomas Kukosa 48eb58a0d4 do not align before enumerated extension
svn path=/trunk/; revision=23916
2007-12-18 10:15:31 +00:00
Anders Broman dbcabb1938 Get rid of most of the legacy oid stuff.
svn path=/trunk/; revision=23333
2007-11-01 22:07:43 +00:00
Tomas Kukosa 84488ec016 asn2wrs
- parameterized object class assignment
 - octet string with extensible size constraint
 - RELATIVE-OID type (still not supported in packet-per/ber)
packet-per
 - octet string with extensible size constraint
more dissect_per_... functions exported from libwireshark.dll
PER dissectors regenerated
add forgotten packet-h323-template.h
fix svn properties for h323 files

svn path=/trunk/; revision=23309
2007-10-29 19:25:37 +00:00
Tomas Kukosa 10a6ffc497 add flags for optional fields of EXTERNAL type into asn1_ctx_t struct
svn path=/trunk/; revision=23238
2007-10-22 12:25:56 +00:00
Tomas Kukosa 7cca38408f make dissect_per_length_determinant() private
svn path=/trunk/; revision=23214
2007-10-17 09:51:27 +00:00
Tomas Kukosa 22bd99f76b PER: fix bitstring handling if SIZE(n) where n<=16
SABP: implement some forgotten code

svn path=/trunk/; revision=22896
2007-09-18 11:46:50 +00:00
Anders Broman 64bafc6a18 Remove debug code and a "lost" line.
svn path=/trunk/; revision=22808
2007-09-06 16:28:08 +00:00
Stig Bjørlykke f1cf7ee6bf Fixed compiler warnings to get the buildbot going.
svn path=/trunk/; revision=22787
2007-09-04 21:49:14 +00:00
Anders Broman b3521c5975 value_tvb=out_tvb, remove unused variables.
svn path=/trunk/; revision=22785
2007-09-04 19:36:07 +00:00
Anders Broman a76efadf0c Get correct value for bitstrings.
svn path=/trunk/; revision=22784
2007-09-04 16:57:07 +00:00
Anders Broman 51460c5a5f fix dissect_per_bit_string() for unaligned PER, values ar still not correctly displayed.
svn path=/trunk/; revision=22758
2007-08-30 19:44:22 +00:00
Luis Ontanon bcd55f4c8e replace oid_to_str_buf() and oid_to_str()
fix a potential buffer overflow due to a very liberal estimate by oid_repr_len()


svn path=/trunk/; revision=22659
2007-08-25 17:29:55 +00:00
Tomas Kukosa 5a46ea46b5 H.450 regenerated from original ASN.1 sources
svn path=/trunk/; revision=22417
2007-07-30 08:01:59 +00:00
Tomas Kukosa ab5d466fc7 rose_ctx_t structure usage in Q.932 dissector
svn path=/trunk/; revision=22349
2007-07-18 13:15:36 +00:00
Jeff Morriss 520296ca02 Fix bug http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1675 (warning: cast from pointer to integer of different size) and, presumably, display of PER encoded IPv4 addresses by copying the IP address into a guint32 and passing that to proto_tree_add_ipv4().
svn path=/trunk/; revision=22328
2007-07-16 21:37:07 +00:00
Tomas Kukosa 6659588f60 - get rid of anonymous unions
- move some structures from packet-per and packet-q932-ros to asn1.h

svn path=/trunk/; revision=22295
2007-07-13 11:25:53 +00:00
Anders Broman 44a41824c3 Fix dissection of IP addresses in unaligned PER.
Add dissection of MSISDN and IMSI to the ULP dissector.

svn path=/trunk/; revision=22233
2007-07-03 09:08:31 +00:00
Anders Broman 9af02b5130 Change actx->external.direct_reference to be the OID string.
Use it in BER direct reference to call the OID dissector.

svn path=/trunk/; revision=22097
2007-06-14 05:17:07 +00:00
Tomas Kukosa d105a414d0 fix warning
svn path=/trunk/; revision=21907
2007-05-23 14:31:12 +00:00
Tomas Kukosa e8ecaf723b support of CONTAINING constraint in OCTET STRING and BIT STRING
svn path=/trunk/; revision=21905
2007-05-23 13:36:25 +00:00
Jörg Mayer 21adfc3029 Trivial warning fixes:
opcua: warning: function declaration isn't a prototype
rest: comma at end of enumerator

svn path=/trunk/; revision=21885
2007-05-22 13:17:24 +00:00
Tomas Kukosa 52b3c8baf4 fix packet-per.c:155: warning: 'val_tvb' may be used uninitialized in this function
svn path=/trunk/; revision=21763
2007-05-14 14:17:42 +00:00
Tomas Kukosa 61ffcf48a9 - more variants of dissect_per_open_type_*()
- move asn1_get_real() to asn1.c/.h

svn path=/trunk/; revision=21757
2007-05-14 13:39:31 +00:00
Tomas Kukosa a8c10b431f changes in external structure of asn1_ctx_t
svn path=/trunk/; revision=21714
2007-05-07 11:25:21 +00:00
Anders Broman 98cb9db12d Split out asn1 common functions. Start of BER EXTERNAL.
svn path=/trunk/; revision=21670
2007-05-03 21:52:57 +00:00
Tomas Kukosa 6e491e8c3b REAL type support
svn path=/trunk/; revision=21658
2007-05-03 09:15:04 +00:00
Tomas Kukosa cd06093bcc fix forgotten calling of dissect_per_External()
svn path=/trunk/; revision=21645
2007-05-02 12:48:22 +00:00
Ronnie Sahlberg 9efe581adc comment out a unused function so that wireshark builds on suse again
svn path=/trunk/; revision=21644
2007-05-02 12:34:28 +00:00
Ronnie Sahlberg 3abb8dd622 fix some compiler warnings leading to compile failure
svn path=/trunk/; revision=21643
2007-05-02 12:26:26 +00:00
Tomas Kukosa b112f7cd40 PER - support of EXTERNAL and ObjectDescriptor types (not tested)
svn path=/trunk/; revision=21640
2007-05-02 12:13:29 +00:00
Anders Broman 1cf1f16391 Split out common asn1 stuff to asn1.h and include that where needed.
svn path=/trunk/; revision=21635
2007-05-01 22:05:11 +00:00
Jeff Morriss 00cf2ec89c Frame numbers are unsigned, print them as such
svn path=/trunk/; revision=21443
2007-04-16 04:52:51 +00:00
Jeff Morriss 4d21c49929 Get rid of some more g_assert*()'s in the dissectors. There are a few
remaining that I'm not sure exactly what to do with at the moment:
the one in packet-frame probably should be there, the others probably
shouldn't but they also should never fail unless there's a compile or build
problem (AFAICS).


svn path=/trunk/; revision=21367
2007-04-10 14:48:06 +00:00
Guy Harris 1fbb567ebe Fix a compiler warning (about a real problem).
svn path=/trunk/; revision=19605
2006-10-19 09:14:27 +00:00
Tomas Kukosa 809d8a1113 From Reinhard Speyerer:
patch fixes a small typo in epan/dissectors/packet-per.c

svn path=/trunk/; revision=19361
2006-09-29 11:09:17 +00:00
Anders Broman 9753b85f46 Handle unaligned dissect_per_length_determinant and dissect_per_restricted_character_string_sorted.
svn path=/trunk/; revision=19340
2006-09-27 19:30:22 +00:00
Tomas Kukosa 5ff34d332b - add value_ptr into struct _asn1_ctx_t
- small changes in h225.cnf
- H.225 regenerated

svn path=/trunk/; revision=18923
2006-08-16 08:07:30 +00:00
Tomas Kukosa c333c6b5bd few formal changes in PER dissector (rename asn_* types to asn1_* ones)
svn path=/trunk/; revision=18652
2006-07-04 06:49:53 +00:00
Tomas Kukosa 6ceb7937bc remove name field from per_sequence_t structure, it can be retrieved from field information
svn path=/trunk/; revision=18637
2006-07-03 07:03:57 +00:00
Tomas Kukosa 9be9eb8e14 use "type function" instead of "field function" in PER CHOICE and SEQUENCE tables
it matches asn2wrs approach and makes generated dissectors source shorter

svn path=/trunk/; revision=18612
2006-06-29 15:26:41 +00:00
Ronnie Sahlberg 139b870383 restore display of optional field names when the optional bit is displayed in the tree
svn path=/trunk/; revision=18573
2006-06-24 12:03:24 +00:00
Ronnie Sahlberg c72123bf4b coverity 197 dead code
svn path=/trunk/; revision=18572
2006-06-24 11:50:47 +00:00
Ronnie Sahlberg cd65440deb coverity 190
remove some dead code


svn path=/trunk/; revision=18557
2006-06-23 09:27:17 +00:00
Ronnie Sahlberg 143f429c61 remove some dead code
coverity 191

svn path=/trunk/; revision=18556
2006-06-23 09:15:20 +00:00
Ronnie Sahlberg c71d5ef7cb coverity 195
remove a redundant check for str==NULL
since str can never be NULL here


svn path=/trunk/; revision=18517
2006-06-19 10:18:42 +00:00
Anders Broman 581dc56d63 MAke it possible to get a tvb with a BIT STRING, regenerate PER dissectors.
svn path=/trunk/; revision=18395
2006-06-08 06:06:17 +00:00
Tomas Kukosa 1f24a713be - packet-per.[ch]: Open Type support
- asn2wrs.py: TYPE-IDENTIFIER and ABSTRACT-SYNTAX information object classes support

svn path=/trunk/; revision=18338
2006-06-05 06:49:52 +00:00
Ronnie Sahlberg 66bf41c493 the very recently added unaligned-per support and the ulp dissector could cause an infinite loop in dissect_per_constrained_integer()
if the interval spans the entire 32 bit range.


special case the two common cases when this may happen  until a real fix is included.

if the range variable becomes 0 due to 32bit overflow   do a g_assert_not_reached to prevent an infinite loop.



this function should be enhanced to work with 64 bit integers.


svn path=/trunk/; revision=18299
2006-06-01 10:16:43 +00:00
Tomas Kukosa 34e1acfc08 get rid of few warnings in packet-per.c
svn path=/trunk/; revision=18264
2006-05-31 13:38:10 +00:00
Tomas Kukosa fbd2a3fe3e - fix bugs in dissect_per_octet_string() introduced with unaligned variant
- step to new ASN.1 API - pass asn_ctx_t* through PER dissectors instead of packet_info*
- PER ALIGNED/UNALIGNED flag moved to asn_ctx_t
- PER created tree item pointer moved to asn_ctx_t
- add nbap into PER dissectors in asn1/Makefile.nmake
- use add_oid_str_name() instead of register_ber_oid_name() in H.225 and H.245
- export asn_ctx_init from library
- PER dissectors regenerated

svn path=/trunk/; revision=18209
2006-05-22 11:49:50 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Anders Broman fff13e4653 Add missing add_new_data_source.
svn path=/trunk/; revision=18180
2006-05-17 18:11:12 +00:00
Anders Broman 622f6d8922 PER:
Adapt dissect_per_octet_string to unaligned PER.
Call rrlp dissector from ulp dissector. 

svn path=/trunk/; revision=18176
2006-05-16 22:00:18 +00:00
Anders Broman ecac136d4d Make dissect_per_constrained_integer handle unaligned PER.
Add ULP TCP port preference decode IPv4/IPv6 fields.

svn path=/trunk/; revision=18143
2006-05-13 12:06:56 +00:00
Anders Broman 102bb4be54 Preparations to be able to handle unaligned PER.
svn path=/trunk/; revision=18119
2006-05-10 05:58:06 +00:00
Tomas Kukosa 3b5ed30a0d better support for ASN.1 Enumerated type in PER decoding
support in asn2eth will follow

svn path=/trunk/; revision=17530
2006-03-08 13:50:04 +00:00
Anders Broman d19c901b52 Make a new PER function dissect_per_enumerated() and use it for the two places in RANAP where
extensions has been made to enumerations. asn2eth should be updated to use it.

svn path=/trunk/; revision=17474
2006-03-05 20:21:19 +00:00
Anders Broman 204212aeff From Peter Johansson:
fixes the following compilation warnings (and 
potential problems that may otherwise follow).

packet-per.c(796) : warning C4047: 'function' : 'struct _proto_node ** ' 
differs in levels of indirection from 'struct _proto_node *'
packet-per.c(796) : warning C4024: 'dissect_per_boolean' : different 
types for formal and actual parameter 7
packet-per.c(796) : warning C4700: local variable 'pi' used without 
having been initialized

svn path=/trunk/; revision=17427
2006-02-28 17:00:31 +00:00
Anders Broman d49c777b71 Add extention bit if per internal fields shown.
svn path=/trunk/; revision=17417
2006-02-27 08:35:24 +00:00
Tomas Kukosa a5bfb48c2f OBJECT IDENTIFIER name resolution moved to oid_resolv.c
svn path=/trunk/; revision=16699
2005-12-06 11:45:55 +00:00
Anders Broman e74a09cd01 If we don't have the OID name let the SNMP dissector try to get it from the MIB:s
svn path=/trunk/; revision=16680
2005-12-05 17:24:19 +00:00
Tomas Kukosa dcae7d303f new field type FT_OID for OBJECT IDENTIFIERs
svn path=/trunk/; revision=16652
2005-12-02 13:16:58 +00:00
Tomas Kukosa 97584210fb improvements in value constraint support
- NO_BOUND is defined instead of usage -1
- negative bound is handled properly for INTEGER

svn path=/trunk/; revision=16505
2005-11-14 13:05:17 +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 f3d6542e0f Octest string of (size 2) does not dissplay correctly.
svn path=/trunk/; revision=16141
2005-10-06 08:53:51 +00:00
Tomas Kukosa 04fc893ad7 bug in dissect_per_object_identifier_str() fixed, wrong pointer was passed to oid_to_str()
svn path=/trunk/; revision=16018
2005-09-27 07:14:07 +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
Tomas Kukosa ee8d53adf5 remove unused parameter 'name' from dissect_per_choice()
svn path=/trunk/; revision=15861
2005-09-19 07:35:05 +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
Tomas Kukosa b9b159713a get rid of few warnings
svn path=/trunk/; revision=15700
2005-09-06 14:18:49 +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
Tomas Kukosa 1050f6b5f2 avoid few warnings
svn path=/trunk/; revision=15610
2005-08-29 13:00:53 +00:00
Tomas Kukosa 0aad00ae37 - fix of bug made with too fast release
svn path=/trunk/; revision=15609
2005-08-29 11:37:08 +00:00
Tomas Kukosa 695130920c - put real value insted of only text into tree for choice extensions
- sort alphabet for restricted character strings
- different handling of PER internal fields (only hide them)

svn path=/trunk/; revision=15608
2005-08-29 10:43:33 +00:00
Ronnie Sahlberg 6657ebb4c9 remove some more sprintf
svn path=/trunk/; revision=15458
2005-08-20 02:51:13 +00:00
Ronnie Sahlberg a34e7e3d03 removal of even more sprintf
svn path=/trunk/; revision=15457
2005-08-20 02:33:33 +00:00
Gerald Combs f2b29423aa Fix value_tvb pointers.
svn path=/trunk/; revision=15409
2005-08-18 18:12:55 +00:00
Tomas Kukosa ec979a97fb - dissect_per_restricted_character_string() returns value in tvbbuff_t instead of char
- asn2eth:
  fixed CHOICE tag handling
  #.FN_PARS support for BIT STRING and all string types
  intersection of SIZE and FROM constraints for string is handled
- new asn2eth features used in h225 and h245
- PER dissectors regeneration

svn path=/trunk/; revision=15408
2005-08-18 14:32:49 +00:00
Ronnie Sahlberg efa1f43005 convert some tvb_fake_unicode() to tvb_get_ephemeral_faked_unicode()
svn path=/trunk/; revision=15272
2005-08-10 14:17:27 +00:00
Jörg Mayer 5602f5bb83 Make some funtions static. More char -> const char warning fixes
svn path=/trunk/; revision=15146
2005-07-30 01:01:02 +00:00
Tomas Kukosa 1374231148 - PER helper functions for SET/SEQUENCE OF dissection were changed to have prototype similar to BER (per_sequence_t is used as parameter)
- asn2eth was updated to support new PER helper functions for SET/SEQUENCE OF
- #.FN_PARS implemented for SET/SEQUENCE OF and REAL
- PER SET/SEQUENCE OF field can be FT_UINTxx to display number of items
- PER dissectors regenerated

svn path=/trunk/; revision=14921
2005-07-15 15:20:40 +00:00
Tomas Kukosa 5f2fd433ab - use tvb instead of offset and length in dissect_per_octet_string() for value returning
- asn2eth: #.FN_PARS support for OCTET STRING
- usage of #.FN_PARS in h225 and h245
- h225: ParallelH245Control support
- h245: better support of NonStandardParameter
- usage of MAX_OID_STR_LEN constant
- all PER dissectors regenerated

svn path=/trunk/; revision=14844
2005-07-04 09:35:25 +00:00
Gerald Combs 3a6c9ab134 Fix a format string vulneratility in the AFP dissector identified
by iDEFENSE.  Add constant format strings to proto_item_append_text()
in a bunch of other dissectors.  Copy a comment from proto.c to proto.h.

svn path=/trunk/; revision=14713
2005-06-20 19:35:58 +00:00
Guy Harris 0583a7ef79 "proto_tree_add_text()" doesn't add a named field, so it takes no "hf_"
argument.

Report a non-integral type used with "dissect_per_integer()" with an
explicit "REPORT_DISSECTOR_BUG()" call, as that's a dissector bug.

svn path=/trunk/; revision=14651
2005-06-16 06:30:33 +00:00
Gerald Combs 578f7a4e84 Handle FT_UINTs in dissect_per_integer(). Fixes bug 234.
svn path=/trunk/; revision=14643
2005-06-15 22:56:23 +00:00