diff options
Diffstat (limited to 'src/rua_msg_factory.c')
| -rw-r--r-- | src/rua_msg_factory.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/rua_msg_factory.c b/src/rua_msg_factory.c index 268f6ac..e974793 100644 --- a/src/rua_msg_factory.c +++ b/src/rua_msg_factory.c @@ -5,8 +5,10 @@ #include <osmocom/rua/rua_ies_defs.h> #include <osmocom/rua/rua_msg_factory.h> #include "asn1helpers.h" -#include <osmocom/iuh/hnbgw.h> +#define DRUA _rua_DRUA + +#define IUH_PPI_RUA 19 struct msgb *rua_new_udt(struct msgb *inmsg) { @@ -16,7 +18,7 @@ struct msgb *rua_new_udt(struct msgb *inmsg) int rc; memset(&ies, 0, sizeof(ies)); - OCTET_STRING_fromBuf(&ies.ranaP_Message, inmsg->data, msgb_length(inmsg)); + OCTET_STRING_fromBuf(&ies.ranaP_Message, (const char *)inmsg->data, msgb_length(inmsg)); msgb_free(inmsg); memset(&out, 0, sizeof(out)); @@ -31,7 +33,7 @@ struct msgb *rua_new_udt(struct msgb *inmsg) ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_ConnectionlessTransfer, &out); - DEBUGP(DMAIN, "transmitting RUA payload of %u bytes\n", msgb_length(msg)); + DEBUGP(DRUA, "transmitting RUA payload of %u bytes\n", msgb_length(msg)); msgb_sctp_ppid(msg) = IUH_PPI_RUA; @@ -53,7 +55,7 @@ struct msgb *rua_new_conn(int is_ps, uint32_t context_id, struct msgb *inmsg) ies.cN_DomainIndicator = RUA_CN_DomainIndicator_cs_domain; asn1_u24_to_bitstring(&ies.context_ID, &ctxidbuf, context_id); ies.establishment_Cause = RUA_Establishment_Cause_normal_call; - OCTET_STRING_fromBuf(&ies.ranaP_Message, inmsg->data, msgb_length(inmsg)); + OCTET_STRING_fromBuf(&ies.ranaP_Message, (const char *)inmsg->data, msgb_length(inmsg)); msgb_free(inmsg); memset(&out, 0, sizeof(out)); @@ -68,7 +70,7 @@ struct msgb *rua_new_conn(int is_ps, uint32_t context_id, struct msgb *inmsg) ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_Connect, &out); - DEBUGP(DMAIN, "transmitting RUA payload of %u bytes\n", msgb_length(msg)); + DEBUGP(DRUA, "transmitting RUA payload of %u bytes\n", msgb_length(msg)); msgb_sctp_ppid(msg) = IUH_PPI_RUA; @@ -89,7 +91,7 @@ struct msgb *rua_new_dt(int is_ps, uint32_t context_id, struct msgb *inmsg) else ies.cN_DomainIndicator = RUA_CN_DomainIndicator_cs_domain; asn1_u24_to_bitstring(&ies.context_ID, &ctxidbuf, context_id); - OCTET_STRING_fromBuf(&ies.ranaP_Message, inmsg->data, msgb_length(inmsg)); + OCTET_STRING_fromBuf(&ies.ranaP_Message, (const char *)inmsg->data, msgb_length(inmsg)); msgb_free(inmsg); memset(&out, 0, sizeof(out)); @@ -104,7 +106,7 @@ struct msgb *rua_new_dt(int is_ps, uint32_t context_id, struct msgb *inmsg) ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_DirectTransfer, &out); - DEBUGP(DMAIN, "transmitting RUA payload of %u bytes\n", msgb_length(msg)); + DEBUGP(DRUA, "transmitting RUA payload of %u bytes\n", msgb_length(msg)); msgb_sctp_ppid(msg) = IUH_PPI_RUA; @@ -130,7 +132,7 @@ struct msgb *rua_new_disc(int is_ps, uint32_t context_id, struct msgb *inmsg) ies.cause.choice.radioNetwork = RUA_CauseRadioNetwork_normal; if (inmsg && inmsg->data&& msgb_length(inmsg)) { ies.presenceMask |= DISCONNECTIES_RUA_RANAP_MESSAGE_PRESENT; - OCTET_STRING_fromBuf(&ies.ranaP_Message, inmsg->data, msgb_length(inmsg)); + OCTET_STRING_fromBuf(&ies.ranaP_Message, (const char *)inmsg->data, msgb_length(inmsg)); } msgb_free(inmsg); @@ -146,7 +148,7 @@ struct msgb *rua_new_disc(int is_ps, uint32_t context_id, struct msgb *inmsg) ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_Disconnect, &out); - DEBUGP(DMAIN, "transmitting RUA payload of %u bytes\n", msgb_length(msg)); + DEBUGP(DRUA, "transmitting RUA payload of %u bytes\n", msgb_length(msg)); msgb_sctp_ppid(msg) = IUH_PPI_RUA; |