work on the call dissector

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>

1 files changed, 281 insertions, 2 deletions

diff --git a/src/isi-call.c b/src/isi-call.c
index d2eb2b4..45329b4 100644
--- a/src/isi-call.c
+++ b/src/isi-call.c
@@ -112,10 +112,173 @@ static const value_string isi_call_id[] = {
 	{0x00, NULL}
 };
 
+static const value_string isi_call_subblock_type[] = {
+	{0x01, "CALL_ORIGIN_ADDRESS"},
+	{0x02, "CALL_ORIGIN_SUBADDRESS"},
+	{0x03, "CALL_DESTINATION_ADDRESS"},
+	{0x04, "CALL_DESTINATION_SUBADDRESS"},
+	{0x05, "CALL_DESTINATION_PRE_ADDRESS"},
+	{0x06, "CALL_DESTINATION_POST_ADDRESS"},
+	{0x07, "CALL_MODE"},
+	{0x08, "CALL_CAUSE"},
+	{0x09, "CALL_OPERATION"},
+	{0x0A, "CALL_STATUS"},
+	{0x0B, "CALL_STATUS_INFO"},
+	{0x0C, "CALL_ALERTING_INFO"},
+	{0x0D, "CALL_RELEASE_INFO"},
+	{0x0E, "CALL_ORIGIN_INFO"},
+	{0x0F, "CALL_DTMF_DIGIT"},
+	{0x10, "CALL_DTMF_STRING"},
+	{0x19, "CALL_DTMF_BCD_STRING"},
+	{0x1A, "CALL_DTMF_INFO"},
+	{0x13, "CALL_PROPERTY_INFO"},
+	{0x14, "CALL_EMERGENCY_NUMBER"},
+	{0x11, "CALL_DTMF_STATUS"},
+	{0x12, "CALL_DTMF_TONE"},
+	{0xA0, "CALL_GSM_CUG_INFO"},
+	{0xA1, "CALL_GSM_ALERTING_PATTERN"},
+	{0xA2, "CALL_GSM_DEFLECTION_ADDRESS"},
+	{0xA3, "CALL_GSM_DEFLECTION_SUBADDRESS"},
+	{0xA4, "CALL_GSM_REDIRECTING_ADDRESS"},
+	{0xA5, "CALL_GSM_REDIRECTING_SUBADDRESS"},
+	{0xA6, "CALL_GSM_REMOTE_ADDRESS"},
+	{0xA7, "CALL_GSM_REMOTE_SUBADDRESS"},
+	{0xA8, "CALL_GSM_USER_TO_USER_INFO"},
+	{0xA9, "CALL_GSM_DIAGNOSTICS"},
+	{0xAA, "CALL_GSM_SS_DIAGNOSTICS"},
+	{0xAB, "CALL_GSM_NEW_DESTINATION"},
+	{0xAC, "CALL_GSM_CCBS_INFO"},
+	{0xAD, "CALL_GSM_ADDRESS_OF_B"},
+	{0xB0, "CALL_GSM_SUBADDRESS_OF_B"},
+	{0xB1, "CALL_GSM_NOTIFY"},
+	{0xB2, "CALL_GSM_SS_NOTIFY"},
+	{0xB3, "CALL_GSM_SS_CODE"},
+	{0xB4, "CALL_GSM_SS_STATUS"},
+	{0xB5, "CALL_GSM_SS_NOTIFY_INDICATOR"},
+	{0xB6, "CALL_GSM_SS_HOLD_INDICATOR"},
+	{0xB7, "CALL_GSM_SS_ECT_INDICATOR"},
+	{0xB8, "CALL_GSM_DATA_CH_INFO"},
+	{0x16, "CALL_DESTINATION_CS_ADDRESS"},
+	{0xBA, "CALL_GSM_CCP"},
+	{0xB9, "CALL_GSM_RAB_INFO"},
+	{0xBB, "CALL_GSM_FNUR_INFO"},
+	{0xBC, "CALL_GSM_CAUSE_OF_NO_CLI"},
+	{0xBD, "CALL_GSM_MM_CAUSE"},
+	{0xBE, "CALL_GSM_EVENT_INFO"},
+	{0xBF, "CALL_GSM_DETAILED_CAUSE"},
+	{0xC0, "CALL_GSM_SS_DATA"},
+	{0x17, "CALL_TIMER"},
+	{0xC1, "CALL_GSM_ALS_INFO"},
+	{0x18, "CALL_STATE_AUTO_CHANGE"},
+	{0x1B, "CALL_EMERGENCY_NUMBER_INFO"},
+	{0x1C, "CALL_STATUS_MODE"},
+	{0x1D, "CALL_ADDR_AND_STATUS_INFO"},
+	{0x1E, "CALL_DTMF_TIMERS"},
+	{0x1F, "CALL_NAS_SYNC_INDICATOR"},
+	{0x20, "CALL_NW_CAUSE"},
+	{0x21, "CALL_TRACFONE_RESULT"},
+	{0x22, "CALL_KODIAK_POC"},
+	{0x23, "CALL_DISPLAY_NUMBER"},
+	{0x24, "CALL_DESTINATION_URI"},
+	{0x25, "CALL_ORIGIN_URI"},
+	{0x26, "CALL_URI"},
+	{0x27, "CALL_SYSTEM_INFO"},
+	{0x28, "CALL_SYSTEMS"},
+	{0x29, "CALL_VOIP_TIMER"},
+	{0x2A, "CALL_REDIRECTING_URI"},
+	{0x2B, "CALL_REMOTE_URI"},
+	{0x2C, "CALL_DEFLECTION_URI"},
+	{0x2D, "CALL_TRANSFER_INFO"},
+	{0x2E, "CALL_FORWARDING_INFO"},
+	{0x2F, "CALL_ID_INFO"},
+	{0x30, "CALL_TEST_CALL"},
+	{0x31, "CALL_AUDIO_CONF_INFO"},
+	{0x33, "CALL_SECURITY_INFO"},
+	{0x32, "CALL_SINGLE_TIMERS"},
+	{0x35, "CALL_MEDIA_INFO"},
+	{0x34, "CALL_MEDIA_HANDLE"},
+	{0x36, "CALL_MODE_CHANGE_INFO"},
+	{0x37, "CALL_ADDITIONAL_PARAMS"},
+	{0x38, "CALL_DSAC_INFO"},
+};
+
+static const value_string isi_call_status_mode[] = {
+	{0x00, "CALL_STATUS_MODE_DEFAULT"},
+	{0x01, "CALL_STATUS_MODE_ADDR"},
+	{0x02, "CALL_STATUS_MODE_ADDR_AND_ORIGIN"},
+	{0x03, "CALL_STATUS_MODE_POC"},
+	{0x04, "CALL_STATUS_MODE_VOIP_ADDR"},
+};
+
+static const value_string isi_call_cause_type[] = {
+	{0x01, "CALL_CAUSE_TYPE_CLIENT"},
+	{0x02, "CALL_CAUSE_TYPE_SERVER"},
+	{0x03, "CALL_CAUSE_TYPE_NETWORK"},
+};
+
+static const value_string isi_call_cause[] = {
+	{0x00, "CALL_CAUSE_NO_CAUSE"},
+	{0x01, "CALL_CAUSE_NO_CALL"},
+	{0x02, "CALL_CAUSE_TIMEOUT"},
+	{0x03, "CALL_CAUSE_RELEASE_BY_USER"},
+	{0x04, "CALL_CAUSE_BUSY_USER_REQUEST"},
+	{0x05, "CALL_CAUSE_ERROR_REQUEST"},
+	{0x06, "CALL_CAUSE_COST_LIMIT_REACHED"},
+	{0x07, "CALL_CAUSE_CALL_ACTIVE"},
+	{0x08, "CALL_CAUSE_NO_CALL_ACTIVE"},
+	{0x09, "CALL_CAUSE_INVALID_CALL_MODE"},
+	{0x0A, "CALL_CAUSE_SIGNALLING_FAILURE"},
+	{0x0B, "CALL_CAUSE_TOO_LONG_ADDRESS"},
+	{0x0C, "CALL_CAUSE_INVALID_ADDRESS"},
+	{0x0D, "CALL_CAUSE_EMERGENCY"},
+	{0x0E, "CALL_CAUSE_NO_TRAFFIC_CHANNEL"},
+	{0x0F, "CALL_CAUSE_NO_COVERAGE"},
+	{0x10, "CALL_CAUSE_CODE_REQUIRED"},
+	{0x11, "CALL_CAUSE_NOT_ALLOWED"},
+	{0x12, "CALL_CAUSE_NO_DTMF"},
+	{0x13, "CALL_CAUSE_CHANNEL_LOSS"},
+	{0x14, "CALL_CAUSE_FDN_NOT_OK"},
+	{0x15, "CALL_CAUSE_USER_TERMINATED"},
+	{0x16, "CALL_CAUSE_BLACKLIST_BLOCKED"},
+	{0x17, "CALL_CAUSE_BLACKLIST_DELAYED"},
+	{0x18, "CALL_CAUSE_NUMBER_NOT_FOUND"},
+	{0x19, "CALL_CAUSE_NUMBER_CANNOT_REMOVE"},
+	{0x1A, "CALL_CAUSE_EMERGENCY_FAILURE"},
+	{0x1B, "CALL_CAUSE_CS_SUSPENDED"},
+	{0x1C, "CALL_CAUSE_DCM_DRIVE_MODE"},
+	{0x1D, "CALL_CAUSE_MULTIMEDIA_NOT_ALLOWED"},
+	{0x1E, "CALL_CAUSE_SIM_REJECTED"},
+	{0x1F, "CALL_CAUSE_NO_SIM"},
+	{0x20, "CALL_CAUSE_SIM_LOCK_OPERATIVE"},
+	{0x21, "CALL_CAUSE_SIMATKCC_REJECTED"},
+	{0x22, "CALL_CAUSE_SIMATKCC_MODIFIED"},
+	{0x23, "CALL_CAUSE_DTMF_INVALID_DIGIT"},
+	{0x24, "CALL_CAUSE_DTMF_SEND_ONGOING"},
+	{0x25, "CALL_CAUSE_CS_INACTIVE"},
+	{0x26, "CALL_CAUSE_SECURITY_MODE"},
+	{0x27, "CALL_CAUSE_TRACFONE_FAILED"},
+	{0x28, "CALL_CAUSE_TRACFONE_WAIT_FAILED"},
+	{0x29, "CALL_CAUSE_TRACFONE_CONF_FAILED"},
+	{0x2A, "CALL_CAUSE_TEMPERATURE_LIMIT"},
+	{0x2B, "CALL_CAUSE_KODIAK_POC_FAILED"},
+	{0x2C, "CALL_CAUSE_NOT_REGISTERED"},
+	{0x2D, "CALL_CAUSE_CS_CALLS_ONLY"},
+	{0x2E, "CALL_CAUSE_VOIP_CALLS_ONLY"},
+	{0x2F, "CALL_CAUSE_LIMITED_CALL_ACTIVE"},
+	{0x30, "CALL_CAUSE_LIMITED_CALL_NOT_ALLOWED"},
+	{0x31, "CALL_CAUSE_SECURE_CALL_NOT_POSSIBLE"},
+	{0x32, "CALL_CAUSE_INTERCEPT"},
+};
+
 static dissector_handle_t isi_call_handle;
 static void dissect_isi_call(tvbuff_t *tvb, packet_info *pinfo, proto_item *tree);
 
 static guint32 hf_isi_call_cmd = -1;
