osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Upgrade NAS disssectors to v11.5.0 

svn path=/trunk/; revision=46842
This commit is contained in:
Pascal Quantin 2012-12-29 17:10:04 +00:00
parent f3e41f1b72
commit 0b20f855f0
4 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/dissectors/packet-gsm_a_common.c
View File

@ -69,11 +69,11 @@ const value_string gsm_common_elem_strings[] = {
static const value_string gsm_a_skip_ind_vals[] = {
{ 0, "No indication of selected PLMN"},
{ 1, "First PLMN in the broadcast system information"},
{ 2, "Second PLMN in the broadcast system information"},
{ 3, "Third PLMN in the broadcast system information"},
{ 4, "Fourth PLMN in the broadcast sytem information"},
{ 5, "Fifth PLMN in the broadcast system information"},
{ 1, "PLMN identity of the Common PLMN in the broadcast system information"},
{ 2, "PLMN identity of the first Additional PLMN in the broadcast system information"},
{ 3, "PLMN identity of the second Additional PLMN in the broadcast system information"},
{ 4, "PLMN identity of the third Additional PLMN in the broadcast sytem information"},
{ 5, "PLMN identity of the fourth Additional PLMN in the broadcast system information"},
{ 6, "Reserved"},
{ 7, "Reserved"},
{ 0, NULL }
@ -209,12 +209,12 @@ static const true_false_string A5_2_algorithm_sup_vals = {
};
static const value_string mobile_identity_type_vals[] = {
{ 0, "No Identity"},
{ 1, "IMSI"},
{ 2, "IMEI"},
{ 3, "IMEISV"},
{ 4, "TMSI/P-TMSI"},
{ 4, "TMSI/P-TMSI/M-TMSI"},
{ 5, "TMGI and optional MBMS Session Identity"}, /* ETSI TS 124 008 V6.8.0 (2005-03) p326 */
{ 0, "No Identity"},
{ 0, NULL }
};
@ -2229,7 +2229,7 @@ de_mid(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guin
curr_offset += len - (curr_offset - offset);
break;
case 4: /* TMSI/P-TMSI */
case 4: /* TMSI/P-TMSI/M-TMSI */
other_decode_bitfield_value(a_bigbuf, oct, 0xf0, 8);
proto_tree_add_text(tree,
tvb, curr_offset, 1,

2
epan/dissectors/packet-gsm_a_dtap.c
View File

@ -76,7 +76,7 @@
* Mobile radio interface Layer 3 specification;
* Core network protocols;
* Stage 3
* (3GPP TS 24.008 version 11.4.0 Release 11)
* (3GPP TS 24.008 version 11.5.0 Release 11)
*
* $Id$
*

8
epan/dissectors/packet-gsm_a_gm.c
View File

@ -45,7 +45,7 @@
* Mobile radio interface Layer 3 specification;
* Core network protocols;
* Stage 3
* (3GPP TS 24.008 version 11.4.0 Release 11)
* (3GPP TS 24.008 version 11.5.0 Release 11)
*
* $Id$
*
@ -4727,12 +4727,12 @@ de_sm_qos(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, g
static const value_string gsm_a_sm_cause_vals[] = {
{ 0x08, "Operator Determined Barring" },
{ 0x18, "MBMS bearer capabilities insufficient for the service" },
{ 0x19, "LLC or SNDCP failure(GSM only)" },
{ 0x19, "LLC or SNDCP failure(A/Gb only)" },
{ 0x1a, "Insufficient resources" },
{ 0x1b, "Missing or unknown APN" },
{ 0x1c, "Unknown PDP address or PDP type" },
{ 0x1d, "User Authentication failed" },
{ 0x1e, "Activation rejected by GGSN" },
{ 0x1d, "User authentication failed" },
{ 0x1e, "Activation rejected by GGSN, Serving GW or PDN GW" },
{ 0x1f, "Activation rejected, unspecified" },
{ 0x20, "Service option not supported" },
{ 0x21, "Requested service option not subscribed" },

59
epan/dissectors/packet-nas_eps.c
View File

@ -23,7 +23,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* References: 3GPP TS 24.301 V11.4.0 (2012-09)
* References: 3GPP TS 24.301 V11.5.0 (2012-12)
*/
#include "config.h"
@ -1729,13 +1729,13 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
proto_tree_add_item(tree, hf_nas_eps_emm_128eea2, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* EPS encryption algorithm 128-EEA3 supported (octet 3, bit 5) */
proto_tree_add_item(tree, hf_nas_eps_emm_eea3, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* EPS encryption algorithm 128-EEA4 supported (octet 3, bit 4) */
/* EPS encryption algorithm EEA4 supported (octet 3, bit 4) */
proto_tree_add_item(tree, hf_nas_eps_emm_eea4, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* EPS encryption algorithm 128-EEA5 supported (octet 3, bit 5) */
/* EPS encryption algorithm EEA5 supported (octet 3, bit 3) */
proto_tree_add_item(tree, hf_nas_eps_emm_eea5, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* EPS encryption algorithm 128-EEA6 supported (octet 3, bit 6) */
/* EPS encryption algorithm EEA6 supported (octet 3, bit 2) */
proto_tree_add_item(tree, hf_nas_eps_emm_eea6, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* EPS encryption algorithm 128-EEA7 supported (octet 3, bit 7) */
/* EPS encryption algorithm EEA7 supported (octet 3, bit 1) */
proto_tree_add_item(tree, hf_nas_eps_emm_eea7, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
curr_offset++;
@ -1769,19 +1769,19 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
*/
/* UMTS encryption algorithm 128-UEA0 supported (octet 5, bit 8) */
proto_tree_add_item(tree, hf_nas_eps_emm_uea0, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS encryption algorithm 128-UEA0 supported (octet 5, bit 7) */
/* UMTS encryption algorithm 128-UEA1 supported (octet 5, bit 7) */
proto_tree_add_item(tree, hf_nas_eps_emm_uea1, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS encryption algorithm 128-UEA0 supported (octet 5, bit 6) */
/* UMTS encryption algorithm 128-UEA2 supported (octet 5, bit 6) */
proto_tree_add_item(tree, hf_nas_eps_emm_uea2, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS encryption algorithm 128-UEA0 supported (octet 5, bit 5) */
/* UMTS encryption algorithm 128-UEA3 supported (octet 5, bit 5) */
proto_tree_add_item(tree, hf_nas_eps_emm_uea3, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* EPS encryption algorithm 128-UEA0 supported (octet 5, bit 4) */
/* UMTS encryption algorithm 128-UEA4 supported (octet 5, bit 4) */
proto_tree_add_item(tree, hf_nas_eps_emm_uea4, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS encryption algorithm 128-UEA0 supported (octet 5, bit 5) */
/* UMTS encryption algorithm 128-UEA5 supported (octet 5, bit 3) */
proto_tree_add_item(tree, hf_nas_eps_emm_uea5, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS encryption algorithm 128-UEA0 supported (octet 5, bit 6) */
/* UMTS encryption algorithm 128-UEA6 supported (octet 5, bit 2) */
proto_tree_add_item(tree, hf_nas_eps_emm_uea6, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS encryption algorithm 128-UEA0 supported (octet 5, bit 7) */
/* UMTS encryption algorithm 128-UEA7 supported (octet 5, bit 1) */
proto_tree_add_item(tree, hf_nas_eps_emm_uea7, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
curr_offset++;
@ -1796,17 +1796,17 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
/* UMTS integrity algorithms supported (octet 6) */
/* UMTS integrity algorithm UIA1 supported (octet 6, bit 7) */
proto_tree_add_item(tree, hf_nas_eps_emm_uia1, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS integrity algorithm UIA1 supported (octet 6, bit 6) */
/* UMTS integrity algorithm UIA2 supported (octet 6, bit 6) */
proto_tree_add_item(tree, hf_nas_eps_emm_uia2, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS integrity algorithm UIA1 supported (octet 6, bit 5) */
/* UMTS integrity algorithm UIA3 supported (octet 6, bit 5) */
proto_tree_add_item(tree, hf_nas_eps_emm_uia3, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS integrity algorithm UIA1 supported (octet 6, bit 4) */
/* UMTS integrity algorithm UIA4 supported (octet 6, bit 4) */
proto_tree_add_item(tree, hf_nas_eps_emm_uia4, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS integrity algorithm UIA1 supported (octet 6, bit 3) */
/* UMTS integrity algorithm UIA5 supported (octet 6, bit 3) */
proto_tree_add_item(tree, hf_nas_eps_emm_uia5, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS integrity algorithm UIA1 supported (octet 6, bit 2) */
/* UMTS integrity algorithm UIA6 supported (octet 6, bit 2) */
proto_tree_add_item(tree, hf_nas_eps_emm_uia6, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS integrity algorithm UIA1 supported (octet 6, bit 1) */
/* UMTS integrity algorithm UIA7 supported (octet 6, bit 1) */
proto_tree_add_item(tree, hf_nas_eps_emm_uia7, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
curr_offset++;
@ -1828,6 +1828,11 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
/* NF capability (octet 7, bit 1) */
proto_tree_add_item(tree, hf_nas_eps_emm_nf_cap, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
curr_offset++;
while ((curr_offset - offset) < len) {
proto_tree_add_bits_item(tree, hf_nas_eps_spare_bits, tvb, (curr_offset<<3), 8, ENC_BIG_ENDIAN);
curr_offset++;
}
return(len);
}
@ -1877,13 +1882,13 @@ de_emm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
proto_tree_add_item(tree, hf_nas_eps_emm_128eea2, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* EPS encryption algorithm 128-EEA3 supported (octet 3, bit 5) */
proto_tree_add_item(tree, hf_nas_eps_emm_eea3, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* EPS encryption algorithm 128-EEA4 supported (octet 3, bit 4) */
/* EPS encryption algorithm EEA4 supported (octet 3, bit 4) */
proto_tree_add_item(tree, hf_nas_eps_emm_eea4, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* EPS encryption algorithm 128-EEA5 supported (octet 3, bit 5) */
/* EPS encryption algorithm EEA5 supported (octet 3, bit 3) */
proto_tree_add_item(tree, hf_nas_eps_emm_eea5, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* EPS encryption algorithm 128-EEA6 supported (octet 3, bit 6) */
/* EPS encryption algorithm EEA6 supported (octet 3, bit 2) */
proto_tree_add_item(tree, hf_nas_eps_emm_eea6, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* EPS encryption algorithm 128-EEA7 supported (octet 3, bit 7) */
/* EPS encryption algorithm EEA7 supported (octet 3, bit 1) */
proto_tree_add_item(tree, hf_nas_eps_emm_eea7, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
curr_offset++;
@ -1923,13 +1928,13 @@ de_emm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_,
proto_tree_add_item(tree, hf_nas_eps_emm_uea2, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS encryption algorithm UEA3 supported (octet 5, bit 5) */
proto_tree_add_item(tree, hf_nas_eps_emm_uea3, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* EPS encryption algorithm UEA4 supported (octet 5, bit 4) */
/* UMTS encryption algorithm UEA4 supported (octet 5, bit 4) */
proto_tree_add_item(tree, hf_nas_eps_emm_uea4, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS encryption algorithm UEA5 supported (octet 5, bit 5) */
/* UMTS encryption algorithm UEA5 supported (octet 5, bit 3) */
proto_tree_add_item(tree, hf_nas_eps_emm_uea5, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS encryption algorithm UEA6 supported (octet 5, bit 6) */
/* UMTS encryption algorithm UEA6 supported (octet 5, bit 2) */
proto_tree_add_item(tree, hf_nas_eps_emm_uea6, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
/* UMTS encryption algorithm UEA7 supported (octet 5, bit 7) */
/* UMTS encryption algorithm UEA7 supported (octet 5, bit 1) */
proto_tree_add_item(tree, hf_nas_eps_emm_uea7, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
curr_offset++;
@ -2504,7 +2509,7 @@ static const value_string nas_eps_esm_cause_vals[] = {
{ 0x2b, "Invalid EPS bearer identity"},
{ 0x2c, "Semantic errors in packet filter(s)"},
{ 0x2d, "Syntactical errors in packet filter(s)"},
{ 0x2e, "EPS bearer context without TFT already activated"},
{ 0x2e, "Unused"},
{ 0x2f, "PTI mismatch"},
{ 0x31, "Last PDN disconnection not allowed"},
{ 0x32, "PDN type IPv4 only allowed"},