pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/33243 )
Change subject: Write explicit role & sctp-role fields in ASP configurations
......................................................................
Write explicit role & sctp-role fields in ASP configurations
Change-Id: I00243a2d549e900f872826c2a4b025936797b5ef
---
M common/chapters/cs7-config.adoc
1 file changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/43/33243/1
diff --git a/common/chapters/cs7-config.adoc b/common/chapters/cs7-config.adoc
index 5ac9bae..09b526c 100644
--- a/common/chapters/cs7-config.adoc
+++ b/common/chapters/cs7-config.adoc
@@ -50,6 +50,7 @@
point-code 0.23.1
asp asp-clnt-OsmoMSC-A-Iu 2905 0 m3ua
remote-ip 127.0.0.1
+ role asp
sctp-role client
as as-clnt-OsmoMSC-A-Iu m3ua
asp asp-clnt-OsmoMSC-A-Iu
@@ -86,6 +87,8 @@
remote-ip 10.23.24.1
# optional: local bind to a specific IP
local-ip 10.9.8.7
+ role asp
+ sctp-role client
----
Be aware that such an `asp` needs to be linked to an `as`, see <<as_and_asp>>.
@@ -235,6 +238,7 @@
asp my-asp 2905 0 m3ua
# where to reach the STP:
remote-ip 127.0.0.1
+ role asp
sctp-role client
as my-as m3ua
asp my-asp
@@ -251,6 +255,8 @@
cs7 instance 0
asp my-asp 2905 0 m3ua
remote-ip 127.0.0.1
+ role asp
+ sctp-role client
as my-as m3ua
routing-key 2 0.23.1
----
@@ -261,6 +267,8 @@
cs7 instance 0
asp my-asp 2905 0 m3ua
remote-ip 127.0.0.1
+ role asp
+ sctp-role client
as my-as m3ua
asp my-asp
routing-key 2 0.23.1
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/33243
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Change-Id: I00243a2d549e900f872826c2a4b025936797b5ef
Gerrit-Change-Number: 33243
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/33240 )
Change subject: Write explicit role & sctp-role fields in ASP configurations
......................................................................
Write explicit role & sctp-role fields in ASP configurations
Change-Id: I44e251ca2df02e4f1fdfc1492306ec25d0653ef6
---
M doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg
M doc/manuals/chapters/configuration.adoc
2 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/40/33240/1
diff --git a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg
index fd5a205..1cc4bde 100644
--- a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg
+++ b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg
@@ -9,6 +9,8 @@
point-code 0.23.4
asp asp-clnt-OsmoSGSN-A 2905 0 m3ua
remote-ip 172.18.8.200 ! where to reach the STP
+ role asp
+ sctp-role client
as as-clnt-OsmoSGSN-A m3ua
asp asp-clnt-OsmoSGSN-A
routing-key 3 0.23.4
diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc
index d51dd77..d6ddcd3 100644
--- a/doc/manuals/chapters/configuration.adoc
+++ b/doc/manuals/chapters/configuration.adoc
@@ -422,6 +422,7 @@
point-code 0.23.4
asp asp-clnt-OsmoSGSN 2905 0 m3ua
remote-ip 127.0.0.1
+ role asp
sctp-role client
as as-clnt-OsmoSGSN m3ua
asp asp-clnt-OsmoSGSN
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/33240
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I44e251ca2df02e4f1fdfc1492306ec25d0653ef6
Gerrit-Change-Number: 33240
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-hnbgw/+/33238
to look at the new patch set (#4).
Change subject: tests: Update *.vty after libosmo-sccp VTY improvements
......................................................................
tests: Update *.vty after libosmo-sccp VTY improvements
After recent change, libosmo-sccp is always printing the "role" config.
Depends: libosmo-sccp.git Change-Id Ie81987265118e48173211f88b27a006115dc62d4
Change-Id: I316cd26ceb97f2ccfd1065d65177e7d3926625b0
---
M doc/examples/osmo-hnbgw/osmo-hnbgw-cs7.cfg
M tests/config/defaults.vty
M tests/config/legacy.vty
M tests/config/one_cs7.vty
M tests/config/one_cs7_with_addrs.vty
M tests/config/one_cs7_with_iucs_addr.vty
M tests/config/one_cs7_with_iups_addr.vty
M tests/config/two_cs7.vty
M tests/config/two_cs7_with_addrs.vty
9 files changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/38/33238/4
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33238
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I316cd26ceb97f2ccfd1065d65177e7d3926625b0
Gerrit-Change-Number: 33238
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: arehbein, laforge, daniel.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33193 )
Change subject: Add osmo_io support to osmo_stream_cli and osmo_stream_srv
......................................................................
Patch Set 6:
(1 comment)
Patchset:
PS5:
> Since we already have osmo_stream_*_get_ofd() we should add osmo_stream_*_get_iofd(). Since they will return pointer we could simply return NULL if it's called with the wrong mode, but maybe an assert is better.
The question here would be: do we really need that API for iofd? or iofd can be handled totally internally?
> osmo_stream_srv_create2 is called with the newly accept()ed fd so I'd still pass the read/close callbacks in create2().
I'd keep setting the callbacks as separate APIs. Yes, it does 2 function calls more, occupies 2 more lines, but if we had done this already in the past then now we wouldn't need to be changing this osmo_stream_srv_create() API in first place... so learning for errors = adding separate setter APIs.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33193
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I2f52c7107c392b6f4b0bf2a84f8c873c084a200c
Gerrit-Change-Number: 33193
Gerrit-PatchSet: 6
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: daniel <dwillmann(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 08 Jun 2023 17:25:00 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/33239 )
Change subject: Explicitly configure ASPs asp-clnt-* as role=asp & sctp-role=client
......................................................................
Explicitly configure ASPs asp-clnt-* as role=asp & sctp-role=client
Until recently, the asp-clnt-* ASPs, which have specific handling in osmo_sccp_simple_client_on_ss7_id(),
were being always forcedly set to sctp-role CLIENT by code in that
function.
This prevented user of that API from explicitly configuring the ASP as
"sctp-role server" through the VTY as the option would be overwritten silently.
Now, the sctp-role from config is followed if the ASP is
defined/configured through the VTY (not dynamically created at the time
osmo_sccp_simple_client_on_ss7_id() is called).
Since the default for a VTY-specified ASP is to be in "sctp-role
server", the config files need to be updated to properly configure the
ASP to be in "sctp-role client", which is the desired mode here.
Same applies for "role", where the default is SG but it is actually used
as "ASP" here.
Change-Id: Idf84502ffa199926a5f0ee616313b515743811ab
Depends: osmo-ttcn3-hacks.git Change-Id I4eb5b5f6b4b24df079b4c74e2a2e2ebb8769b0bd
---
M osmo-cn-latest/osmo-msc.cfg
M osmo-cn-latest/osmo-msc.cfg.base
M osmo-hnbgw-latest/osmo-hnbgw.cfg
M osmo-hnbgw-master/osmo-hnbgw.cfg
M ttcn3-bsc-test-vamos/osmo-bsc.cfg
M ttcn3-bsc-test/osmo-bsc.cfg
M ttcn3-bsc-test/sccplite/osmo-bsc.cfg
M ttcn3-hnbgw-test/osmo-hnbgw.cfg
M ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
M ttcn3-msc-test/osmo-msc.cfg
M ttcn3-sgsn-test/osmo-sgsn.cfg
M ttcn3-smlc-test/osmo-smlc.cfg
12 files changed, 51 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/39/33239/1
diff --git a/osmo-cn-latest/osmo-msc.cfg b/osmo-cn-latest/osmo-msc.cfg
index c7649fc..15a25aa 100644
--- a/osmo-cn-latest/osmo-msc.cfg
+++ b/osmo-cn-latest/osmo-msc.cfg
@@ -15,6 +15,8 @@
cs7 instance 0
asp asp-clnt-OsmoMSC-A-Iu 2905 2904 m3ua
remote-ip 192.168.42.10
+ role asp
+ sctp-role client
network
network country code 901
mobile network code 99
diff --git a/osmo-cn-latest/osmo-msc.cfg.base b/osmo-cn-latest/osmo-msc.cfg.base
index da61a49..8f1b0c1 100644
--- a/osmo-cn-latest/osmo-msc.cfg.base
+++ b/osmo-cn-latest/osmo-msc.cfg.base
@@ -15,6 +15,8 @@
cs7 instance 0
asp asp-clnt-OsmoMSC-A-Iu 2905 2904 m3ua
remote-ip 192.168.42.10
+ role asp
+ sctp-role client
network
network country code 901
mobile network code 1
diff --git a/osmo-hnbgw-latest/osmo-hnbgw.cfg b/osmo-hnbgw-latest/osmo-hnbgw.cfg
index 8bffd76..36c8f8c 100644
--- a/osmo-hnbgw-latest/osmo-hnbgw.cfg
+++ b/osmo-hnbgw-latest/osmo-hnbgw.cfg
@@ -23,6 +23,8 @@
point-code 0.23.5
asp asp-clnt-OsmoHNBGW 2905 0 m3ua
remote-ip 172.18.0.200
+ role asp
+ sctp-role client
sccp-address msc
point-code 0.23.2
sccp-address sgsn
diff --git a/osmo-hnbgw-master/osmo-hnbgw.cfg b/osmo-hnbgw-master/osmo-hnbgw.cfg
index 5608e3e..3c6fa98 100644
--- a/osmo-hnbgw-master/osmo-hnbgw.cfg
+++ b/osmo-hnbgw-master/osmo-hnbgw.cfg
@@ -26,6 +26,8 @@
point-code 0.23.5
asp asp-clnt-OsmoHNBGW 2905 0 m3ua
remote-ip 172.18.0.200
+ role asp
+ sctp-role client
sccp-address msc
point-code 0.23.2
sccp-address sgsn
diff --git a/ttcn3-bsc-test-vamos/osmo-bsc.cfg b/ttcn3-bsc-test-vamos/osmo-bsc.cfg
index bf339fa..98f1304 100644
--- a/ttcn3-bsc-test-vamos/osmo-bsc.cfg
+++ b/ttcn3-bsc-test-vamos/osmo-bsc.cfg
@@ -58,6 +58,8 @@
local-ip fd02:db8:31::20
remote-ip 172.18.31.200
remote-ip fd02:db8:31::200
+ role asp
+ sctp-role client
sccp-address msc2
point-code 0.0.2
sccp-address msc3
diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg
index ef7ffae..5902b1d 100644
--- a/ttcn3-bsc-test/osmo-bsc.cfg
+++ b/ttcn3-bsc-test/osmo-bsc.cfg
@@ -68,6 +68,8 @@
local-ip fd02:db8:2::20
remote-ip 172.18.2.200
remote-ip fd02:db8:2::200
+ role asp
+ sctp-role client
sccp-address msc2
point-code 0.0.2
sccp-address msc3
diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
index c680ef7..423f6d9 100644
--- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
+++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
@@ -57,6 +57,8 @@
asp asp-clnt-msc-0 5000 0 ipa
local-ip 172.18.12.20
remote-ip 172.18.12.203
+ role asp
+ sctp-role client
as as-clnt-msc-0 ipa
asp asp-clnt-msc-0
routing-key 0 0.23.3
diff --git a/ttcn3-hnbgw-test/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/osmo-hnbgw.cfg
index e116c79..61d6236 100644
--- a/ttcn3-hnbgw-test/osmo-hnbgw.cfg
+++ b/ttcn3-hnbgw-test/osmo-hnbgw.cfg
@@ -24,6 +24,8 @@
asp asp-clnt-msc-0 2905 2905 m3ua
local-ip 172.18.35.20
remote-ip 172.18.35.200
+ role asp
+ sctp-role client
point-code 0.23.5
sccp-address msc
routing-indicator PC
diff --git a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
index ce8e673..329ea7d 100644
--- a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
+++ b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
@@ -24,6 +24,8 @@
asp asp-clnt-msc-0 2905 2905 m3ua
local-ip 172.18.35.20
remote-ip 172.18.35.200
+ role asp
+ sctp-role client
point-code 0.23.5
sccp-address msc
routing-indicator PC
diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg
index 903b5bd..dabf142 100644
--- a/ttcn3-msc-test/osmo-msc.cfg
+++ b/ttcn3-msc-test/osmo-msc.cfg
@@ -61,6 +61,8 @@
local-ip fd02:db8:20::10
remote-ip 172.18.20.200
remote-ip fd02:db8:20::200
+ role asp
+ sctp-role client
as as-clnt-OsmoMSC-A m3ua
asp asp-clnt-OsmoMSC-A
routing-key 3 0.23.1
diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg
index 73d55e7..0fb826a 100644
--- a/ttcn3-sgsn-test/osmo-sgsn.cfg
+++ b/ttcn3-sgsn-test/osmo-sgsn.cfg
@@ -57,6 +57,8 @@
local-ip fd02:db8:8::10
remote-ip 172.18.8.200
remote-ip fd02:db8:8::200
+ role asp
+ sctp-role client
as as-clnt-OsmoSGSN-A m3ua
asp asp-clnt-OsmoSGSN-A
routing-key 3 0.23.4
diff --git a/ttcn3-smlc-test/osmo-smlc.cfg b/ttcn3-smlc-test/osmo-smlc.cfg
index 3bba0b3..7da2163 100644
--- a/ttcn3-smlc-test/osmo-smlc.cfg
+++ b/ttcn3-smlc-test/osmo-smlc.cfg
@@ -21,7 +21,8 @@
local-ip fd02:db8:23::20
remote-ip 172.18.23.200
remote-ip fd02:db8:23::200
-
+ role asp
+ sctp-role client
cells
lac-ci 23 42 lat 23.23 lon 42.42
cgi 001 02 3 4 lat 5.678 lon 6.789
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33239
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Idf84502ffa199926a5f0ee616313b515743811ab
Gerrit-Change-Number: 33239
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
