Commit Graph

121 Commits

Author SHA1 Message Date
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
Ronnie Sahlberg 8920a7e7f2 change the signature that asn2wrs generates for functions to marm all parameters as _U_
to reduce the number of compiler warnings.

update some template and cnf files to use _U_ as well 


svn path=/trunk/; revision=21088
2007-03-21 10:22:22 +00:00
Tomas Kukosa a91eb30021 H.225.0 updated to 05/2006, Amendment 1 01/2007
svn path=/trunk/; revision=20807
2007-02-14 08:08:44 +00:00
Tomas Kukosa 9a36b34d03 fix registration H.225 over TLS
svn path=/trunk/; revision=20449
2007-01-16 07:53:46 +00:00
Tomas Kukosa 539102ca60 - new function ssl_dissector_delete()
- register H.225.0 over TLS (configurable port 1300)
- register SIP over TLS (fixed port 5061)
- new function proto_tree_get_root()

svn path=/trunk/; revision=19059
2006-08-28 07:05:02 +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 5cd8c719e6 ASN.1 dissectors regenerated with new asn2wrs to get updated field blurb
svn path=/trunk/; revision=18921
2006-08-16 05:58:39 +00:00
Jörg Mayer 76b9953baa Fix for http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1014
provided by markdrago@mail.com.

Me: Patch template files instead and regenerate the dissector files.
    Fix Makefiles to use the correct asn filenames.

svn path=/trunk/; revision=18866
2006-08-10 09:02:24 +00:00
Tomas Kukosa 2b4d003c06 H.225.0 update to version 6 (05/2006)
H.245 updated to version 13 (05/2006)

svn path=/trunk/; revision=18779
2006-07-21 07:05:39 +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 ba9d5cd625 fix wrong terminator record in per_sequence_t tables
svn path=/trunk/; revision=18621
2006-06-30 10:18:25 +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
Tomas Kukosa a063a87af5 - "next tvb" list moved from h225 to new file next_tvb.[ch]
- h225 updated and regenerated
- restore calling subdissectors for SNMP variables which was broken with new SNMP

svn path=/trunk/; revision=18451
2006-06-13 13:21:12 +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 a12a5a7148 uncomment newly supported TYPE-IDENTIFIER usage and per regeneration
svn path=/trunk/; revision=18339
2006-06-05 06:52:50 +00:00
Anders Broman 6471c00a55 From Cvetan Ivanov:
H225.cnf
I noticed is that the voip call flow graph does not have a label for the setupAck packet. I traced this to the empty frame_label.

