aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2019-01-21 14:19:59 +0100
committerHarald Welte <laforge@gnumonks.org>2019-01-21 13:47:08 +0000
commitb27e6feb699712345373e87a48187dc622e4fa92 (patch)
tree0da011baa9a80a2f992430b38d9acfed71cdf782
parenta0c1cba28a661d9d5c7fcb092afe37e4bd70eeca (diff)
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
-rw-r--r--include/osmocom/core/msgb.h2
-rw-r--r--src/gsm/gsm0480.c18
2 files changed, 10 insertions, 10 deletions
diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h
index b7c84221..f006b345 100644
--- a/include/osmocom/core/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -368,7 +368,7 @@ static inline void msgb_push_u32(struct msgb *msg, uint32_t word)
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 01f245a0..b5c98445 100644
--- a/src/gsm/gsm0480.c
+++ b/src/gsm/gsm0480.c
@@ -84,7 +84,7 @@ int gsm0480_wrap_invoke(struct msgb *msg, int op, int link_id)
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 @@ int gsm0480_wrap_invoke(struct msgb *msg, int op, int link_id)
/* 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 @@ struct msgb *gsm0480_gen_ussd_resp_7bit(uint8_t invoke_id, const char *text)
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 @@ struct msgb *gsm0480_create_ussd_resp(uint8_t invoke_id, uint8_t trans_id, const
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 @@ struct msgb *gsm0480_gen_return_error(uint8_t invoke_id, uint8_t error_code)
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 @@ struct msgb *gsm0480_gen_reject(int invoke_id, uint8_t problem_tag, uint8_t prob
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;