Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/12662 )
Change subject: Rename msgb_wrap_with_TL()
......................................................................
Rename msgb_wrap_with_TL()
This resolves an issue introduced in 84fb5bb6a09a6a358f98c654c84c3b99a0f24eef
when msgb_wrap_with_TL() was introduced as an inline function with
*exactly the same name* as in osmo-msc.git and openbsc.git. We *NEVER*
do something like this. Functions moved from applications to library
*MUST* always be renamed. This has been the case for almost a decade
now.
With this subsequent change we make sure the libosmocore function
has a different name and doesn't clash. After this commit, old
openbsc.git and osmo-bsc.git should again build fine.
Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e
---
M include/osmocom/core/msgb.h
M src/gsm/gsm0480.c
2 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h
index b7c8422..f006b34 100644
--- a/include/osmocom/core/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -368,7 +368,7 @@
osmo_store32be(word, space);
}
-static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, uint8_t tag)
+static inline unsigned char *msgb_push_tl(struct msgb *msgb, uint8_t tag)
{
uint8_t *data = msgb_push(msgb, 2);
diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c
index 01f245a..b5c9844 100644
--- a/src/gsm/gsm0480.c
+++ b/src/gsm/gsm0480.c
@@ -84,7 +84,7 @@
msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, link_id);
/* 1. component tag */
- msgb_wrap_with_TL(msg, GSM0480_CTYPE_INVOKE);
+ msgb_push_tl(msg, GSM0480_CTYPE_INVOKE);
return 0;
}
@@ -92,7 +92,7 @@
/* wrap the GSM 04.08 Facility IE around it */
int gsm0480_wrap_facility(struct msgb *msg)
{
- msgb_wrap_with_TL(msg, GSM0480_IE_FACILITY);
+ msgb_push_tl(msg, GSM0480_IE_FACILITY);
return 0;
}
@@ -793,26 +793,26 @@
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_tlv1_push(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_tlv1_push(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_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, 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);
return msg;
}
@@ -832,7 +832,7 @@
return NULL;
/* 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 */
gsm48_push_l3hdr_tid(msg, GSM48_PDISC_NC_SS,
@@ -863,7 +863,7 @@
msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id);
/* Wrap this up as a Reject component */
- msgb_wrap_with_TL(msg, GSM0480_CTYPE_RETURN_ERROR);
+ msgb_push_tl(msg, GSM0480_CTYPE_RETURN_ERROR);
/* FIXME: Wrap in Facility + L3? */
return msg;
@@ -896,7 +896,7 @@
msgb_tlv1_push(msg, GSM0480_COMPIDTAG_INVOKE_ID, invoke_id);
/* Wrap this up as a Reject component */
- msgb_wrap_with_TL(msg, GSM0480_CTYPE_REJECT);
+ msgb_push_tl(msg, GSM0480_CTYPE_REJECT);
/* FIXME: Wrap in Facility + L3? */
return msg;
--
To view, visit https://gerrit.osmocom.org/12662
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If1e851ac605c8d2fde3da565b0bd674ea6350c2e
Gerrit-Change-Number: 12662
Gerrit-PatchSet: 3
Gerrit-Owner: Max <msur...@sysmocom.de>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Max <msur...@sysmocom.de>
