diff options
| author | Daniel Willmann <daniel@totalueberwachung.de> | 2009-08-13 03:42:07 +0200 |
|---|---|---|
| committer | Harald Welte (local) <laflocal@hanuman.gnumonks.org> | 2009-08-13 16:38:56 +0200 |
| commit | eea9337e9e0684dcd1056af395613fdcca68b124 (patch) | |
| tree | ff8535963a777b4a61b050bc8d796cb0cd63a4ad | |
| parent | 9aef14547a721e96193e65be0a60eb94b34eb476 (diff) | |
Encode the network name int the MM info messages in GSM 7bit alphabet.
| -rw-r--r-- | openbsc/src/gsm_04_08.c | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/openbsc/src/gsm_04_08.c b/openbsc/src/gsm_04_08.c index 98f2d5603..03fe01058 100644 --- a/openbsc/src/gsm_04_08.c +++ b/openbsc/src/gsm_04_08.c @@ -35,6 +35,7 @@ #include <openbsc/tlv.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> +#include <openbsc/gsm_utils.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_04_11.h> #include <openbsc/gsm_04_08.h> @@ -1335,7 +1336,7 @@ int gsm48_tx_mm_info(struct gsm_lchan *lchan) struct gsm_network *net = lchan->ts->trx->bts->network; u_int8_t *ptr8; u_int16_t *ptr16; - int name_len; + int name_len, name_pad; int i; #if 0 time_t cur_t; @@ -1350,6 +1351,7 @@ int gsm48_tx_mm_info(struct gsm_lchan *lchan) gh->msg_type = GSM48_MT_MM_INFO; if (net->name_long) { +#if 0 name_len = strlen(net->name_long); /* 10.5.3.5a */ ptr8 = msgb_put(msg, 3); @@ -1363,9 +1365,24 @@ int gsm48_tx_mm_info(struct gsm_lchan *lchan) /* FIXME: Use Cell Broadcast, not UCS-2, since * UCS-2 is only supported by later revisions of the spec */ +#endif + name_len = (strlen(net->name_long)*7)/8; + name_pad = (8 - strlen(net->name_long)*7)%8; + if (name_pad > 0) + name_len++; + /* 10.5.3.5a */ + ptr8 = msgb_put(msg, 3); + ptr8[0] = GSM48_IE_NAME_LONG; + ptr8[1] = name_len +1; + ptr8[2] = 0x80 | name_pad; /* Cell Broadcast DCS, no CI */ + + ptr8 = msgb_put(msg, name_len); + gsm_7bit_encode(ptr8, net->name_long); + } if (net->name_short) { +#if 0 name_len = strlen(net->name_short); /* 10.5.3.5a */ ptr8 = (u_int8_t *) msgb_put(msg, 3); @@ -1376,6 +1393,20 @@ int gsm48_tx_mm_info(struct gsm_lchan *lchan) ptr16 = (u_int16_t *) msgb_put(msg, name_len*2); for (i = 0; i < name_len; i++) ptr16[i] = htons(net->name_short[i]); +#endif + name_len = (strlen(net->name_short)*7)/8; + name_pad = (8 - strlen(net->name_short)*7)%8; + if (name_pad > 0) + name_len++; + /* 10.5.3.5a */ + ptr8 = (u_int8_t *) msgb_put(msg, 3); + ptr8[0] = GSM48_IE_NAME_SHORT; + ptr8[1] = name_len +1; + ptr8[2] = 0x80 | name_pad; /* Cell Broadcast DCS, no CI */ + + ptr8 = msgb_put(msg, name_len); + gsm_7bit_encode(ptr8, net->name_short); + } #if 0 @@ -1397,6 +1428,8 @@ int gsm48_tx_mm_info(struct gsm_lchan *lchan) ptr8[7] |= 0x80; #endif + DEBUGP(DMM, "-> MM INFO\n"); + return gsm48_sendmsg(msg, NULL); } |