Commit Graph

71 Commits

Author SHA1 Message Date
Pascal Quantin d0ac937567 Revert "Update ASN.1 source files with the API changes done in g021e7af"
This reverts commit e308e7c4de.

Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071
Reviewed-on: https://code.wireshark.org/review/2435
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-19 18:42:28 +00:00
Pascal Quantin e308e7c4de Update ASN.1 source files with the API changes done in g021e7af
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88
Reviewed-on: https://code.wireshark.org/review/2385
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 16:15:42 +00:00
Jeff Morriss 8c608e6e82 Remove $Id$ from the ASN.1 dissectors and regenerate them.
Change-Id: Ie476c6f82f318188b41ed922b92c6fec119ea954
Reviewed-on: https://code.wireshark.org/review/244
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-18 03:05:28 +00:00
Michael Mann 60e3e52a53 Have asn1_ctx_t passed into the "h245.gef.name" and "h245.gef.content" subdissectors instead of using pinfo->private_data.
svn path=/trunk/; revision=53055
2013-11-03 02:45:22 +00:00
Michael Mann 02a8391535 Require dissector_try_string to pass a data parameter to its subdissectors. There weren't that many calls, so might as well modify the function than create a need for dissector_try_string_new.
svn path=/trunk/; revision=53049
2013-11-02 15:52:25 +00:00
Tomas Kukosa 744f47107e H.225.0: fix handling of compound parameters in Generic Extensible Framework (H.460.22 did not work well)
svn path=/trunk/; revision=52659
2013-10-17 11:24:43 +00:00
Pascal Quantin 7d6899b96b Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9155 :
Ensure that codec_str string is always initialized 

svn path=/trunk/; revision=52107
2013-09-16 21:26:03 +00:00
Evan Huus 8b0f1addd9 Apparently one of our major global headers must include emem.h, because I just
found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.

svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Anders Broman 7c56677cf9 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48429
2013-03-19 21:22:31 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Tomas Kukosa d19cde439e Fix H.460.x calling from H.225 - content decoding
svn path=/trunk/; revision=47253
2013-01-24 10:11:02 +00:00
Jeff Morriss 09221f45e4 When copying addresses, also copy the (new) hf field.
Use SET_ADDRESS in some dissectors that weren't using it (so that the hf field
is correctly initialized).

Introduce a COPY_ADDRESS_SHALLOW (which copies an address without copying the
contents of the data field).

