Commit graph

1060 commits

Author SHA1 Message Date
Anders Broman
4e83fc8287 Makefile.am Try to get the latest state of asn1 files into the dist.
Try again ;)

svn path=/trunk/; revision=22732
2007-08-29 22:21:25 +00:00
Anders Broman
8b62bc5077 Makefile.am Try to get the latest state of asn1 files into the dist.
Delete "old" unused asn1 files.

svn path=/trunk/; revision=22731
2007-08-29 19:31:15 +00:00
Stig Bjørlykke
21d5aaaa4f - Rewrote handling of extensions to get rid of "funky" oid strings.
- Added ASN.1 integer values for StandardExtension, ExtensionAttributeType
  and TokenDataType.
- Added expert info for unknown standard-extension, extension-attribute-type 
  and tokendata-type.
- Added expert info for unknown built-in content-type.

svn path=/trunk/; revision=22730
2007-08-29 18:39:30 +00:00
Anders Broman
b71c2da3e4 OID name fixes.
svn path=/trunk/; revision=22729
2007-08-29 16:10:47 +00:00
Tomas Kukosa
a8357929c4 RANAP rewritten to use original ASN.1 source and updated to TS 25.413 V7.6.0 (2007-06)
svn path=/trunk/; revision=22726
2007-08-29 11:57:27 +00:00
Anders Broman
f832aaf3b6 Fix up most of the OID names in GSM MAP.
svn path=/trunk/; revision=22723
2007-08-29 06:13:40 +00:00
Luis Ontanon
d56f4f3a68 - turn some other TC from FT_BYTES to FT_STRING so that human-readable strings become readable by humans
- Add the EngineId decoding for the contextEngineId
- Add some expert info about malformed indexed oids


svn path=/trunk/; revision=22720
2007-08-28 23:55:49 +00:00
Luis Ontanon
8d3b80e57b Add some more expert info.
Restore engine-id dissection (a "victim" of decryption support)


svn path=/trunk/; revision=22719
2007-08-28 23:19:30 +00:00
Luis Ontanon
79ea56143c Fix non implicit oid key indexes. This starts to look good!
svn path=/trunk/; revision=22718
2007-08-28 21:27:54 +00:00
Luis Ontanon
dfbac00752 SNMP:
- As noted by Thomas Anders values are not added to the tree anymore. Move the calling of subdissectors to the end of the function, so that the value is added to the tree.
 - add port 8161 to be decoded as SNMP (hey, it's on IANA's services file!)
UAT:
 - do not have the uat reloaded.
OIDS:
 - do not complain if renaming an OID to an identical name



svn path=/trunk/; revision=22704
2007-08-28 15:18:32 +00:00
Tomas Kukosa
99a2ec1c9f fix bug in snmp.variable_oid subdissector calling and call them at the end of snmp dissector (so as snmp does not overwrite COL_INFO of subdissector)
svn path=/trunk/; revision=22701
2007-08-28 07:59:35 +00:00
Luis Ontanon
392fd3f689 - packet-snmp(-template).c
- reimplement the "snmp.variable_oid" dissector table
- oids.[ch]
   - get rid of keytype_implicit in oid_value_type_t we won't use it.
   - have the windows base path for mibs be consistent to where we've put the mibs
   - oid_get_from_encoded() and oid_get_from_string(): have the subids array being computed in a prior statement of where the side-effected argument is going to be used... worked on gcc, not on windows... I deserve "have daemons flying out of my nose" for that :-).


svn path=/trunk/; revision=22684
2007-08-27 17:05:11 +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
Luis Ontanon
becf83594b there's nothing like a MAX_OID_STR_LEN... get rid of a potential stack BO
svn path=/trunk/; revision=22657
2007-08-25 14:48:48 +00:00
Stig Bjørlykke
1f58f3e2ec Removed duplicate entry of OID 1.0.8571.2.4 in FTAM
svn path=/trunk/; revision=22655
2007-08-25 09:57:12 +00:00
Luis Ontanon
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
Stig Bjørlykke
fb082a9a3c From Shaun Jackman:
* asn1/mpeg/packet-mpeg-pes-template.c (proto_register_mpeg_pes):
	Register the dissectors mpeg and mpeg-pes.
	* epan/dissectors/packet-mp2t.c (dissect_tsp): Call the mpeg-pes
	dissector.
	(ett_mp2t_header, ett_mp2t_af): New subtree identifiers.