+static guint32 hf_isi_call_subblock_type = -1;
+static guint32 hf_isi_call_id = -1;
+static guint32 hf_isi_call_status_mode = -1;
+static guint32 hf_isi_call_cause_type = -1;
+static guint32 hf_isi_call_cause = -1;
 
 
 void proto_reg_handoff_isi_call(void) {
@@ -130,7 +293,17 @@ void proto_reg_handoff_isi_call(void) {
 void proto_register_isi_call(void) {
 	static hf_register_info hf[] = {
 		{ &hf_isi_call_cmd,
-			{ "Command", "isi.call.cmd", FT_UINT8, BASE_HEX, isi_call_id, 0x0, "Command", HFILL }}
+			{ "Command", "isi.call.cmd", FT_UINT8, BASE_HEX, isi_call_id, 0x0, "Command", HFILL }},
+		{ &hf_isi_call_subblock_type,
+			{ "Subblock-Type", "isi.call.subblock.type", FT_UINT8, BASE_HEX, isi_call_subblock_type, 0x0, "Subblock-Type", HFILL }},
+		{ &hf_isi_call_id,
+			{ "Call-Id", "isi.call.id", FT_UINT8, BASE_HEX, NULL, 0x0, "Call-Id", HFILL }},
+		{ &hf_isi_call_status_mode,
+			{ "Call-Mode", "isi.call.mode", FT_UINT8, BASE_HEX, isi_call_status_mode, 0x0, "Call-Mode", HFILL }},
+		{ &hf_isi_call_cause_type,
+			{ "Cause-Type", "isi.call.cause_type", FT_UINT8, BASE_HEX, isi_call_cause_type, 0x0, "Cause-Type", HFILL }},
+		{ &hf_isi_call_cause,
+			{ "Cause", "isi.call.cause", FT_UINT8, BASE_HEX, isi_call_cause, 0x0, "Cause", HFILL }},
 	};
 
 	proto_register_field_array(proto_isi, hf, array_length(hf));
@@ -138,6 +311,109 @@ void proto_register_isi_call(void) {
 }
 
 
+static void _sub_call_status_mode(tvbuff_t *tvb, proto_tree *tree) {
+	proto_tree_add_item(tree, hf_isi_call_status_mode, tvb, 2, 1, FALSE);
+}
+
+static void _sub_call_cause(tvbuff_t *tvb, proto_tree *tree) {
+	proto_tree_add_item(tree, hf_isi_call_cause_type, tvb, 2, 1, FALSE);
+	proto_tree_add_item(tree, hf_isi_call_cause, tvb, 3, 1, FALSE);
+}
+
+static void dissect_isi_call_subblock(guint8 sptype, tvbuff_t *tvb, packet_info *pinfo, proto_item *item, proto_tree *tree) {
+	switch(sptype) {
+		case 0x1C: _sub_call_status_mode(tvb, tree); break; /* CALL_STATUS_MODE */
+		case 0x08: _sub_call_cause(tvb, tree); break;       /* CALL_CAUSE */
+		case 0x01: /* CALL_ORIGIN_ADDRESS */
+		case 0x02: /* CALL_ORIGIN_SUBADDRESS */
+		case 0x03: /* CALL_DESTINATION_ADDRESS */
+		case 0x04: /* CALL_DESTINATION_SUBADDRESS */
+		case 0x05: /* CALL_DESTINATION_PRE_ADDRESS */
+		case 0x06: /* CALL_DESTINATION_POST_ADDRESS */
+		case 0x07: /* CALL_MODE */
+		case 0x09: /* CALL_OPERATION */
+		case 0x0A: /* CALL_STATUS */
+		case 0x0B: /* CALL_STATUS_INFO */
+		case 0x0C: /* CALL_ALERTING_INFO */
+		case 0x0D: /* CALL_RELEASE_INFO */
+		case 0x0E: /* CALL_ORIGIN_INFO */
+		case 0x0F: /* CALL_DTMF_DIGIT */
+		case 0x10: /* CALL_DTMF_STRING */
+		case 0x19: /* CALL_DTMF_BCD_STRING */
+		case 0x1A: /* CALL_DTMF_INFO */
+		case 0x13: /* CALL_PROPERTY_INFO */
+		case 0x14: /* CALL_EMERGENCY_NUMBER */
+		case 0x11: /* CALL_DTMF_STATUS */
+		case 0x12: /* CALL_DTMF_TONE */
+		case 0xA0: /* CALL_GSM_CUG_INFO */
+		case 0xA1: /* CALL_GSM_ALERTING_PATTERN */
+		case 0xA2: /* CALL_GSM_DEFLECTION_ADDRESS */
+		case 0xA3: /* CALL_GSM_DEFLECTION_SUBADDRESS */
+		case 0xA4: /* CALL_GSM_REDIRECTING_ADDRESS */
+		case 0xA5: /* CALL_GSM_REDIRECTING_SUBADDRESS */
+		case 0xA6: /* CALL_GSM_REMOTE_ADDRESS */
+		case 0xA7: /* CALL_GSM_REMOTE_SUBADDRESS */
+		case 0xA8: /* CALL_GSM_USER_TO_USER_INFO */
+		case 0xA9: /* CALL_GSM_DIAGNOSTICS */
+		case 0xAA: /* CALL_GSM_SS_DIAGNOSTICS */
+		case 0xAB: /* CALL_GSM_NEW_DESTINATION */
+		case 0xAC: /* CALL_GSM_CCBS_INFO */
+		case 0xAD: /* CALL_GSM_ADDRESS_OF_B */
+		case 0xB0: /* CALL_GSM_SUBADDRESS_OF_B */
+		case 0xB1: /* CALL_GSM_NOTIFY */
+		case 0xB2: /* CALL_GSM_SS_NOTIFY */
+		case 0xB3: /* CALL_GSM_SS_CODE */
+		case 0xB4: /* CALL_GSM_SS_STATUS */
+		case 0xB5: /* CALL_GSM_SS_NOTIFY_INDICATOR */
+		case 0xB6: /* CALL_GSM_SS_HOLD_INDICATOR */
+		case 0xB7: /* CALL_GSM_SS_ECT_INDICATOR */
+		case 0xB8: /* CALL_GSM_DATA_CH_INFO */
+		case 0x16: /* CALL_DESTINATION_CS_ADDRESS */
+		case 0xBA: /* CALL_GSM_CCP */
+		case 0xB9: /* CALL_GSM_RAB_INFO */
+		case 0xBB: /* CALL_GSM_FNUR_INFO */
+		case 0xBC: /* CALL_GSM_CAUSE_OF_NO_CLI */
+		case 0xBD: /* CALL_GSM_MM_CAUSE */
+		case 0xBE: /* CALL_GSM_EVENT_INFO */
+		case 0xBF: /* CALL_GSM_DETAILED_CAUSE */
+		case 0xC0: /* CALL_GSM_SS_DATA */
+		case 0x17: /* CALL_TIMER */
+		case 0xC1: /* CALL_GSM_ALS_INFO */
+		case 0x18: /* CALL_STATE_AUTO_CHANGE */
+		case 0x1B: /* CALL_EMERGENCY_NUMBER_INFO */
+		case 0x1D: /* CALL_ADDR_AND_STATUS_INFO */
+		case 0x1E: /* CALL_DTMF_TIMERS */
+		case 0x1F: /* CALL_NAS_SYNC_INDICATOR */
+		case 0x20: /* CALL_NW_CAUSE */
+		case 0x21: /* CALL_TRACFONE_RESULT */
+		case 0x22: /* CALL_KODIAK_POC */
+		case 0x23: /* CALL_DISPLAY_NUMBER */
+		case 0x24: /* CALL_DESTINATION_URI */
+		case 0x25: /* CALL_ORIGIN_URI */
+		case 0x26: /* CALL_URI */
+		case 0x27: /* CALL_SYSTEM_INFO */
+		case 0x28: /* CALL_SYSTEMS */
+		case 0x29: /* CALL_VOIP_TIMER */
+		case 0x2A: /* CALL_REDIRECTING_URI */
+		case 0x2B: /* CALL_REMOTE_URI */
+		case 0x2C: /* CALL_DEFLECTION_URI */
+		case 0x2D: /* CALL_TRANSFER_INFO */
+		case 0x2E: /* CALL_FORWARDING_INFO */
+		case 0x2F: /* CALL_ID_INFO */
+		case 0x30: /* CALL_TEST_CALL */
+		case 0x31: /* CALL_AUDIO_CONF_INFO */
+		case 0x33: /* CALL_SECURITY_INFO */
+		case 0x32: /* CALL_SINGLE_TIMERS */
+		case 0x35: /* CALL_MEDIA_INFO */
+		case 0x34: /* CALL_MEDIA_HANDLE */
+		case 0x36: /* CALL_MODE_CHANGE_INFO */
+		case 0x37: /* CALL_ADDITIONAL_PARAMS */
+		case 0x38: /* CALL_DSAC_INFO */
+		default:
+			break;
+	}
+}
+
 static void dissect_isi_call(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree) {
 	proto_item *item = NULL;
 	proto_tree *tree = NULL;
@@ -189,9 +465,12 @@ static void dissect_isi_call(tvbuff_t *tvb, packet_info *pinfo, proto_item *isit
 				break;
 			case 0x0D: /* CALL_STATUS_REQ */
 				col_set_str(pinfo->cinfo, COL_INFO, "Call Status Request");
+                                proto_tree_add_item(tree, hf_isi_call_id, tvb, 1, 1, FALSE);
+				dissect_isi_subpacket(hf_isi_call_subblock_type, 3, tvb, pinfo, item, tree, dissect_isi_call_subblock);
 				break;
 			case 0x0E: /* CALL_STATUS_RESP */
 				col_set_str(pinfo->cinfo, COL_INFO, "Call Status Response");
+				dissect_isi_subpacket(hf_isi_call_subblock_type, 3, tvb, pinfo, item, tree, dissect_isi_call_subblock);
 				break;
 			case 0x0F: /* CALL_STATUS_IND */
 				col_set_str(pinfo->cinfo, COL_INFO, "Call Status Indication");
@@ -399,7 +678,7 @@ static void dissect_isi_call(tvbuff_t *tvb, packet_info *pinfo, proto_item *isit
 				dissect_isi_common("Call", tvb, pinfo, tree);
 				break;
 			default:
-				col_set_str(pinfo->cinfo, COL_INFO, "unknown Call packet");
+				col_set_str(pinfo->cinfo, COL_INFO, "unhandled Call packet");
 				expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "unsupported packet");
 				break;
 		}