Commit Graph

50 Commits

Author SHA1 Message Date
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
Lars Roland 13bf5539af When using Cygwin's python asn2eth.py
generates dissectors with mixed EOL! SVN doesn't allow you to commit such files.
Add a target to all nmake makefiles in asn1 subdirectory which will fix these files.

svn path=/trunk/; revision=13077
2005-01-16 23:26:02 +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
Guy Harris eaf9490e04 Make the Makefile look like the h235 Makefiles, with the new rules.
Get rid of their "executable" property, and set svn:keywords to Id and
svn:eol-style to native if they're not already set.

svn path=/trunk/; revision=13071
2005-01-16 10:19:21 +00:00
Guy Harris 9757ee05c8 Make the dissector files depend on asn2eth.py, so they're regenerated if
it's modified.

svn path=/trunk/; revision=13069
2005-01-16 09:17:16 +00:00
Guy Harris 21667c248a Make the rules match those of Makefile.nmake - make "all" and
"generate_dissector" generate the dissector files but not copy them to
epan/dissectors, add a "copy_files" rule to copy them, and add a "clean"
rule to clean up.

svn path=/trunk/; revision=13068
2005-01-16 09:16:36 +00:00
Guy Harris 840b84c12f Add a Makefile.
svn path=/trunk/; revision=13067
2005-01-16 09:09:57 +00:00
Guy Harris 72eb406f8d Phase 2 of renaming "makefile.nmake" to "Makefile.nmake", to match other
Makefile.nmake files.

svn path=/trunk/; revision=13066
2005-01-16 09:06:25 +00:00
Guy Harris f709d03855 Phase 1 of renaming "makefile.nmake" to "Makefile.nmake" - this is a bit
of a pain on case-insensitive file systems.

svn path=/trunk/; revision=13065
2005-01-16 09:05:45 +00:00
Lars Roland 8b2c549c08 With xcopy use backsplash instead of slash as directory seperator
svn path=/trunk/; revision=13038
2005-01-14 18:04:54 +00:00
Lars Roland 858cca22d5 Replace another "cp" with two "xcopy"s
svn path=/trunk/; revision=13037
2005-01-14 17:56:40 +00:00
Lars Roland a394e4984d Add nmake makefile for /asn1/h225
svn path=/trunk/; revision=13036
2005-01-14 17:52:03 +00:00
Tomas Kukosa 0955a2c27b Included filename packet-H225-exp.h changed to packet-h225-exp.h
svn path=/trunk/; revision=13031
2005-01-14 11:42:39 +00:00
Anders Broman 94a2b9a789 Minor bug fixes and export functions needed by h450
svn path=/trunk/; revision=13022
2005-01-13 21:09:45 +00:00
Lars Roland 2f5e81cccc From Luis Ontanon:
Add another piece of code that got lost to the cnf file of the new h225 dissector.

svn path=/trunk/; revision=13000
2005-01-10 02:19:11 +00:00
Anders Broman a4863006ca Fixa a typo
svn path=/trunk/; revision=12990
2005-01-08 14:36:10 +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
Guy Harris b6f732fe23 "dissect_h225_H323UserInformation()" returns the number of bytes
dissected, so register it as a new-style dissector.

As we register it by name, we don't need to create a dissector handle
for it to register it in a dissector table - just use "find_dissector()"
to find the handle.

svn path=/trunk/; revision=12947
2005-01-04 21:05:56 +00:00
Lars Roland 8dadc16642 fix a typo in new packet-h225.h
svn path=/trunk/; revision=12933
2005-01-02 22:56:25 +00:00
Anders Broman 422d331c09 asn2eth generated h225 dissector
svn path=/trunk/; revision=12930
2005-01-02 22:01:32 +00:00