aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--epan/dissectors/packet-gsm_a.c18
2 files changed, 10 insertions, 9 deletions
diff --git a/AUTHORS b/AUTHORS
index 4f7f3fdd29..8fdb7679f5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2439,6 +2439,7 @@ Neil Kettle <njk4 [AT] kent.ac.uk>
Steve Karg <skarg [AT] users.sourceforge.net>
Steve Packet <packetsteve [AT] hotmail.com>
Javier Acuna <javier.acuna [AT] sixbell.cl>
+Miklos Szurdi <szurdimiklos [AT] yahoo.com>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.
diff --git a/epan/dissectors/packet-gsm_a.c b/epan/dissectors/packet-gsm_a.c
index 2e1f473fd7..7e1f86fc69 100644
--- a/epan/dissectors/packet-gsm_a.c
+++ b/epan/dissectors/packet-gsm_a.c
@@ -9307,7 +9307,7 @@ de_gmm_service_type(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len,
case 0: str="Signalling"; break;
case 1: str="Data"; break;
case 2: str="Paging Response"; break;
- case 3: str="MBMS Notification Reponse"; break;
+ case 3: str="MBMS Notification Response"; break;/* reponse->response*/
default: str="reserved";
}
@@ -10221,11 +10221,11 @@ de_sm_qos(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add
else if (( oct >= 0x40 ) && ( oct <= 0x7f ))
proto_tree_add_text(tree,
tvb, curr_offset, 1,
- "Maximum bit rate for uplink: (%u) %ukbps",oct,(oct-0x40)*8);
+ "Maximum bit rate for uplink: (%u) %ukbps",oct,(oct-0x40)*8+64); /* - was (oct-0x40)*8 */
else if (( oct >= 0x80 ) && ( oct <= 0xfe ))
proto_tree_add_text(tree,
tvb, curr_offset, 1,
- "Maximum bit rate for uplink: (%u) %ukbps",oct,(oct-0x80)*64);
+ "Maximum bit rate for uplink: (%u) %ukbps",oct,(oct-0x80)*64+576); /* - was (oct-0x80)*64 */
else
proto_tree_add_text(tree,
tvb, curr_offset, 1,
@@ -10257,11 +10257,11 @@ de_sm_qos(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add
else if (( oct >= 0x40 ) && ( oct <= 0x7f ))
proto_tree_add_text(tree,
tvb, curr_offset, 1,
- "Maximum bit rate for downlink: (%u) %ukbps",oct,(oct-0x40)*8);
+ "Maximum bit rate for downlink: (%u) %ukbps",oct,(oct-0x40)*8+64);/*same as above*/
else if (( oct >= 0x80 ) && ( oct <= 0xfe ))
proto_tree_add_text(tree,
tvb, curr_offset, 1,
- "Maximum bit rate for downlink: (%u) %ukbps",oct,(oct-0x80)*64);
+ "Maximum bit rate for downlink: (%u) %ukbps",oct,(oct-0x80)*64+576);/*same as above*/
else
proto_tree_add_text(tree,
tvb, curr_offset, 1,
@@ -10392,11 +10392,11 @@ de_sm_qos(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add
else if (( oct >= 0x40 ) && ( oct <= 0x7f ))
proto_tree_add_text(tree,
tvb, curr_offset, 1,
- "Guaranteed bit rate for uplink: (%u) %ukbps",oct,(oct-0x40)*8);
+ "Guaranteed bit rate for uplink: (%u) %ukbps",oct,(oct-0x40)*8+64);/*same as for max bit rate*/
else if (( oct >= 0x80 ) && ( oct <= 0xfe ))
proto_tree_add_text(tree,
tvb, curr_offset, 1,
- "Guaranteed bit rate for uplink: (%u) %ukbps",oct,(oct-0x80)*64);
+ "Guaranteed bit rate for uplink: (%u) %ukbps",oct,(oct-0x80)*64+576);/*same as for max bit rate*/
else
proto_tree_add_text(tree,
tvb, curr_offset, 1,
@@ -10428,11 +10428,11 @@ de_sm_qos(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add
else if (( oct >= 0x40 ) && ( oct <= 0x7f ))
proto_tree_add_text(tree,
tvb, curr_offset, 1,
- "Guaranteed bit rate for downlink: (%u) %ukbps",oct,(oct-0x40)*8);
+ "Guaranteed bit rate for downlink: (%u) %ukbps",oct,(oct-0x40)*8+64);/*same as above*/
else if (( oct >= 0x80 ) && ( oct <= 0xfe ))
proto_tree_add_text(tree,
tvb, curr_offset, 1,
- "Guaranteed bit rate for downlink: (%u) %ukbps",oct,(oct-0x80)*64);
+ "Guaranteed bit rate for downlink: (%u) %ukbps",oct,(oct-0x80)*64+576);/*same as above*/
else
proto_tree_add_text(tree,
tvb, curr_offset, 1,