cellular-infrastructure
/
osmo-mgw
mirror of https://gerrit.osmocom.org/osmo-mgw
10
0
Fork 0
Code Issues Releases Wiki Activity

recovery latin1 USSD message, probably bad rebase

This commit is contained in:
Sergey Kostanbaev 2016-02-10 04:06:54 +03:00 committed by Ivan Kluchnikov
parent d4839fe14a
commit da8c96e097
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openbsc/src/ussd-proxy/ussd_proxy.c
View File

@ -1108,7 +1108,7 @@ int ussd_send_data(operation_t *op, int last, const char* lang, unsigned lang_le
&outbuf, &outleft);
if (s == (size_t)-1) {
outbuf = (char*)ss.ussd_text;
outleft = MAX_LEN_USSD_STRING;
outleft = MAX_ASN1_LEN_USSD_STRING;
s = iconv(op->ctx->utf8_to_ucs2,
&inbuf, &inleft,
@ -1122,11 +1122,13 @@ int ussd_send_data(operation_t *op, int last, const char* lang, unsigned lang_le
} else {
int outlen;
size_t len = (msg_len > MAX_LEN_USSD_STRING) ?
MAX_LEN_USSD_STRING : msg_len;
memcpy(tmpbuf, msg, len);
tmpbuf[len] = 0;
// Set null-termination
outbuf[0] = 0;
gsm_7bit_encode_n_ussd(ss.ussd_text,
MAX_LEN_USSD_STRING, outbuf, &outlen);
MAX_ASN1_LEN_USSD_STRING, tmpbuf, &outlen);
ss.ussd_text_len = outlen;
ss.ussd_text_language = 0x0f;
}