ttcn3
/
osmo-ttcn3-hacks
mirror of https://gerrit.osmocom.org/osmo-ttcn3-hacks
10
0
Fork 1
Code Issues Releases Wiki Activity

MNCC: Represent 'keypad' as one-character charstring, not int 

The MNCC Unix Domain Socket encoding uses an int here, which is
a bit odd, given that it's an ASCII / IA5 char value on the actual
GSM L3.  Let's convert from/to something useful.

Change-Id: Id17ac502ca33f4962214a3d5938d0dc29ca6ec1b
This commit is contained in:
Harald Welte 2018-02-02 20:06:52 +01:00
parent 8a3dc925da
commit d13700dd6c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/MNCC_EncDec.cc
View File

@ -155,8 +155,8 @@ OCTETSTRING enc__MNCC__PDU(const MNCC__PDU& in)
mncc.fields |= MNCC_F_SIGNAL;
}
if (in_sig.keypad().is_value()) {
const INTEGER &kpd = in_sig.keypad();
mncc.signal = kpd;
const CHARSTRING &kpd = in_sig.keypad();
mncc.signal = (int) kpd[0].get_char();
mncc.fields |= MNCC_F_KEYPAD;
}
mncc.more = in_sig.more();
@ -292,8 +292,10 @@ MNCC__PDU dec__MNCC__PDU(const OCTETSTRING& in)
sign.ssversion() = CHARSTRING(in_mncc->ssversion.info);
if (in_mncc->fields & MNCC_F_CCCAP)
sign.cccap() = MNCC__cccap(in_mncc->cccap.dtmf, in_mncc->cccap.pcp);
if (in_mncc->fields & MNCC_F_KEYPAD)
sign.keypad() = in_mncc->keypad;
if (in_mncc->fields & MNCC_F_KEYPAD) {
char kpd[2] = { (char) in_mncc->keypad, 0 };
sign.keypad() = CHARSTRING(kpd);
}
if (in_mncc->fields & MNCC_F_SIGNAL)
sign.signal() = in_mncc->signal;

2
library/MNCC_Types.ttcn
View File

@ -303,7 +303,7 @@ type record MNCC_cccap {
};
type int MNCC_notify (0..127);
type int MNCC_keypad (0..127);
type charstring MNCC_keypad length (1);
type enumerated MNCC_bcap {
GSM_MNCC_BCAP_SPEECH (0),