mirror of git://git.sysmocom.de/ofono
stkutil: Don't include USSD text unless needed
This commit is contained in:
parent
47ddc4b70d
commit
a0d476281d
|
@ -4177,11 +4177,19 @@ static gboolean build_dataobj_ussd_text(struct stk_tlv_builder *tlv,
|
||||||
const struct stk_ussd_text *text = data;
|
const struct stk_ussd_text *text = data;
|
||||||
unsigned char tag = STK_DATA_OBJECT_TYPE_TEXT;
|
unsigned char tag = STK_DATA_OBJECT_TYPE_TEXT;
|
||||||
|
|
||||||
stk_tlv_builder_open_container(tlv, cr, tag, TRUE);
|
if (text->has_text == FALSE)
|
||||||
|
return TRUE;
|
||||||
|
|
||||||
|
if (stk_tlv_builder_open_container(tlv, cr, tag, TRUE) != TRUE)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
if (text->len > 0) {
|
if (text->len > 0) {
|
||||||
stk_tlv_builder_append_byte(tlv, text->dcs);
|
if (stk_tlv_builder_append_byte(tlv, text->dcs) != TRUE)
|
||||||
stk_tlv_builder_append_bytes(tlv, text->text, text->len);
|
return FALSE;
|
||||||
|
|
||||||
|
if (stk_tlv_builder_append_bytes(tlv, text->text,
|
||||||
|
text->len) != TRUE)
|
||||||
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
return stk_tlv_builder_close_container(tlv);
|
return stk_tlv_builder_close_container(tlv);
|
||||||
|
|
|
@ -1377,6 +1377,7 @@ struct stk_answer_text {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct stk_ussd_text {
|
struct stk_ussd_text {
|
||||||
|
ofono_bool_t has_text;
|
||||||
const unsigned char *text;
|
const unsigned char *text;
|
||||||
int dcs;
|
int dcs;
|
||||||
int len;
|
int len;
|
||||||
|
|
Loading…
Reference in New Issue