Commit Graph

833 Commits

Author SHA1 Message Date
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
Harald Welte 81c6a0a979 Bump version: 0.10.0.39-b723 → 1.0.0
Change-Id: I9b9d9331bdd1d9cdebdef5c3e0c49a1b18972abd
2019-01-20 15:19:07 +01:00
Harald Welte 2c880ba6f4 sccp.c: Fix gcc-8.2 -Werror=maybe-uninitialized
This fixes the following compiler warning when using -Werror on gcc-8.2:

sccp.c: In function ‘sccp_system_incoming_ctx’:
sccp.c:1039:10: error: ‘result.destination_local_reference’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
       && memcmp(&conn->source_local_reference,
          result.destination_local_reference,
          sizeof(conn->source_local_reference)) == 0
sccp.c:1030:27: note: ‘result.destination_local_reference’ was declared here
  struct sccp_parse_result result;
                           ^~~~~~

Change-Id: Ied41f7c8ddaa5f616dd6556079a54d8d70274490
2019-01-20 15:11:07 +01:00
Stefan Sperling 069b20dd6e fix ipa_asp_fsm down state transition
Properly transition into IPA_ASP_S_DOWN from IPA_ASP_S_ACTIVE
and fix the mask of legal out states from IPA_ASP_S_ACTIVE.

BSC-sccplite tests are still passing with this change.

Change-Id: Idb8e7bd1c74a4b47080fe32ebe0161c503ead571
Related: OS#3111
2018-12-20 16:23:19 +01:00
Oliver Smith 959290be11 contrib: fix makedistcheck with disabled systemd
EXTRA_DIST files need to be distributed, no matter if the systemd option
is configured or not.

Change-Id: Ib848aa5ce03f45d4f8182a4e77b0130ccb261635
2018-12-06 13:43:26 +01:00
Oliver Smith 397903fdb7 contrib/jenkins.sh: build and publish manuals
Add new environment variables WITH_MANUALS and PUBLISH to control if
the manuals should be built and uploaded. Describe all environment vars
on top of the file.

When WITH_MANUALS is set, install osmo-gsm-manuals like any other
dependency and add --enable-manuals to the configure flags (for "make"
and "make distcheck"). Add the bin subdir of the installed files to
PATH, so osmo-gsm-manuals-check-depends can be used by ./configure.

Related: OS#3385
Change-Id: I5904c86c7e38d36d23df213f5a2ae1986647a051
2018-12-05 13:08:57 +01:00
Oliver Smith c563197778 Fix DISTCHECK_CONFIGURE_FLAGS override
Set AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of
DISTCHECK_CONFIGURE_FLAGS. This is the recommended way from the
automake manual, as otherwise the flag can't be changed by the user
anymore.

Related: OS#3718
Change-Id: Ib3f443e07f51df352357c5a90792bd946efcdf27
2018-12-04 15:39:31 +01:00
Oliver Smith b7237b139d build manuals moved here from osmo-gsm-manuals.git
Moved to doc/manuals/, with full commit history, in preceding merge commit.
Now incorporate in the build system.

Build with:

$ autoreconf -fi
$ ./configure --enable-manuals
$ make

Shared files from osmo-gsm-manuals.git are found automatically if
- the repository is checked out in ../osmo-gsm-manuals; or
- if it osmo-gsm-manuals was installed with "make install"; or
- OSMO_GSM_MANUALS_DIR is set.

Related: OS#3385
Change-Id: Ib5a22c2ea81fdde036bf9efb47d785a830b88c93
2018-11-27 18:46:32 +01:00
Neels Hofmeyr 2162f5d89e Merge history from osmo-gsm-manuals.git
Change-Id: Iabd0af069f00e7827a7793aabfc38a14fb7f1570
2018-11-27 18:46:19 +01:00
Neels Hofmeyr e6a0409d6e stp: update vty reference with added SCCP commands
After I66e97706de0c546db3c6ff77fb5e6ac6e32bff55 which adds the missing
sccp_vty_init(), update VTY reference with the new SCCP show / config commands.

Depends: I66e97706de0c546db3c6ff77fb5e6ac6e32bff55
Change-Id: Id941b8e31d3b4cfdb3f912beedc1e7af321a0113
2018-11-27 18:46:12 +01:00
Neels Hofmeyr 3508df2200 stp: update vty reference
Change-Id: Id5f1067760db7a11ec380a541bfe7357a21a3bb3
2018-11-27 18:46:12 +01:00
Harald Welte fcc95f960b vty-ref: Update URI of docbook 5.0 schema
... to match the /etc/xml/catalog file on debian (no "www" in hostname)

Change-Id: Id9f3579c7f2bc3af13fe30b5268f249b6f59ed0d
2018-11-27 18:46:12 +01:00
Neels Hofmeyr 5fab07911d OsmoSTP: update VTY reference
This is the first update since the libosmocore changes to the 'show
online-help' generated output. Hence the produced document now benefits from
the structural improvements:
- not repeating common commands for every node;
- using section names that match the VTY prompt.

Change-Id: I98cdfcb6c1c7db49ab106e775be92e4c6adeab17
2018-11-27 18:46:12 +01:00
Harald Welte 51ef55b6d4 STP: Update vty reference XML file
This ensures useful content in the STP vty reference manual

Change-Id: Ica4b1c0172255ec2328562fdd8fac190e3ad448d
2018-11-27 18:46:12 +01:00
Harald Welte 46c4b92926 First step towards an OsmoSTP manual
Change-Id: I450bfac7444ac9cb7f50c086d87cf7157c2e2a31
2018-11-27 18:46:12 +01:00
Neels Hofmeyr 7dd567979a Importing history from osmo-gsm-manuals.git
Change-Id: I17bfe64d98ca47cb4b3be81d2715bda047b79466
2018-11-27 18:46:00 +01:00
Max 5371a21293 SS7: safeguard against wrong number of pointcode component
Previously internal function get_pc_comp_shift() returned negative error
code when called with wrong component number despite unsigned return
value which wasn't checked for error anyway.

Fix this by using explicit assert in the error path. This should not
affect external users because this function always called with constant
component argument.

Change-Id: Ib24cdbcf614bad68f3cfa9776a451c5c1e45ae6e
2018-11-22 14:12:18 +00:00
Max c3824bca16 Log ip:port for created SS7 server
Change-Id: If2ae093175d64000490a2be31ecfea265ca3853d
2018-11-19 05:50:13 +00:00