Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 405 insertions, 0 deletions

diff --git a/epan/dissectors/asn1/smrse/CMakeLists.txt b/epan/dissectors/asn1/smrse/CMakeLists.txt
new file mode 100644
index 00000000..6d1209d7
--- /dev/null
+++ b/epan/dissectors/asn1/smrse/CMakeLists.txt
@@ -0,0 +1,35 @@
+# CMakeLists.txt
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+
+set( PROTOCOL_NAME smrse )
+
+set( PROTO_OPT )
+
+set( EXT_ASN_FILE_LIST
+)
+
+set( ASN_FILE_LIST
+	SMRSE.asn
+)
+
+set( EXTRA_DIST
+	${ASN_FILE_LIST}
+	packet-${PROTOCOL_NAME}-template.c
+	packet-${PROTOCOL_NAME}-template.h
+	${PROTOCOL_NAME}.cnf
+)
+
+set( SRC_FILES
+	${EXTRA_DIST}
+	${EXT_ASN_FILE_LIST}
+)
+
+set( A2W_FLAGS -b )
+
+ASN2WRS()
diff --git a/epan/dissectors/asn1/smrse/SMRSE.asn b/epan/dissectors/asn1/smrse/SMRSE.asn
new file mode 100644
index 00000000..ee11a261
--- /dev/null
+++ b/epan/dissectors/asn1/smrse/SMRSE.asn
@@ -0,0 +1,133 @@
+SMRS DEFINITIONS IMPLICIT TAGS ::=
+BEGIN
+
+SMR-Bind ::= SEQUENCE {
+	sc-address SMS-Address,
+	password Password,
+	... 
+}
+
+ub-password-length INTEGER ::= 20
+
+IMSI-Address ::= OCTET STRING
+
+SMS-Address ::= SEQUENCE {
+	address-type INTEGER {
+		unknown-type (0),
+		internat-number (1),
+		national-number (2),
+		net-spec-number (3),
+		short-number (4)
+	},
+
+	numbering-plan INTEGER {
+		unknown-numbering (0),
+		iSDN-numbering (1),
+		data-network-numbering (3),
+		telex-numbering (4),
+		national-numbering (8),
+		private-numbering (9)
+	},
+
+	address-value CHOICE {
+		octet-format SemiOctetString
+	}
+}
+
+
+SemiOctetString ::= OCTET STRING
+
+Password ::= PrintableString
+
+SMR-Bind-Confirm ::= SEQUENCE {
+	...
+}
+
+SMR-Bind-Failure ::= SEQUENCE {
+	connect-fail-reason Connect-fail,
+	...
+}
+
+Connect-fail ::= INTEGER {
+	not-entitled (0),
+	tmp-overload (1),
+	tmp-failure (2),
+	id-or-passwd (3),
+	not-supported (4),
+	inv-SC-addr (5)
+}
+
+SMR-Unbind ::= SEQUENCE {
+	...
+}
+
+RPDataMT ::= SEQUENCE {
+	mt-priority-request BOOLEAN,
+	mt-mms BOOLEAN,
+	mt-message-reference RP-MR,
+	mt-originating-address SMS-Address,
+	mt-destination-address SMS-Address,
+	mt-user-data RP-UD,
+	mt-origVMSCAddr [1] SMS-Address OPTIONAL,
+	mt-tariffClass [2] SM-TC OPTIONAL,
+	...
+}
+
+RPDataMO ::= SEQUENCE {
+	mo-message-reference RP-MR,
+	mo-originating-address SMS-Address,
+	mo-user-data RP-UD,
+	origVMSCAddr [1] SMS-Address OPTIONAL ,
+	moimsi [2] IMSI-Address OPTIONAL,
+	...
+}
+
+RP-MR ::= INTEGER (0..65535)
+
+RP-UD ::= OCTET STRING (SIZE (1..164))
+
+SM-TC ::= INTEGER (0..65535)
+
+RPAck ::= SEQUENCE {
+	message-reference RP-MR,
+	...
+}
+
+Error-reason ::= INTEGER {
+	unknown-subscriber (1),
+	illegal-subscriber (9),
+	teleservice-not-provisioned (11),
+	call-barred (13),
+	cug-reject (15),
+	sMS-ll-capabilities-not-prov (19),
+	error-in-MS (20),
+	facility-not-supported (21),
+	memory-capacity-exceeded (22),
+	absent-subscriber (29),
+	ms-busy-for-MT-sms (30),
+	system-failure (36),
+	illegal-equipment (44),
+	no-resp-to-paging (60),
+	gMSC-congestion (61),
+	dublicate-sm (70),
+	sC-congestion (101),
+	mS-not-SC-Subscriber (103),
+	invalid-sme-address (104)
+}
+
+RPError ::= SEQUENCE {
+	error-reason Error-reason,
+	msg-waiting-set BOOLEAN,
+	message-reference RP-MR,
+	alerting-MS-ISDN [1] SMS-Address OPTIONAL,
+	sm-diag-info [2] RP-UD OPTIONAL,
+	...
+}
+
+RPAlertSC ::= SEQUENCE {
+	ms-address SMS-Address,
+	message-reference RP-MR,
+	...
+}
+
+END
diff --git a/epan/dissectors/asn1/smrse/packet-smrse-template.c b/epan/dissectors/asn1/smrse/packet-smrse-template.c
new file mode 100644
index 00000000..d8695f80
--- /dev/null
+++ b/epan/dissectors/asn1/smrse/packet-smrse-template.c
@@ -0,0 +1,173 @@
+/* packet-smrse.c
+ * Routines for SMRSE Short Message Relay Service packet dissection
+ *   Ronnie Sahlberg 2004
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "config.h"
+
+#include <epan/packet.h>
+#include <epan/asn1.h>
+
+#include "packet-ber.h"
+#include "packet-smrse.h"
+
+#define PNAME  "Short Message Relaying Service"
+#define PSNAME "SMRSE"
+#define PFNAME "smrse"
+
+#define TCP_PORT_SMRSE 4321 /* Not IANA registered */
+
+void proto_register_smrse(void);
+void proto_reg_handoff_smrse(void);
+
+static dissector_handle_t smrse_handle;
+
+/* Initialize the protocol and registered fields */
+static int proto_smrse = -1;
+static int hf_smrse_reserved = -1;
+static int hf_smrse_tag = -1;
+static int hf_smrse_length = -1;
+static int hf_smrse_Octet_Format = -1;
+#include "packet-smrse-hf.c"
+
+/* Initialize the subtree pointers */
+static gint ett_smrse = -1;
+#include "packet-smrse-ett.c"
+
+
+#include "packet-smrse-fn.c"
+
+static const value_string tag_vals[] = {
+	{  1,	"AliveTest" },
+	{  2,	"AliveTestRsp" },
+	{  3,	"Bind" },
+	{  4,	"BindRsp" },
+	{  5,	"BindFail" },
+	{  6,	"Unbind" },
+	{  7,	"MT" },
+	{  8,	"MO" },
+	{  9,	"Ack" },
+	{ 10,	"Error" },
+	{ 11,	"Alert" },
+	{ 0, NULL }
+};
+
+static int
+dissect_smrse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_)
+{
+	proto_item *item = NULL;
+	proto_tree *tree = NULL;
+	guint8 reserved, tag;
+	int offset=0;
+	asn1_ctx_t asn1_ctx;
+	asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+
+	reserved=tvb_get_guint8(tvb, 0);
+	tag=tvb_get_guint8(tvb, 3);
+
+	if( reserved!= 126 )
+		return 0;
+	if( (tag<1)||(tag>11) )
+		return 0;
+
+	if(parent_tree){
+		item = proto_tree_add_item(parent_tree, proto_smrse, tvb, 0, -1, ENC_NA);
+		tree = proto_item_add_subtree(item, ett_smrse);
+	}
+
+	col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMRSE");
+	col_add_str(pinfo->cinfo, COL_INFO, val_to_str(tag, tag_vals,"Unknown Tag:0x%02x"));
+
+	proto_tree_add_item(tree, hf_smrse_reserved, tvb, 0, 1, ENC_BIG_ENDIAN);
+	proto_tree_add_item(tree, hf_smrse_length, tvb, 1, 2, ENC_BIG_ENDIAN);
+	proto_tree_add_item(tree, hf_smrse_tag, tvb, 3, 1, ENC_BIG_ENDIAN);
+
+	switch(tag){
+	case 1:
+	case 2:
+		offset=4;
+		break;
+	case 3:
+		offset=dissect_smrse_SMR_Bind(FALSE, tvb, 4, &asn1_ctx, tree, -1);
+		break;
+	case 4:
+		offset=dissect_smrse_SMR_Bind_Confirm(FALSE, tvb, 4, &asn1_ctx, tree, -1);
+		break;
+	case 5:
+		offset=dissect_smrse_SMR_Bind_Failure(FALSE, tvb, 4, &asn1_ctx, tree, -1);
+		break;
+	case 6:
+		offset=dissect_smrse_SMR_Unbind(FALSE, tvb, 4, &asn1_ctx, tree, -1);
+		break;
+	case 7:
+		offset=dissect_smrse_RPDataMT(FALSE, tvb, 4, &asn1_ctx, tree, -1);
+		break;
+	case 8:
+		offset=dissect_smrse_RPDataMO(FALSE, tvb, 4, &asn1_ctx, tree, -1);
+		break;
+	case 9:
+		offset=dissect_smrse_RPAck(FALSE, tvb, 4, &asn1_ctx, tree, -1);
+		break;
+	case 10:
+		offset=dissect_smrse_RPError(FALSE, tvb, 4, &asn1_ctx, tree, -1);
+		break;
+	case 11:
+		offset=dissect_smrse_RPAlertSC(FALSE, tvb, 4, &asn1_ctx, tree, -1);
+		break;
+	}
+
+	return offset;
+}
+
+/*--- proto_register_smrse ----------------------------------------------*/
+void proto_register_smrse(void) {
+
+  /* List of fields */
+  static hf_register_info hf[] = {
+	{ &hf_smrse_reserved, {
+		"Reserved", "smrse.reserved", FT_UINT8, BASE_DEC,
+		NULL, 0, "Reserved byte, must be 126", HFILL }},
+	{ &hf_smrse_tag, {
+		"Tag", "smrse.tag", FT_UINT8, BASE_DEC,
+		VALS(tag_vals), 0, NULL, HFILL }},
+	{ &hf_smrse_length, {
+		"Length", "smrse.length", FT_UINT16, BASE_DEC,
+		NULL, 0, "Length of SMRSE PDU", HFILL }},
+    { &hf_smrse_Octet_Format,
+      { "octet-Format", "smrse.octet_Format",
+        FT_STRING, BASE_NONE, NULL, 0,
+        "SMS-Address/address-value/octet-format", HFILL }},
+
+#include "packet-smrse-hfarr.c"
+  };
+
+  /* List of subtrees */
+  static gint *ett[] = {
+    &ett_smrse,
+#include "packet-smrse-ettarr.c"
+  };
+
+  /* Register protocol */
+  proto_smrse = proto_register_protocol(PNAME, PSNAME, PFNAME);
+
+  /* Register dissector */
+  smrse_handle = register_dissector(PFNAME, dissect_smrse, proto_smrse);
+
+  /* Register fields and subtrees */
+  proto_register_field_array(proto_smrse, hf, array_length(hf));
+  proto_register_subtree_array(ett, array_length(ett));
+
+}
+
+
+/*--- proto_reg_handoff_smrse -------------------------------------------*/
+void proto_reg_handoff_smrse(void) {
+  dissector_add_uint_with_preference("tcp.port",TCP_PORT_SMRSE, smrse_handle);
+}
+
diff --git a/epan/dissectors/asn1/smrse/packet-smrse-template.h b/epan/dissectors/asn1/smrse/packet-smrse-template.h
new file mode 100644
index 00000000..c22c15db
--- /dev/null
+++ b/epan/dissectors/asn1/smrse/packet-smrse-template.h
@@ -0,0 +1,18 @@
+/* packet-smrse.h
+ * Routines for SMRSE Short Message Relay Service packet dissection
+ *   Ronnie Sahlberg 2004
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#ifndef PACKET_SMRSE_H
+#define PACKET_SMRSE_H
+
+/*#include "packet-smrse-exp.h"*/
+
+#endif  /* PACKET_SMRSE_H */
+
diff --git a/epan/dissectors/asn1/smrse/smrse.cnf b/epan/dissectors/asn1/smrse/smrse.cnf
new file mode 100644
index 00000000..7794027c
--- /dev/null
+++ b/epan/dissectors/asn1/smrse/smrse.cnf
@@ -0,0 +1,46 @@
+# smrse.cnf
+# SMRSE conformation file
+
+#.MODULE_IMPORT
+
+#.EXPORTS
+
+#.NO_EMIT
+SemiOctetString
+#.END
+
+#.PDU
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.FN_BODY SMS-Address/address-value/octet-format
+	char *strp,tmpstr[21];
+	guint32 i, start_offset;
+	gint8 ber_class;
+	bool pc, ind;
+	gint32 tag;
+	guint32 len;
+	static char n2a[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+
+	start_offset=offset;
+
+	/* skip the tag and length */
+	offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &ber_class, &pc, &tag);
+	offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
+	if(len>10){
+		len=10;
+	}
+	strp=tmpstr;
+	for(i=0;i<len;i++){
+		*strp++=n2a[tvb_get_guint8(tvb, offset)&0x0f];
+		*strp++=n2a[(tvb_get_guint8(tvb, offset)>>4)&0x0f];
+		offset++;
+	}
+	*strp=0;
+
+	proto_tree_add_string(tree, hf_smrse_Octet_Format, tvb, start_offset, offset-start_offset, tmpstr);
+#.END
+
+