Commit Graph

750 Commits

Author SHA1 Message Date
Pau Espin f0a0a4cdd7 ss7: Fix finding asp by socket addr if it has no remote hosts configured
Fixes: 80b1355819
Change-Id: I14a0132a4667cea75fc212dfeeef76d8509b991d
2019-10-23 18:10:10 +00:00
Pau Espin 6168660986 ss7: Fix finding asp by socket addr if local ip addr is 0.0.0.0
Fixes: 80b1355819
Change-Id: I319e4983b35f63846ed7e8bfa8e8e3688c5d16e6
2019-10-23 18:10:10 +00:00
Pau Espin 51efa023c9 ss7: Fix osmo_ss7_asp_peer_snprintf() output if peer has zero IP addr assigned
If no IP addr is assigned yet, until know it'd print "(:3456". Let's
print ":34456" in that scenario.

Change-Id: Iae85d231093b6f3ce6b969324699858e525c14ea
2019-10-23 18:10:10 +00:00
Pau Espin 0e019528c9 cosmetic: Fix trailing whitespace
Change-Id: Ic5bae0b69dcf24da8069709692b5687ad76239dc
2019-10-23 16:47:33 +02:00
Pau Espin e21192dbb0 vty: Fix write-config of local-ip and remote-ip commands
Fixes: CID#205338
Fixes: CID#205337
Change-Id: I7b01e53aa4bfd714467cbd729cfcf4dc12a64bd4
2019-10-23 16:47:33 +02:00
Pau Espin b2ab192327 cosmetic: ss7: Fix trailing whitespace
Change-Id: Ifd947c51067842b83ea43ce25ba0d652baff259b
2019-10-22 19:38:53 +00:00
Pau Espin 2c3ff8c81b tests: Introduce test for multi-homing STP features
Config file sets omo-stp instance to bind on 2 IP addresses, and then
the test verfies through linux /proc/net/sctp/* that binding is done
correctly and that it can be reached from another remote address to one
of the configured addresses.

Change-Id: Ifa11b1fc882dff415405f62024e94bed67228866
2019-10-22 19:38:53 +00:00
Pau Espin dec38c1416 ss7: Log local and remote address set upon ASP restart
Change-Id: I35c2581923ed3e1f7aff6c137ddf356882bac621
2019-10-22 19:38:53 +00:00
Pau Espin 80b1355819 ss7: Support multiple addresses in SCTP connections
After this patch, Several "local-ip" and "remote-ip" lines are accepted
under "listen" and "asp" VTY nodes, allowing to configure an SCTP
connection with multiple connections, hence allowing control of SCTP
multi-homing features.
libosmo-sccp clients such as osmo-bsc and osmo-msc also gain support for
this feature with this commit.

Related: OS#3608
Depends: libosmocore.git Ic8681d9e093216c99c6bca4be81c31ef83688ed1
Depends: libosmo-netif.git I0fe62f518e195db4e34f3b0ad1762bb57ba9d92a
Change-Id: Ibd15de7a4e00dbec78ff2e2dd6a686b0f3af22de
2019-10-22 19:38:53 +00:00
Pau Espin 38ae954da5 Defer xua server binding until exit of VTY node
Commit 10d4815bb1 already fixed the issue
where binding was done during L_CS7_XUA_NODE (listen) done, meaning
local-ip inside it had no effect. In that comment, binding was moved to
happen during "local-ip" VTY cmd. Furthermore, that commit added a new
osmo_ss7_bind_all_instances() and related APIs to allow osmo-stp to have
all xua servers bound if no "local-ip" was provided.
These APIs have only been used so far by osmo-stp (which lays in the
same git repo that libosmo-sccp) since it's the only program using the
xua server features.

In the present commit, let's drop the APIs added by commit described
above, and instead let libosmo-sccp code to internally bind the xua
server upon exit of the VTY node. As a result, the previously introduced
APIs can be dropped (not used by anyone anymore) and it will provide
ways to support multiple "local-ip" commands in the future, hence
supporting SCTP multi-home features.

It's recommended to require libosmocore.git Ia6d88c0e63d94ba99e950da6efbc4c1871070012
since it fixes a bug where go_parent_cb was not called for nodes at the
end of the file.

Related: OS#3608
Change-Id: I2cff17b5e2e2fbfd4591e23a416e510e94e173d6
2019-10-22 19:38:53 +00:00
Pau Espin cb66698c8d m3ua: Log incorrect selected AS
Change-Id: Idfdf6279de1fed453b5f83a5329c50716a79aca9
2019-10-22 17:34:29 +02:00
Pau Espin 7504bd6f11 Fix typo in log message of recent commit
Change-Id: I53e6395ea564a7f6f5f8c9e1dd3372ba37bdfb39
2019-10-22 16:48:29 +02:00
Harald Welte 26a4c84ca7 cosmetic: Document why IPA uses hard-coded routing-context 0
Change-Id: Ibfae10a1e9385079db4b353e48a262bc8ab5230a
2019-10-20 18:56:05 +02:00
Harald Welte 89407619a3 Don't permit routing-context != 0 for IPA peers
The IPA protocol doesn't have the context of routing-keys. We are only
permitting routing key '0' (as the default routing key) when configuring
via VTY.

Change-Id: I3f166f44903d0b93963cc5d0cca73d277d2b7215
Fixes: OS#4234, OS#4233
2019-10-20 18:55:55 +02:00
Harald Welte ecb2cf1a31 ipa: VTY config option to explicitly enable/disable SCCP patching
When receiving SCCP messages from an IPA peer/ASP, osmo-stp so far
unconditionally inserted origin/destination point codes int the SCCP
called / calling party addresses.

This behaviro is now made optional with the introduction of the
following per-AS configuration:
	"point-code override patch-sccp (disabled|both)"

The default behavior is switched from 'both' to 'disabled' at the same
time.

Change-Id: I535e2170adadfe755d2bcbf5bbf4556bebb77737
Closes: OS#4219
2019-10-19 22:31:04 +02:00
Harald Welte d747573feb ipa: Fix crash when parsing of received IPA SCCP message fails
If an IPA ASP is sending us a SCCP message that cannot be parsed,
we shouldn't crash but handle this gracefully.

Change-Id: Ib7a8c2a36dd1b82ca8ed472760c1682ede50cb90
Fixes: OS#4236
2019-10-19 17:47:22 +02:00
Harald Welte 959c90492f ipa: Don't send non-SCCP data over IPA/SCCPlite
The IPA/SCCPlite stacking is - as the name implies - constrained to
the transport of SCCP messages. We have to reject any non-SCCP payload.

Change-Id: I5e5a2879013ee8cf08aa4199b4bee498dcb61446
Fixes: OS#4235
2019-10-19 12:24:55 +02:00
Harald Welte 6f7587eff1 Use LOGPAS / LOGPASP in favor of generic LOGSS7 where applicable
Change-Id: If3a88863d18941c10d34361b323412ad7e517334
2019-10-19 12:23:21 +02:00
Harald Welte 1c197af06c Move definition of LOGSS7() to header file; add LOGPAS() like LOGPASP()
Change-Id: Ic85fc460cc1f31d0fb407095afe417ceaa60e7bd
2019-10-19 12:19:15 +02:00
Alexander Couzens 87c1550d70 sccp_user: correct comment for osmo_sccp_simple_client
Fixes: 3884eb68d9 ("osmo_sccp_simple_client(): use sccp instance index 0 instead of 1")
Change-Id: Iaac59222df84eacf813825c2ef660281381e6b14
2019-09-16 00:10:55 +02:00
Pau Espin 912e058212 ss7: Do not queue messages if stream is not connected
Consider them as lost by the lower layer, otherwise lots of old messages
and retransmissions can end up queued in there until stream becomes
connected, and then will flood the peer with all those messages.

Depends: libosmo-netif.git 962bf9a48eed418354685dc733b8271d2dd62c27
Related: OS#4188
Change-Id: Ic7d3571848faf28221dcfa8eb8b33b42964d988e
2019-09-04 17:12:07 +02:00
Alexander Couzens 3884eb68d9 osmo_sccp_simple_client(): use sccp instance index 0 instead of 1
When using osmo_sccp_simple_client(), it will create an sccp instance if
none exists. The sccp instance identifier starts with 0.
The implicit created instance should use sccp instance 0 (the
first connection).

Change-Id: I9d9f65555b9cdc1e3c697c8b834528d51878e1ae
2019-08-29 05:28:41 +00:00
Kira Obrezkova 51c92705b5 systemd: This patch adds Documentation field to the systemd service file
Change-Id: Ia112dec6b61853cbfe1222cf4b7aecfe305ddb99
2019-08-12 08:32:07 +00:00
Pau Espin 0b7ad1a72f Bump version: 1.0.0.26-2728-dirty → 1.1.0
Change-Id: I3fe741cb70fa75fb911d40dc8f9eb50e1a85238b
2019-08-07 21:18:00 +02:00
Pau Espin 2728abf9d9 Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds
Since March 15th 2017, libosmocore API logging_vty_add_cmds() had its
parameter removed (c65c5b4ea075ef6cef11fff9442ae0b15c1d6af7). However,
definition in C file doesn't contain "(void)", which means number of
parameters is undefined and thus compiler doesn't complain. Let's remove
parameters from all callers before enforcing "(void)" on it.

Related: OS#4138
Change-Id: Iedd11f816002b686f0ddb54c0cf7ba4e229e21e3
2019-08-05 14:47:06 +02:00
Kira Obrezkova 2164784670 This patch fixes typos on which Lintian complains
Change-Id: I657c694a9a7474182a97f90aa8424403ca9c58db
2019-07-17 10:56:37 +00:00
Oliver Smith fdff85b8d5 contrib/jenkins.sh: "maintainer-clean" after "publish"
Run "make maintainer-clean" after publishing manuals, not the other way
around. Otherwise jenkins.sh fails when running for the master branch,
because docs/manuals/Makefile gets deleted although it is still needed
to publish the manuals.

Related: OS#3047
Fixes: 55f03b898a ("contrib/jenkins.sh: run "make maintainer-clean"")
Change-Id: I8bcee9069743b76966a78e1c13d0be9ba62d992c
2019-07-11 09:33:56 +02:00
Oliver Smith 55f03b898a contrib/jenkins.sh: run "make maintainer-clean"
Related: OS#3047
Change-Id: Ia6ebe5add2c1ce6891d596fb2987e46f8ff8a6d6
2019-07-10 12:07:54 +02:00
Daniel Willmann abcb3898ed manuals: Update vty documentation
Related: OS#1700
Change-Id: I2061d7883f5457ec8c53358dc6089daaf60c67c3
2019-06-19 11:58:17 +02:00
Daniel Willmann 298e6a74d8 manuals: Add script to regenerate vty/counter documentation
Related: OS#1700
Change-Id: I9978d04fec68d6a8e17caa3c88c1020cf3a348ac
2019-06-19 11:58:17 +02:00
Oliver Smith 1ae52d1a65 debian: create -doc subpackage with pdf manuals
I have verified, that the resulting debian packages build in my own OBS
namespace (see the -doc packages):
https://download.opensuse.org/repositories/home:/osmith42/Debian_9.0/all/
https://build.opensuse.org/project/show/home:osmith42

Depends: Ib7251cca9116151e473798879375cd5eb48ff3ad (osmo-ci)
Related: OS#3899
Change-Id: I1f412953e60c10e6146327a90edbd18d738e1365
2019-05-29 12:14:05 +02:00
Vadim Yanitskiy 5227207506 osmo-stp: expose root talloc context to the VTY code
In Id0789c4946929b783c54220de439958001f94992 I introduced the VTY
commands for talloc-context introspection, but forgot to expose
the root talloc-context.

Change-Id: Id2bf6cdae112f9791c93411c1837de488cab9ee3
2019-05-11 00:20:02 +07:00
Vadim Yanitskiy efcaff0b80 osmo-stp: register VTY commands for talloc context introspection
Change-Id: Id0789c4946929b783c54220de439958001f94992
2019-05-10 03:06:54 +07:00
Harald Welte d6cc1294e2 stp: Ensure telnet uses STP talloc context, not NULL context
Change-Id: I38a9538dc93cdcecbeb236f0eadc3d675cf20b5d
2019-05-09 10:34:23 +02:00
Holger Hans Peter Freyther 174d33681a udts/xudts: Attempt to implement unitdata service parsing
Use the new offset based parsing to extract GT and data from the
UDTS/XUDTS message as well. Test vectors are missing right now.

Change-Id: Id0a3a291d8bad3f8c9621e6c97d4ea0b8bbe6035
2019-05-02 00:12:16 +01:00
Holger Hans Peter Freyther 1646d9b827 xudt: Implement address and data extraction
The cellmgr-ng unfortunately looks at the data being sent and can't
handle the presence of XUDT at all. Add the structure definition
and refactor extraction code to work on offsets. Add a unit test.

Change-Id: I45a7447cc1be432fff34849e0e35abc0410cf153
2019-05-01 23:52:31 +01:00
Neels Hofmeyr 21ff9ae426 add osmo_sccp_addr_cmp(), osmo_sccp_addr_ri_cmp()
osmo-msc identifies its BSC and RNC peers by SCCP address, and compares those
by memcmp(), which is not really accurate. Rather provide a meaningful
osmo_sccp_addr_cmp() API to determine whether SCCP addresses are identical.

Go for a full cmp that would also allow sorting.

Change-Id: Ie9e2add7bbfae651c04e230d62e37cebeb91b0f5
2019-04-12 06:28:34 +02:00
Neels Hofmeyr ac729eb5a8 add caller-owns-msgb variant osmo_sccp_user_sap_down_nofree()
Add osmo_sccp_user_sap_down_nofree(), which is identical to
osmo_sccp_user_sap_down(), but doesn't imply a msgb_free().

To implement that, sccp_sclc_user_sap_down_nofree() with the same msgb
semantics is required.

Rationale:

Avoiding msgb leaks is easiest if the caller retains ownership of the msgb.
Take this hypothetical chain where leaks are obviously avoided:

  void send()
  {
  	msg = msgb_alloc();
	dispatch(msg);
	msgb_free(msg);
  }

  void dispatch(msg)
  {
  	osmo_fsm_inst_dispatch(fi, msg);
  }

  void fi_on_event(fi, data)
  {
	if (socket_is_ok)
		socket_write((struct msgb*)data);
  }

  void socket_write(msgb)
  {
  	if (!ok1)
		return;
	if (ok2) {
		if (!ok3)
			return;
		write(sock, msg->data);
	}
  }

However, if the caller passes ownership down to the msgb consumer, things
become nightmarishly complex:

  void send()
  {
  	msg = msgb_alloc();
	rc = dispatch(msg);
	/* dispatching event failed? */
	if (rc)
		msgb_free(msg);
  }

  int dispatch(msg)
  {
  	if (osmo_fsm_inst_dispatch(fi, msg))
		return -1;
	if (something_else())
		return -1; // <-- double free!
  }

  void fi_on_event(fi, data)
  {
	if (socket_is_ok) {
		socket_write((struct msgb*)data);
	else
		/* socket didn't consume? */
		msgb_free(data);
  }

  int socket_write(msgb)
  {
  	if (!ok1)
		return -1; // <-- leak!
	if (ok2) {
		if (!ok3)
			goto out;
		write(sock, msg->data);
	}
  out:
        msgb_free(msg);
	return -2;
  }

If any link in this call chain fails to be aware of the importance to return a
failed RC or to free a msgb if the chain is broken, or to not return a failed
RC if the msgb is consumed, we have a hidden msgb leak or double free.

This is the case with osmo_sccp_user_sap_down(). In new osmo-msc, passing data
through various FSM instances, there is high potential for leak/double-free
bugs. A very large brain is required to track down every msgb path.

osmo_sccp_user_sap_down_nofree() makes this problem trivial to solve even for
humans.

Change-Id: Ic818efa78b90f727e1a94c18b60d9a306644f340
2019-04-12 06:27:10 +02:00
Oliver Smith 49eea32ab4 sccp_scoc: conn_create{,_id}() user arg, not inst
Accept the osmo_sccp_user instead of calling conn_create() and setting
conn->user afterwards. Prepare for generating a local_ref inside
conn_create_id() in the future.

Related: OS#3871
Change-Id: I2fb47c8ba6c0ce7cd92c9ac31f15c67eb67fb66e
2019-04-04 08:33:58 +02:00
Oliver Smith ee0bcf2fca sccp_scoc: move sccp_find_user() up
Move it before sccp_scoc_rx_scrc_rout_fail(), so it can be used in
the latter function to figure out the local_ref from the user (follow
up commit).

Related: OS#3871
Change-Id: Ieabeda3126dcc0349a06c0fc7c9e468b900d7855
2019-04-03 15:06:10 +02:00
Oliver Smith 67b895e156 Cosmetic: sccp_scoc: fix local reference comments
Remove all comments, that claim conn_id is the local reference. This
is only a hack, and should not be something to rely on. A properly
separated local reference will be introduced shortly.

Related: OS#3871
Change-Id: I900124037da76caaaf5ecee323eb82e1c6d2e368
2019-04-03 15:06:02 +02:00
Harald Welte 3f2ff81831 sccp_scoc: Add more comments describing conn_id and local_ref members
Change-Id: I85cabc42621103de1a83282baf210fbc117b63db
2019-04-01 15:50:38 +02:00
Harald Welte 99beede80c Fix output of route destination in 'show ss7 instance <0-15> route'
We were printing the mask of the route, but not the point code itself.

Best would probably be to print both?

Closes: OS#3835
Change-Id: Ifa4fdbad953d40f222beb470a082eed8c20991ef
2019-03-15 17:26:01 +00:00
Harald Welte 005c3a6982 Store + show remote ip/port in dynamically created ASPs
"show cs7 instance 0 asp" before this patch would not display the
remote IP/port information about dynamically-added ASPs but instead:

                                                          Effect Primary

ASP Name      AS Name       State          Type  Rmt Port Remote IP Addr  SCTP
------------  ------------  -------------  ----  -------- --------------- ----------
asp-dyn-0     ?             ASP_ACTIVE     m3ua  0        (null)

With this patch it is now correctly displayed:
                                                          Effect Primary

ASP Name      AS Name       State          Type  Rmt Port Remote IP Addr  SCTP
------------  ------------  -------------  ----  -------- --------------- ----------
asp-dyn-0     ?             ASP_ACTIVE     m3ua  24905    127.0.0.1

Change-Id: I39a1c57bc72e8aff607f3a551811a2f6372adab4
Closes: OS#3836
2019-03-14 15:40:29 +00:00
Neels Hofmeyr bf7eded0fc improve logging for rejected AS in xua_rkm.c
Change a loglevel from NOTICE to ERROR, for when a routing key gets
re-purposed.

Add another error log for insufficient resources case.

Change-Id: Id22e3c6bab5f7b597df3514eedb162277ce0ef7d
2019-03-14 03:41:59 +00:00
Harald Welte 93940a2e35 vty: Ensure to properly save route pointcode and mask when writing
As osmo_ss7_route_print() returns a static buffer, we cannot use it
twice within a single log/print statement.  Rather, we must use
osmo_ss7_route_print2() for the second call, as it uses a separate
static buffer.

Change-Id: Ica32e83cbe8af2317cb07f8d8422a399fa537012
2019-03-13 21:20:12 +00:00
Neels Hofmeyr 03209f8eb6 debug log typo fix in sccp_scoc.c
Change-Id: Ic5637700122ef26a44932149994c01ccbfc18ffd
2019-03-06 07:19:36 +01:00
Max 5b5c1ed63c OsmoSTP: enable statsd support
Change-Id: I5309ae44e5b9eda1a5dd1bbf10db5ffdff1fa9cd
2019-02-18 13:33:28 +01:00
Max 8d712f0623 osmo_ss7.c: fix typo
Change-Id: Idd0945ef7fa5cc0caf2f35919f97e2e11691f3a3
2019-02-12 14:38:28 +01:00
Max 0a93a683f3 Don't use deprecated osmo_stream_cli_open2()
Using osmo_stream_cli_open() with explicit timeout set via
osmo_stream_cli_set_reconnect_timeout() will have the same
effect. Update comment explaining this as well as the code.

Change-Id: Iffe6ea48a170880faef071c7c4a1bc0605aa9855
2019-02-07 11:06:15 +01:00