<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16197">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move headers to include/osmocom/hlr<br><br>Apply the same headers structure that we keep in most Osmocom source trees:<br>Keep noinst_HEADERS in include/osmocom/hlr and include them using<br>  #include <osmocom/hlr/*.h><br><br>The only header kept in src/ is db_bootstrap.h, because it is generated during<br>build time. If it was built in include/osmocom/hlr, we would need db.o to<br>depend on db_bootstrap.h in a different subdir, which automake can't do well.<br><br>Change-Id: Ic912fe27f545b85443c5fb713d8c3c8aac23c9ad<br>---<br>M configure.ac<br>M include/Makefile.am<br>A include/osmocom/Makefile.am<br>A include/osmocom/hlr/Makefile.am<br>R include/osmocom/hlr/auc.h<br>R include/osmocom/hlr/ctrl.h<br>R include/osmocom/hlr/db.h<br>R include/osmocom/hlr/gsup_router.h<br>R include/osmocom/hlr/gsup_server.h<br>R include/osmocom/hlr/hlr.h<br>R include/osmocom/hlr/hlr_ussd.h<br>R include/osmocom/hlr/hlr_vty.h<br>R include/osmocom/hlr/hlr_vty_subscr.h<br>R include/osmocom/hlr/logging.h<br>R include/osmocom/hlr/luop.h<br>R include/osmocom/hlr/rand.h<br>M src/Makefile.am<br>M src/auc.c<br>M src/ctrl.c<br>M src/db.c<br>M src/db_auc.c<br>M src/db_hlr.c<br>M src/gsup_router.c<br>M src/gsup_send.c<br>M src/gsup_server.c<br>M src/hlr.c<br>M src/hlr_db_tool.c<br>M src/hlr_ussd.c<br>M src/hlr_vty.c<br>M src/hlr_vty_subscr.c<br>M src/logging.c<br>M src/luop.c<br>M src/osmo-euse-demo.c<br>M tests/auc/Makefile.am<br>M tests/auc/auc_test.c<br>M tests/auc/gen_ts_55_205_test_sets/main_template.c<br>M tests/db/Makefile.am<br>M tests/db/db_test.c<br>M tests/gsup/Makefile.am<br>M tests/gsup/gsup_test.c<br>M tests/gsup_server/Makefile.am<br>M tests/gsup_server/gsup_server_test.c<br>42 files changed, 99 insertions(+), 90 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/97/16197/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index ca78f38..f7714aa 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -175,6 +175,8 @@</span><br><span>   src/Makefile</span><br><span>         src/gsupclient/Makefile</span><br><span>      include/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+      include/osmocom/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+      include/osmocom/hlr/Makefile</span><br><span>         libosmo-gsup-client.pc</span><br><span>       sql/Makefile</span><br><span>         doc/manuals/Makefile</span><br><span>diff --git a/include/Makefile.am b/include/Makefile.am</span><br><span>index dac7011..d8eb1ec 100644</span><br><span>--- a/include/Makefile.am</span><br><span>+++ b/include/Makefile.am</span><br><span>@@ -1,2 +1,3 @@</span><br><span style="color: hsl(0, 100%, 40%);">-nobase_include_HEADERS = osmocom/gsupclient/gsup_client.h</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = osmocom</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+nobase_include_HEADERS = osmocom/gsupclient/gsup_client.h</span><br><span>diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..dbc2344</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/Makefile.am</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = \</span><br><span style="color: hsl(120, 100%, 40%);">+        hlr \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span>diff --git a/include/osmocom/hlr/Makefile.am b/include/osmocom/hlr/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..77a8764</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/hlr/Makefile.am</span><br><span>@@ -0,0 +1,14 @@</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_HEADERS = \</span><br><span style="color: hsl(120, 100%, 40%);">+       auc.h \</span><br><span style="color: hsl(120, 100%, 40%);">+       ctrl.h \</span><br><span style="color: hsl(120, 100%, 40%);">+      db.h \</span><br><span style="color: hsl(120, 100%, 40%);">+        gsup_router.h \</span><br><span style="color: hsl(120, 100%, 40%);">+       gsup_server.h \</span><br><span style="color: hsl(120, 100%, 40%);">+       hlr.h \</span><br><span style="color: hsl(120, 100%, 40%);">+       hlr_ussd.h \</span><br><span style="color: hsl(120, 100%, 40%);">+  hlr_vty.h \</span><br><span style="color: hsl(120, 100%, 40%);">+   hlr_vty_subscr.h \</span><br><span style="color: hsl(120, 100%, 40%);">+    logging.h \</span><br><span style="color: hsl(120, 100%, 40%);">+   luop.h \</span><br><span style="color: hsl(120, 100%, 40%);">+      rand.h \</span><br><span style="color: hsl(120, 100%, 40%);">+      $(NULL)</span><br><span>diff --git a/src/auc.h b/include/osmocom/hlr/auc.h</span><br><span>similarity index 100%</span><br><span>rename from src/auc.h</span><br><span>rename to include/osmocom/hlr/auc.h</span><br><span>diff --git a/src/ctrl.h b/include/osmocom/hlr/ctrl.h</span><br><span>similarity index 100%</span><br><span>rename from src/ctrl.h</span><br><span>rename to include/osmocom/hlr/ctrl.h</span><br><span>diff --git a/src/db.h b/include/osmocom/hlr/db.h</span><br><span>similarity index 100%</span><br><span>rename from src/db.h</span><br><span>rename to include/osmocom/hlr/db.h</span><br><span>diff --git a/src/gsup_router.h b/include/osmocom/hlr/gsup_router.h</span><br><span>similarity index 94%</span><br><span>rename from src/gsup_router.h</span><br><span>rename to include/osmocom/hlr/gsup_router.h</span><br><span>index bff484e..0fc10d0 100644</span><br><span>--- a/src/gsup_router.h</span><br><span>+++ b/include/osmocom/hlr/gsup_router.h</span><br><span>@@ -1,7 +1,7 @@</span><br><span> #pragma once</span><br><span> </span><br><span> #include <stdint.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_server.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span> </span><br><span> struct gsup_route {</span><br><span>   struct llist_head list;</span><br><span>diff --git a/src/gsup_server.h b/include/osmocom/hlr/gsup_server.h</span><br><span>similarity index 100%</span><br><span>rename from src/gsup_server.h</span><br><span>rename to include/osmocom/hlr/gsup_server.h</span><br><span>diff --git a/src/hlr.h b/include/osmocom/hlr/hlr.h</span><br><span>similarity index 100%</span><br><span>rename from src/hlr.h</span><br><span>rename to include/osmocom/hlr/hlr.h</span><br><span>diff --git a/src/hlr_ussd.h b/include/osmocom/hlr/hlr_ussd.h</span><br><span>similarity index 97%</span><br><span>rename from src/hlr_ussd.h</span><br><span>rename to include/osmocom/hlr/hlr_ussd.h</span><br><span>index 393ca6c..08e810e 100644</span><br><span>--- a/src/hlr_ussd.h</span><br><span>+++ b/include/osmocom/hlr/hlr_ussd.h</span><br><span>@@ -5,7 +5,7 @@</span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/gsm/gsup.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_server.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span> </span><br><span> #define NCSS_GUARD_TIMEOUT_DEFAULT 30</span><br><span> </span><br><span>diff --git a/src/hlr_vty.h b/include/osmocom/hlr/hlr_vty.h</span><br><span>similarity index 97%</span><br><span>rename from src/hlr_vty.h</span><br><span>rename to include/osmocom/hlr/hlr_vty.h</span><br><span>index 280b55a..acd6510 100644</span><br><span>--- a/src/hlr_vty.h</span><br><span>+++ b/include/osmocom/hlr/hlr_vty.h</span><br><span>@@ -25,7 +25,7 @@</span><br><span> #include <osmocom/core/logging.h></span><br><span> #include <osmocom/vty/vty.h></span><br><span> #include <osmocom/vty/command.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr.h></span><br><span> </span><br><span> enum hlr_vty_node {</span><br><span>     HLR_NODE = _LAST_OSMOVTY_NODE + 1,</span><br><span>diff --git a/src/hlr_vty_subscr.h b/include/osmocom/hlr/hlr_vty_subscr.h</span><br><span>similarity index 100%</span><br><span>rename from src/hlr_vty_subscr.h</span><br><span>rename to include/osmocom/hlr/hlr_vty_subscr.h</span><br><span>diff --git a/src/logging.h b/include/osmocom/hlr/logging.h</span><br><span>similarity index 100%</span><br><span>rename from src/logging.h</span><br><span>rename to include/osmocom/hlr/logging.h</span><br><span>diff --git a/src/luop.h b/include/osmocom/hlr/luop.h</span><br><span>similarity index 96%</span><br><span>rename from src/luop.h</span><br><span>rename to include/osmocom/hlr/luop.h</span><br><span>index f96593b..77a1dec 100644</span><br><span>--- a/src/luop.h</span><br><span>+++ b/include/osmocom/hlr/luop.h</span><br><span>@@ -27,8 +27,8 @@</span><br><span> #include <osmocom/core/timer.h></span><br><span> #include <osmocom/gsm/gsup.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "db.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_server.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/db.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span> </span><br><span> #define CANCEL_TIMEOUT_SECS   30</span><br><span> #define ISD_TIMEOUT_SECS  30</span><br><span>diff --git a/src/rand.h b/include/osmocom/hlr/rand.h</span><br><span>similarity index 100%</span><br><span>rename from src/rand.h</span><br><span>rename to include/osmocom/hlr/rand.h</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index a042e4e..a5b71cf 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -11,6 +11,7 @@</span><br><span>       $(NULL)</span><br><span> </span><br><span> AM_CPPFLAGS = -I$(top_srcdir)/include \</span><br><span style="color: hsl(120, 100%, 40%);">+        -I$(top_builddir)/include \</span><br><span>  $(NULL)</span><br><span> </span><br><span> EXTRA_DIST = \</span><br><span>@@ -24,18 +25,6 @@</span><br><span> CLEANFILES = $(BUILT_SOURCES)</span><br><span> </span><br><span> noinst_HEADERS = \</span><br><span style="color: hsl(0, 100%, 40%);">-   auc.h \</span><br><span style="color: hsl(0, 100%, 40%);">- db.h \</span><br><span style="color: hsl(0, 100%, 40%);">-  hlr.h \</span><br><span style="color: hsl(0, 100%, 40%);">- luop.h \</span><br><span style="color: hsl(0, 100%, 40%);">-        gsup_router.h \</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_server.h \</span><br><span style="color: hsl(0, 100%, 40%);">- logging.h \</span><br><span style="color: hsl(0, 100%, 40%);">-     rand.h \</span><br><span style="color: hsl(0, 100%, 40%);">-        ctrl.h \</span><br><span style="color: hsl(0, 100%, 40%);">-        hlr_vty.h \</span><br><span style="color: hsl(0, 100%, 40%);">-     hlr_vty_subscr.h \</span><br><span style="color: hsl(0, 100%, 40%);">-      hlr_ussd.h \</span><br><span>         db_bootstrap.h \</span><br><span>     $(NULL)</span><br><span> </span><br><span>diff --git a/src/auc.c b/src/auc.c</span><br><span>index 79c3918..28c441f 100644</span><br><span>--- a/src/auc.c</span><br><span>+++ b/src/auc.c</span><br><span>@@ -23,8 +23,8 @@</span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/crypt/auth.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "rand.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/rand.h></span><br><span> </span><br><span> #define hexb(buf) osmo_hexdump_nospc((void*)buf, sizeof(buf))</span><br><span> #define hex(buf,sz) osmo_hexdump_nospc((void*)buf, sz)</span><br><span>diff --git a/src/ctrl.c b/src/ctrl.c</span><br><span>index c610d92..b78be12 100644</span><br><span>--- a/src/ctrl.c</span><br><span>+++ b/src/ctrl.c</span><br><span>@@ -28,9 +28,9 @@</span><br><span> #include <osmocom/gsm/gsm23003.h></span><br><span> #include <osmocom/ctrl/ports.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "ctrl.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "db.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/ctrl.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/db.h></span><br><span> </span><br><span> #define SEL_BY "by-"</span><br><span> #define SEL_BY_IMSI SEL_BY "imsi-"</span><br><span>diff --git a/src/db.c b/src/db.c</span><br><span>index 75ca889..ed2e568 100644</span><br><span>--- a/src/db.c</span><br><span>+++ b/src/db.c</span><br><span>@@ -23,8 +23,8 @@</span><br><span> #include <sqlite3.h></span><br><span> #include <string.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "db.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/db.h></span><br><span> #include "db_bootstrap.h"</span><br><span> </span><br><span> /* This constant is currently duplicated in sql/hlr.sql and must be kept in sync! */</span><br><span>diff --git a/src/db_auc.c b/src/db_auc.c</span><br><span>index 2cf7143..e3a840e 100644</span><br><span>--- a/src/db_auc.c</span><br><span>+++ b/src/db_auc.c</span><br><span>@@ -26,10 +26,10 @@</span><br><span> </span><br><span> #include <sqlite3.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "db.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "auc.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "rand.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/db.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/auc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/rand.h></span><br><span> </span><br><span> #define LOGAUC(imsi, level, fmt, args ...)    LOGP(DAUC, level, "IMSI='%s': " fmt, imsi, ## args)</span><br><span> </span><br><span>diff --git a/src/db_hlr.c b/src/db_hlr.c</span><br><span>index 694ac53..e52b5ed 100644</span><br><span>--- a/src/db_hlr.c</span><br><span>+++ b/src/db_hlr.c</span><br><span>@@ -33,11 +33,11 @@</span><br><span> </span><br><span> #include <sqlite3.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "db.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_server.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "luop.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/db.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/luop.h></span><br><span> </span><br><span> #define LOGHLR(imsi, level, fmt, args ...)      LOGP(DAUC, level, "IMSI='%s': " fmt, imsi, ## args)</span><br><span> </span><br><span>diff --git a/src/gsup_router.c b/src/gsup_router.c</span><br><span>index df978ba..adf3af7 100644</span><br><span>--- a/src/gsup_router.c</span><br><span>+++ b/src/gsup_router.c</span><br><span>@@ -23,9 +23,9 @@</span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_server.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_router.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_router.h></span><br><span> </span><br><span> /*! Find a route for the given address.</span><br><span>  * \param[in] gs gsup server</span><br><span>diff --git a/src/gsup_send.c b/src/gsup_send.c</span><br><span>index 247a7e7..29aeaa5 100644</span><br><span>--- a/src/gsup_send.c</span><br><span>+++ b/src/gsup_send.c</span><br><span>@@ -21,8 +21,8 @@</span><br><span> </span><br><span> #include <errno.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_server.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_router.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_router.h></span><br><span> </span><br><span> #include <osmocom/core/logging.h></span><br><span> </span><br><span>diff --git a/src/gsup_server.c b/src/gsup_server.c</span><br><span>index e75bbd7..bee6aef 100644</span><br><span>--- a/src/gsup_server.c</span><br><span>+++ b/src/gsup_server.c</span><br><span>@@ -27,8 +27,8 @@</span><br><span> #include <osmocom/gsm/gsm48_ie.h></span><br><span> #include <osmocom/gsm/apn.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_server.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_router.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_router.h></span><br><span> </span><br><span> static void osmo_gsup_server_send(struct osmo_gsup_conn *conn,</span><br><span>                            int proto_ext, struct msgb *msg_tx)</span><br><span>diff --git a/src/hlr.c b/src/hlr.c</span><br><span>index 6bfc141..0970bb1 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -37,16 +37,16 @@</span><br><span> #include <osmocom/gsm/gsm_utils.h></span><br><span> #include <osmocom/gsm/protocol/gsm_23_003.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "db.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "ctrl.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_server.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_router.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "rand.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "luop.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr_vty.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr_ussd.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/db.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/ctrl.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_router.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/rand.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/luop.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr_vty.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr_ussd.h></span><br><span> </span><br><span> struct hlr *g_hlr;</span><br><span> static void *hlr_ctx = NULL;</span><br><span>diff --git a/src/hlr_db_tool.c b/src/hlr_db_tool.c</span><br><span>index fcef597..1212018 100644</span><br><span>--- a/src/hlr_db_tool.c</span><br><span>+++ b/src/hlr_db_tool.c</span><br><span>@@ -29,9 +29,9 @@</span><br><span> #include <osmocom/core/logging.h></span><br><span> #include <osmocom/core/application.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "db.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "rand.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/db.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/rand.h></span><br><span> </span><br><span> struct hlr_db_tool_ctx {</span><br><span>       /* DB context */</span><br><span>diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c</span><br><span>index 1568815..00023ba 100644</span><br><span>--- a/src/hlr_ussd.c</span><br><span>+++ b/src/hlr_ussd.c</span><br><span>@@ -29,12 +29,12 @@</span><br><span> #include <string.h></span><br><span> #include <errno.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr_ussd.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_server.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_router.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "db.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr_ussd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_router.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/db.h></span><br><span> </span><br><span> /***********************************************************************</span><br><span>  * core data structures expressing config from VTY</span><br><span>@@ -317,7 +317,7 @@</span><br><span>  * Internal USSD Handlers</span><br><span>  ***********************************************************************/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "db.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/db.h></span><br><span> </span><br><span> static int handle_ussd_own_msisdn(struct osmo_gsup_conn *conn, struct ss_session *ss,</span><br><span>                                const struct osmo_gsup_message *gsup, const struct ss_request *req)</span><br><span>diff --git a/src/hlr_vty.c b/src/hlr_vty.c</span><br><span>index f7c5bc8..6701cd9 100644</span><br><span>--- a/src/hlr_vty.c</span><br><span>+++ b/src/hlr_vty.c</span><br><span>@@ -33,12 +33,12 @@</span><br><span> #include <osmocom/vty/misc.h></span><br><span> #include <osmocom/abis/ipa.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "db.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr_vty.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr_vty_subscr.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr_ussd.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_server.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/db.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr_vty.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr_vty_subscr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr_ussd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span> </span><br><span> struct cmd_node hlr_node = {</span><br><span>         HLR_NODE,</span><br><span>@@ -150,7 +150,7 @@</span><br><span>  * USSD Entity</span><br><span>  ***********************************************************************/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr_ussd.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr_ussd.h></span><br><span> </span><br><span> #define USSD_STR "USSD Configuration\n"</span><br><span> #define UROUTE_STR "Routing Configuration\n"</span><br><span>diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c</span><br><span>index 73dfab6..d2c4c81 100644</span><br><span>--- a/src/hlr_vty_subscr.c</span><br><span>+++ b/src/hlr_vty_subscr.c</span><br><span>@@ -28,8 +28,8 @@</span><br><span> #include <osmocom/vty/command.h></span><br><span> #include <osmocom/core/utils.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "hlr.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "db.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/hlr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/db.h></span><br><span> </span><br><span> struct vty;</span><br><span> </span><br><span>diff --git a/src/logging.c b/src/logging.c</span><br><span>index 3fa2a69..3713ab3 100644</span><br><span>--- a/src/logging.c</span><br><span>+++ b/src/logging.c</span><br><span>@@ -1,5 +1,5 @@</span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span> </span><br><span> const struct log_info_cat hlr_log_info_cat[] = {</span><br><span>     [DMAIN] = {</span><br><span>diff --git a/src/luop.c b/src/luop.c</span><br><span>index aff4d81..652ce0d 100644</span><br><span>--- a/src/luop.c</span><br><span>+++ b/src/luop.c</span><br><span>@@ -28,10 +28,10 @@</span><br><span> #include <osmocom/gsm/gsup.h></span><br><span> #include <osmocom/gsm/apn.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_server.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_router.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "luop.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_router.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/luop.h></span><br><span> </span><br><span> const struct value_string lu_state_names[] = {</span><br><span>      { LU_S_NULL,                    "NULL" },</span><br><span>diff --git a/src/osmo-euse-demo.c b/src/osmo-euse-demo.c</span><br><span>index 4e4ef78..e707a9c 100644</span><br><span>--- a/src/osmo-euse-demo.c</span><br><span>+++ b/src/osmo-euse-demo.c</span><br><span>@@ -44,7 +44,7 @@</span><br><span> </span><br><span> #include <osmocom/gsupclient/gsup_client.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span> </span><br><span> static struct osmo_gsup_client *g_gc;</span><br><span> </span><br><span>diff --git a/tests/auc/Makefile.am b/tests/auc/Makefile.am</span><br><span>index a3814b6..9b65d71 100644</span><br><span>--- a/tests/auc/Makefile.am</span><br><span>+++ b/tests/auc/Makefile.am</span><br><span>@@ -2,12 +2,12 @@</span><br><span> </span><br><span> AM_CPPFLAGS = \</span><br><span>         $(all_includes) \</span><br><span style="color: hsl(0, 100%, 40%);">-       -I$(top_srcdir)/src \</span><br><span>        $(NULL)</span><br><span> </span><br><span> AM_CFLAGS = \</span><br><span>         -Wall \</span><br><span>      -ggdb3 \</span><br><span style="color: hsl(120, 100%, 40%);">+      -I$(top_srcdir)/include \</span><br><span>    $(LIBOSMOCORE_CFLAGS) \</span><br><span>      $(LIBOSMOGSM_CFLAGS) \</span><br><span>       $(NULL)</span><br><span>diff --git a/tests/auc/auc_test.c b/tests/auc/auc_test.c</span><br><span>index e23cc02..cdbd0b7 100644</span><br><span>--- a/tests/auc/auc_test.c</span><br><span>+++ b/tests/auc/auc_test.c</span><br><span>@@ -29,8 +29,8 @@</span><br><span> </span><br><span> #include <osmocom/crypt/auth.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "auc.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/auc.h></span><br><span> </span><br><span> #define comment_start() fprintf(stderr, "\n===== %s\n", __func__);</span><br><span> #define comment_end() fprintf(stderr, "===== %s: SUCCESS\n\n", __func__);</span><br><span>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</span><br><span>index a78bddb..3fafdf5 100644</span><br><span>--- a/tests/auc/gen_ts_55_205_test_sets/main_template.c</span><br><span>+++ b/tests/auc/gen_ts_55_205_test_sets/main_template.c</span><br><span>@@ -33,8 +33,8 @@</span><br><span> </span><br><span> #include <osmocom/crypt/auth.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "auc.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/auc.h></span><br><span> </span><br><span> #define comment_start() fprintf(stderr, "\n===== %s\n", __func__);</span><br><span> #define comment_end() fprintf(stderr, "===== %s: SUCCESS\n\n", __func__);</span><br><span>diff --git a/tests/db/Makefile.am b/tests/db/Makefile.am</span><br><span>index 5730937..f13824d 100644</span><br><span>--- a/tests/db/Makefile.am</span><br><span>+++ b/tests/db/Makefile.am</span><br><span>@@ -1,7 +1,7 @@</span><br><span> AM_CFLAGS = \</span><br><span>        $(all_includes) \</span><br><span style="color: hsl(0, 100%, 40%);">-       -I$(top_srcdir)/src \</span><br><span style="color: hsl(0, 100%, 40%);">-   -I$(top_builddir)/src \</span><br><span style="color: hsl(120, 100%, 40%);">+       -I$(top_srcdir)/include \</span><br><span style="color: hsl(120, 100%, 40%);">+     -I$(top_builddir)/include \</span><br><span>  -Wall \</span><br><span>      -ggdb3 \</span><br><span>     $(LIBOSMOCORE_CFLAGS) \</span><br><span>diff --git a/tests/db/db_test.c b/tests/db/db_test.c</span><br><span>index 1da2752..d6060dd 100644</span><br><span>--- a/tests/db/db_test.c</span><br><span>+++ b/tests/db/db_test.c</span><br><span>@@ -27,8 +27,8 @@</span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/core/logging.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "db.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/db.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span> </span><br><span> #define comment_start() fprintf(stderr, "\n===== %s\n", __func__);</span><br><span> #define comment(fmt, args...) fprintf(stderr, "\n--- " fmt "\n\n", ## args);</span><br><span>diff --git a/tests/gsup/Makefile.am b/tests/gsup/Makefile.am</span><br><span>index 907aae8..2f56504 100644</span><br><span>--- a/tests/gsup/Makefile.am</span><br><span>+++ b/tests/gsup/Makefile.am</span><br><span>@@ -1,11 +1,11 @@</span><br><span> AM_CPPFLAGS = \</span><br><span>       $(all_includes) \</span><br><span style="color: hsl(0, 100%, 40%);">-       -I$(top_srcdir)/src \</span><br><span>        $(NULL)</span><br><span> </span><br><span> AM_CFLAGS = \</span><br><span>         -Wall \</span><br><span>      -ggdb3 \</span><br><span style="color: hsl(120, 100%, 40%);">+      -I$(top_srcdir)/include \</span><br><span>    $(LIBOSMOCORE_CFLAGS) \</span><br><span>      $(LIBOSMOGSM_CFLAGS) \</span><br><span>       $(LIBOSMOABIS_CFLAGS) \</span><br><span>diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c</span><br><span>index 41865d2..a41ba88 100644</span><br><span>--- a/tests/gsup/gsup_test.c</span><br><span>+++ b/tests/gsup/gsup_test.c</span><br><span>@@ -24,8 +24,8 @@</span><br><span> #include <osmocom/core/application.h></span><br><span> #include <osmocom/gsm/gsup.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "logging.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "luop.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/luop.h></span><br><span> </span><br><span> struct osmo_gsup_server;</span><br><span> </span><br><span>diff --git a/tests/gsup_server/Makefile.am b/tests/gsup_server/Makefile.am</span><br><span>index 686ce37..e64ac4a 100644</span><br><span>--- a/tests/gsup_server/Makefile.am</span><br><span>+++ b/tests/gsup_server/Makefile.am</span><br><span>@@ -1,11 +1,11 @@</span><br><span> AM_CPPFLAGS = \</span><br><span>         $(all_includes) \</span><br><span style="color: hsl(0, 100%, 40%);">-       -I$(top_srcdir)/src \</span><br><span>        $(NULL)</span><br><span> </span><br><span> AM_CFLAGS = \</span><br><span>         -Wall \</span><br><span>      -ggdb3 \</span><br><span style="color: hsl(120, 100%, 40%);">+      -I$(top_srcdir)/include \</span><br><span>    $(LIBOSMOCORE_CFLAGS) \</span><br><span>      $(LIBOSMOGSM_CFLAGS) \</span><br><span>       $(LIBOSMOABIS_CFLAGS) \</span><br><span>diff --git a/tests/gsup_server/gsup_server_test.c b/tests/gsup_server/gsup_server_test.c</span><br><span>index cc475be..4aec69b 100644</span><br><span>--- a/tests/gsup_server/gsup_server_test.c</span><br><span>+++ b/tests/gsup_server/gsup_server_test.c</span><br><span>@@ -20,7 +20,7 @@</span><br><span> </span><br><span> #include <stdio.h></span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include "gsup_server.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hlr/gsup_server.h></span><br><span> </span><br><span> #define comment_start() printf("\n===== %s\n", __func__)</span><br><span> #define comment_end() printf("===== %s: SUCCESS\n\n", __func__)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/16197">change 16197</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-hlr/+/16197"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic912fe27f545b85443c5fb713d8c3c8aac23c9ad </div>
<div style="display:none"> Gerrit-Change-Number: 16197 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>