diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-04-04 07:40:07 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-04-04 07:40:07 +0000 |
| commit | f16afe28a960c4c94ee2295bc295fc0b80987034 (patch) | |
| tree | b46c40a9e34a7b60606682b1da26fa5540b2bf3c /epan | |
| parent | 38fd4be5647148fcbebf0782cf11d8cb30b5a91f (diff) | |
From Cvetan Ivanov
Updates to Q931, SM and ISUP
svn path=/trunk/; revision=14013
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-isup.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-q931.c | 16 |
2 files changed, 19 insertions, 1 deletions
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 7df8e98743..f4f48ac14a 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -3151,12 +3151,14 @@ dissect_isup_connected_number_parameter(tvbuff_t *parameter_tvb, proto_tree *par proto_tree_add_uint(parameter_tree, hf_isup_screening_indicator, parameter_tvb, 1, 1, indicators2); offset = 2; + length = tvb_length_remaining(parameter_tvb, offset); + if (length == 0) + return; /* empty connected number */ address_digits_item = proto_tree_add_text(parameter_tree, parameter_tvb, offset, -1, "Connected Number"); address_digits_tree = proto_item_add_subtree(address_digits_item, ett_isup_address_digits); - length = tvb_length_remaining(parameter_tvb, offset); while(length > 0){ address_digit_pair = tvb_get_guint8(parameter_tvb, offset); proto_tree_add_uint(address_digits_tree, hf_isup_calling_party_odd_address_signal_digit, parameter_tvb, offset, 1, address_digit_pair); diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 0de375b193..513c1807a4 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -173,6 +173,11 @@ dissect_q931_IEs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root_tree, #define Q931_SEGMENT 0x60 #define Q931_STATUS 0x7D #define Q931_STATUS_ENQUIRY 0x75 +#define Q931_VERSION 0x0a +#define Q931_GROUIP_SERVICE 0x06 +#define Q931_GROUIP_SERVICE_ACK 0x0b +#define Q931_RESYNC_REQ 0x08 +#define Q931_RESYNC_RESP 0x09 static const value_string q931_message_type_vals[] = { { Q931_ESCAPE, "ESCAPE" }, @@ -209,6 +214,11 @@ static const value_string q931_message_type_vals[] = { { Q931_SEGMENT, "SEGMENT" }, { Q931_STATUS, "STATUS" }, { Q931_STATUS_ENQUIRY, "STATUS ENQUIRY" }, + { Q931_VERSION, "VERSION" }, + { Q931_GROUIP_SERVICE, "GROUP SERVICE" }, + { Q931_GROUIP_SERVICE_ACK, "GROUP SERVICE ACK" }, + { Q931_RESYNC_REQ, "RESYNC REQ" }, + { Q931_RESYNC_RESP, "RESYNC RESP" }, { 0, NULL } }; @@ -296,6 +306,9 @@ static const true_false_string q931_extension_ind_value = { #define Q931_IE_CUG 0x47 /* Closed user group */ #define Q931_IE_REVERSE_CHARGE_IND 0x4A /* Reverse charging indication */ #define Q931_IE_CONNECTED_NUMBER_DEFAULT 0x4C /* Connected Number */ +#define Q931_IE_INTERFACE_SERVICE 0x66 /* q931+ Interface Service */ +#define Q931_IE_CHANNEL_STATUS 0x67 /* q931+ Channel Status */ +#define Q931_IE_VERSION_INFO 0x68 /* q931+ Version Info */ #define Q931_IE_CALLING_PARTY_NUMBER 0x6C /* Calling Party Number */ #define Q931_IE_CALLING_PARTY_SUBADDR 0x6D /* Calling Party Subaddress */ #define Q931_IE_CALLED_PARTY_NUMBER 0x70 /* Called Party Number */ @@ -374,6 +387,9 @@ static const value_string q931_info_element_vals0[] = { { Q931_IE_CUG, "Closed user group" }, { Q931_IE_REVERSE_CHARGE_IND, "Reverse charging indication" }, { Q931_IE_CONNECTED_NUMBER_DEFAULT, "Connected number" }, + { Q931_IE_INTERFACE_SERVICE, "Interface Service" }, + { Q931_IE_CHANNEL_STATUS, "Channel Status" }, + { Q931_IE_VERSION_INFO, "Version Info" }, { Q931_IE_CALLING_PARTY_NUMBER, "Calling party number" }, { Q931_IE_CALLING_PARTY_SUBADDR, "Calling party subaddress" }, { Q931_IE_CALLED_PARTY_NUMBER, "Called party number" }, |