voip_calls.c
It seems to me that in gtk/voip_calls.c tmp_h323info->guid is pointer itself, therefore: 
memcmp(&tmp_h323info->guid 
should in fact read: 
memcmp(tmp_h323info->guid

svn path=/trunk/; revision=18304
2006-06-01 20:19:51 +00:00
Tomas Kukosa 667fed5915 - h225.asn renamed to H323-MESSAGES.asn
- h245.asn renamed to MULTIMEDIA-SYSTEM-CONTROL.asn
- rollback changes in .asn sources to keep them in original ITU-T form and put necessary changes into .cnf files
- PER dissectors regenerated

svn path=/trunk/; revision=18238
2006-05-29 13:06:44 +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
Tomas Kukosa aada0116b7 H.225, H.245, H.450 regenerated with new asn2eth
svn path=/trunk/; revision=18156
2006-05-15 06:27:53 +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
Guy Harris 7db8eea5c6 Make the GUIDs in various data structures e_guid_t's rather than arrays
of 16 bytes.  Use "sizeof" for the size of e_guid_t's, and use structure
assignment to copy GUID values.

Make functions such as append_h225ras_call() and new_h225ras_call() take
pointers to e_guid_t's as arguments.

Define GUID_LEN in epan/guid-utils.h and use it as the length of a GUID
in a packet.  (Note that "sizeof e_guid_t" is not guaranteed to be 16,
although it is guaranteed to be the size of an e_guid_t.)

When constructing a display filter that matches a GUID, use
guid_to_str() to construct the string for the GUID.

svn path=/trunk/; revision=17676
2006-03-19 20:45:45 +00:00
Guy Harris b45d2efe6d Regenerate with the latest asn2eth, to get FT_OID used, and to add #line.
svn path=/trunk/; revision=16736
2005-12-08 23:29:21 +00:00
Tomas Kukosa 2b4785f93e PER dissectors regenerated with FT_OID
svn path=/trunk/; revision=16653
2005-12-02 13:21:43 +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
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
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
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
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
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
Tomas Kukosa fd99f48371 - more standard way for FastStart item dissection
- protocol names fixed

svn path=/trunk/; revision=15636
2005-08-31 15:03:12 +00:00
Gerald Combs b70ea47464 Make sure the size of dialedDigits matches the ASN.1 definition.
svn path=/trunk/; revision=15540
2005-08-26 15:46:53 +00:00
Ulf Lamping 6f43fbb2f0 EVERYTHING IN THE BUILDBOT IS GOING TO BE RED!!! Sorry!
I've done more than a day to change the timestamp resolution from microseconds to nanoseconds. As I really don't want to loose those changes, I'm going to check in the changes I've done so far. Hopefully someone else will give me a helping hand with the things left ...

What's done: I've changed the timestamp resolution from usec to nsec in almost any place in the sources. I've changed parts of the implementation in nstime.s/.h and a lot of places elsewhere.

As I don't understand the editcap source (well, I'm maybe just too tired right now), hopefully someone else might be able to fix this soon.

Doing all those changes, we get native nanosecond timestamp resolution in Ethereal. After fixing all the remaining issues, I'll take a look how to display this in a convenient way...

As I've also changed the wiretap timestamp resolution from usec to nsec we might want to change the wiretap version number...

svn path=/trunk/; revision=15520
2005-08-24 21:31:56 +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
Tomas Kukosa 1602310bd4 - update ftam.cnf for new asn2eth compiler
- usage of #.FN_PARS in h225 and h245 dissectors
- PER dissectors regenerated

svn path=/trunk/; revision=15162
2005-08-01 08:46:09 +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
Gerald Combs 8434647836 Call proto_tree_add_guid_hidden() for an FT_GUID value. Fixes bugs 274,
276, and 277.

svn path=/trunk/; revision=14859
2005-07-05 20:20:15 +00:00
Tomas Kukosa cdb09b497a usage of FT_GUID field type in H.225 dissector
svn path=/trunk/; revision=14847
2005-07-04 13:19:58 +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
Guy Harris dec6cc3408 Fix dissect_per_restricted_character_string() calls in h225.cnf to pass
0, not NULL, for the last argument.

Re-generate packet-h225.c with the fixed h225.cnf.

svn path=/trunk/; revision=13820
2005-03-20 11:09:29 +00:00
Guy Harris 26722e4761 Fix asn2eth to pass 0, not NULL, for the last argument to
"dissect_per_restricted_character_string()", which is a guint32, not a
pointer.  Re-generate packet-h225.c with the fixed asn2eth.

svn path=/trunk/; revision=13819
2005-03-20 10:57:39 +00:00
Lars Roland fe83d6527b Move h225-persistentdata.[ch] to epan,
as its code is linked into libethereal.dll.

svn path=/trunk/; revision=13354
2005-02-08 19:36:20 +00:00
Anders Broman 2a9f29ce77 From Alejandro Vaquero :
Find attached a patch for "Voip analysis" to get the LRQ/LCF/LRJ messages included in the H323 calls for Gatekeeper to Gatekeeper configurations

svn path=/trunk/; revision=13337
2005-02-07 08:57:47 +00:00
Lars Roland 627918aecb Small fix for h225 dissector as suggested by Tomas Kukosa
svn path=/trunk/; revision=13257
2005-02-03 16:22:08 +00:00
Anders Broman 851ecd2ac4 From Jon Ringle:
1) Added a setup_frame parameter to conversation_t
2) Used the conversation_t next to maintain a list of conversations with the 
same src/dest tuple but different setup_frame number.
3) Changed the signature of find_conversation() and conversation_new() to pass 
in the frame number.
4) Adjusted packet-sdp to select RTP conversation if both m=audio and m=image 
are present, and T.38 conversation if only m=image is present. I expect that 
RTP/T.38 dissecting to be better, but I don't have a way to generate T.38 
packets.

svn path=/trunk/; revision=13243
2005-02-02 20:07:03 +00:00
Lars Roland 197ceddab1 From Alejandro Vaquero:
h323 taps support up to 5 messages per packet now.

VoIP call analysis:
      - Collect ISUP, SIP and H323 calls from a capture and show them in window with the following info:
      - Start and Stop time of the call
      - Init