svn path=/trunk/; revision=46602
2012-12-18 23:28:38 +00:00
Chris Maynard 352cc7a410 Fix bug 5848, "https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5848", which was apparently introduced with r27287 (http://anonsvn.wireshark.org/viewvc/trunk/epan/dissectors/packet-h225.c?r1=26698&r2=27287). Regenerate the packet-h225.c dissector. Patch from ericn1234@yahoo.com.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5848

svn path=/trunk/; revision=38399
2011-08-07 20:50:31 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Anders Broman ae7d471ebe Make the changes from:
Use value_string_ext fcns to access certain value_string arrays;
Sort certain value_string arrays so the values are in ascending order;
Use val_to_str_ext() instead of for loops to do value_string array lookups (voip_calls.c).
Minor whitespace cleanup.
In the source files of the as2wrs generated dissectors.

svn path=/trunk/; revision=34803
2010-11-07 20:51:16 +00:00
Tomas Kukosa 05d418eba8 H.225.0 updated to version 7 (2009-12)
svn path=/trunk/; revision=32672
2010-05-05 13:14:41 +00:00
Anders Broman ba8d7bd919 Get rid of check_col();
svn path=/trunk/; revision=31544
2010-01-17 12:19:02 +00:00
Kovarththanan Rajaratnam 65c53fedb6 Don't guard col_append_str with check_col
svn path=/trunk/; revision=30125
2009-09-24 20:00:21 +00:00
Stig Bjørlykke 6f2d887850 From Kovarththanan Rajaratnam via bug 3548:
More header_field_info cleanup in the asn1 cnf files.

Dissectors will be regenerated later.

svn path=/trunk/; revision=28782
2009-06-20 18:33:33 +00:00
Tomas Kukosa c0af52c979 Fix Bug 3219: avoid overwriting H.323 callIdentifier value when CallIdentifier type is called from another dissector, e.g. H.450
svn path=/trunk/; revision=27287
2009-01-22 19:48:12 +00:00
Tomas Kukosa bfdccf3f9d - update H.245 to v14 (06/2008)
- use #.MODULE_EXPORT to avoid conflict between TransportAddress from H.225 and H.245
- regenerate H.323 family dissectors 

svn path=/trunk/; revision=26739
2008-11-10 13:31:16 +00:00
Tomas Kukosa 7d1c30c417 Get rid of next few warnings (dissect_per_choice needs signed value parameter)
svn path=/trunk/; revision=25840
2008-07-26 19:07:04 +00:00
Tomas Kukosa 1644e4138a Get rid of few warnings (unused generated code, signed/unsigned mismatch)
svn path=/trunk/; revision=25839
2008-07-26 15:28:04 +00:00
Tomas Kukosa 27a531e06a more sophisticated H245 OLC handling focusing on more reliable T.38 establishment
svn path=/trunk/; revision=24043
2008-01-09 13:30:31 +00:00
Tomas Kukosa 7529f33437 support for additionally SIZE constrained Typereference
the support is only semiautomated as this feature does not occur very often
use this feature for the TBCD-STRING in the H.225 dissector

svn path=/trunk/; revision=23958
2007-12-28 10:42:44 +00:00
Gerald Combs b8c7fa9bc6 Don't dereference a NULL pointer.
svn path=/trunk/; revision=23438
2007-11-12 20:02:24 +00:00
Tomas Kukosa 44800d2c5a H.460 new dissector implemented (H.460.2-H.460.22)
H.225
 - change RysMessage_vals to h225_Rasmessage_vals
 - use #.PDU directive for H323-UserInformation and RasMessage instead of implementing it by hands
 - register RasMessage_PDU as "h225.ras" dissector for calling it from H.460
asn2wrs make PDUs exportable

svn path=/trunk/; revision=23226
2007-10-18 13:35:57 +00:00
Tomas Kukosa 286f231eb9 new H.323 dissector
- Generic Extensible Framework helper
  - Annex M1 (QSIG over H.323)
  - Annex M4
  - Annex R
H.225/H.245 support for Generic Extensible Framework (GEF)
H.235 register MIKEY into new H.225/H.245 GEF tables
regenerate H.225,H.245,H.235,H.450,H.450-ROS,T.35 from new makefiles

svn path=/trunk/; revision=23216
2007-10-17 10:25:21 +00:00
Tomas Kukosa 5ba3d8aaaa - add missing h450-ros and q932-ros clean rules to asn1/Makefile.nmake
- solve h225<->h235 cyclic dependency with usage of -E option and #.IMPORT directive

svn path=/trunk/; revision=23189
2007-10-15 18:44:53 +00:00
Tomas Kukosa e461d0d0e8 export more types from H.225.0 and H.245 which will be necessary for H.460.x, H.323 (Annex M,R), H.501
svn path=/trunk/; revision=23069
2007-10-05 07:44:03 +00:00
Tomas Kukosa 138050c4ea improvements in ROS handling in Q.932 and H.450
move common ROS code into ros/ros-*.cnf files

svn path=/trunk/; revision=22936
2007-09-24 11:01:53 +00:00
Tomas Kukosa 31e3747eab get rid of few warnings
svn path=/trunk/; revision=21933
2007-05-25 11:40:32 +00:00
Tomas Kukosa cfc38cfdbd use new possibility to set #.EXPORTS flag for whole directive
svn path=/trunk/; revision=21469
2007-04-18 10:52:46 +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 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 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
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
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
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
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 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
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
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