lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38111?usp=email )
Change subject: Move vlr.h & vlr_sgs.h into osmocom/vlr/ ......................................................................
Move vlr.h & vlr_sgs.h into osmocom/vlr/
Prepare libvlr to be independent, start by moving the vlr headers into its own directory.
Change-Id: I8b18b05091b35e744b3234d1ce0d537f56bccf07 --- M configure.ac M include/osmocom/Makefile.am M include/osmocom/msc/Makefile.am M include/osmocom/msc/sgs_iface.h M include/osmocom/msc/transaction_cc.h A include/osmocom/vlr/Makefile.am R include/osmocom/vlr/vlr.h R include/osmocom/vlr/vlr_sgs.h M src/libmsc/ctrl_commands.c M src/libmsc/db.c M src/libmsc/e_link.c M src/libmsc/gsm_04_08.c M src/libmsc/gsm_04_08_cc.c M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_11_gsup.c M src/libmsc/gsm_09_11.c M src/libmsc/mncc_call.c M src/libmsc/msc_a.c M src/libmsc/msc_a_remote.c M src/libmsc/msc_ho.c M src/libmsc/msc_net_init.c M src/libmsc/msc_t.c M src/libmsc/msc_vgcs.c M src/libmsc/msc_vty.c M src/libmsc/msub.c M src/libmsc/paging.c M src/libmsc/ran_conn.c M src/libmsc/ran_peer.c M src/libmsc/sgs_iface.c M src/libmsc/silent_call.c M src/libmsc/sms_queue.c M src/libmsc/transaction.c M src/libsmpputil/smpp_msc.c M src/libvlr/vlr.c M src/libvlr/vlr_access_req_fsm.c M src/libvlr/vlr_auth_fsm.c M src/libvlr/vlr_core.h M src/libvlr/vlr_lu_fsm.c M src/libvlr/vlr_sgs.c M src/libvlr/vlr_sgs_fsm.c M tests/db_sms/db_sms_test.c M tests/msc_vlr/msc_vlr_test_rest.c M tests/msc_vlr/msc_vlr_tests.h M tests/sms_queue/sms_queue_test.c 44 files changed, 51 insertions(+), 47 deletions(-)
Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve
diff --git a/configure.ac b/configure.ac index 05bea8a..8170a1f 100644 --- a/configure.ac +++ b/configure.ac @@ -234,6 +234,7 @@ include/osmocom/Makefile include/osmocom/msc/Makefile include/osmocom/smpp/Makefile + include/osmocom/vlr/Makefile src/Makefile src/libmsc/Makefile src/libvlr/Makefile diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am index b07a004..e4ac924 100644 --- a/include/osmocom/Makefile.am +++ b/include/osmocom/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = \ msc \ smpp \ + vlr \ $(NULL) diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am index a940056..b6901b9 100644 --- a/include/osmocom/msc/Makefile.am +++ b/include/osmocom/msc/Makefile.am @@ -53,8 +53,6 @@ sms_queue.h \ transaction.h \ transaction_cc.h \ - vlr.h \ - vlr_sgs.h \ vty.h \ asci_gcr.h \ asci_vty.h \ diff --git a/include/osmocom/msc/sgs_iface.h b/include/osmocom/msc/sgs_iface.h index b5ff489..00e7ebc 100644 --- a/include/osmocom/msc/sgs_iface.h +++ b/include/osmocom/msc/sgs_iface.h @@ -22,8 +22,8 @@
#include <osmocom/gsm/protocol/gsm_23_003.h> #include <osmocom/gsm/protocol/gsm_29_118.h> -#include <osmocom/msc/vlr.h> -#include <osmocom/msc/vlr_sgs.h> +#include <osmocom/vlr/vlr.h> +#include <osmocom/vlr/vlr_sgs.h> #include <osmocom/msc/paging.h> #include <osmocom/core/socket.h>
diff --git a/include/osmocom/msc/transaction_cc.h b/include/osmocom/msc/transaction_cc.h index 963cb45..c19c033 100644 --- a/include/osmocom/msc/transaction_cc.h +++ b/include/osmocom/msc/transaction_cc.h @@ -28,7 +28,7 @@
#include <osmocom/msc/codec_mapping.h> #include <osmocom/msc/transaction.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h>
void trans_cc_filter_init(struct gsm_trans *trans); void trans_cc_filter_set_ran(struct gsm_trans *trans, enum osmo_rat_type ran_type); diff --git a/include/osmocom/vlr/Makefile.am b/include/osmocom/vlr/Makefile.am new file mode 100644 index 0000000..f47da40 --- /dev/null +++ b/include/osmocom/vlr/Makefile.am @@ -0,0 +1,4 @@ +noinst_HEADERS = \ + vlr.h \ + vlr_sgs.h \ + $(NULL) diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/vlr/vlr.h similarity index 99% rename from include/osmocom/msc/vlr.h rename to include/osmocom/vlr/vlr.h index 562b30f..8686020 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/vlr/vlr.h @@ -15,7 +15,7 @@ #include <osmocom/gsm/ipa.h> #include <osmocom/msc/msc_common.h> #include <osmocom/gsupclient/gsup_client.h> -#include <osmocom/msc/vlr_sgs.h> +#include <osmocom/vlr/vlr_sgs.h>
#define LOGGSUPP(level, gsup, fmt, args...) \ LOGP(DVLR, level, "GSUP(%s) " fmt, (gsup)->imsi, ## args) diff --git a/include/osmocom/msc/vlr_sgs.h b/include/osmocom/vlr/vlr_sgs.h similarity index 100% rename from include/osmocom/msc/vlr_sgs.h rename to include/osmocom/vlr/vlr_sgs.h diff --git a/src/libmsc/ctrl_commands.c b/src/libmsc/ctrl_commands.c index 87e9afd..d228309 100644 --- a/src/libmsc/ctrl_commands.c +++ b/src/libmsc/ctrl_commands.c @@ -25,7 +25,7 @@ #include <osmocom/msc/gsm_subscriber.h> #include <osmocom/msc/db.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h>
#include <stdbool.h>
diff --git a/src/libmsc/db.c b/src/libmsc/db.c index d12f04c..04e11c5 100644 --- a/src/libmsc/db.c +++ b/src/libmsc/db.c @@ -35,7 +35,7 @@ #include <osmocom/msc/gsm_04_11.h> #include <osmocom/msc/db.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h>
#include <osmocom/gsm/protocol/gsm_23_003.h> #include <osmocom/core/talloc.h> diff --git a/src/libmsc/e_link.c b/src/libmsc/e_link.c index b26f53b..5107c22 100644 --- a/src/libmsc/e_link.c +++ b/src/libmsc/e_link.c @@ -29,7 +29,7 @@ #include <osmocom/msc/e_link.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/msc_roles.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/ran_infra.h> #include <osmocom/msc/msc_a.h> #include <osmocom/msc/msc_a_remote.h> diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 17350fa..34f7b76 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -39,7 +39,7 @@ #include <osmocom/msc/msc_vgcs.h> #include <osmocom/msc/signal.h> #include <osmocom/msc/transaction.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msc_a.h>
#include <osmocom/gsm/gsm48.h> diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index c27caab..dafb41c 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -48,7 +48,7 @@ #include <osmocom/msc/mncc_int.h> #include <osmocom/abis/e1_input.h> #include <osmocom/core/bitvec.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/msc_a.h> #include <osmocom/msc/paging.h> diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index ed36302..6536d0b 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -52,7 +52,7 @@ #include <osmocom/msc/signal.h> #include <osmocom/msc/db.h> #include <osmocom/msc/transaction.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/msc_a.h> #include <osmocom/msc/paging.h> diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index 328d047..3566e76 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -30,7 +30,7 @@ #include <osmocom/msc/transaction.h> #include <osmocom/msc/msc_common.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/gsup_client_mux.h> #include <osmocom/msc/msc_a.h> diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index ab40f02..86b4a4f 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -43,7 +43,7 @@ #include <osmocom/msc/gsm_04_80.h> #include <osmocom/msc/gsm_subscriber.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/gsm_04_08.h> #include <osmocom/msc/transaction.h> #include <osmocom/gsupclient/gsup_client.h> diff --git a/src/libmsc/mncc_call.c b/src/libmsc/mncc_call.c index 557f2d7..a42baff 100644 --- a/src/libmsc/mncc_call.c +++ b/src/libmsc/mncc_call.c @@ -34,7 +34,7 @@ #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/rtp_stream.h> #include <osmocom/msc/msub.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/codec_mapping.h>
struct osmo_fsm mncc_call_fsm; diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index 59f1a57..97f723c 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -34,7 +34,7 @@ #include <osmocom/msc/msc_i.h> #include <osmocom/msc/paging.h> #include <osmocom/msc/signal.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/transaction_cc.h> #include <osmocom/msc/ran_conn.h> diff --git a/src/libmsc/msc_a_remote.c b/src/libmsc/msc_a_remote.c index 3b9693e..ae9d6b7 100644 --- a/src/libmsc/msc_a_remote.c +++ b/src/libmsc/msc_a_remote.c @@ -34,7 +34,7 @@ #include <osmocom/msc/msc_a.h> #include <osmocom/msc/msc_t.h> #include <osmocom/msc/e_link.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/ran_peer.h>
static struct osmo_fsm msc_a_remote_fsm; diff --git a/src/libmsc/msc_ho.c b/src/libmsc/msc_ho.c index cea658c..d5dba30 100644 --- a/src/libmsc/msc_ho.c +++ b/src/libmsc/msc_ho.c @@ -34,7 +34,7 @@ #include <osmocom/msc/neighbor_ident.h> #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/ran_peer.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/gsm_04_08.h> #include <osmocom/msc/call_leg.h> diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index 1fc712a..9b8a8b3 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -27,7 +27,7 @@ #include <osmocom/crypt/utran_cipher.h>
#include <osmocom/msc/gsm_data.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/gsup_client_mux.h> #include <osmocom/msc/gsm_04_11_gsup.h> #include <osmocom/msc/gsm_09_11.h> diff --git a/src/libmsc/msc_t.c b/src/libmsc/msc_t.c index eb6c797..65ebb69 100644 --- a/src/libmsc/msc_t.c +++ b/src/libmsc/msc_t.c @@ -35,7 +35,7 @@ #include <osmocom/msc/call_leg.h> #include <osmocom/msc/rtp_stream.h> #include <osmocom/msc/ran_infra.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msc_i.h> #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/codec_mapping.h> diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c index 4660a2c..528d282 100644 --- a/src/libmsc/msc_vgcs.c +++ b/src/libmsc/msc_vgcs.c @@ -93,7 +93,7 @@ #include <osmocom/msc/msub.h> #include <osmocom/msc/debug.h> #include <osmocom/msc/msc_a.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/rtp_stream.h> #include <osmocom/msc/codec_mapping.h> #include <osmocom/msc/msc_vgcs.h> diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index dfed117..92b166f 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -52,7 +52,7 @@ #include <osmocom/msc/gsm_subscriber.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/msc_a.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/db.h> #include <osmocom/msc/sms_queue.h> @@ -63,7 +63,7 @@ #include <osmocom/msc/mncc_int.h> #include <osmocom/msc/osmux.h> #include <osmocom/msc/rrlp.h> -#include <osmocom/msc/vlr_sgs.h> +#include <osmocom/vlr/vlr_sgs.h> #include <osmocom/msc/sgs_vty.h> #include <osmocom/msc/sccp_ran.h> #include <osmocom/msc/ran_peer.h> diff --git a/src/libmsc/msub.c b/src/libmsc/msub.c index 8df8d26..c821c1c 100644 --- a/src/libmsc/msub.c +++ b/src/libmsc/msub.c @@ -29,7 +29,7 @@ #include <osmocom/msc/msc_i.h> #include <osmocom/msc/msc_t.h> #include <osmocom/msc/ran_conn.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/e_link.h>
const struct value_string msc_role_names[] = { diff --git a/src/libmsc/paging.c b/src/libmsc/paging.c index 6e3d20e..8c166c9 100644 --- a/src/libmsc/paging.c +++ b/src/libmsc/paging.c @@ -22,7 +22,7 @@
#include <osmocom/msc/gsm_data.h> #include <osmocom/msc/paging.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/ran_peer.h> #include <osmocom/msc/sgs_iface.h> #include <osmocom/msc/signal.h> diff --git a/src/libmsc/ran_conn.c b/src/libmsc/ran_conn.c index 0763801..a86b27e 100644 --- a/src/libmsc/ran_conn.c +++ b/src/libmsc/ran_conn.c @@ -26,7 +26,7 @@ #include <osmocom/core/signal.h>
#include <osmocom/msc/ran_conn.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/debug.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/signal.h> diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c index 8604443..09e57eb 100644 --- a/src/libmsc/ran_peer.c +++ b/src/libmsc/ran_peer.c @@ -30,7 +30,7 @@ #include <osmocom/msc/msub.h> #include <osmocom/msc/msc_i.h> #include <osmocom/msc/msc_a.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/ran_conn.h> #include <osmocom/msc/cell_id_list.h> #include <osmocom/msc/msc_vgcs.h> diff --git a/src/libmsc/sgs_iface.c b/src/libmsc/sgs_iface.c index 0147d3f..178aa64 100644 --- a/src/libmsc/sgs_iface.c +++ b/src/libmsc/sgs_iface.c @@ -33,8 +33,8 @@
#include <osmocom/netif/stream.h>
-#include <osmocom/msc/vlr.h> -#include <osmocom/msc/vlr_sgs.h> +#include <osmocom/vlr/vlr.h> +#include <osmocom/vlr/vlr_sgs.h> #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/gsm_04_08.h> #include <osmocom/msc/msub.h> diff --git a/src/libmsc/silent_call.c b/src/libmsc/silent_call.c index 4de12b9..a59e3af 100644 --- a/src/libmsc/silent_call.c +++ b/src/libmsc/silent_call.c @@ -31,7 +31,7 @@ #include <osmocom/msc/debug.h> #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/gsm_subscriber.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msc_a.h> #include <osmocom/msc/paging.h> #include <osmocom/msc/transaction.h> diff --git a/src/libmsc/sms_queue.c b/src/libmsc/sms_queue.c index 9f18f4f..7dd14ff 100644 --- a/src/libmsc/sms_queue.c +++ b/src/libmsc/sms_queue.c @@ -37,7 +37,7 @@ #include <osmocom/msc/gsm_04_11.h> #include <osmocom/msc/gsm_subscriber.h> #include <osmocom/msc/signal.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h>
#include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 7ae4c7d..b7c7beb 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -24,7 +24,7 @@ #include <osmocom/msc/debug.h> #include <osmocom/core/talloc.h> #include <osmocom/msc/gsm_04_08.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msc_a.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/paging.h> diff --git a/src/libsmpputil/smpp_msc.c b/src/libsmpputil/smpp_msc.c index 0c2a928..d68dcc0 100644 --- a/src/libsmpputil/smpp_msc.c +++ b/src/libsmpputil/smpp_msc.c @@ -46,7 +46,7 @@ #include <osmocom/msc/signal.h> #include <osmocom/msc/transaction.h> #include <osmocom/msc/gsm_subscriber.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msc_a.h> #include <osmocom/smpp/smpp_smsc.h>
diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index e190132..dbf9e67 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -32,8 +32,8 @@ #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/ipa.h> #include <osmocom/gsupclient/gsup_client.h> -#include <osmocom/msc/vlr_sgs.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr_sgs.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/debug.h> #include <osmocom/msc/gsup_client_mux.h> #include <osmocom/msc/paging.h> diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c index 629625e..c2e185b 100644 --- a/src/libvlr/vlr_access_req_fsm.c +++ b/src/libvlr/vlr_access_req_fsm.c @@ -22,7 +22,7 @@ #include <osmocom/core/fsm.h> #include <osmocom/gsm/gsup.h> #include <osmocom/gsm/gsm48.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/debug.h>
#include "vlr_core.h" diff --git a/src/libvlr/vlr_auth_fsm.c b/src/libvlr/vlr_auth_fsm.c index b5052b0..0f7efc6 100644 --- a/src/libvlr/vlr_auth_fsm.c +++ b/src/libvlr/vlr_auth_fsm.c @@ -23,7 +23,7 @@ #include <osmocom/core/fsm.h> #include <osmocom/core/utils.h> #include <osmocom/gsm/gsup.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/debug.h>
#include "vlr_core.h" diff --git a/src/libvlr/vlr_core.h b/src/libvlr/vlr_core.h index 41b8800..ec11448 100644 --- a/src/libvlr/vlr_core.h +++ b/src/libvlr/vlr_core.h @@ -1,6 +1,6 @@ #pragma once
-#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h>
struct osmo_gsup_message;
diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 5d8f78b..d622baa 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -21,7 +21,7 @@
#include <osmocom/core/fsm.h> #include <osmocom/gsm/gsm48.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/debug.h>
#include "vlr_core.h" diff --git a/src/libvlr/vlr_sgs.c b/src/libvlr/vlr_sgs.c index 61db585..a0147c0 100644 --- a/src/libvlr/vlr_sgs.c +++ b/src/libvlr/vlr_sgs.c @@ -23,8 +23,8 @@ #include <osmocom/core/utils.h> #include <osmocom/core/fsm.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> -#include <osmocom/msc/vlr_sgs.h> +#include <osmocom/vlr/vlr.h> +#include <osmocom/vlr/vlr_sgs.h> #include "vlr_sgs_fsm.h"
const struct value_string sgs_state_timer_names[] = { diff --git a/src/libvlr/vlr_sgs_fsm.c b/src/libvlr/vlr_sgs_fsm.c index 9aac74b..c7a9fdd 100644 --- a/src/libvlr/vlr_sgs_fsm.c +++ b/src/libvlr/vlr_sgs_fsm.c @@ -22,8 +22,8 @@ #include <osmocom/core/fsm.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> -#include <osmocom/msc/vlr_sgs.h> +#include <osmocom/vlr/vlr.h> +#include <osmocom/vlr/vlr_sgs.h>
#include "vlr_sgs_fsm.h" #include "vlr_core.h" diff --git a/tests/db_sms/db_sms_test.c b/tests/db_sms/db_sms_test.c index 7c015d3..352ec01 100644 --- a/tests/db_sms/db_sms_test.c +++ b/tests/db_sms/db_sms_test.c @@ -32,7 +32,7 @@
#include <osmocom/msc/gsm_data.h> #include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/db.h>
/* Talloc context of this unit test */ diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c index 029e8b5..54ea2f7 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.c +++ b/tests/msc_vlr/msc_vlr_test_rest.c @@ -23,7 +23,7 @@
#include "msc_vlr_tests.h"
-#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h>
#if 0 static void test_early_stage() diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index b0605f1..f095a7f 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -28,7 +28,7 @@
#include <osmocom/crypt/utran_cipher.h> #include <osmocom/msc/gsm_data.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/msub.h> #include <osmocom/msc/msc_a.h> #include <osmocom/msc/mncc.h> diff --git a/tests/sms_queue/sms_queue_test.c b/tests/sms_queue/sms_queue_test.c index cc78e14..bca60b1 100644 --- a/tests/sms_queue/sms_queue_test.c +++ b/tests/sms_queue/sms_queue_test.c @@ -24,7 +24,7 @@ #include <osmocom/core/application.h>
#include <osmocom/msc/debug.h> -#include <osmocom/msc/vlr.h> +#include <osmocom/vlr/vlr.h> #include <osmocom/msc/gsm_data.h> #include <osmocom/msc/gsm_04_11.h> #include <osmocom/msc/db.h>