svn path=/trunk/; revision=13225
2005-02-01 12:12:35 +00:00
Tomas Kukosa 5978eebab0 NonStandardData and TunnelledProtocol reimplemented and tested
H225 dissector regenerated with new asn2eth version

svn path=/trunk/; revision=13139
2005-01-20 12:16:53 +00:00
Anders Broman d80fae9ab9 Attempt to reimplement "non standard data/parameter" and "tunnelled
protocol"

svn path=/trunk/; revision=13123
2005-01-19 22:44:09 +00:00
Anders Broman eee54467b1 Reinsert h450 dissection
svn path=/trunk/; revision=13100
2005-01-17 22:30:31 +00:00
Lars Roland 5a483e3abe From Anders Broman:
Add recently lost support for the h.323 conversations tap in the h225 dissector.

svn path=/trunk/; revision=13092
2005-01-17 21:52:30 +00:00
Lars Roland ce032dd5cf Add a few more things to the h225 dissector that got lost.
Lost things left:
-h.450 stuff
-support for the h.323 conversations tap (It is currently broken.)

svn path=/trunk/; revision=13076
2005-01-16 21:21:41 +00:00
Anders Broman 1fb480bcfe Some minor bugfixes to H225 functions exported and an OID added and one OID for H245
svn path=/trunk/; revision=13024
2005-01-13 21:12:06 +00:00
Anders Broman d787b13c7c Reinsert dissection of h450 messages
svn path=/trunk/; revision=12994
2005-01-08 16:38:13 +00:00
Anders Broman 5163475742 Generate "conversations" code correctly, adaptions to changes in asn2eth generator.
Regenerate with latest asn2eth compiler.

svn path=/trunk/; revision=12992
2005-01-08 14:42:12 +00:00
Lars Roland adcb6ff460 Fix broken parts of the new h225 dissector:
- add more data to the Info structure of the h225 taps.
- Fix the output to the Info Column

This patch is not complete, but statistics should basically work now.

svn path=/trunk/; revision=12948
2005-01-05 02:25:34 +00:00
Anders Broman 08ab390705 Change the dissectors to asn2eth generated ones.
svn path=/trunk/; revision=12932
2005-01-02 22:05:47 +00:00
Anders Broman d7bda80c71 Change a function name in preparation for genereating H.245 and H.225 dissectors with asn2etrh
svn path=/trunk/; revision=12873
2004-12-30 22:40:21 +00:00
Anders Broman d885b845c4 Add some OID string names
svn path=/trunk/; revision=12497
2004-11-09 07:03:04 +00:00
Ronnie Sahlberg fd6e2f7099 From Martin M, update h2250 so that some things that are supposed to be strings are printed as strings and not as hex data.
svn path=/trunk/; revision=12263
2004-10-11 12:04:35 +00:00
Guy Harris c01a523dc4 Make "per_choice_t" and "per_sequence_t" structures "const" structures.
svn path=/trunk/; revision=12255
2004-10-11 06:51:19 +00:00
Anders Broman b9f8796c1c From Miha Jemec: I implemented a H323 call decoder. Using the TAP system, it keeps track of each call, number of packets, setting filter and a more detailed analysis of each call.
svn path=/trunk/; revision=12142
2004-09-29 22:23:37 +00:00
Guy Harris eaadcc4c62 Move various tables into the epan directory.
svn path=/trunk/; revision=12130
2004-09-29 00:52:45 +00:00
Guy Harris 6472876ab3 Move the tap infrastructure to the epan directory.
svn path=/trunk/; revision=12128
2004-09-29 00:06:36 +00:00
Guy Harris bbe7f89742 Move prefs.c and prefs.h into the epan subdirectory.
svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
Ulf Lamping d530bd4e14 Prevent the word "desegmentation" at the GUI, but use reassembling at that places, as we also use "defragmentation" and "reassembling". Use reassembling as the general term for such actions.
I (hopefully) didn't changed any protocol fields or preference file names, but only the GUI labels appearing in the protocol display and the protocol preferences.

Also added a note to the protocol preferences (where appropriate), that you have to enable "Allow subdissectors to reassemble TCP streams" at the corresponding protocol settings for TCP reassembling to take effect.

If you encounter any mistakes I've made here, please let me know...

svn path=/trunk/; revision=11784
2004-08-21 09:02:52 +00:00
Gilbert Ramirez 669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00