From 96979af054dd71f8fccc749a56512e1cf9af0be8 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Tue, 5 Jan 2016 15:19:44 +0100 Subject: move ranap_*.h,iu_helpers.h to include/osmocom/ranap/ A bit hacky: the ranap_ies_defs.h is generated together with the ranap_encoder.c and ranap_decoder.c. See comments in src/Makefile.am and include/osmocom/ranap/Makefile.am. --- include/osmocom/ranap/Makefile.am | 12 + include/osmocom/ranap/iu_helpers.h | 7 + include/osmocom/ranap/ranap_common.h | 634 ++++++++++++++++++++++++++++++ include/osmocom/ranap/ranap_msg_factory.h | 47 +++ src/Makefile.am | 12 +- src/hnbgw_cn.c | 4 +- src/hnbgw_hnbap.c | 2 +- src/hnbgw_ranap.c | 4 +- src/iu_helpers.h | 7 - src/ranap_common.c | 2 +- src/ranap_common.h | 634 ------------------------------ src/ranap_msg_factory.c | 8 +- src/ranap_msg_factory.h | 47 --- src/tests/dummy_cn_sua.c | 2 +- src/tests/hnb-test.c | 4 +- src/tests/ranap_common_cn.c | 4 +- src/tests/ranap_common_cn.h | 4 +- src/tests/test-helpers.c | 2 +- src/tests/test-hnbap.c | 2 +- src/tests/test-ranap.c | 8 +- 20 files changed, 729 insertions(+), 717 deletions(-) create mode 100644 include/osmocom/ranap/iu_helpers.h create mode 100644 include/osmocom/ranap/ranap_common.h create mode 100644 include/osmocom/ranap/ranap_msg_factory.h delete mode 100644 src/iu_helpers.h delete mode 100644 src/ranap_common.h delete mode 100644 src/ranap_msg_factory.h diff --git a/include/osmocom/ranap/Makefile.am b/include/osmocom/ranap/Makefile.am index 873cadc..b4e1e29 100644 --- a/include/osmocom/ranap/Makefile.am +++ b/include/osmocom/ranap/Makefile.am @@ -1,4 +1,16 @@ +# Ugly: ranap_ies_defs.h is generated from asn1tostruct.py at the same time as +# the ranap_*.c files in src/, but the ranap_ies_defs.h should live here. If +# the build process wants this header file, it should first build +# src/ranap_encoder.c and src/ranap_decoder.c. +# This rule sucks: +ranap_ies_defs.h: $(top_builddir)/src/ranap_encoder.c + make -C $(top_builddir)/src/ ranap_encoder.c + ranap_HEADERS = \ + ranap_ies_defs.h \ + ranap_common.h \ + ranap_msg_factory.h \ + iu_helpers.h \ RANAP_AccuracyFulfilmentIndicator.h \ RANAP_AllocationOrRetentionPriority.h \ RANAP_AlternativeRABConfigurationRequest.h \ diff --git a/include/osmocom/ranap/iu_helpers.h b/include/osmocom/ranap/iu_helpers.h new file mode 100644 index 0000000..109b6da --- /dev/null +++ b/include/osmocom/ranap/iu_helpers.h @@ -0,0 +1,7 @@ +#pragma once + +#include +#include + +int ranap_bcd_decode(char *out, size_t out_len, const uint8_t *in, size_t in_len); +int ranap_imsi_encode(uint8_t *out, size_t out_len, const char *in); diff --git a/include/osmocom/ranap/ranap_common.h b/include/osmocom/ranap/ranap_common.h new file mode 100644 index 0000000..de38771 --- /dev/null +++ b/include/osmocom/ranap/ranap_common.h @@ -0,0 +1,634 @@ +#pragma once + +#include + +/* for f in ranap/RANAP_*.h; printf "#include \"$f\"\n" */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if (ASN1C_ENVIRONMENT_VERSION < 924) +# error "You are compiling with the wrong version of ASN1C" +#endif + +#include +#include + +#define RANAP_DEBUG(x, args ...) DEBUGP(_ranap_DRANAP, x, ## args) +extern int _ranap_DRANAP; + +extern int asn1_xer_print; + +extern const struct value_string ranap_presence_vals[5]; +extern const struct value_string ranap_procedure_code_vals[48]; + +char *ranap_cause_str(const RANAP_Cause_t *cause); + +struct msgb *ranap_generate_initiating_message(e_RANAP_ProcedureCode procedureCode, + RANAP_Criticality_t criticality, + asn_TYPE_descriptor_t *td, void *sptr); + +struct msgb *ranap_generate_successful_outcome( + e_RANAP_ProcedureCode procedureCode, + RANAP_Criticality_t criticality, + asn_TYPE_descriptor_t * td, + void *sptr); + +struct msgb *ranap_generate_unsuccessful_outcome( + e_RANAP_ProcedureCode procedureCode, + RANAP_Criticality_t criticality, + asn_TYPE_descriptor_t * td, + void *sptr); + +struct msgb *ranap_generate_outcome( + e_RANAP_ProcedureCode procedureCode, + RANAP_Criticality_t criticality, + asn_TYPE_descriptor_t * td, + void *sptr); + +RANAP_IE_t *ranap_new_ie(RANAP_ProtocolIE_ID_t id, RANAP_Criticality_t criticality, + asn_TYPE_descriptor_t *type, void *sptr); + +RANAP_ProtocolIE_FieldPair_t *ranap_new_ie_pair(RANAP_ProtocolIE_ID_t id, + RANAP_Criticality_t criticality1, + asn_TYPE_descriptor_t *type1, void *sptr1, + RANAP_Criticality_t criticality2, + asn_TYPE_descriptor_t *type2, void *sptr2); + +void ranap_set_log_area(int log_area); diff --git a/include/osmocom/ranap/ranap_msg_factory.h b/include/osmocom/ranap/ranap_msg_factory.h new file mode 100644 index 0000000..7a9f3d2 --- /dev/null +++ b/include/osmocom/ranap/ranap_msg_factory.h @@ -0,0 +1,47 @@ +#pragma once + +#include +#include +#include +#include + +/*! \brief generate RANAP DIRECT TRANSFER message */ +struct msgb *ranap_new_msg_dt(uint8_t sapi, const uint8_t *nas, unsigned int nas_len); + +/*! \brief generate RANAP SECURITY MODE COMMAND message */ +struct msgb *ranap_new_msg_sec_mod_cmd(const uint8_t *ik, const uint8_t *ck); + +/*! \brief generate RANAP COMMON ID message */ +struct msgb *ranap_new_msg_common_id(const char *imsi); + +/*! \brief generate RANAP IU RELEASE COMMAND message */ +struct msgb *ranap_new_msg_iu_rel_cmd(const RANAP_Cause_t *cause_in); + +/*! \brief generate RANAP PAGING COMMAND message */ +struct msgb *ranap_new_msg_paging_cmd(const char *imsi, const uint32_t *tmsi, int is_ps, uint32_t cause); + +/*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for CS (voice) */ +struct msgb *ranap_new_msg_rab_assign_voice(uint8_t rab_id, uint32_t rtp_ip, uint16_t rtp_port); + +/*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for PS (data) */ +struct msgb *ranap_new_msg_rab_assign_data(uint8_t rab_id, uint32_t gtp_ip, uint32_t gtp_tei); + +/*! \brief generate RANAP RESET message */ +struct msgb *ranap_new_msg_reset(RANAP_CN_DomainIndicator_t domain, + const RANAP_Cause_t *cause); + +/*! \brief generate RANAP RESET ACK message */ +struct msgb *ranap_new_msg_reset_ack(RANAP_CN_DomainIndicator_t domain, + RANAP_GlobalRNC_ID_t *rnc_id); + + +/*! \brief generate RANAP INITIAL UE message */ +struct msgb *ranap_new_msg_initial_ue(uint32_t conn_id, int is_ps, + RANAP_GlobalRNC_ID_t *rnc_id, + uint8_t *nas_pdu, unsigned int nas_len); + +/*! \brief generate RANAP IU RELEASE REQUEST message */ +struct msgb *ranap_new_msg_iu_rel_req(const RANAP_Cause_t *cause); + +/*! \brief generate RANAP RAB RELEASE REQUEST message */ +struct msgb *ranap_new_msg_rab_rel_req(uint8_t rab_id, const RANAP_Cause_t *cause); diff --git a/src/Makefile.am b/src/Makefile.am index 1fc76a4..aeb75b2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,9 +11,13 @@ hnbap_encoder.c hnbap_decoder.c hnbap_ies_defs.h: $(ASN1_ROOT)/hnbap/HNBAP-PDU-C rua_encoder.c rua_decoder.c rua_ies_defs.h: $(ASN1_ROOT)/rua/RUA-PDU-Contents.asn $(ASN1TOSTRUCT) $(ASN1TOSTRUCT) -p RUA_ -f $< -ranap_encoder.c ranap_decoder.c ranap_ies_defs.h: $(ASN1_ROOT)/ranap/RANAP-PDU-Contents.asn $(ASN1TOSTRUCT) +ranap_encoder.c ranap_decoder.c: $(ASN1_ROOT)/ranap/RANAP-PDU-Contents.asn $(ASN1TOSTRUCT) $(ASN1TOSTRUCT) -p RANAP_ -f $< - + mv ranap_ies_defs.h $(includedir)/osmocom/ranap/ +# this is ugly ^. ranap_ies_defs.h is generated from asn1tostruct.py here, but +# it should live in include/osmocom/ranap/. +# We also need to replace the include in the newly generated .c files: + sed -i 's,^#include "ranap_ies_defs.h",#include ,' ranap_encoder.c ranap_decoder.c AM_CFLAGS = $(OSMOCORE_CFLAGS) $(OSMOVTY_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) -I../include COMMON_LDADD = -lsctp @@ -26,10 +30,6 @@ libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION) libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(ASN1C_LIBS) $(COMMON_LDADD) ranap/libosmo-asn1-ranap.la libosmo_ranap_la_SOURCES = ranap_common.c ranap_encoder.c ranap_decoder.c ranap_msg_factory.c iu_helpers.c -osmoranap_HEADERS = ranap_common.h ranap_ies_defs.h ranap_msg_factory.h iu_helpers.h -osmoranapdir = $(includedir)/osmocom/ranap - - # build the actual HomeNodeB gateway # bin_PROGRAMS = osmo-hnbgw diff --git a/src/hnbgw_cn.c b/src/hnbgw_cn.c index c1e9d1c..18661ea 100644 --- a/src/hnbgw_cn.c +++ b/src/hnbgw_cn.c @@ -28,8 +28,8 @@ #include "hnbgw.h" #include "hnbgw_rua.h" -#include "ranap_ies_defs.h" -#include "ranap_msg_factory.h" +#include +#include #include "context_map.h" #include "sccp_helpers.h" diff --git a/src/hnbgw_hnbap.c b/src/hnbgw_hnbap.c index 7790bfd..4d7870e 100644 --- a/src/hnbgw_hnbap.c +++ b/src/hnbgw_hnbap.c @@ -28,7 +28,7 @@ #include #include "asn1helpers.h" -#include "iu_helpers.h" +#include #include "hnbgw.h" #include "hnbap_common.h" diff --git a/src/hnbgw_ranap.c b/src/hnbgw_ranap.c index 5d9168b..3f7c2bf 100644 --- a/src/hnbgw_ranap.c +++ b/src/hnbgw_ranap.c @@ -31,8 +31,8 @@ #include "hnbgw.h" #include "hnbgw_rua.h" -#include "ranap_common.h" -#include "ranap_ies_defs.h" +#include +#include static int ranap_tx_reset_ack(struct hnb_context *hnb, RANAP_CN_DomainIndicator_t domain) diff --git a/src/iu_helpers.h b/src/iu_helpers.h deleted file mode 100644 index 109b6da..0000000 --- a/src/iu_helpers.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include -#include - -int ranap_bcd_decode(char *out, size_t out_len, const uint8_t *in, size_t in_len); -int ranap_imsi_encode(uint8_t *out, size_t out_len, const char *in); diff --git a/src/ranap_common.c b/src/ranap_common.c index 47ee684..4bd088c 100644 --- a/src/ranap_common.c +++ b/src/ranap_common.c @@ -23,7 +23,7 @@ #include #include -#include "ranap_common.h" +#include extern int asn1_xer_print; int _ranap_DRANAP = 0; diff --git a/src/ranap_common.h b/src/ranap_common.h deleted file mode 100644 index de38771..0000000 --- a/src/ranap_common.h +++ /dev/null @@ -1,634 +0,0 @@ -#pragma once - -#include - -/* for f in ranap/RANAP_*.h; printf "#include \"$f\"\n" */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if (ASN1C_ENVIRONMENT_VERSION < 924) -# error "You are compiling with the wrong version of ASN1C" -#endif - -#include -#include - -#define RANAP_DEBUG(x, args ...) DEBUGP(_ranap_DRANAP, x, ## args) -extern int _ranap_DRANAP; - -extern int asn1_xer_print; - -extern const struct value_string ranap_presence_vals[5]; -extern const struct value_string ranap_procedure_code_vals[48]; - -char *ranap_cause_str(const RANAP_Cause_t *cause); - -struct msgb *ranap_generate_initiating_message(e_RANAP_ProcedureCode procedureCode, - RANAP_Criticality_t criticality, - asn_TYPE_descriptor_t *td, void *sptr); - -struct msgb *ranap_generate_successful_outcome( - e_RANAP_ProcedureCode procedureCode, - RANAP_Criticality_t criticality, - asn_TYPE_descriptor_t * td, - void *sptr); - -struct msgb *ranap_generate_unsuccessful_outcome( - e_RANAP_ProcedureCode procedureCode, - RANAP_Criticality_t criticality, - asn_TYPE_descriptor_t * td, - void *sptr); - -struct msgb *ranap_generate_outcome( - e_RANAP_ProcedureCode procedureCode, - RANAP_Criticality_t criticality, - asn_TYPE_descriptor_t * td, - void *sptr); - -RANAP_IE_t *ranap_new_ie(RANAP_ProtocolIE_ID_t id, RANAP_Criticality_t criticality, - asn_TYPE_descriptor_t *type, void *sptr); - -RANAP_ProtocolIE_FieldPair_t *ranap_new_ie_pair(RANAP_ProtocolIE_ID_t id, - RANAP_Criticality_t criticality1, - asn_TYPE_descriptor_t *type1, void *sptr1, - RANAP_Criticality_t criticality2, - asn_TYPE_descriptor_t *type2, void *sptr2); - -void ranap_set_log_area(int log_area); diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c index c62f268..e5d742f 100644 --- a/src/ranap_msg_factory.c +++ b/src/ranap_msg_factory.c @@ -22,11 +22,11 @@ #include #include "asn1helpers.h" -#include "iu_helpers.h" +#include -#include "ranap_common.h" -#include "ranap_ies_defs.h" -#include "ranap_msg_factory.h" +#include +#include +#include #define DRANAP _ranap_DRANAP diff --git a/src/ranap_msg_factory.h b/src/ranap_msg_factory.h deleted file mode 100644 index 7a9f3d2..0000000 --- a/src/ranap_msg_factory.h +++ /dev/null @@ -1,47 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -/*! \brief generate RANAP DIRECT TRANSFER message */ -struct msgb *ranap_new_msg_dt(uint8_t sapi, const uint8_t *nas, unsigned int nas_len); - -/*! \brief generate RANAP SECURITY MODE COMMAND message */ -struct msgb *ranap_new_msg_sec_mod_cmd(const uint8_t *ik, const uint8_t *ck); - -/*! \brief generate RANAP COMMON ID message */ -struct msgb *ranap_new_msg_common_id(const char *imsi); - -/*! \brief generate RANAP IU RELEASE COMMAND message */ -struct msgb *ranap_new_msg_iu_rel_cmd(const RANAP_Cause_t *cause_in); - -/*! \brief generate RANAP PAGING COMMAND message */ -struct msgb *ranap_new_msg_paging_cmd(const char *imsi, const uint32_t *tmsi, int is_ps, uint32_t cause); - -/*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for CS (voice) */ -struct msgb *ranap_new_msg_rab_assign_voice(uint8_t rab_id, uint32_t rtp_ip, uint16_t rtp_port); - -/*! \brief generate RANAP RAB ASSIGNMENT REQUEST message for PS (data) */ -struct msgb *ranap_new_msg_rab_assign_data(uint8_t rab_id, uint32_t gtp_ip, uint32_t gtp_tei); - -/*! \brief generate RANAP RESET message */ -struct msgb *ranap_new_msg_reset(RANAP_CN_DomainIndicator_t domain, - const RANAP_Cause_t *cause); - -/*! \brief generate RANAP RESET ACK message */ -struct msgb *ranap_new_msg_reset_ack(RANAP_CN_DomainIndicator_t domain, - RANAP_GlobalRNC_ID_t *rnc_id); - - -/*! \brief generate RANAP INITIAL UE message */ -struct msgb *ranap_new_msg_initial_ue(uint32_t conn_id, int is_ps, - RANAP_GlobalRNC_ID_t *rnc_id, - uint8_t *nas_pdu, unsigned int nas_len); - -/*! \brief generate RANAP IU RELEASE REQUEST message */ -struct msgb *ranap_new_msg_iu_rel_req(const RANAP_Cause_t *cause); - -/*! \brief generate RANAP RAB RELEASE REQUEST message */ -struct msgb *ranap_new_msg_rab_rel_req(uint8_t rab_id, const RANAP_Cause_t *cause); diff --git a/src/tests/dummy_cn_sua.c b/src/tests/dummy_cn_sua.c index 4760b7b..c9acd9f 100644 --- a/src/tests/dummy_cn_sua.c +++ b/src/tests/dummy_cn_sua.c @@ -18,7 +18,7 @@ #include "test_common.h" -#include "ranap_ies_defs.h" +#include #include "ranap_common_cn.h" #include "hnbgw.h" diff --git a/src/tests/hnb-test.c b/src/tests/hnb-test.c index b4a30f8..e2fa2ed 100644 --- a/src/tests/hnb-test.c +++ b/src/tests/hnb-test.c @@ -51,10 +51,10 @@ #include "hnbap_ies_defs.h" #include "rua_msg_factory.h" #include "asn1helpers.h" -#include "iu_helpers.h" +#include #include "test_common.h" -#include "ranap_msg_factory.h" +#include static void *tall_hnb_ctx; diff --git a/src/tests/ranap_common_cn.c b/src/tests/ranap_common_cn.c index f8b8e6e..799629e 100644 --- a/src/tests/ranap_common_cn.c +++ b/src/tests/ranap_common_cn.c @@ -25,8 +25,8 @@ #include #include -#include "ranap_common.h" -#include "ranap_ies_defs.h" +#include +#include #include "ranap_common_cn.h" #include "hnbgw.h" diff --git a/src/tests/ranap_common_cn.h b/src/tests/ranap_common_cn.h index 38d2384..6eb16c2 100644 --- a/src/tests/ranap_common_cn.h +++ b/src/tests/ranap_common_cn.h @@ -2,8 +2,8 @@ #include -#include "ranap_common.h" -#include "ranap_ies_defs.h" +#include +#include /* call-back functions to be provided by actual core network node */ int cn_ranap_handle_co(void *ctx, ranap_message *message); diff --git a/src/tests/test-helpers.c b/src/tests/test-helpers.c index b514d10..78bbe23 100644 --- a/src/tests/test-helpers.c +++ b/src/tests/test-helpers.c @@ -19,7 +19,7 @@ */ -#include "iu_helpers.h" +#include #include "asn1helpers.h" #include diff --git a/src/tests/test-hnbap.c b/src/tests/test-hnbap.c index 5101ff4..463b4d4 100644 --- a/src/tests/test-hnbap.c +++ b/src/tests/test-hnbap.c @@ -19,7 +19,7 @@ * */ -#include "iu_helpers.h" +#include #include "asn1helpers.h" #include "hnbap_common.h" diff --git a/src/tests/test-ranap.c b/src/tests/test-ranap.c index 8364e7e..5566848 100644 --- a/src/tests/test-ranap.c +++ b/src/tests/test-ranap.c @@ -22,11 +22,11 @@ #include #include "asn1helpers.h" -#include "iu_helpers.h" +#include -#include "ranap_common.h" -#include "ranap_ies_defs.h" -#include "ranap_msg_factory.h" +#include +#include +#include #include "test_common.h" -- cgit v1.2.3