diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-03-10 06:39:14 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-03-10 06:39:14 +0000 |
| commit | 342a3ca71234d48a510311cd807399cdf224d77b (patch) | |
| tree | 9622983aa7af075c51c27afd85cb83e532b8df70 /epan/dissectors/packet-gsm_a_gm.c | |
| parent | 103d684a3f86fbeedc28dec7f8b60cd61834bf84 (diff) | |
From Vladimir Kazansky:
Wrong offset returned by de_sm_pdp_addr().
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4568
svn path=/trunk/; revision=32156
Diffstat (limited to 'epan/dissectors/packet-gsm_a_gm.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_a_gm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index 88787e5b8b..39ab3e575e 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -3275,6 +3275,7 @@ de_sm_pdp_addr(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar if (pdp_type_org == 0 ) { + /* ETSI allocated address */ switch (pdp_type_num) { case 0x00: str="Reserved, used in earlier version of this protocol"; break; @@ -3284,6 +3285,7 @@ de_sm_pdp_addr(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar } else if (pdp_type_org == 1) { + /* IETF allocated addres */ switch (pdp_type_num) { case 0x21: str="IPv4 address"; break; @@ -3306,7 +3308,7 @@ de_sm_pdp_addr(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar proto_tree_add_text(tree, tvb, curr_offset, 1, "Dynamic addressing"); - + curr_offset += 1; return(curr_offset - offset); } else if ( len == 2 ) @@ -3314,7 +3316,7 @@ de_sm_pdp_addr(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar proto_tree_add_text(tree, tvb, curr_offset, 1, "No PDP address is included"); - + curr_offset += 1; return(curr_offset - offset); } |