6ff98095fe
From Martin Peylo (bug 2184), fix for:
...
The current dissection of GeneralizedTime in packet-ber does not consider all
the possibilities how this field can be constructed.
According to ITU-T X.680 this field can be encoded as
YYYYMMDDhhmmss([\.,]f{1,3})?(([+-]hhmm)|Z)?
This is a regex-like expression where each letter except the literal 'Z'
represents an ASCII encoded digit.
So far only the first 14 digits are dissected and the 15th character is put
into parentheses. This may not show all available information.
svn path=/trunk/; revision=24071
2008-01-12 12:06:56 +00:00
db8bae4fb2
When searching for EOC (because we have an indefinite length) don't stop searching just because we ran out of TVB (thus assuming that the EOC is just beyond the end of the message). Instead, try to keep going which will throw an exception (ReportedBoundsError). I had a packet which was missing the EOC (probably programmer error) and Wirshark was reporting BoundsError (Packet size limited during capture) instead of ReportedBoundsError (Malformed Packet); this patch fixes that.
...
svn path=/trunk/; revision=24046
2008-01-09 17:06:25 +00:00
de16039c51
Get rid of dissect_ber_boolean_value() and change the signature of
...
dissect_ber_boolean() to return a value and update asn2wrs to generate the new signature.
Regenerate all BER dissectors.
svn path=/trunk/; revision=24015
2008-01-04 16:21:07 +00:00
73fee653de
Get rid of ber_last_created_item(). (Final?)
...
svn path=/trunk/; revision=24010
2008-01-04 13:39:24 +00:00
6f5a53b789
Add more debug info.
...
svn path=/trunk/; revision=23977
2007-12-30 00:03:10 +00:00
5e1ffde520
Moved check for empty choice to make it work correctly.
...
svn path=/trunk/; revision=23548
2007-11-23 12:22:22 +00:00
92682d51de
Added handling of octet-aligned data according to direct_reference.
...
Implemented handling of ber_callback for tagged type octet-aligned
and arbitrary. Renamed some functions.
svn path=/trunk/; revision=23539
2007-11-21 23:33:13 +00:00
8fc83d2cf3
Improved "BER Error" messages to be more uniform.
...
svn path=/trunk/; revision=23501
2007-11-19 20:23:49 +00:00
9233fa7578
Second try to not stop processing if length==0 in choice.
...
svn path=/trunk/; revision=23497
2007-11-19 17:46:11 +00:00
77e69e06e1
Reverted r23485 and r23486, this was not a correct fix.
...
svn path=/trunk/; revision=23489
2007-11-19 07:25:06 +00:00
c3d985077e
And dump internal ber fields for empty choice field.
...
svn path=/trunk/; revision=23486
2007-11-18 16:40:20 +00:00
ddc4d639ba
As proposed by Martin Peylo:
...
Do not stop processing if the length of a choice has the (illegal)
value of zero.
svn path=/trunk/; revision=23485
2007-11-18 16:20:51 +00:00
4a285928bb
Changed to use the the packet-ber EXTERNAL decoding (into the ASN1 context).
...
Uses the ber_callback mechanism to call the rtse oid callbacks, rather than the default ber oid callback list.
A couple of fixes to packet-ber.c to mark [in]direct references as present and call the ber_callback if it has been specified.
svn path=/trunk/; revision=23450
2007-11-14 20:57:55 +00:00
524db0a082
From Florent DROUIN:
...
Since the use of the function 'dissect_ber_tagged_type' for DialoguePortion,
the file tcap.cnf must be updated to remove the decoding of the tag and length.
This decoding is now done in the new function 'dissect_ber_tagged_type'.
The file tcap.cnf has been updated to take into account this change.
But this leads to a change in tcap.asn too, for the definition of the
ExternalPDU.
I think this part of the ASN1 file is specific to Wireshark and can be
modified.
In the meantime, I did update the DEBUG part for packet_ber.c for the function
(dissect_ber_tagged_type)
svn path=/trunk/; revision=23442
2007-11-13 21:59:53 +00:00
dbcabb1938
Get rid of most of the legacy oid stuff.
...
svn path=/trunk/; revision=23333
2007-11-01 22:07:43 +00:00
9492700608
Change:
...
get_oid_str_name() -> oid_resolved_from_string()
get_oid_name() -> oid_resolved_from_encoded()
svn path=/trunk/; revision=23331
2007-11-01 19:36:39 +00:00
7329ae8ac6
Use oid_add_from_string for adding names.
...
fix compil of gsmmap and inap.
Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?)
svn path=/trunk/; revision=23325
2007-10-31 23:11:15 +00:00
1950ffc214
Apply the small performance enhancment patches for:
...
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster.
Replace
- col_append_fstr() with faster col_append_str()
- col_add_str() with col_set_str()
when it's safe
svn path=/trunk/; revision=23252
2007-10-23 05:50:00 +00:00
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
00c5e48a17
get users of oid_resolv to use the new oids, rollout packet-snmp.c
...
svn path=/trunk/; revision=22651
2007-08-25 01:14:24 +00:00
93f5beda89
Warning fixes
...
svn path=/trunk/; revision=22629
2007-08-24 10:20:22 +00:00
733f78043e
The ber header was missing from the object, resulting in
...
invalid saved certificates.
svn path=/trunk/; revision=22628
2007-08-24 08:12:39 +00:00
b312e64f6a
get_ber_length doesn't need the tree argument, get rid of it.
...
Rebuild asn1 dissectors.
svn path=/trunk/; revision=22627
2007-08-24 07:12:04 +00:00
d36abc4549
Handle unknown Universal and BMP strings.
...
svn path=/trunk/; revision=22551
2007-08-18 17:39:44 +00:00
93a9ea7879
Improved dumping of unexpected data when dissector for OID not implemented.
...
svn path=/trunk/; revision=22517
2007-08-15 22:34:56 +00:00
57592cb2aa
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1739
...
Fro Stig Bjørlykke:
1. BER: Added support for empty indef SET
2. RTSE: Added fragment length in COL_INFO
3. IMF: Use correct hf_id for extension value
4. DOP: Fix typo in COL_INFO oid name
svn path=/trunk/; revision=22492
2007-08-13 16:41:16 +00:00
b104611590
remove unused variable
...
svn path=/trunk/; revision=22407
2007-07-26 14:31:38 +00:00
82ea2908f1
- export some ASN.1 functions from libwireshark
...
- fill-in actx->created_item in dissect_ber_object_identifier()
svn path=/trunk/; revision=22406
2007-07-26 14:00:48 +00:00
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
379d320b8b
From Stig Bjørlykke:
...
This patch adds an option to packet-ber to show unexpected tags/data as unknown BER. It also fixes some offset/length combinations when adding the error message to the tree.
svn path=/trunk/; revision=22244
2007-07-05 13:14:25 +00:00
442538ce0b
Fix a typo.
...
svn path=/trunk/; revision=22171
2007-06-23 15:31:37 +00:00
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
bcfc3b9468
Get the Unix buildbots going again
...
svn path=/trunk/; revision=22086
2007-06-13 06:22:43 +00:00
58f01d87cc
Preparations for updated CMIP dissector:
...
- Export AE-title from ACSE
- Start REAL dissection(unfinished).
svn path=/trunk/; revision=22083
2007-06-12 21:29:27 +00:00
5a2fb14332
Add some opcodes and mark func as _U_ in packet-ber.c
...
svn path=/trunk/; revision=22032
2007-06-03 21:10:29 +00:00
4393bceae5
INAP:
...
- Use (some) IN CS4 asn1 files Q.1248.1 Q.1248.2 Q.1248.3
BER/asn2wrs:
- Add basic support for EmbeddedPDVType
svn path=/trunk/; revision=22031
2007-06-03 19:58:59 +00:00
d197031761
Change implicit tag handling for SEQUENCE OF and fix a cut'n paste error.
...
svn path=/trunk/; revision=22006
2007-05-30 19:00:50 +00:00
ddb6768db2
Update the EXTERNAL dissection code(still unfinished).
...
svn path=/trunk/; revision=21893
2007-05-22 21:15:00 +00:00
dca634c4de
Prepare for the use of the new -X parameter for BER encoded protocols.
...
svn path=/trunk/; revision=21889
2007-05-22 16:17:54 +00:00
f08cd1e5e3
actx in the rest of dissect_ber..()l
...
svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
fc5ce01ee4
replace an incorrect '{' with ';' in the ber header file
...
change the signature for dissect_ber_external_type() to only provide the
parameter actx once
svn path=/trunk/; revision=21756
2007-05-13 22:19:04 +00:00
0bc558f88d
actx in ber_external
...
svn path=/trunk/; revision=21755
2007-05-13 22:01:17 +00:00
0a0a913a01
Try to make the buildbot happy.
...
svn path=/trunk/; revision=21754
2007-05-13 21:54:45 +00:00
c01f382974
Second step in introducing asn context to BER dissectors just like in PER.
...
svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
fd108518ed
_U_ mark some parameters and a forgotten file.
...
svn path=/trunk/; revision=21706
2007-05-07 05:35:45 +00:00
4c692a62b6
Start introducing actx to ber functions.
...
svn path=/trunk/; revision=21705
2007-05-06 22:34:05 +00:00
2e96e3fe55
Separate field for the elements of a constructed OCTET STRING.
...
svn path=/trunk/; revision=21695
2007-05-06 08:18:44 +00:00
334177b096
Show BER internal fields in external type in ACSE, update a comment in packet-ber.c.
...
svn path=/trunk/; revision=21685
2007-05-04 20:27:43 +00:00
2447ba1de6
Once is enough. :-)
...
That should get rid of warnings in packet-ber.c; add it to the list of
clean dissectors, to try to keep it clean.
svn path=/trunk/; revision=21684
2007-05-04 18:56:59 +00:00
98cb9db12d
Split out asn1 common functions. Start of BER EXTERNAL.
...
svn path=/trunk/; revision=21670
2007-05-03 21:52:57 +00:00
Sake Blok