2017-01-31 00:19:27 +00:00
|
|
|
SUBDIRS = \
|
|
|
|
|
auc \
|
2017-10-09 15:28:53 +00:00
|
|
|
db \
|
1/2: refactor: add and use lu_fsm, osmo_gsup_req, osmo_ipa_name
These are seemingly orthogonal changes in one patch, because they are in fact
sufficiently intertwined that we are not willing to spend the time to separate
them. They are also refactoring changes, unlikely to make sense on their own.
** lu_fsm:
Attempting to make luop.c keep state about incoming GSUP requests made me find
shortcomings in several places:
- since it predates osmo_fsm, it is a state machine that does not strictly
enforce the order of state transitions or the right sequence of incoming
events.
- several places OSMO_ASSERT() on data received from the network.
- modifies the subscriber state before a LU is accepted.
- dead code about canceling a subscriber in a previous VLR. That would be a
good thing to actually do, which should also be trivial now that we record
vlr_name and sgsn_name, but I decided to remove the dead code for now.
To both step up the LU game *and* make it easier for me to integrate
osmo_gsup_req handling, I decided to create a lu_fsm, drawing from my, by now,
ample experience of writing osmo_fsms.
** osmo_gsup_req:
Prepare for D-GSM, where osmo-hlr will do proxy routing for remote HLRs /
communicate with remote MSCs via a proxy:
a) It is important that a response that osmo-hlr generates and that is sent
back to a requesting MSC contains all IEs that are needed to route it back to
the requester. Particularly source_name must become destination_name in the
response to be able to even reach the requesting MSC. Other fields are also
necessary to match, which were so far taken care of in individual numerous code
paths.
b) For some operations, the response to a GSUP request is generated
asynchronously (like Update Location Request -> Response, or taking the
response from an EUSE, or the upcoming proxying to a remote HLR). To be able to
feed a request message's information back into the response, we must thus keep
the request data around. Since struct osmo_gsup_message references a lot of
external data, usually with pointers directly into the received msgb, it is not
so trivial to pass GSUP message data around asynchronously, on its own.
osmo_gsup_req is the combined solution for both a and b: it keeps all data for
a GSUP message by taking ownership of the incoming msgb, and it provides an
explicit API "forcing" callers to respond with osmo_gsup_req_respond(), so that
all code paths trivially are definitely responding with the correct IEs set to
match the request's routing (by using osmo_gsup_make_response() recently added
to libosmocore).
Adjust all osmo-hlr code paths to use *only* osmo_gsup_req to respond to
incoming requests received on the GSUP server (above LU code being one of
them).
In fact, the same should be done on the client side. Hence osmo_gsup_req is
implemented in a server/client agnostic way, and is placed in
libosmo-gsupclient. As soon as we see routing errors in complex GSUP setups,
using osmo_gsup_req in the related GSUP client is likely to resolve those
problems without much thinking required beyond making all code paths use it.
libosmo-gsupclient is hence added to osmo-hlr binary's own library
dependencies. It would have been added by the D-GSM proxy routing anyway, we
are just doing it a little sooner.
** cni_peer_id.c / osmo_ipa_name:
We so far handle an IPA unit name as pointer + size, or as just pointer with
implicit talloc size. To ease working with GSUP peer identification data, I
require:
- a non-allocated storage of an IPA Name. It brings the drawback of being
size limited, but our current implementation is anyway only able to handle
MSC and SGSN names of 31 characters (see struct hlr_subscriber).
- a single-argument handle for IPA Name,
- easy to use utility functions like osmo_ipa_name_to_str(), osmo_ipa_name_cmp(), and copying
by simple assignment, a = b.
Hence this patch adds a osmo_ipa_name in cni_peer_id.h and cni_peer_id.c. Heavily
used in LU and osmo_gsup_req.
Depends: libosmocore Id9692880079ea0f219f52d81b1923a76fc640566
Change-Id: I3a8dff3d4a1cbe10d6ab08257a0138d6b2a082d9
2019-11-20 01:36:45 +00:00
|
|
|
gsup \
|
2019-10-31 01:03:48 +00:00
|
|
|
db_upgrade \
|
2019-11-20 09:56:35 +00:00
|
|
|
mslookup \
|
2017-01-31 00:19:27 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
# The `:;' works around a Bash 3.2 bug when the output is not writeable.
|
|
|
|
|
$(srcdir)/package.m4: $(top_srcdir)/configure.ac
|
|
|
|
|
:;{ \
|
|
|
|
|
echo '# Signature of the current package.' && \
|
|
|
|
|
echo 'm4_define([AT_PACKAGE_NAME],' && \
|
|
|
|
|
echo ' [$(PACKAGE_NAME)])' && \
|
|
|
|
|
echo 'm4_define([AT_PACKAGE_TARNAME],' && \
|
|
|
|
|
echo ' [$(PACKAGE_TARNAME)])' && \
|
|
|
|
|
echo 'm4_define([AT_PACKAGE_VERSION],' && \
|
|
|
|
|
echo ' [$(PACKAGE_VERSION)])' && \
|
|
|
|
|
echo 'm4_define([AT_PACKAGE_STRING],' && \
|
|
|
|
|
echo ' [$(PACKAGE_STRING)])' && \
|
|
|
|
|
echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \
|
|
|
|
|
echo ' [$(PACKAGE_BUGREPORT)])'; \
|
|
|
|
|
echo 'm4_define([AT_PACKAGE_URL],' && \
|
|
|
|
|
echo ' [$(PACKAGE_URL)])'; \
|
|
|
|
|
} >'$(srcdir)/package.m4'
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST = \
|
|
|
|
|
testsuite.at \
|
|
|
|
|
$(srcdir)/package.m4 \
|
|
|
|
|
$(TESTSUITE) \
|
2017-10-15 02:58:50 +00:00
|
|
|
test_nodes.vty \
|
2017-10-06 00:59:54 +00:00
|
|
|
test_subscriber.vty \
|
2017-10-15 01:24:43 +00:00
|
|
|
test_subscriber.sql \
|
|
|
|
|
test_subscriber.ctrl \
|
2017-01-31 00:19:27 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
TESTSUITE = $(srcdir)/testsuite
|
|
|
|
|
|
|
|
|
|
DISTCLEANFILES = \
|
|
|
|
|
atconfig \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2017-09-25 21:22:02 +00:00
|
|
|
if ENABLE_EXT_TESTS
|
2017-10-06 00:59:54 +00:00
|
|
|
python-tests:
|
|
|
|
|
# don't run vty and ctrl tests concurrently so that the ports don't conflict
|
|
|
|
|
$(MAKE) vty-test
|
2017-10-15 01:24:43 +00:00
|
|
|
$(MAKE) ctrl-test
|
2019-10-31 01:03:48 +00:00
|
|
|
$(MAKE) db-upgrade-equivalence-test
|
2018-09-18 13:05:17 +00:00
|
|
|
else
|
|
|
|
|
python-tests:
|
|
|
|
|
echo "Not running python-based external tests (determined at configure-time)"
|
|
|
|
|
endif
|
2017-10-06 00:59:54 +00:00
|
|
|
|
|
|
|
|
VTY_TEST_DB = hlr_vty_test.db
|
2019-11-11 17:13:47 +00:00
|
|
|
VTY_TEST ?= *.vty
|
2017-10-06 00:59:54 +00:00
|
|
|
|
|
|
|
|
# To update the VTY script from current application behavior,
|
|
|
|
|
# pass -u to vty_script_runner.py by doing:
|
|
|
|
|
# make vty-test U=-u
|
|
|
|
|
vty-test:
|
|
|
|
|
-rm -f $(VTY_TEST_DB)
|
2019-01-22 13:44:28 +00:00
|
|
|
sqlite3 $(VTY_TEST_DB) < $(top_srcdir)/sql/hlr.sql
|
|
|
|
|
sqlite3 $(VTY_TEST_DB) < $(srcdir)/test_subscriber.vty.sql
|
2017-10-06 00:59:54 +00:00
|
|
|
osmo_verify_transcript_vty.py -v \
|
|
|
|
|
-n OsmoHLR -p 4258 \
|
2017-10-27 00:46:11 +00:00
|
|
|
-r "$(top_builddir)/src/osmo-hlr -c $(top_srcdir)/doc/examples/osmo-hlr.cfg -l $(VTY_TEST_DB)" \
|
2019-11-11 17:13:47 +00:00
|
|
|
$(U) $(srcdir)/$(VTY_TEST)
|
|
|
|
|
-rm -f $(VTY_TEST_DB) $(VTY_TEST_DB)-*
|
2017-10-15 01:24:43 +00:00
|
|
|
|
|
|
|
|
CTRL_TEST_DB = hlr_ctrl_test.db
|
|
|
|
|
|
|
|
|
|
# To update the CTRL script from current application behavior,
|
|
|
|
|
# pass -u to ctrl_script_runner.py by doing:
|
|
|
|
|
# make ctrl-test U=-u
|
|
|
|
|
ctrl-test:
|
|
|
|
|
-rm -f $(CTRL_TEST_DB)
|
|
|
|
|
sqlite3 $(CTRL_TEST_DB) < $(top_srcdir)/sql/hlr.sql
|
|
|
|
|
sqlite3 $(CTRL_TEST_DB) < $(srcdir)/test_subscriber.sql
|
|
|
|
|
osmo_verify_transcript_ctrl.py -v \
|
|
|
|
|
-p 4259 \
|
2017-10-27 00:46:11 +00:00
|
|
|
-r "$(top_builddir)/src/osmo-hlr -c $(top_srcdir)/doc/examples/osmo-hlr.cfg -l $(CTRL_TEST_DB)" \
|
2017-10-15 01:24:43 +00:00
|
|
|
$(U) $(srcdir)/*.ctrl
|
|
|
|
|
-rm -f $(CTRL_TEST_DB)
|
2018-07-30 14:54:17 +00:00
|
|
|
-rm $(CTRL_TEST_DB)-*
|
2017-10-15 01:24:43 +00:00
|
|
|
|
2019-10-31 01:03:48 +00:00
|
|
|
db-upgrade-equivalence-test:
|
|
|
|
|
$(MAKE) -C db_upgrade upgrade-equivalence-test
|
|
|
|
|
|
2017-01-31 00:19:27 +00:00
|
|
|
check-local: atconfig $(TESTSUITE)
|
|
|
|
|
$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
|
2017-09-25 21:22:02 +00:00
|
|
|
$(MAKE) $(AM_MAKEFLAGS) python-tests
|
2017-01-31 00:19:27 +00:00
|
|
|
|
|
|
|
|
installcheck-local: atconfig $(TESTSUITE)
|
|
|
|
|
$(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \
|
|
|
|
|
$(TESTSUITEFLAGS)
|
|
|
|
|
|
|
|
|
|
clean-local:
|
|
|
|
|
test ! -f '$(TESTSUITE)' || \
|
|
|
|
|
$(SHELL) '$(TESTSUITE)' --clean
|
|
|
|
|
|
|
|
|
|
AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te
|
|
|
|
|
AUTOTEST = $(AUTOM4TE) --language=autotest
|
|
|
|
|
$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4
|
|
|
|
|
$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
|
|
|
|
|
mv $@.tmp $@
|