svn path=/trunk/; revision=22650
2007-08-25 00:50:20 +00:00
Jörg Mayer
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
Anders Broman
64ae231eaa From Chris Maynard:
Fix display filter field problems
Correct the template files in the case of generated dissectors.

svn path=/trunk/; revision=22621
2007-08-24 05:58:08 +00:00
Luis Ontanon
4787c0ce6a this one was missing
svn path=/trunk/; revision=22620
2007-08-24 00:41:43 +00:00
Luis Ontanon
2fdaae5dc2 Never, never, never modify a generated file... or out of idiocy you might loose changes (or not check them in).
svn path=/trunk/; revision=22619
2007-08-24 00:33:35 +00:00
Luis Ontanon
e7d5e2fc2d Another iteration, the new code is almost there, We're missing just the implied octetstrings indexes.
svn path=/trunk/; revision=22618
2007-08-24 00:26:30 +00:00
Luis Ontanon
cfc4b0efc8 Implement Resolution of conceptual table indexing
So far this has being tested only for integer indexes.


svn path=/trunk/; revision=22606
2007-08-23 19:45:31 +00:00
Guy Harris
ae8b29ec53 More timestamp calculation fixes similar to the previous ones.
svn path=/trunk/; revision=22584
2007-08-22 07:14:08 +00:00
Guy Harris
e994584040 Cast away shortening conversions that are presumed not to lose any data.
Use G_GINT64_CONSTANT() to make a 64-bit integral constant; not all
compilers we use support LL as a suffix for that (MSVC++ 6, for one).

svn path=/trunk/; revision=22581
2007-08-22 04:25:00 +00:00
Richard van der Hoff
e6002deb3e From Shaun Jackman <sjackman@gmail.com> / bug 1753:
* asn1/mpeg/packet-mpeg-pes-template.c: Improved decoding of PES
        extension header and Pack header. Decode SCR, PTS, and DTS.
        * asn1/mpeg/mpeg-pes.asn (Pack): Remove.
        * epan/dissectors/packet-mpeg-pes.c: Regenerate.
        * wiretap/mpeg.c (mpeg_read): Decode the SCR using integer
        arithmetic instead of double float arithmetic to prevent rounding
        error.
        * wiretap/wtap-int.h (mpeg_t) <t0>: Use time_t instead of double.


