update GSS

1 files changed, 59 insertions, 15 deletions

diff --git a/src/isi-gss.c b/src/isi-gss.c
index e3d2a1e..b8058a6 100644
--- a/src/isi-gss.c
+++ b/src/isi-gss.c
@@ -2,7 +2,7 @@
  * Dissector for ISI's General Stack Server resource
  * Copyright 2010, Sebastian Reichel <sre@ring0.de>
  * Copyright 2010, Tyson Key <tyson.key@gmail.com>
- * 
+ *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
@@ -31,10 +31,11 @@ static const value_string isi_gss_message_id[] = {
 	{0x00, "GSS_CS_SERVICE_REQ"},
 	{0x01, "GSS_CS_SERVICE_RESP"},
 	{0x02, "GSS_CS_SERVICE_FAIL_RESP"},
+	{0xF0, "COMMON_MESSAGE"},
 };
 
 static const value_string isi_gss_subblock[] = {
-	{0x0B, "GSS_RAT_INFO"}, 
+	{0x0B, "GSS_RAT_INFO"},
 };
 
 static const value_string isi_gss_operation[] = {
@@ -42,6 +43,19 @@ static const value_string isi_gss_operation[] = {
 	{0x9C, "GSS_SELECTED_RAT_READ"},
 };
 
+static const value_string isi_gss_cause[] = {
+	{0x01, "GSS_SERVICE_FAIL"},
+	{0x02, "GSS_SERVICE_NOT_ALLOWED"},
+	{0x03, "GSS_SERVICE_FAIL_CS_INACTIVE"},
+};
+
+static const value_string isi_gss_common_message_id[] = {
+	{0x01, "COMM_SERVICE_NOT_IDENTIFIED_RESP"},
+	{0x12, "COMM_ISI_VERSION_GET_REQ"},
+	{0x13, "COMM_ISI_VERSION_GET_RESP"},
+	{0x14, "COMM_ISA_ENTITY_NOT_REACHABLE_RESP"},
+};
+
 static dissector_handle_t isi_gss_handle;
 static void dissect_isi_gss(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
@@ -49,6 +63,8 @@ static guint32 hf_isi_gss_message_id = -1;
 static guint32 hf_isi_gss_subblock = -1;
 static guint32 hf_isi_gss_operation = -1;
 static guint32 hf_isi_gss_subblock_count = -1;
+static guint32 hf_isi_gss_cause = -1;
+static guint32 hf_isi_gss_common_message_id = -1;
 
 void proto_reg_handoff_isi_gss(void) {
 	static gboolean initialized=FALSE;
@@ -66,9 +82,13 @@ void proto_register_isi_gss(void) {
 		{ &hf_isi_gss_subblock,
 		  { "Subblock", "isi.gss.subblock", FT_UINT8, BASE_HEX, isi_gss_subblock, 0x0, "Subblock", HFILL }},
 		{ &hf_isi_gss_operation,
-		  { "Operation", "isi.gss.operation", FT_UINT8, BASE_HEX, isi_gss_operation, 0x0, "Operation", HFILL }},  
+		  { "Operation", "isi.gss.operation", FT_UINT8, BASE_HEX, isi_gss_operation, 0x0, "Operation", HFILL }},
 		{ &hf_isi_gss_subblock_count,
 		  { "Subblock Count", "isi.gss.subblock_count", FT_UINT8, BASE_DEC, NULL, 0x0, "Subblock Count", HFILL }},
+		{ &hf_isi_gss_cause,
+		  { "Cause", "isi.gss.cause", FT_UINT8, BASE_HEX, isi_gss_cause, 0x0, "Cause", HFILL }},
+		{ &hf_isi_gss_common_message_id,
+		  { "Common Message ID", "isi.gss.common.msg_id", FT_UINT8, BASE_HEX, isi_gss_common_message_id, 0x0, "Common Message ID", HFILL }},
 	};
 
 	proto_register_field_array(proto_isi, hf, array_length(hf));
@@ -105,35 +125,59 @@ static void dissect_isi_gss(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitr
 						col_set_str(pinfo->cinfo, COL_INFO, "Service Request");
 						break;
 				}
-				break; 
-				
+				break;
+
 			case 0x01: /* GSS_CS_SERVICE_RESP */
 				//proto_tree_add_item(tree, hf_isi_gss_service_type, tvb, 1, 1, FALSE);
 				code = tvb_get_guint8(tvb, 1);
 				switch(code) {
-					//case 0x2F:
+					//case 0x9C:
 					//	col_set_str(pinfo->cinfo, COL_INFO, "Network Information Request: Read Home PLMN");
 					//	break;
 					default:
 						col_set_str(pinfo->cinfo, COL_INFO, "Service Response");
 						break;
 				}
-				break; 
-				
+				break;
+
 			case 0x02: /* GSS_CS_SERVICE_FAIL_RESP */
-				//proto_tree_add_item(tree, hf_isi_gss_service_type, tvb, 1, 1, FALSE);
+				proto_tree_add_item(tree, hf_isi_gss_operation, tvb, 1, 1, FALSE);
+				proto_tree_add_item(tree, hf_isi_gss_cause, tvb, 2, 1, FALSE);
 				code = tvb_get_guint8(tvb, 1);
 				switch(code) {
-					//case 0x2F:
-					//	col_set_str(pinfo->cinfo, COL_INFO, "Network Information Request: Read Home PLMN");
-					//	break;
+					case 0x9C:
+						col_set_str(pinfo->cinfo, COL_INFO, "Service Failed Response: Radio Access Type Read");
+						break;
 					default:
 						col_set_str(pinfo->cinfo, COL_INFO, "Service Failed Response");
 						break;
 				}
-				break; 
-				
-				
+				break;
+
+			case 0xF0: /* Common Message */
+				proto_tree_add_item(tree, hf_isi_gss_common_message_id, tvb, 1, 1, FALSE);
+				//proto_tree_add_item(tree, hf_isi_gss_cause, tvb, 2, 1, FALSE);
+				code = tvb_get_guint8(tvb, 1);
+				switch(code) {
+					case 0x01: /* COMM_SERVICE_NOT_IDENTIFIED_RESP */
+						col_set_str(pinfo->cinfo, COL_INFO, "Common Message: Service Not Identified Response");
+						break;
+					case 0x12: /* COMM_ISI_VERSION_GET_REQ */
+						col_set_str(pinfo->cinfo, COL_INFO, "Common Message: ISI Version Get Request");
+						break;
+					case 0x13: /* COMM_ISI_VERSION_GET_RESP */
+						col_set_str(pinfo->cinfo, COL_INFO, "Common Message: ISI Version Get Response");
+						break;
+					case 0x14: /* COMM_ISA_ENTITY_NOT_REACHABLE_RESP */
+						col_set_str(pinfo->cinfo, COL_INFO, "Common Message: ISA Entity Not Reachable");
+						break;
+					default:
+						col_set_str(pinfo->cinfo, COL_INFO, "Common Message");
+						break;
+				}
+				break;
+
+
 			default:
 				col_set_str(pinfo->cinfo, COL_INFO, "Unknown type");
 				break;