Commit Graph

69 Commits

Author SHA1 Message Date
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
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 98d7d92661 - change ETH_VAR to WS_VAR
- preparation for tagged type support

svn path=/trunk/; revision=18525
2006-06-20 19:54:28 +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
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 55600fb60a Ethereal -> Wireshark
asn2eth -> asn2wrs

svn path=/trunk/; revision=18214
2006-05-23 15:17:14 +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
Tomas Kukosa 62da958bd9 - asn2eth renamed to asn2wrs
- remove obsolete -X option from makefiles
- not generate enumerated map table for BER

dissector will be regenerated later

svn path=/trunk/; revision=18199
2006-05-21 14:36:05 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +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 a6930fe4ae Add distclean and maintainerclean rules.
svn path=/trunk/; revision=17999
2006-04-25 18:45:08 +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
Anders Broman 4e13ea2982 Add parsertab.pyc in clean target
svn path=/trunk/; revision=17386
2006-02-23 20:05:05 +00:00
Anders Broman 483ec5bd05 From Graeme Lunt:
* DOP - This has now been successfully tested and so is now enabled by default and workaround code removed. 
Also now uses the correct EXPORTs from the other modules/dissectors.

* X509SAT - Most of the selected attributes are now supported in addition to the DirectoryString syntax attributes. This includes restoring the correct DirectoryString syntax and also providing the basic syntaxes (e.g. OBJECT IDENTIFIER, PrintableString). The latter requires a sed line in the Makefile which I assume should be OK? Not all the SAT can be defined in x509sat - so some have been included in x509if and x509af - though x509sat.cnf contains the master list and references the other dissectors where appropriate.

(I still prefer a syntax registration approach but I don't think that is going to be agreed in the short term.)

* X509IF - a mechanism to register some formating, based upon the hf_index, that is used in the cnf file.

* A couple of fixes identified by Stig.

svn path=/trunk/; revision=16814
2005-12-16 06:47:22 +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
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
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
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
Tomas Kukosa 57a75020f7 time resolution changes from packet-h225.c moved to packet-h225-template.c
svn path=/trunk/; revision=15538
2005-08-26 12:15:49 +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 cf9e596d86 avoid few warnings from asn2eth compiler
svn path=/trunk/; revision=14869
2005-07-07 05:45:51 +00:00
Tomas Kukosa 2c70677901 more usage of #.FN_PARS directive and usage of DEFAULT_BODY parameter
svn path=/trunk/; revision=14864
2005-07-06 16:19:34 +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 f1cf503709 more usage of #.FN_PARS
svn path=/trunk/; revision=14857
2005-07-05 19:53:38 +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
Tomas Kukosa 285d26c3e7 Usage of new #.FN_PARS directive instead of #.FN_BODY
svn path=/trunk/; revision=14576
2005-06-07 12:05:03 +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
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
Lars Roland 66194e3f4a And finally (I hope) the last part from the patch
from Alejandro Vaquero:
 
  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=13347
2005-02-07 21:09:23 +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 93ea4470f0 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=13242
2005-02-02 20:02:46 +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 f73394ab99 NonStandardData and TunnelledProtocol reimplemented and tested
svn path=/trunk/; revision=13138
2005-01-20 12:02:08 +00:00
Anders Broman 3fc09d6c18 Attempt to reimplement "non standard data/parameter" and "tunnelled
protocol"

svn path=/trunk/; revision=13122
2005-01-19 22:43:15 +00:00
Anders Broman b33945c4b0 Use the new h450 dissector
svn path=/trunk/; revision=13099
2005-01-17 22:27:39 +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