svn path=/trunk/; revision=22577
2007-08-21 22:00:06 +00:00
Luis Ontanon
76658ef0f1 A further iteration in the code, things start to look good!
svn path=/trunk/; revision=22575
2007-08-21 21:32:00 +00:00
Luis Ontanon
a5efe69a79 Filtering on snmp variables starts to work so I put it there in case anyone wants to start playing with it. I'll leave the generated dissector in place and the rest off the Makefiles so that others are not bothered by this.
TODO:
- Global
   - add libsmi to autoconf (I modified CFLAGS and LDADDs in the makefile.ams appending my own values, that's good only for me)
   - have other users of oid_resolv.h get to use the new functions in oids.h
   - add a menu item or preference setting for the smi_modules UAT ( the smi_modules file has one dquoted string per line with the name of each module to be loaded)
- SNMP
  - put complete information in the labels of the VarBind Items
  - add oids to COL_INFO
  - negative testing (Well, testing in general)
- OIDS
  - implement "ALL" modules 
  - some functions are not yet tested or implemented

I'll put a TO-DO list on the wiki for people (incl. me) to add more items




svn path=/trunk/; revision=22556
2007-08-19 23:00:47 +00:00
Anders Broman
c7fd82dbbe Add code for finding sub dissectors.
svn path=/trunk/; revision=22544
2007-08-17 23:23:36 +00:00
Graeme Lunt
98688eb828 Further tidy up for preference.
svn path=/trunk/; revision=22539
2007-08-17 19:40:40 +00:00
Graeme Lunt
3d19c5130b Fix for OSX gremlin in PKCS12 template.
svn path=/trunk/; revision=22537
2007-08-17 19:23:15 +00:00
Graeme Lunt
4d708c7260 Faked BMP string display.
svn path=/trunk/; revision=22536
2007-08-17 19:16:51 +00:00
Graeme Lunt
0e9f4f05f1 Support for the decryption of EncryptedData which is used by PKCS12
Uses the PBE routines from PKCS12.


svn path=/trunk/; revision=22535
2007-08-17 19:14:39 +00:00
Graeme Lunt
54aa46c2bb Support for decrypting of PKCS#12 bag contents.
Supports RC2, RC4 and 3DES with SHA1 Password-based Encryption using libgcrypt functions.
Password is provided as a preference, as is trying to decode with a empty/NULL password. 


svn path=/trunk/; revision=22534
2007-08-17 18:52:40 +00:00
Anders Broman
8d76d4130e Collect context data.
svn path=/trunk/; revision=22528
2007-08-16 19:59:55 +00:00
Stig Bjørlykke
138d737a47 Added handling of ISO FTAM unstructured binary, as this OID is used in
X.420 FileTransferBodyPart for generic binary bodyparts.
Also added handling of ISO FTAM unstructured text.

svn path=/trunk/; revision=22527
2007-08-16 17:59:27 +00:00
Anders Broman
246d0c1e84 Fix makefiles and a comment.
svn path=/trunk/; revision=22525
2007-08-16 07:00:50 +00:00
Stig Bjørlykke
6a751ffd2e Regenerate the CDT dissector with -X and -T options.
svn path=/trunk/; revision=22519
2007-08-15 23:42:29 +00:00
Jeff Morriss
ffec5b8896 Convert a couple tvb_get_string()'s into tvb_get_ephemeral_string(). In the one remaining use of tvb_get_string(), g_free the old entry if the pointer is *not* NULL.
svn path=/trunk/; revision=22518
2007-08-15 22:41:49 +00:00
Jeff Morriss
37b786a771 Change tvb_get_string() to tvb_get_ephemeral_string(). Since we weren't freeing the returned buffer, this cleans up a memory leak. NOTE: I had to manually regenerate this dissector without the "-T" option to avoid checking in a lot of changes that I don't understand/didn't make. Why is the Makefile newer than what's in epan/dissectors/ ?
svn path=/trunk/; revision=22511
2007-08-15 21:37:09 +00:00
Anders Broman
d2e37e0fef Change tcap_private to ansi_tcap_private.
svn path=/trunk/; revision=22505
2007-08-15 05:47:17 +00:00
Anders Broman
1518d1b07a Preparations to split the TCAP dissector into ANSI and ITU parts.
svn path=/trunk/; revision=22501
2007-08-14 22:05:36 +00:00
Anders Broman
2bcdc1570a Update the makefile
svn path=/trunk/; revision=22498
2007-08-14 06:20:54 +00:00
Anders Broman
ba7b62649a Add files for ANSI TCAP.
svn path=/trunk/; revision=22497
2007-08-14 06:14:31 +00:00
Anders Broman
4b6cfd0f16 Add the original TCAP ASN1 files.
svn path=/trunk/; revision=22496
2007-08-14 06:03:52 +00:00
Anders Broman
26f1fbcb12 Register by name.(Add the template file as well).
svn path=/trunk/; revision=22493
2007-08-13 16:44:35 +00:00
Anders Broman
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
Tomas Kukosa
396ceb5607 NBAP rewritten to use original ASN.1 source and updated to TS 25.433 V7.5.0 (2007-06)
svn path=/trunk/; revision=22490
2007-08-13 11:15:39 +00:00
Anders Broman
9eb4bf072c Use correct SVN keywords.
Add missing ASN1 files.

svn path=/trunk/; revision=22459
2007-08-06 12:16:20 +00:00
Jeff Morriss
7c4cca3e63 From Florent Drouin:
Correct bug in TCAP statistics when read filter is used.
Rename the TCAP decoding functions to show which are ITU vs. ANSI.
Don't unregister an ITU SSN if it's used by an ANSI subdissector.

svn path=/trunk/; revision=22421
2007-07-30 17:10:20 +00:00