aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
Diffstat (limited to 'asn1')
-rw-r--r--asn1/MAP_Dialogue/Makefile.nmake4
-rw-r--r--asn1/Makefile.nmake2
-rw-r--r--asn1/cmip/Makefile.nmake4
-rw-r--r--asn1/ftam/Makefile.nmake4
-rw-r--r--asn1/ftbp/Makefile.nmake4
-rw-r--r--asn1/gnm/Makefile.nmake4
-rw-r--r--asn1/gsm_ss/Makefile.nmake4
-rw-r--r--asn1/gsmmap/GSMMAP.asn44
-rw-r--r--asn1/gsmmap/gsmmap.cnf13
-rw-r--r--asn1/gsmmap/packet-gsm_map-template.c5
-rw-r--r--asn1/gsmmap/packet-gsm_map-template.h2
-rw-r--r--asn1/logotype-cert-extn/Makefile.nmake4
-rw-r--r--asn1/mms/Makefile.nmake4
-rw-r--r--asn1/ns-cert-exts/Makefile.nmake4
-rw-r--r--asn1/ocsp/Makefile.nmake4
-rw-r--r--asn1/smrse/Makefile.nmake4
-rw-r--r--asn1/spnego/Makefile.nmake4
17 files changed, 85 insertions, 29 deletions
diff --git a/asn1/MAP_Dialogue/Makefile.nmake b/asn1/MAP_Dialogue/Makefile.nmake
index d18717a7a3..8bb63e1834 100644
--- a/asn1/MAP_Dialogue/Makefile.nmake
+++ b/asn1/MAP_Dialogue/Makefile.nmake
@@ -37,6 +37,6 @@ fix_eol: generate_dissector
del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
copy_files: generate_dissector fix_eol
- xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
- xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
+ xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+ xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
diff --git a/asn1/Makefile.nmake b/asn1/Makefile.nmake
index ccd5147ef9..7e6b6bc370 100644
--- a/asn1/Makefile.nmake
+++ b/asn1/Makefile.nmake
@@ -51,7 +51,6 @@ all: \
wlancertextn \
x411 \
x420 \
- x501 \
x509af \
x509ce \
x509if \
@@ -260,7 +259,6 @@ ber: \
wlancertextn \
x411 \
x420 \
- x501 \
x509af \
x509ce \
x509if \
diff --git a/asn1/cmip/Makefile.nmake b/asn1/cmip/Makefile.nmake
index 6f21eb1a43..28ff717d0b 100644
--- a/asn1/cmip/Makefile.nmake
+++ b/asn1/cmip/Makefile.nmake
@@ -37,5 +37,5 @@ fix_eol: generate_dissector
del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
copy_files: generate_dissector fix_eol
- xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
- xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
+ xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+ xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
diff --git a/asn1/ftam/Makefile.nmake b/asn1/ftam/Makefile.nmake
index 3c58aa3fbe..56388dfa7b 100644
--- a/asn1/ftam/Makefile.nmake
+++ b/asn1/ftam/Makefile.nmake
@@ -37,6 +37,6 @@ fix_eol: generate_dissector
del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
copy_files: generate_dissector fix_eol
- xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
- xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
+ xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+ xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
diff --git a/asn1/ftbp/Makefile.nmake b/asn1/ftbp/Makefile.nmake
index 8fb08977e8..98f9f6640c 100644
--- a/asn1/ftbp/Makefile.nmake
+++ b/asn1/ftbp/Makefile.nmake
@@ -37,6 +37,6 @@ fix_eol: generate_dissector
del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
copy_files: generate_dissector fix_eol
- xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
- xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
+ xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+ xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
diff --git a/asn1/gnm/Makefile.nmake b/asn1/gnm/Makefile.nmake
index c385cd1017..53ea858b5e 100644
--- a/asn1/gnm/Makefile.nmake
+++ b/asn1/gnm/Makefile.nmake
@@ -37,6 +37,6 @@ fix_eol: generate_dissector
del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
copy_files: generate_dissector fix_eol
- xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
- xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
+ xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+ xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
diff --git a/asn1/gsm_ss/Makefile.nmake b/asn1/gsm_ss/Makefile.nmake
index 23c800c53e..5309456316 100644
--- a/asn1/gsm_ss/Makefile.nmake
+++ b/asn1/gsm_ss/Makefile.nmake
@@ -37,5 +37,5 @@ fix_eol: generate_dissector
del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
copy_files: generate_dissector fix_eol
- xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
- xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
+ xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+ xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
diff --git a/asn1/gsmmap/GSMMAP.asn b/asn1/gsmmap/GSMMAP.asn
index bd76d58683..c1ece2596f 100644
--- a/asn1/gsmmap/GSMMAP.asn
+++ b/asn1/gsmmap/GSMMAP.asn
@@ -5410,6 +5410,50 @@ ExtensionContainer ::= SEQUENCE {
pcsExtensions [1] IMPLICIT PcsExtensions OPTIONAL,
... }
+-- Private extensions
+accessType-id OBJECT IDENTIFIER ::=
+ {1 3 12 2 1107 3 66 1 1}
+
+ --iso (1)
+ --identified-organization (3)
+ --ecma (12)
+ --member-company (2)
+ --siemens-units (1107)
+ --oen (3)
+ --mn (66)
+ --proprietary-extensions (1)
+ --accessType (1)
+
+accessTypeNotAllowed-id OBJECT IDENTIFIER ::=
+ {1 3 12 2 1107 3 66 1 2}
+
+ --iso (1)
+ --identified-organization (3)
+ --ecma (12)
+ --member-company (2)
+ --siemens-units (1107)
+ --oen (3)
+ --mn (66)
+ --proprietary-extensions (1)
+ --accessTypeNotAllowed (2)
+
+--accessType MAP-EXTENSION ::= {
+-- &ExtensionType AccessType,
+-- &extensionId accessType-id}
+
+AccessTypePriv ::= SEQUENCE {
+ access Access,
+ version Version,
+ ...}
+
+Access ::= ENUMERATED {
+ gsm (1),
+ geran (2),
+ utran (3),
+ ...}
+
+Version ::= INTEGER (1..20)
+
END
diff --git a/asn1/gsmmap/gsmmap.cnf b/asn1/gsmmap/gsmmap.cnf
index 112c6783bd..ec1db9bdb5 100644
--- a/asn1/gsmmap/gsmmap.cnf
+++ b/asn1/gsmmap/gsmmap.cnf
@@ -445,9 +445,15 @@ Component
#----------------------------------------------------------------------------------------
#.FN_BODY PrivateExtension/extType
+
proto_tree_add_text(tree, tvb, offset, -1, "Extension Data");
- call_dissector(data_handle, tvb, pinfo, tree);
- offset = tvb_length_remaining(tvb,offset);
+ if (obj_id){
+ offset=call_ber_oid_callback(obj_id, tvb, offset, pinfo, tree);
+ }else{
+ call_dissector(data_handle, tvb, pinfo, tree);
+ offset = tvb_length_remaining(tvb,offset);
+ }
+
#.END
#.FN_FTR ForwardingOptions
@@ -583,6 +589,9 @@ Component
subtree = proto_item_add_subtree(item, ett_gsm_map_LAIFixedLength);
dissect_e212_mcc_mnc(parameter_tvb, subtree, 0);
+#.FN_PARS OBJECT_IDENTIFIER
+ FN_VARIANT = _str VAL_PTR = &obj_id
+
#----------------------------------------------------------------------------------------
#.TYPE_ATTR
SS-Code TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(ssCode_vals)
diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c
index 487cd8a6aa..ba527a29e1 100644
--- a/asn1/gsmmap/packet-gsm_map-template.c
+++ b/asn1/gsmmap/packet-gsm_map-template.c
@@ -146,6 +146,7 @@ static proto_tree *top_tree;
static int application_context_version;
gint protocolId;
gint AccessNetworkProtocolId;
+const char *obj_id = NULL;
static int gsm_map_tap = -1;
/* Forward declarations */
@@ -1927,6 +1928,10 @@ void proto_register_gsm_map(void) {
BASE_DEC);
gsm_map_tap = register_tap("gsm_map");
+
+/* #include "packet-gsm_map-dis-tab.c" */
+ register_ber_oid_name("1.2.826.0.1249.58.1.0","iso(1) member-body(2) bsi(826) disc(0) ericsson(1249) gsmNetworkApplicationsDefinition(58) gsm-Map(1) gsm-Map-Ext(0)" );
+ register_ber_oid_name("1.3.12.2.1107.3.66.1.2","accessTypeNotAllowed-id" );
/*register_ber_oid_name("0.4.0.0.1.0.1.3","itu-t(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) map-ac(0) networkLocUp(1) version3(3)" );
*
* Register our configuration options, particularly our ssn:s
diff --git a/asn1/gsmmap/packet-gsm_map-template.h b/asn1/gsmmap/packet-gsm_map-template.h
index e58b2c4c60..4892d378ab 100644
--- a/asn1/gsmmap/packet-gsm_map-template.h
+++ b/asn1/gsmmap/packet-gsm_map-template.h
@@ -1,6 +1,6 @@
/* packet-gsm_map-template.h
* Routines for GSM MAP packet dissection
- * Copyright 2004, Anders Broman <anders.broman@ericsson.com>
+ * Copyright 2004 - 2006, Anders Broman <anders.broman@ericsson.com>
*
* $Id$
*
diff --git a/asn1/logotype-cert-extn/Makefile.nmake b/asn1/logotype-cert-extn/Makefile.nmake
index ae5cb46c62..61b43654f3 100644
--- a/asn1/logotype-cert-extn/Makefile.nmake
+++ b/asn1/logotype-cert-extn/Makefile.nmake
@@ -37,5 +37,5 @@ fix_eol: generate_dissector
del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
copy_files: generate_dissector fix_eol
- xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
- xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
+ xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+ xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
diff --git a/asn1/mms/Makefile.nmake b/asn1/mms/Makefile.nmake
index cd99128111..44b20e7f72 100644
--- a/asn1/mms/Makefile.nmake
+++ b/asn1/mms/Makefile.nmake
@@ -37,6 +37,6 @@ fix_eol: generate_dissector
del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
copy_files: generate_dissector fix_eol
- xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
- xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
+ xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+ xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
diff --git a/asn1/ns-cert-exts/Makefile.nmake b/asn1/ns-cert-exts/Makefile.nmake
index 13469557af..62bc1e9c81 100644
--- a/asn1/ns-cert-exts/Makefile.nmake
+++ b/asn1/ns-cert-exts/Makefile.nmake
@@ -37,5 +37,5 @@ fix_eol: generate_dissector
del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
copy_files: generate_dissector fix_eol
- xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
- xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
+ xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+ xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
diff --git a/asn1/ocsp/Makefile.nmake b/asn1/ocsp/Makefile.nmake
index efc1637df8..c0ce092994 100644
--- a/asn1/ocsp/Makefile.nmake
+++ b/asn1/ocsp/Makefile.nmake
@@ -37,5 +37,5 @@ fix_eol: generate_dissector
del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
copy_files: generate_dissector fix_eol
- xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
- xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
+ xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+ xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
diff --git a/asn1/smrse/Makefile.nmake b/asn1/smrse/Makefile.nmake
index 9e6537ab51..90efacbefc 100644
--- a/asn1/smrse/Makefile.nmake
+++ b/asn1/smrse/Makefile.nmake
@@ -37,5 +37,5 @@ fix_eol: generate_dissector
del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
copy_files: generate_dissector fix_eol
- xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
- xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
+ xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+ xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
diff --git a/asn1/spnego/Makefile.nmake b/asn1/spnego/Makefile.nmake
index 6cf110c046..d99f44207d 100644
--- a/asn1/spnego/Makefile.nmake
+++ b/asn1/spnego/Makefile.nmake
@@ -37,6 +37,6 @@ fix_eol: generate_dissector
del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
copy_files: generate_dissector fix_eol
- xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
- xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
+ xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
+ xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 23:20:38 +0000