aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Freyther <holger@freyther.de>2016-05-20 19:21:27 +0000
committerHolger Freyther <holger@freyther.de>2016-05-20 19:42:50 +0000
commit45abec20dd66a7ebb762ad8942d1ba818287ff63 (patch)
tree7a76612b93b4b6d96988ce73115996a1930810a5
parentcc3694b650e22598811b3e5eaf74ef3dc0e4f7ab (diff)
Revert "gsm48: move to hex TMSI representation"
This is a "flag" day change. Old OpenBSC break with new libosmocore because suddenly there is the 0x in front. I am afraid we need to find a better solution here. I think we will need to create a gsm48_mi_to_string variant that takes a mode parameter to enable the TMSI mode and deprecate the old method. Right now we should not break old versions of OpenBSC. This reverts commit 78ad042f94afd5bf7de477ae634e9d2fdd9c9dc4. Change-Id: I2f61e626f2f9088b492e1b643c3dcc9bce77d52b Reviewed-on: https://gerrit.osmocom.org/86 Tested-by: Jenkins Builder Reviewed-by: Holger Freyther <holger@freyther.de>
-rw-r--r--src/gsm/gsm48.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c
index d0e050bb..8a46f769 100644
--- a/src/gsm/gsm48.c
+++ b/src/gsm/gsm48.c
@@ -458,10 +458,11 @@ int gsm48_mi_to_string(char *string, const int str_len, const uint8_t *mi,
case GSM_MI_TYPE_NONE:
break;
case GSM_MI_TYPE_TMSI:
+ /* Table 10.5.4.3, reverse generate_mid_from_tmsi */
if (mi_len == GSM48_TMSI_LEN && mi[0] == (0xf0 | GSM_MI_TYPE_TMSI)) {
memcpy(&tmsi, &mi[1], 4);
tmsi = ntohl(tmsi);
- return snprintf(string, str_len, "0x%08X", tmsi);
+ return snprintf(string, str_len, "%u", tmsi);
}
break;
case GSM_MI_TYPE_IMSI: