osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

- Fix svn:ignore for all directories 

- gsmmap: uncomment -s option in gsmmap.cnf
- Fix cyclic dependencies:
  + Remove EXPORT_CNF from dependencies for cnf files
  + Replace all INCLUDE ...-exp.cnf with IMPORT ...-exp.cnf

svn path=/trunk/; revision=23202
This commit is contained in:
Jörg Mayer 2007-10-16 13:59:40 +00:00
parent 254a5ad705
commit c2d0c8fa31
41 changed files with 98 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
asn1/Makefile.inc
View File

@ -29,7 +29,7 @@ generate_export: $(EXPORT_FILES)
PROTO_OPT ?= -p $(PROTOCOL_NAME)
$(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(IMPORT_CNF)
$(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
python $(top_srcdir)/tools/asn2wrs.py \
$(A2W_FLAGS) \
$(PROTO_OPT) \
@ -38,15 +38,13 @@ $(DISSECTOR_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(I
-D $(srcdir) \
$(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
#ifdef EXPORT_FILES
#$(EXPORT_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
# python $(top_srcdir)/tools/asn2wrs.py \
# -E $(A2W_FLAGS) \
# $(PROTO_OPT) \
# -c $(srcdir)/$(PROTOCOL_NAME).cnf \
# -D $(srcdir) \
# $(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
#endif
$(EXPORT_FILES): $(top_srcdir)/tools/asn2wrs.py $(SRC_FILES)
python $(top_srcdir)/tools/asn2wrs.py \
-E $(A2W_FLAGS) \
$(PROTO_OPT) \
-c $(srcdir)/$(PROTOCOL_NAME).cnf \
-D $(srcdir) \
$(EXT_ASN_FILE_LIST) $(ASN_FILE_LIST) $(EXT_ASN_FILE_LIST_LATE)
copy_files: generate_dissector
cp $(DISSECTOR_FILES) $(top_srcdir)/epan/dissectors/
@ -56,5 +54,5 @@ CLEANFILES = \
parsetab.pyc \
$(DISSECTOR_FILES) \
*-exp.cnf \
packet-*-{dis-tab,ettarr,ett,fn,hfarr,hf,table*,val}.[hc]
packet-*-{dis-tab,ettarr,ett,fn,hfarr,hf,table*,val,exp}.[hc]

4
asn1/Makefile.inc.nmake
View File

@ -36,7 +36,7 @@ generate_export: $(EXPORT_FILES)
PROTO_OPT = -p $(PROTOCOL_NAME)
!ENDIF
$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(IMPORT_CNF)
$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
!IFDEF PYTHON
$(PYTHON) "../../tools/asn2wrs.py" \
$(A2W_FLAGS) \
@ -50,7 +50,7 @@ $(DISSECTOR_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF) $(IMPORT_CN
!ENDIF
!IFDEF EXPORT_FILES
$(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES) $(EXTRA_CNF)
$(EXPORT_FILES): ../../tools/asn2wrs.py $(SRC_FILES)
!IFDEF PYTHON
$(PYTHON) "../../tools/asn2wrs.py" \
-E $(A2W_FLAGS) \

8
asn1/acp133/acp133.cnf
View File

@ -1,10 +1,10 @@
# acp133.cnf
# ACP133 conformation file
#.INCLUDE ../x509ce/x509ce-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x411/x411-exp.cnf
#.IMPORT ../x509ce/x509ce-exp.cnf
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../x411/x411-exp.cnf
#.MODULE_IMPORT
MTSAbstractService x411

2
asn1/acse/acse.cnf
View File

@ -3,7 +3,7 @@
# $Id$
#.INCLUDE ../x509if/x509if-exp.cnf
#.IMPORT ../x509if/x509if-exp.cnf
#.EXPORTS
EXTERNALt

2
asn1/ansi_map/ansi_map.cnf
View File

@ -3,7 +3,7 @@
# Copyright 2005-2007 Anders Broman
# $Id$
#.INCLUDE ../gsmmap/gsm_map-exp.cnf
#.IMPORT ../gsmmap/gsm_map-exp.cnf
#.EXPORTS

4
asn1/camel/camel.cnf
View File

@ -3,8 +3,8 @@
# Anders Broman 2007
# $Id$
#.INCLUDE ../gsmmap/gsm_map-exp.cnf
#.INCLUDE ../inap/inap-exp.cnf
#.IMPORT ../gsmmap/gsm_map-exp.cnf
#.IMPORT ../inap/inap-exp.cnf
#.MODULE
CS1-DataTypes inap

2
asn1/cmip/cmip.cnf
View File

@ -3,7 +3,7 @@
# $Id$
#.INCLUDE ../acse/acse-exp.cnf
#.IMPORT ../acse/acse-exp.cnf
#.MODULE
Remote-Operations-Information-Objects cmip.ros

4
asn1/cms/cms.cnf
View File

@ -3,8 +3,8 @@
# $Id$
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../x509if/x509if-exp.cnf
#.EXPORTS
ContentInfo

16
asn1/dap/dap.cnf
View File

@ -1,11 +1,11 @@
#.INCLUDE ../x509if/x509if-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509sat/x509sat-exp.cnf
#.INCLUDE ../pkixcrmf/crmf-exp.cnf
#.INCLUDE ../dsp/dsp-exp.cnf
#.INCLUDE ../disp/disp-exp.cnf
#.INCLUDE ../ros/ros-exp.cnf
#.INCLUDE ../acse/acse-exp.cnf
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../x509sat/x509sat-exp.cnf
#.IMPORT ../pkixcrmf/crmf-exp.cnf
#.IMPORT ../dsp/dsp-exp.cnf
#.IMPORT ../disp/disp-exp.cnf
#.IMPORT ../ros/ros-exp.cnf
#.IMPORT ../acse/acse-exp.cnf
#.MODULE_IMPORT
ServiceAdministration x509if

12
asn1/disp/disp.cnf
View File

@ -4,12 +4,12 @@ Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
#.MODULE_IMPORT
OperationalBindingManagement dop
#.INCLUDE ../x509if/x509if-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../dap/dap-exp.cnf
#.INCLUDE ../dsp/dsp-exp.cnf
#.INCLUDE ../dop/dop-exp.cnf
#.INCLUDE ../acse/acse-exp.cnf
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../dap/dap-exp.cnf
#.IMPORT ../dsp/dsp-exp.cnf
#.IMPORT ../dop/dop-exp.cnf
#.IMPORT ../acse/acse-exp.cnf
#.EXPORTS
AgreementID

14
asn1/dop/dop.cnf
View File

@ -1,10 +1,10 @@
#.INCLUDE ../x509sat/x509sat-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../dsp/dsp-exp.cnf
#.INCLUDE ../dap/dap-exp.cnf
#.INCLUDE ../pkixcrmf/crmf-exp.cnf
#.INCLUDE ../acse/acse-exp.cnf
#.IMPORT ../x509sat/x509sat-exp.cnf
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../dsp/dsp-exp.cnf
#.IMPORT ../dap/dap-exp.cnf
#.IMPORT ../pkixcrmf/crmf-exp.cnf
#.IMPORT ../acse/acse-exp.cnf
#.MODULE_IMPORT
BasicAccessControl crmf

10
asn1/dsp/dsp.cnf
View File

@ -2,11 +2,11 @@
DirectoryAccessProtocol dap
ServiceAdministration x509if
#.INCLUDE ../dap/dap-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509sat/x509sat-exp.cnf
#.INCLUDE ../acse/acse-exp.cnf
#.IMPORT ../dap/dap-exp.cnf
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../x509sat/x509sat-exp.cnf
#.IMPORT ../acse/acse-exp.cnf
#.EXPORTS
OperationProgress

6
asn1/ess/ess.cnf
View File

@ -3,9 +3,9 @@
# $Id$
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509ce/x509ce-exp.cnf
#.INCLUDE ../cms/cms-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../x509ce/x509ce-exp.cnf
#.IMPORT ../cms/cms-exp.cnf
#.EXPORTS

2
asn1/ftam/ftam.cnf
View File

@ -3,7 +3,7 @@
# $Id$
#.INCLUDE ../acse/acse-exp.cnf
#.IMPORT ../acse/acse-exp.cnf
#.EXPORTS
Attribute-Extensions

2
asn1/gnm/gnm.cnf
View File

@ -2,7 +2,7 @@
# gnm conformation file
# $Id$
#.INCLUDE ../cmip/cmip-exp.cnf
#.IMPORT ../cmip/cmip-exp.cnf
#.EXPORTS
#.PDU

4
asn1/gsmmap/Makefile.common
View File

@ -22,8 +22,8 @@
PROTOCOL_NAME=gsmmap
DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c \
packet-$(PROTOCOL_NAME).h
DISSECTOR_FILES=packet-gsm_map.c \
packet-gsm_map.h
NEED_PACKET_PROTO_H = 1

2
asn1/gsmmap/gsmmap.cnf
View File

@ -5,7 +5,7 @@
-X
#-d satcom
-d om
-s packet-gsm_map-tmp
#-s packet-gsm_map-tmp
-k
-o gsm_map
#.END

4
asn1/h225/Makefile.common
View File

@ -49,9 +49,7 @@ SRC_FILES = \
A2W_FLAGS= -e
EXTRA_CNF =
IMPORT_CNF = \
EXTRA_CNF = \
../h235/h235-exp.cnf \
../h245/h245-exp.cnf

4
asn1/h235/Makefile.common
View File

@ -49,9 +49,7 @@ SRC_FILES = \
A2W_FLAGS = -e
EXTRA_CNF =
IMPORT_CNF = \
EXTRA_CNF = \
../h225/h225-exp.cnf
../h225/h225-exp.cnf:

4
asn1/h450/h450.cnf
View File

@ -10,8 +10,8 @@ GROUP_BY_PROT
-o h450
#.END
#.INCLUDE ../h225/h225-exp.cnf
#.INCLUDE ../h450-ros/h450-ros-exp.cnf
#.IMPORT ../h225/h225-exp.cnf
#.IMPORT ../h450-ros/h450-ros-exp.cnf
#.MODULE

2
asn1/logotype-cert-extn/logotypecertextn.cnf
View File

@ -3,7 +3,7 @@
# $Id$
#.INCLUDE ../x509af/x509af-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.EXPORTS

2
asn1/mms/mms.cnf
View File

@ -6,7 +6,7 @@
#.MODULE_IMPORT
ISO-8650-ACSE-1 acse
#.INCLUDE ../acse/acse-exp.cnf
#.IMPORT ../acse/acse-exp.cnf
#.EXPORTS
MMSpdu

4
asn1/ocsp/ocsp.cnf
View File

@ -7,8 +7,8 @@
PKIX1Implicit88 pkix1implicit
PKIX1Explicit88 pkix1explicit
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509ce/x509ce-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../x509ce/x509ce-exp.cnf
#.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf
#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf

2
asn1/pkcs1/pkcs1.cnf
View File

@ -3,7 +3,7 @@
# $Id$
#.INCLUDE ../x509af/x509af-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.EXPORTS

6
asn1/pkcs12/pkcs12.cnf
View File

@ -7,9 +7,9 @@
PKCS-7 cms
PKCS-5 x509af
#.INCLUDE ../cms/cms-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
#.IMPORT ../cms/cms-exp.cnf
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.EXPORTS

2
asn1/pkinit/pkinit.cnf
View File

@ -7,7 +7,7 @@
PKIX1Explicit88 pkix1explicit
#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
#.INCLUDE ../cms/cms-exp.cnf
#.IMPORT ../cms/cms-exp.cnf
#.EXPORTS

2
asn1/pkix1implicit/pkix1implicit.cnf
View File

@ -7,7 +7,7 @@
PKIX1Explicit93 pkix1explicit
#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
#.INCLUDE ../x509ce/x509ce-exp.cnf
#.IMPORT ../x509ce/x509ce-exp.cnf
#.EXPORTS

2
asn1/pkixcmp/cmp.cnf
View File

@ -10,7 +10,7 @@ PKIXCRMF-2005 crmf
#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
#.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf
#.INCLUDE ../pkixcrmf/crmf-exp.cnf
#.IMPORT ../pkixcrmf/crmf-exp.cnf
#.EXPORTS
CAKeyUpdAnnContent

2
asn1/pkixcrmf/crmf.cnf
View File

@ -8,7 +8,7 @@ PKIX1Explicit88 pkix1explicit
PKIX1Implicit88 pkix1implicit
CryptographicMessageSyntax2004 cms
#.INCLUDE ../cms/cms-exp.cnf
#.IMPORT ../cms/cms-exp.cnf
#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
#.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf

6
asn1/pkixqualified/pkixqualified.cnf
View File

@ -3,9 +3,9 @@
# $Id$
#.INCLUDE ../x509ce/x509ce-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509sat/x509sat-exp.cnf
#.IMPORT ../x509ce/x509ce-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../x509sat/x509sat-exp.cnf
#.EXPORTS

2
asn1/pkixtsp/pkixtsp.cnf
View File

@ -9,7 +9,7 @@ PKIX1Implicit88 pkix1implicit
#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
#.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf
#.INCLUDE ../cms/cms-exp.cnf
#.IMPORT ../cms/cms-exp.cnf
#.EXPORTS

2
asn1/pres/pres.cnf
View File

@ -3,7 +3,7 @@
# $Id$
#.INCLUDE ../rtse/rtse-exp.cnf
#.IMPORT ../rtse/rtse-exp.cnf
#.EXPORTS

1
asn1/q932/Makefile.common
View File

@ -54,4 +54,3 @@ A2W_FLAGS= -e -b -T -X
EXTRA_CNF =
IMPORT_CNF =

1
asn1/qsig/Makefile.common
View File

@ -79,4 +79,3 @@ A2W_FLAGS = -e
EXTRA_CNF =
IMPORT_CNF =

4
asn1/s4406/s4406.cnf
View File

@ -1,8 +1,8 @@
#.MODULE_IMPORT
MTSAbstractService x411
#.INCLUDE ../x411/x411-exp.cnf
#.INCLUDE ../x420/x420-exp.cnf
#.IMPORT ../x411/x411-exp.cnf
#.IMPORT ../x420/x420-exp.cnf
#.TYPE_RENAME
AddressListDesignator/type AddressListType

10
asn1/x411/x411.cnf
View File

@ -2,11 +2,11 @@
CountryName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x411_CountryName_vals) BITMASK = 0
Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
#.INCLUDE ../acse/acse-exp.cnf
#.INCLUDE ../x509ce/x509ce-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
#.INCLUDE ../x509sat/x509sat-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
#.IMPORT ../acse/acse-exp.cnf
#.IMPORT ../x509ce/x509ce-exp.cnf
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x509sat/x509sat-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.EXPORTS
ContentLength

10
asn1/x420/x420.cnf
View File

@ -4,11 +4,11 @@ Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
#.MODULE_IMPORT
MTSAbstractService x411
#.INCLUDE ../ftam/ftam-exp.cnf
#.INCLUDE ../x411/x411-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509ce/x509ce-exp.cnf
#.INCLUDE ../acse/acse-exp.cnf
#.IMPORT ../ftam/ftam-exp.cnf
#.IMPORT ../x411/x411-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../x509ce/x509ce-exp.cnf
#.IMPORT ../acse/acse-exp.cnf
#.MODULE

6
asn1/x509af/x509af.cnf
View File

@ -3,9 +3,9 @@
# $Id$
#.INCLUDE ../x509ce/x509ce-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
#.INCLUDE ../x509sat/x509sat-exp.cnf
#.IMPORT ../x509ce/x509ce-exp.cnf
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x509sat/x509sat-exp.cnf
#.EXPORTS
ACPathData

8
asn1/x509ce/x509ce.cnf
View File

@ -6,10 +6,10 @@
#.MODULE_IMPORT
MTSAbstractService x411
#.INCLUDE ../x509if/x509if-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509sat/x509sat-exp.cnf
#.INCLUDE ../x411/x411-exp.cnf
#.IMPORT ../x509if/x509if-exp.cnf
#.IMPORT ../x509af/x509af-exp.cnf
#.IMPORT ../x509sat/x509sat-exp.cnf
#.IMPORT ../x411/x411-exp.cnf
#.EXPORTS
AltNameType

2
asn1/x509if/x509if.cnf
View File

@ -3,7 +3,7 @@
# $Id$
#.INCLUDE ../x509sat/x509sat-exp.cnf
#.IMPORT ../x509sat/x509sat-exp.cnf
#.EXPORTS
AllowedSubset

2
asn1/x509sat/x509sat.cnf
View File

@ -3,7 +3,7 @@
# $Id$
#.INCLUDE ../x509if/x509if-exp.cnf
#.IMPORT ../x509if/x509if-exp.cnf
#.EXPORTS
CaseIgnoreListMatch