diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2019-11-20 00:37:07 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2019-11-20 01:25:39 +0100 |
| commit | 2f75803e5dba27b1a2afcffe753f58ee29d83987 (patch) | |
| tree | ddaca8df29d59e722ea8f8ee641902430dfa8c7b | |
| parent | 7f4dd11682186f6c2426ff9b7f6075b3c409cba1 (diff) | |
move headers to include/osmocom/hlr
Apply the same headers structure that we keep in most Osmocom source trees:
Keep noinst_HEADERS in include/osmocom/hlr and include them using
#include <osmocom/hlr/*.h>
The only header kept in src/ is db_bootstrap.h, because it is generated during
build time. If it was built in include/osmocom/hlr, we would need db.o to
depend on db_bootstrap.h in a different subdir, which automake can't do well.
Change-Id: Ic912fe27f545b85443c5fb713d8c3c8aac23c9ad
42 files changed, 99 insertions, 90 deletions
diff --git a/configure.ac b/configure.ac index ca78f38..f7714aa 100644 --- a/configure.ac +++ b/configure.ac @@ -175,6 +175,8 @@ AC_OUTPUT( src/Makefile src/gsupclient/Makefile include/Makefile + include/osmocom/Makefile + include/osmocom/hlr/Makefile libosmo-gsup-client.pc sql/Makefile doc/manuals/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index dac7011..d8eb1ec 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,2 +1,3 @@ -nobase_include_HEADERS = osmocom/gsupclient/gsup_client.h +SUBDIRS = osmocom +nobase_include_HEADERS = osmocom/gsupclient/gsup_client.h diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am new file mode 100644 index 0000000..dbc2344 --- /dev/null +++ b/include/osmocom/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + hlr \ + $(NULL) diff --git a/include/osmocom/hlr/Makefile.am b/include/osmocom/hlr/Makefile.am new file mode 100644 index 0000000..77a8764 --- /dev/null +++ b/include/osmocom/hlr/Makefile.am @@ -0,0 +1,14 @@ +noinst_HEADERS = \ + auc.h \ + ctrl.h \ + db.h \ + gsup_router.h \ + gsup_server.h \ + hlr.h \ + hlr_ussd.h \ + hlr_vty.h \ + hlr_vty_subscr.h \ + logging.h \ + luop.h \ + rand.h \ + $(NULL) diff --git a/src/auc.h b/include/osmocom/hlr/auc.h index f5b6765..f5b6765 100644 --- a/src/auc.h +++ b/include/osmocom/hlr/auc.h diff --git a/src/ctrl.h b/include/osmocom/hlr/ctrl.h index 3f9ba3f..3f9ba3f 100644 --- a/src/ctrl.h +++ b/include/osmocom/hlr/ctrl.h diff --git a/src/db.h b/include/osmocom/hlr/db.h index 15d83de..15d83de 100644 --- a/src/db.h +++ b/include/osmocom/hlr/db.h diff --git a/src/gsup_router.h b/include/osmocom/hlr/gsup_router.h index bff484e..0fc10d0 100644 --- a/src/gsup_router.h +++ b/include/osmocom/hlr/gsup_router.h @@ -1,7 +1,7 @@ #pragma once #include <stdint.h> -#include "gsup_server.h" +#include <osmocom/hlr/gsup_server.h> struct gsup_route { struct llist_head list; diff --git a/src/gsup_server.h b/include/osmocom/hlr/gsup_server.h index 9c4d483..9c4d483 100644 --- a/src/gsup_server.h +++ b/include/osmocom/hlr/gsup_server.h diff --git a/src/hlr.h b/include/osmocom/hlr/hlr.h index 18c4a1d..18c4a1d 100644 --- a/src/hlr.h +++ b/include/osmocom/hlr/hlr.h diff --git a/src/hlr_ussd.h b/include/osmocom/hlr/hlr_ussd.h index 393ca6c..08e810e 100644 --- a/src/hlr_ussd.h +++ b/include/osmocom/hlr/hlr_ussd.h @@ -5,7 +5,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/gsm/gsup.h> -#include "gsup_server.h" +#include <osmocom/hlr/gsup_server.h> #define NCSS_GUARD_TIMEOUT_DEFAULT 30 diff --git a/src/hlr_vty.h b/include/osmocom/hlr/hlr_vty.h index 280b55a..acd6510 100644 --- a/src/hlr_vty.h +++ b/include/osmocom/hlr/hlr_vty.h @@ -25,7 +25,7 @@ #include <osmocom/core/logging.h> #include <osmocom/vty/vty.h> #include <osmocom/vty/command.h> -#include "hlr.h" +#include <osmocom/hlr/hlr.h> enum hlr_vty_node { HLR_NODE = _LAST_OSMOVTY_NODE + 1, diff --git a/src/hlr_vty_subscr.h b/include/osmocom/hlr/hlr_vty_subscr.h index 5dd0772..5dd0772 100644 --- a/src/hlr_vty_subscr.h +++ b/include/osmocom/hlr/hlr_vty_subscr.h diff --git a/src/logging.h b/include/osmocom/hlr/logging.h index ed24075..ed24075 100644 --- a/src/logging.h +++ b/include/osmocom/hlr/logging.h diff --git a/src/luop.h b/include/osmocom/hlr/luop.h index f96593b..77a1dec 100644 --- a/src/luop.h +++ b/include/osmocom/hlr/luop.h @@ -27,8 +27,8 @@ #include <osmocom/core/timer.h> #include <osmocom/gsm/gsup.h> -#include "db.h" -#include "gsup_server.h" +#include <osmocom/hlr/db.h> +#include <osmocom/hlr/gsup_server.h> #define CANCEL_TIMEOUT_SECS 30 #define ISD_TIMEOUT_SECS 30 diff --git a/src/rand.h b/include/osmocom/hlr/rand.h index 9c5aedf..9c5aedf 100644 --- a/src/rand.h +++ b/include/osmocom/hlr/rand.h diff --git a/src/Makefile.am b/src/Makefile.am index a042e4e..a5b71cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,6 +11,7 @@ AM_CFLAGS = \ $(NULL) AM_CPPFLAGS = -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ $(NULL) EXTRA_DIST = \ @@ -24,18 +25,6 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) noinst_HEADERS = \ - auc.h \ - db.h \ - hlr.h \ - luop.h \ - gsup_router.h \ - gsup_server.h \ - logging.h \ - rand.h \ - ctrl.h \ - hlr_vty.h \ - hlr_vty_subscr.h \ - hlr_ussd.h \ db_bootstrap.h \ $(NULL) @@ -23,8 +23,8 @@ #include <osmocom/core/utils.h> #include <osmocom/crypt/auth.h> -#include "logging.h" -#include "rand.h" +#include <osmocom/hlr/logging.h> +#include <osmocom/hlr/rand.h> #define hexb(buf) osmo_hexdump_nospc((void*)buf, sizeof(buf)) #define hex(buf,sz) osmo_hexdump_nospc((void*)buf, sz) @@ -28,9 +28,9 @@ #include <osmocom/gsm/gsm23003.h> #include <osmocom/ctrl/ports.h> -#include "hlr.h" -#include "ctrl.h" -#include "db.h" +#include <osmocom/hlr/hlr.h> +#include <osmocom/hlr/ctrl.h> +#include <osmocom/hlr/db.h> #define SEL_BY "by-" #define SEL_BY_IMSI SEL_BY "imsi-" @@ -23,8 +23,8 @@ #include <sqlite3.h> #include <string.h> -#include "logging.h" -#include "db.h" +#include <osmocom/hlr/logging.h> +#include <osmocom/hlr/db.h> #include "db_bootstrap.h" /* This constant is currently duplicated in sql/hlr.sql and must be kept in sync! */ diff --git a/src/db_auc.c b/src/db_auc.c index 2cf7143..e3a840e 100644 --- a/src/db_auc.c +++ b/src/db_auc.c @@ -26,10 +26,10 @@ #include <sqlite3.h> -#include "logging.h" -#include "db.h" -#include "auc.h" -#include "rand.h" +#include <osmocom/hlr/logging.h> +#include <osmocom/hlr/db.h> +#include <osmocom/hlr/auc.h> +#include <osmocom/hlr/rand.h> #define LOGAUC(imsi, level, fmt, args ...) LOGP(DAUC, level, "IMSI='%s': " fmt, imsi, ## args) diff --git a/src/db_hlr.c b/src/db_hlr.c index 694ac53..e52b5ed 100644 --- a/src/db_hlr.c +++ b/src/db_hlr.c @@ -33,11 +33,11 @@ #include <sqlite3.h> -#include "logging.h" -#include "hlr.h" -#include "db.h" -#include "gsup_server.h" -#include "luop.h" +#include <osmocom/hlr/logging.h> +#include <osmocom/hlr/hlr.h> +#include <osmocom/hlr/db.h> +#include <osmocom/hlr/gsup_server.h> +#include <osmocom/hlr/luop.h> #define LOGHLR(imsi, level, fmt, args ...) LOGP(DAUC, level, "IMSI='%s': " fmt, imsi, ## args) diff --git a/src/gsup_router.c b/src/gsup_router.c index df978ba..adf3af7 100644 --- a/src/gsup_router.c +++ b/src/gsup_router.c @@ -23,9 +23,9 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/talloc.h> -#include "logging.h" -#include "gsup_server.h" -#include "gsup_router.h" +#include <osmocom/hlr/logging.h> +#include <osmocom/hlr/gsup_server.h> +#include <osmocom/hlr/gsup_router.h> /*! Find a route for the given address. * \param[in] gs gsup server diff --git a/src/gsup_send.c b/src/gsup_send.c index 247a7e7..29aeaa5 100644 --- a/src/gsup_send.c +++ b/src/gsup_send.c @@ -21,8 +21,8 @@ #include <errno.h> -#include "gsup_server.h" -#include "gsup_router.h" +#include <osmocom/hlr/gsup_server.h> +#include <osmocom/hlr/gsup_router.h> #include <osmocom/core/logging.h> diff --git a/src/gsup_server.c b/src/gsup_server.c index e75bbd7..bee6aef 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -27,8 +27,8 @@ #include <osmocom/gsm/gsm48_ie.h> #include <osmocom/gsm/apn.h> -#include "gsup_server.h" -#include "gsup_router.h" +#include <osmocom/hlr/gsup_server.h> +#include <osmocom/hlr/gsup_router.h> static void osmo_gsup_server_send(struct osmo_gsup_conn *conn, int proto_ext, struct msgb *msg_tx) @@ -37,16 +37,16 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_23_003.h> -#include "db.h" -#include "hlr.h" -#include "ctrl.h" -#include "logging.h" -#include "gsup_server.h" -#include "gsup_router.h" -#include "rand.h" -#include "luop.h" -#include "hlr_vty.h" -#include "hlr_ussd.h" +#include <osmocom/hlr/db.h> +#include <osmocom/hlr/hlr.h> +#include <osmocom/hlr/ctrl.h> +#include <osmocom/hlr/logging.h> +#include <osmocom/hlr/gsup_server.h> +#include <osmocom/hlr/gsup_router.h> +#include <osmocom/hlr/rand.h> +#include <osmocom/hlr/luop.h> +#include <osmocom/hlr/hlr_vty.h> +#include <osmocom/hlr/hlr_ussd.h> struct hlr *g_hlr; static void *hlr_ctx = NULL; diff --git a/src/hlr_db_tool.c b/src/hlr_db_tool.c index fcef597..1212018 100644 --- a/src/hlr_db_tool.c +++ b/src/hlr_db_tool.c @@ -29,9 +29,9 @@ #include <osmocom/core/logging.h> #include <osmocom/core/application.h> -#include "logging.h" -#include "db.h" -#include "rand.h" +#include <osmocom/hlr/logging.h> +#include <osmocom/hlr/db.h> +#include <osmocom/hlr/rand.h> struct hlr_db_tool_ctx { /* DB context */ diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c index 1568815..00023ba 100644 --- a/src/hlr_ussd.c +++ b/src/hlr_ussd.c @@ -29,12 +29,12 @@ #include <string.h> #include <errno.h> -#include "hlr.h" -#include "hlr_ussd.h" -#include "gsup_server.h" -#include "gsup_router.h" -#include "logging.h" -#include "db.h" +#include <osmocom/hlr/hlr.h> +#include <osmocom/hlr/hlr_ussd.h> +#include <osmocom/hlr/gsup_server.h> +#include <osmocom/hlr/gsup_router.h> +#include <osmocom/hlr/logging.h> +#include <osmocom/hlr/db.h> /*********************************************************************** * core data structures expressing config from VTY @@ -317,7 +317,7 @@ static int ss_tx_ussd_7bit(struct ss_session *ss, bool final, uint8_t invoke_id, * Internal USSD Handlers ***********************************************************************/ -#include "db.h" +#include <osmocom/hlr/db.h> static int handle_ussd_own_msisdn(struct osmo_gsup_conn *conn, struct ss_session *ss, const struct osmo_gsup_message *gsup, const struct ss_request *req) diff --git a/src/hlr_vty.c b/src/hlr_vty.c index f7c5bc8..6701cd9 100644 --- a/src/hlr_vty.c +++ b/src/hlr_vty.c @@ -33,12 +33,12 @@ #include <osmocom/vty/misc.h> #include <osmocom/abis/ipa.h> -#include "db.h" -#include "hlr.h" -#include "hlr_vty.h" -#include "hlr_vty_subscr.h" -#include "hlr_ussd.h" -#include "gsup_server.h" +#include <osmocom/hlr/db.h> +#include <osmocom/hlr/hlr.h> +#include <osmocom/hlr/hlr_vty.h> +#include <osmocom/hlr/hlr_vty_subscr.h> +#include <osmocom/hlr/hlr_ussd.h> +#include <osmocom/hlr/gsup_server.h> struct cmd_node hlr_node = { HLR_NODE, @@ -150,7 +150,7 @@ DEFUN(cfg_hlr_gsup_bind_ip, * USSD Entity ***********************************************************************/ -#include "hlr_ussd.h" +#include <osmocom/hlr/hlr_ussd.h> #define USSD_STR "USSD Configuration\n" #define UROUTE_STR "Routing Configuration\n" diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c index 73dfab6..d2c4c81 100644 --- a/src/hlr_vty_subscr.c +++ b/src/hlr_vty_subscr.c @@ -28,8 +28,8 @@ #include <osmocom/vty/command.h> #include <osmocom/core/utils.h> -#include "hlr.h" -#include "db.h" +#include <osmocom/hlr/hlr.h> +#include <osmocom/hlr/db.h> struct vty; diff --git a/src/logging.c b/src/logging.c index 3fa2a69..3713ab3 100644 --- a/src/logging.c +++ b/src/logging.c @@ -1,5 +1,5 @@ #include <osmocom/core/utils.h> -#include "logging.h" +#include <osmocom/hlr/logging.h> const struct log_info_cat hlr_log_info_cat[] = { [DMAIN] = { @@ -28,10 +28,10 @@ #include <osmocom/gsm/gsup.h> #include <osmocom/gsm/apn.h> -#include "gsup_server.h" -#include "gsup_router.h" -#include "logging.h" -#include "luop.h" +#include <osmocom/hlr/gsup_server.h> +#include <osmocom/hlr/gsup_router.h> +#include <osmocom/hlr/logging.h> +#include <osmocom/hlr/luop.h> const struct value_string lu_state_names[] = { { LU_S_NULL, "NULL" }, diff --git a/src/osmo-euse-demo.c b/src/osmo-euse-demo.c index 4e4ef78..e707a9c 100644 --- a/src/osmo-euse-demo.c +++ b/src/osmo-euse-demo.c @@ -44,7 +44,7 @@ #include <osmocom/gsupclient/gsup_client.h> -#include "logging.h" +#include <osmocom/hlr/logging.h> static struct osmo_gsup_client *g_gc; diff --git a/tests/auc/Makefile.am b/tests/auc/Makefile.am index a3814b6..9b65d71 100644 --- a/tests/auc/Makefile.am +++ b/tests/auc/Makefile.am @@ -2,12 +2,12 @@ SUBDIRS = gen_ts_55_205_test_sets AM_CPPFLAGS = \ $(all_includes) \ - -I$(top_srcdir)/src \ $(NULL) AM_CFLAGS = \ -Wall \ -ggdb3 \ + -I$(top_srcdir)/include \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(NULL) diff --git a/tests/auc/auc_test.c b/tests/auc/auc_test.c index e23cc02..cdbd0b7 100644 --- a/tests/auc/auc_test.c +++ b/tests/auc/auc_test.c @@ -29,8 +29,8 @@ #include <osmocom/crypt/auth.h> -#include "logging.h" -#include "auc.h" +#include <osmocom/hlr/logging.h> +#include <osmocom/hlr/auc.h> #define comment_start() fprintf(stderr, "\n===== %s\n", __func__); #define comment_end() fprintf(stderr, "===== %s: SUCCESS\n\n", __func__); diff --git a/tests/auc/gen_ts_55_205_test_sets/main_template.c b/tests/auc/gen_ts_55_205_test_sets/main_template.c index a78bddb..3fafdf5 100644 --- a/tests/auc/gen_ts_55_205_test_sets/main_template.c +++ b/tests/auc/gen_ts_55_205_test_sets/main_template.c @@ -33,8 +33,8 @@ #include <osmocom/crypt/auth.h> -#include "logging.h" -#include "auc.h" +#include <osmocom/hlr/logging.h> +#include <osmocom/hlr/auc.h> #define comment_start() fprintf(stderr, "\n===== %s\n", __func__); #define comment_end() fprintf(stderr, "===== %s: SUCCESS\n\n", __func__); diff --git a/tests/db/Makefile.am b/tests/db/Makefile.am index 5730937..f13824d 100644 --- a/tests/db/Makefile.am +++ b/tests/db/Makefile.am @@ -1,7 +1,7 @@ AM_CFLAGS = \ $(all_includes) \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ -Wall \ -ggdb3 \ $(LIBOSMOCORE_CFLAGS) \ diff --git a/tests/db/db_test.c b/tests/db/db_test.c index 1da2752..d6060dd 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -27,8 +27,8 @@ #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> -#include "db.h" -#include "logging.h" +#include <osmocom/hlr/db.h> +#include <osmocom/hlr/logging.h> #define comment_start() fprintf(stderr, "\n===== %s\n", __func__); #define comment(fmt, args...) fprintf(stderr, "\n--- " fmt "\n\n", ## args); diff --git a/tests/gsup/Makefile.am b/tests/gsup/Makefile.am index 907aae8..2f56504 100644 --- a/tests/gsup/Makefile.am +++ b/tests/gsup/Makefile.am @@ -1,11 +1,11 @@ AM_CPPFLAGS = \ $(all_includes) \ - -I$(top_srcdir)/src \ $(NULL) AM_CFLAGS = \ -Wall \ -ggdb3 \ + -I$(top_srcdir)/include \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c index 41865d2..a41ba88 100644 --- a/tests/gsup/gsup_test.c +++ b/tests/gsup/gsup_test.c @@ -24,8 +24,8 @@ #include <osmocom/core/application.h> #include <osmocom/gsm/gsup.h> -#include "logging.h" -#include "luop.h" +#include <osmocom/hlr/logging.h> +#include <osmocom/hlr/luop.h> struct osmo_gsup_server; diff --git a/tests/gsup_server/Makefile.am b/tests/gsup_server/Makefile.am index 686ce37..e64ac4a 100644 --- a/tests/gsup_server/Makefile.am +++ b/tests/gsup_server/Makefile.am @@ -1,11 +1,11 @@ AM_CPPFLAGS = \ $(all_includes) \ - -I$(top_srcdir)/src \ $(NULL) AM_CFLAGS = \ -Wall \ -ggdb3 \ + -I$(top_srcdir)/include \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ diff --git a/tests/gsup_server/gsup_server_test.c b/tests/gsup_server/gsup_server_test.c index cc475be..4aec69b 100644 --- a/tests/gsup_server/gsup_server_test.c +++ b/tests/gsup_server/gsup_server_test.c @@ -20,7 +20,7 @@ #include <stdio.h> #include <osmocom/core/utils.h> -#include "gsup_server.h" +#include <osmocom/hlr/gsup_server.h> #define comment_start() printf("\n===== %s\n", __func__) #define comment_end() printf("===== %s: SUCCESS\n\n", __func__) |