Commit Graph

392 Commits

Author SHA1 Message Date
Tomas Kukosa 31e45c7a21 not allow #.FN_HDR/FTR for Wireshark types but only for ASN.1 types
it makes interconnection between .cnf file and ASN.1 source more readable
(changes for #.FN_BODY will follow)

svn path=/trunk/; revision=22043
2007-06-05 12:00:57 +00:00
Tomas Kukosa 368528502e few small changes to compile INAP (Q.1248.x) from original ASN.1 source
svn path=/trunk/; revision=22042
2007-06-05 08:33:39 +00:00
Tomas Kukosa eb782d0cea - CLASS definitions support including exports through the *-exp.cnf file
- support of extension in middle of SEQUENCE root elements
- new option EMBEDDED_PDV_CB to set default callback
- ChoiceValue support at syntax level
- ValueSet support at syntax level
- exception identifier support
- ValueFromObject support at syntax level
- next minor changes (to compile X.880 and INAP)

- dissectors using classes regenerated

svn path=/trunk/; revision=22036
2007-06-04 14:41:38 +00:00
Anders Broman 4393bceae5 INAP:
- Use (some) IN CS4 asn1 files Q.1248.1 Q.1248.2 Q.1248.3

BER/asn2wrs:
-  Add basic support for EmbeddedPDVType

svn path=/trunk/; revision=22031
2007-06-03 19:58:59 +00:00
Anders Broman 7c5ec2a1e0 Syntax suport for Embedded pdv.
svn path=/trunk/; revision=22025
2007-06-02 12:26:13 +00:00
Tomas Kukosa 7cd09b8fd6 - fix bug in TaggedType support
svn path=/trunk/; revision=22003
2007-05-30 14:22:26 +00:00
Tomas Kukosa 5445d333de - better support if more modules are compiled together
- BSTRING support
- bug fix which sometimes duplicates items in SEQ/CHOICE extension

svn path=/trunk/; revision=22002
2007-05-30 14:13:26 +00:00
Guy Harris 5a43799a17 Use G_GINT64_MODIFIER, rather than the PRI[douxX]64 macros, for GLib
routines and routines using those routines.  GLib might use different
modifiers for 64-bit quantities than the platform's C library does.

svn path=/trunk/; revision=21990
2007-05-29 18:52:42 +00:00
Tomas Kukosa 41ac062479 - COMPONENTS OF implementation (can be used only inside one module or more modules compiled together, can not be done across exported/imported types)
- if protocol name contains dot '.' it is replaced with dash '-' for default output filename
- fix bug in more modules output handling if they are not merged together but output is done one by one
- new #.OPT option EXTERNAL_TYPE_CB for default EXTERNAL type callback
- start of X.880 support implementation

svn path=/trunk/; revision=21984
2007-05-29 14:32:46 +00:00
Tomas Kukosa 77a163a6e3 fix SelectionType creation for export (if the type is only exported but not used in module)
svn path=/trunk/; revision=21973
2007-05-28 11:10:41 +00:00
Tomas Kukosa 28b739896d support of SelectionType
e.g. in TCAP
Component{...} ::= CHOICE {
  basicROS  ROS{...},
  returnResultNotLast [7] returnResult < ROS{..}
}

svn path=/trunk/; revision=21972
2007-05-28 10:55:03 +00:00
Tomas Kukosa ddc09877e2 small improvements in value handling, defined INTEGER value can be used in OID value
svn path=/trunk/; revision=21969
2007-05-28 07:10:09 +00:00
Jörg Mayer 5c4151bb8f Update from samba tree revision 23054 to 23135
============================ Samba log start ============
------------------------------------------------------------------------
r23069 | metze | 2007-05-22 13:23:36 +0200 (Tue, 22 May 2007) | 3 lines
Changed paths:
   M /branches/SAMBA_4_0/source/pidl/tests/Util.pm

print out the command, to find out the problem on host 'tridge'

metze
------------------------------------------------------------------------
r23071 | metze | 2007-05-22 14:45:58 +0200 (Tue, 22 May 2007) | 3 lines
Changed paths:
   M /branches/SAMBA_4_0/source/pidl/tests/Util.pm

print the command on failure only

metze
------------------------------------------------------------------------
------------------------------------------------------------------------
============================ Samba log end ==============

svn path=/trunk/; revision=21932
2007-05-25 08:34:15 +00:00
Tomas Kukosa 3f071c757a - improvements in registering dissectors to OID table (value defined in ASN.1 can be used)
- new #.END_OF_CNF directive

svn path=/trunk/; revision=21916
2007-05-24 07:19:21 +00:00
Tomas Kukosa e6e55fd517 small fix in duplicate type warning
svn path=/trunk/; revision=21911
2007-05-23 19:35:29 +00:00
Tomas Kukosa fe5ee23c89 - support of CONTAINING constraint in OCTET STRING and BIT STRING
- fix handling of tag for EXTERNAL type
- change automatic postfix for duplicate names from '...%d' to '..._%02d'

svn path=/trunk/; revision=21906
2007-05-23 13:42:05 +00:00
Anders Broman 81ee0e3c42 Copy paste error, actx duplicated.
svn path=/trunk/; revision=21892
2007-05-22 21:13:55 +00:00
Anders Broman dca634c4de Prepare for the use of the new -X parameter for BER encoded protocols.
svn path=/trunk/; revision=21889
2007-05-22 16:17:54 +00:00
Jörg Mayer 5e33afbf50 Don't generate enums that end in a comma
svn path=/trunk/; revision=21888
2007-05-22 16:14:28 +00:00
Tomas Kukosa 16c4aa8e38 - fix asn2wrs crash if typereference assignment has non-default body
- mode directives for assignments omitting 
  (#.NO_OMIT_ASSGN, #.OMIT_ALL_ASSIGNMENTS, #.OMIT_ASSIGNMENTS_EXCEPT, #.OMIT_ALL_TYPE_ASSIGNMENTS, #.OMIT_TYPE_ASSIGNMENTS_EXCEPT, #.OMIT_ALL_VALUE_ASSIGNMENTS, #.OMIT_VALUE_ASSIGNMENTS_EXCEPT)

svn path=/trunk/; revision=21824
2007-05-18 12:48:28 +00:00
Tomas Kukosa 58105364d5 fix crash if C enum for ENUMERATED type is created
svn path=/trunk/; revision=21786
2007-05-15 12:50:13 +00:00
Tomas Kukosa e62aef53da fix bug - compiler crashes if already imported value or class is defined
svn path=/trunk/; revision=21785
2007-05-15 11:41:45 +00:00
Tomas Kukosa 12abbdb118 command line option -X for "new BER" CHOICE and SEQUENCE table format (type oriented instead of field oriented)
svn path=/trunk/; revision=21779
2007-05-15 08:55:12 +00:00
Tomas Kukosa 35da9bda8a support for value range and unions in permitted alphabet
svn path=/trunk/; revision=21777
2007-05-15 08:15:34 +00:00
Anders Broman f08cd1e5e3 actx in the rest of dissect_ber..()l
svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
Gerald Combs 253eee10e2 Update to the latest Win32 libraries.
svn path=/trunk/; revision=21770
2007-05-14 17:07:34 +00:00
Tomas Kukosa 25c299ea4e - support of constraint unions
- support of FN_VARIANT parameter for OpenType
- many small changes

svn path=/trunk/; revision=21758
2007-05-14 13:46:09 +00:00
Anders Broman 0bc558f88d actx in ber_external
svn path=/trunk/; revision=21755
2007-05-13 22:01:17 +00:00
Anders Broman c01f382974 Second step in introducing asn context to BER dissectors just like in PER.
svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
Stephen Fisher 511188e5a0 Copy environment variable HTTP_PROXY when set to http_proxy so wget can grab it.
Also add $Id$ tag

svn path=/trunk/; revision=21750
2007-05-11 22:54:54 +00:00
Jörg Mayer 26aae8fd12 Update from samba tree revision 22657 to 22761
============================ Samba log start ============
------------------------------------------------------------------------
r22667 | metze | 2007-05-04 12:44:41 +0200 (Fri, 04 May 2007) | 3 lines
Changed paths:
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm

revert revision 22640 as it breaks nested structs in idl

metze
------------------------------------------------------------------------
r22741 | jelmer | 2007-05-07 14:31:42 +0200 (Mon, 07 May 2007) | 1 line
Changed paths:
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm

Add MSVC-specific pragma's for Wireshark. Patch from Ronnie.
------------------------------------------------------------------------
r22742 | jelmer | 2007-05-07 14:41:23 +0200 (Mon, 07 May 2007) | 1 line
Changed paths:
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm

Fix tests.
------------------------------------------------------------------------
------------------------------------------------------------------------
============================ Samba log end ==============

svn path=/trunk/; revision=21729
2007-05-08 17:39:28 +00:00
Graeme Lunt cf56e76be9 Updated splash screen for Wireshark that shows the initialisation progress.
The splash screen shows a progress bar and a percentage complete - like the progress dialog.
As dissectors are initialised and handed off the name is shown. However, the names of plugin dissectors are not shown.
The update to the make-dissector-reg shell script has been tested, though I think generally the python version is used.


svn path=/trunk/; revision=21716
2007-05-07 17:55:42 +00:00
Tomas Kukosa a38b44a647 - simple Information Objects support
- all definitions in ASN.1 source are skipped and need not to be commented out
  - #.CLASS directive can define types for Object Class Fields
- do not append 'xxx' postfix to parametrized types (changes H.235 and H.450 in accordance with it)
- change QSIG ASN.1 source to be more identical to original one

svn path=/trunk/; revision=21715
2007-05-07 12:59:31 +00:00
Anders Broman 4c692a62b6 Start introducing actx to ber functions.
svn path=/trunk/; revision=21705
2007-05-06 22:34:05 +00:00
Tomas Kukosa d58b1031de - new #.OPT directive which allows to use command line options from conformance file (and more options in the future)
- option -F|CREATE_FIELDS used from conformance file can have type parameter, field functions are created only for its members

svn path=/trunk/; revision=21682
2007-05-04 13:11:34 +00:00
Tomas Kukosa 48b11b6f15 - fix creating PDU_NEW functions, return the right value
- allow FN_PARS to be spreaded over more lines

svn path=/trunk/; revision=21675
2007-05-04 06:55:48 +00:00
Jörg Mayer 904640fdb4 Note: make test for the following update generates 1 error:
---------
tests/header..............NOK 14#   Failed test 'struct declaration'
#   in tests/header.pl at line 49.
#                   '/* header auto-generated by pidl */
#
# #include <core.h>
# #include <stdint.h>
#
# #ifndef _HEADER_p
# #define _HEADER_p
#
# struct x#endif /* _HEADER_p */
# '
#     doesn't match '(?ms-xi:struct x;)'
# Looks like you failed 1 test of 15.
tests/header..............dubious
        Test returned status 1 (wstat 256, 0x100)
DIED. FAILED test 14
---------

Update from samba tree revision 22314 to 22657
============================ Samba log start ============
------------------------------------------------------------------------
r22357 | jelmer | 2007-04-19 03:26:15 +0200 (Thu, 19 Apr 2007) | 2 lines
Changed paths:
   M /branches/SAMBA_4_0
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
   M /branches/SAMBA_4_0/source/pidl/tests/wireshark-ndr.pl

Don't use 'our'

------------------------------------------------------------------------
r22453 | jelmer | 2007-04-22 12:42:33 +0200 (Sun, 22 Apr 2007) | 1 line
Changed paths:
   M /branches/SAMBA_4_0
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/TDR.pm
   M /branches/SAMBA_4_0/source/pidl/tests/tdr.pl

Fix TDR testsuite without using our.
------------------------------------------------------------------------
r22456 | jelmer | 2007-04-22 15:57:07 +0200 (Sun, 22 Apr 2007) | 1 line
Changed paths:
   M /branches/SAMBA_4_0
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
   M /branches/SAMBA_4_0/source/pidl/pidl
   M /branches/SAMBA_4_0/source/pidl/tests/samba-ejs.pl
   M /branches/SAMBA_4_0/source/pidl/tests/wireshark-ndr.pl

Merge wireshark and ejs test improvements.
------------------------------------------------------------------------
r22457 | jelmer | 2007-04-22 16:19:22 +0200 (Sun, 22 Apr 2007) | 1 line
Changed paths:
   M /branches/SAMBA_4_0
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
   M /branches/SAMBA_4_0/source/pidl/pidl
   M /branches/SAMBA_4_0/source/pidl/tests/samba3-cli.pl

Fix tests for Samba3 client generator.
------------------------------------------------------------------------
r22462 | jelmer | 2007-04-22 17:59:34 +0200 (Sun, 22 Apr 2007) | 1 line
Changed paths:
   M /branches/SAMBA_4_0
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
   M /branches/SAMBA_4_0/source/pidl/pidl
   M /branches/SAMBA_4_0/source/pidl/tests/Util.pm
   M /branches/SAMBA_4_0/source/pidl/tests/samba-ndr.pl

Fix test suite for ndr parser without using 'our'
------------------------------------------------------------------------
r22520 | jelmer | 2007-04-25 18:10:54 +0200 (Wed, 25 Apr 2007) | 1 line
Changed paths:
   M /branches/SAMBA_4_0
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
   M /branches/SAMBA_4_0/source/pidl/tests/wireshark-conf.pl

Fix the TYPE command.
------------------------------------------------------------------------
r22617 | metze | 2007-05-01 03:57:17 +0200 (Tue, 01 May 2007) | 4 lines
Changed paths:
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm

assume we have defered elements if the type is just provides via
'declare' this should fix the problem with the winbind IRPC calls

metze
------------------------------------------------------------------------
r22618 | metze | 2007-05-01 04:00:57 +0200 (Tue, 01 May 2007) | 8 lines
Changed paths:
   M /branches/SAMBA_4_0/source/pidl/idl.yp
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/IDL.pm

handle the properties related to the type
and not to 'declare' to avoid a pidl warning with:

declare [switch_type(uint16)] union netr_Validation;

void foo([in] uint16 level, [in,switch_is(level)] netrValidation info);

metze
------------------------------------------------------------------------
r22640 | metze | 2007-05-02 20:00:02 +0200 (Wed, 02 May 2007) | 4 lines
Changed paths:
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm

- generate nicer output
- fix compiler warning about unused ';'

metze
------------------------------------------------------------------------
------------------------------------------------------------------------
============================ Samba log end ==============

svn path=/trunk/; revision=21671
2007-05-03 21:56:22 +00:00
Anders Broman 98cb9db12d Split out asn1 common functions. Start of BER EXTERNAL.
svn path=/trunk/; revision=21670
2007-05-03 21:52:57 +00:00
Tomas Kukosa 3ecac7ddd1 - REAL type and values are supported
- if a value of some INTEGER type is defined then it is assigned to this type like a named value
i.e.
MyType ::= INTEGER
mv01 MyType ::= 1
is equal to
MyType ::= INTEGER { mv01 (1) }

svn path=/trunk/; revision=21663
2007-05-03 11:42:33 +00:00
Tomas Kukosa 6f80d9228f - better reporting of syntax errors (or unsupported syntax) in ASN.1 source
- support of EXTERNAL type
- support of ObjectDescriptor for PER
- new #.CLASS directive for supporting some class workarounds

svn path=/trunk/; revision=21642
2007-05-02 12:18:27 +00:00
Tomas Kukosa 9f6c1ed0bb - new #.Exports parameter VALS_WITH_TABLE which "exports" whole table into header file
/it is only one way how to use it in Windows plugins/
- better handling of imports and definitions if more ASN.1 sources are compiled together
- fix tag handling on top level of PDU
- new -I command line option for path(s) of conformance files including

svn path=/trunk/; revision=21600
2007-04-27 07:35:01 +00:00
Tomas Kukosa dc9a2c4c14 new parameter EXTERN for #.EXPORTS directive
svn path=/trunk/; revision=21561
2007-04-25 11:14:14 +00:00
Tomas Kukosa 6c2acdcfba fix bug in handling of tagged type reference
svn path=/trunk/; revision=21559
2007-04-25 06:33:24 +00:00
Tomas Kukosa 635171a4c0 added missing dependency in tagged type
svn path=/trunk/; revision=21475
2007-04-19 12:58:31 +00:00
Tomas Kukosa 0bb959a11a - new -L command line option to suppress #line directives from .cnf file
- new #.MAKE_ENUM and #.MAKE_DEFINES directives to generate enum/#define for enumerated types (ENUMERATED or INTEGER with named values)

svn path=/trunk/; revision=21466
2007-04-18 08:55:28 +00:00
Gerald Combs fc2e2a7c3b Use the older-style ST_MTIME instead of st_mtime. This should fix backward
compatibility.

svn path=/trunk/; revision=21459
2007-04-17 17:13:55 +00:00
Jörg Mayer ac582f5d97 Update from samba tree revision 22006 to 22314
============================ Samba log start ============
------------------------------------------------------------------------
r22029 | jpeach | 2007-04-02 19:06:14 +0200 (Mon, 02 Apr 2007) | 2 lines
Changed paths:
   M /branches/SAMBA_4_0/source/lib/registry/config.mk
   M /branches/SAMBA_4_0/source/lib/replace/samba.m4
   M /branches/SAMBA_4_0/source/main.mk
   M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4.pm

Make sure we respect $srcdir correctly for the srcdir != builddir case.

------------------------------------------------------------------------
------------------------------------------------------------------------
============================ Samba log end ==============


svn path=/trunk/; revision=21458
2007-04-17 16:51:24 +00:00
Gerald Combs b190b5e759 Fixup whitespace.
svn path=/trunk/; revision=21419
2007-04-13 22:49:54 +00:00
Tomas Kukosa f764553978 support of tagged types for BER - i.e. tagged assignments, more than one level tags in SEQUENCE/CHOICE
it has to be enabled with -T option as it is experimental

svn path=/trunk/; revision=21407
2007-04-13 14:19:26 +00:00
Gerald Combs a0afc5d832 Add a registration symbol cache to make-dissector-reg.py. When you
update a dissector and recompile, make-dissector-reg.py can now pull
its list of registration routines from a cache instead of having to
scan through every dissector.  The time to create register.c has gone
from 20 to 30 seconds down to 2 on my desktop machine.

The cache file is a Python pickle data stream.  It should be portable
across architectures, so we may be able to add it to the distribution
at some point.

svn path=/trunk/; revision=21348
2007-04-06 16:15:36 +00:00