diff options
| author | Max <msuraev@sysmocom.de> | 2019-01-21 14:34:28 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2019-01-22 02:38:33 +0100 |
| commit | 81675b1e518a0685372bd0d8f8aa374bea7a471a (patch) | |
| tree | f913f39a960ef583d13c050d26e2daa578603b08 /openbsc | |
| parent | 6504c9d391201bc730a3329c377a1ca1226f812f (diff) | |
fix build: apply msgb_wrap_with_TL() rename
After libosmocore commit
If1e851ac605c8d2fde3da565b0bd674ea6350c2e
b27e6feb699712345373e87a48187dc622e4fa92
the openbsc master build is broken.
Apply the msgb_wrap_with_TL() rename to msgb_push_tl() to unbreak the build.
Also related is commit e8cd09dd6f3378a8137afb581dcd7ed554daa24c in this
repository, which removed the locally defined msgb_wrap_with_TL() definition.
The libosmocore mistake should have become obvious then and there...
Change-Id: I6fece7bbbea84962daff885e54f0bc0108c8d0a5
Diffstat (limited to 'openbsc')
| -rw-r--r-- | openbsc/src/libmsc/gsm_04_80.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/openbsc/src/libmsc/gsm_04_80.c b/openbsc/src/libmsc/gsm_04_80.c index dc9ae2369..1c08d99cb 100644 --- a/openbsc/src/libmsc/gsm_04_80.c +++ b/openbsc/src/libmsc/gsm_04_80.c @@ -67,29 +67,29 @@ int gsm0480_send_ussd_response(struct gsm_subscriber_connection *conn, msgb_put(msg, response_len); /* Then wrap it as an Octet String */ - msgb_wrap_with_TL(msg, ASN1_OCTET_STRING_TAG); + msgb_push_tl(msg, ASN1_OCTET_STRING_TAG); /* Pre-pend the DCS octet string */ msgb_push_TLV1(msg, ASN1_OCTET_STRING_TAG, 0x0F); /* Then wrap these as a Sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); + msgb_push_tl(msg, GSM_0480_SEQUENCE_TAG); /* Pre-pend the operation code */ msgb_push_TLV1(msg, GSM0480_OPERATION_CODE, GSM0480_OP_CODE_PROCESS_USS_REQ); /* Wrap the operation code and IA5 string as a sequence */ - msgb_wrap_with_TL(msg, GSM_0480_SEQUENCE_TAG); + msgb_push_tl(msg, GSM_0480_SEQUENCE_TAG); /* Pre-pend the invoke ID */ msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, req->invoke_id); /* Wrap this up as a Return Result component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_RESULT); + msgb_push_tl(msg, GSM0480_CTYPE_RETURN_RESULT); /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_push_tl(msg, GSM0480_IE_FACILITY); /* And finally pre-pend the L3 header */ gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); @@ -115,10 +115,10 @@ int gsm0480_send_ussd_reject(struct gsm_subscriber_connection *conn, msgb_push_TLV1(msg, GSM0480_COMPIDTAG_INVOKE_ID, req->invoke_id); /* Wrap this up as a Reject component */ - msgb_wrap_with_TL(msg, GSM0480_CTYPE_REJECT); + msgb_push_tl(msg, GSM0480_CTYPE_REJECT); /* Wrap the component in a Facility message */ - msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY); + msgb_push_tl(msg, GSM0480_IE_FACILITY); /* And finally pre-pend the L3 header */ gh = (struct gsm48_hdr *) msgb_push(msg, sizeof(*gh)); |