July 2022 - gerrit-log - lists.osmocom.org

Change in libosmocore[master]: gsm_23_041.h: Document CBS ETWS Warning Type values

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28739 ) Change subject: gsm_23_041.h: Document CBS ETWS Warning Type values ...................................................................... gsm_23_041.h: Document CBS ETWS Warning Type values Change-Id: I3a5bb9b2c77b8e4a984631d199fc073183691c31 --- M include/osmocom/gsm/protocol/gsm_23_041.h 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/39/28739/1 diff --git a/include/osmocom/gsm/protocol/gsm_23_041.h b/include/osmocom/gsm/protocol/gsm_23_041.h index e726cff..b13f393 100644 --- a/include/osmocom/gsm/protocol/gsm_23_041.h +++ b/include/osmocom/gsm/protocol/gsm_23_041.h @@ -2,6 +2,16 @@ #include <osmocom/core/endian.h> +/* Section 9.3.24: Warning-Type */ +enum { + CBS_ETWS_WARN_TYPE_EARTHQUAKE = 0, + CBS_ETWS_WARN_TYPE_TSUNAMI = 1, + CBS_ETWS_WARN_TYPE_EARTHQUAKE_AND_TSUNAMI = 2, + CBS_ETWS_WARN_TYPE_TEST = 3, + CBS_ETWS_WARN_TYPE_OTHER = 4, + /* 0000101-1111111 Reserved for future use */ +}; + /* Section 9.4.1.2: GSM Message Format */ struct gsm23041_msg_param_gsm { uint16_t serial_nr; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3a5bb9b2c77b8e4a984631d199fc073183691c31 Gerrit-Change-Number: 28739 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: Change CC_CAUSE returned on unanswered MT Call

by neels

Attention is currently required from: laforge, pespin, fixeria, keith, dexter. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28509 ) Change subject: Change CC_CAUSE returned on unanswered MT Call ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: regarding proper CC timeout: the old cc implementation apparently only has one overall guard timer, see gsm48_cc_guard_timeout(). Instead of in call_leg.c which is all about RTP, we could set that trans.cc.release_cause value in that gsm48_cc_guard_timeout() function depending on the trans->cc.state? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4a9cfc388ec9ecb743d154a114a6db638eac4701 Gerrit-Change-Number: 28509 Gerrit-PatchSet: 1 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 17:07:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: Change CC_CAUSE returned on unanswered MT Call

by neels

Attention is currently required from: laforge, pespin, fixeria, keith, dexter. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28509 ) Change subject: Change CC_CAUSE returned on unanswered MT Call ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/c/osmo-msc/+/28509/comment/4cd300a7_318ddd36 PS1, Line 281: (trans->cc.state == GSM_CSTATE_CALL_RECEIVED) ? > In adding this check, I should point out that I do not know what other CC state is possible when we […] related: the cc state transitioning was written a very long time ago, before we had osmo_fsm. Specially for inter-MSC HO i implemented a new "proper" FSM for CC via MNCC in 2018, in mncc_fsm.[hc], because it was not possible to use the older cc implementation for what inter-msc requires. It is well possible and loosely intended to replace the old cc implementation with this new mncc_fsm (i wrote that intention into the comment on top of mncc_call.c). IMO it would clarify things and have "proper" state transition checking and so forth. Given the relatively low attention to osmo-msc in the past years the cc refactoring hasn't happened, and other things are more pressing, it doesn't seem to be happening any time soon. So until then we're left with figuring out the old cc implementation that osmo-msc still uses in the usual voice call scenarios. So: It seems to me that you have already figured out at least one case where sending USER_NOTRESPOND makes more sense, and i trust you with that judgement. I think this patch is fine, but if you would want to limit this cause to mgw X2 expiry: in call_leg.c, in call_leg_fsm_timer_cb(), you could detect the T that expired: if (fi->T == -2) ... the usual pattern we use is to store state about whether a cause value has already been determined, for example add trans.cc.release_cause, and here use that if it is nonzero: trans->cc.release_cause ? : GSM48_CAUSE_RESOURCE_UNAVAIL It seems that X2 is also used for a timeout during call release (though actually that seems like dead code), so probably if (fi->T == -2 && fi->state == CALL_LEG_ST_ESTABLISHING) trans->cc.release_cause = GSM48_CC_CAUSE_USER_NOTRESPOND; The missing link is that call_leg doesn't know its cc trans yet, so in call_leg we would need to add a backpointer to the trans, like rtp_stream already has: for_trans. All of this just if you think it is worthwhile... -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I4a9cfc388ec9ecb743d154a114a6db638eac4701 Gerrit-Change-Number: 28509 Gerrit-PatchSet: 1 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 17:03:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: keith <keith(a)rhizomatica.org> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: cbc-apitool: print usage instead of crashing if no subcmd passed

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28738 ) Change subject: cbc-apitool: print usage instead of crashing if no subcmd passed ...................................................................... cbc-apitool: print usage instead of crashing if no subcmd passed The "required" param was added in python 3.7. Change-Id: Ia8d13beeb8da64644d1aaf36deeddda4de889a6c --- M contrib/cbc-apitool.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/38/28738/1 diff --git a/contrib/cbc-apitool.py b/contrib/cbc-apitool.py index 20d9819..299846a 100755 --- a/contrib/cbc-apitool.py +++ b/contrib/cbc-apitool.py @@ -117,7 +117,7 @@ parser.add_argument("-p", "--port", help="TCP port to connect to", type=int, default=12345) parser.add_argument("-v", "--verbose", help="increase output verbosity", action='count', default=0) - subparsers = parser.add_subparsers() + subparsers = parser.add_subparsers(required=True) parser_c_cbs = subparsers.add_parser('create-cbs', help='Create a new CBS message') parser_c_cbs.add_argument("--msg-id", type=int, help='Message Identifier', required=True) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia8d13beeb8da64644d1aaf36deeddda4de889a6c Gerrit-Change-Number: 28738 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Support CBSP/TCP and SBc-AP/SCTP client mode

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28732 to look at the new patch set (#3). Change subject: Support CBSP/TCP and SBc-AP/SCTP client mode ...................................................................... Support CBSP/TCP and SBc-AP/SCTP client mode This patch adds support to set up a CBSP link so that osmo-cbc connects as a TCP client to the BSC, which runs as a TCP server. Similary, support to set up a SBc-AP link so that osmo-cbc connects as a SCTP client to the MME, which runs as SCTP server. A new "mode (client|server|disabled)" VTY command is added to use one mother or the other, and also to disable the link and hence the peer until it is set again. This is useful if the peer is under manintenance for instance. client sockets are created automatically when the "peer" vty node is exited if the link is not yet created, hence creating it at startup or if moved back from "disabled" mode. If client socket dies, it will keep attempting reconnect every 5 seconds. Related: OS#4945 Change-Id: I3ec54b615b41b56f7a9c64298e3fcaac37f4b60e --- M doc/examples/osmo-cbc/osmo-cbc.cfg M include/osmocom/cbc/cbc_peer.h M include/osmocom/cbc/cbsp_link.h M include/osmocom/cbc/sbcap_link.h M src/cbc_main.c M src/cbc_peer.c M src/cbc_vty.c M src/cbsp_link.c M src/sbcap_link.c 9 files changed, 476 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/32/28732/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I3ec54b615b41b56f7a9c64298e3fcaac37f4b60e Gerrit-Change-Number: 28732 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Support CBSP/TCP and SBc-AP/SCTP client mode

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28732 ) Change subject: Support CBSP/TCP and SBc-AP/SCTP client mode ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I3ec54b615b41b56f7a9c64298e3fcaac37f4b60e Gerrit-Change-Number: 28732 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 22 Jul 2022 16:13:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: add contrib/set_cap_net_admin.sh

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28311 ) Change subject: add contrib/set_cap_net_admin.sh ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > two reasons: […] Doesn't look valid points to me. - doc/reminder: that's what UserManual is for. - having to set up cap_net_admin all the time: You also need to run it every time and you don't add a script run_upf.sh for that. This should be set in your own env (osmo-dev?) IMHO, not here, specially since it's basically a oneliner. I really don't see the point in having this in, let's see what other think. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: If31c304e2602d3c37d5d8a5a2705417b2fc4686c Gerrit-Change-Number: 28311 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 16:10:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-ci[master]: scripts/common-obs: use git commit --no-verify

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28638 ) Change subject: scripts/common-obs: use git commit --no-verify ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: i'd like to better understand... --no-verify skips the linter? why do these commits see linter problems at all, and then why does it make sense to skip it? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icdb50cdd1217d848e1e640fbffd7a88b9c8bc8c6 Gerrit-Change-Number: 28638 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 16:08:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: add contrib/set_cap_net_admin.sh

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28311 ) Change subject: add contrib/set_cap_net_admin.sh ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > As mentioned I'm not sure this is needed here. two reasons: it's a doc/reminder of how setting cap_net_admin works. when developing, after rebuilding osmo-upf i have to set cap_net_admin all the time, it's a convenient script for the dev cycle. debian packaging: good point, not sure how that is done, would be great if i could delegate that part, i see it as a separate patch; this script is not at all intended to replace whatever the packaging should do. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: If31c304e2602d3c37d5d8a5a2705417b2fc4686c Gerrit-Change-Number: 28311 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 16:03:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Split cbsp/sbcap server socket creation from struct allocation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28736 ) Change subject: Split cbsp/sbcap server socket creation from struct allocation ...................................................................... Split cbsp/sbcap server socket creation from struct allocation This will be needed when we add client support, since clients will require the mgr structs to be available during VTY parsing. Change-Id: I14e49d8d2e603925d7f06a7edb710c0eceb02ea3 --- M include/osmocom/cbc/cbsp_link.h M include/osmocom/cbc/sbcap_link.h M src/cbc_data.c M src/cbsp_link.c M src/sbcap_link.c 5 files changed, 82 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/36/28736/1 diff --git a/include/osmocom/cbc/cbsp_link.h b/include/osmocom/cbc/cbsp_link.h index 7fcacdf..9f964e8 100644 --- a/include/osmocom/cbc/cbsp_link.h +++ b/include/osmocom/cbc/cbsp_link.h @@ -24,7 +24,8 @@ int (*rx_cb)(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *dec); }; -struct cbc_cbsp_mgr *cbc_cbsp_mgr_create(void *ctx); +struct cbc_cbsp_mgr *cbc_cbsp_mgr_alloc(void *ctx); +int cbc_cbsp_mgr_open_srv(struct cbc_cbsp_mgr *mgr); /* a CBSP link with a single (remote) peer connected to us */ struct cbc_cbsp_link { diff --git a/include/osmocom/cbc/sbcap_link.h b/include/osmocom/cbc/sbcap_link.h index 5946544..da804a3 100644 --- a/include/osmocom/cbc/sbcap_link.h +++ b/include/osmocom/cbc/sbcap_link.h @@ -26,7 +26,8 @@ /* receive call-back; called for every received message */ int (*rx_cb)(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu); }; -struct cbc_sbcap_mgr *cbc_sbcap_mgr_create(void *ctx); +struct cbc_sbcap_mgr *cbc_sbcap_mgr_alloc(void *ctx); +int cbc_sbcap_mgr_open_srv(struct cbc_sbcap_mgr *mgr); /* an SBc-AP link with a single (remote) peer connected to us */ struct cbc_sbcap_link { diff --git a/src/cbc_data.c b/src/cbc_data.c index 5d5a64f..2e350e9 100644 --- a/src/cbc_data.c +++ b/src/cbc_data.c @@ -54,6 +54,12 @@ OSMO_ASSERT(cbc->it_q.rest2main); osmo_fd_register(&cbc->it_q.rest2main->event_ofd); + cbc->cbsp.mgr = cbc_cbsp_mgr_alloc(cbc); + OSMO_ASSERT(cbc->cbsp.mgr); + + cbc->sbcap.mgr = cbc_sbcap_mgr_alloc(cbc); + OSMO_ASSERT(cbc->sbcap.mgr); + return cbc; } @@ -64,14 +70,14 @@ tall_rest_ctx = talloc_named_const(cbc, 0, "REST"); - if (!(cbc->cbsp.mgr = cbc_cbsp_mgr_create(cbc))) { + if ((rc = cbc_cbsp_mgr_open_srv(cbc->cbsp.mgr)) < 0) { LOGP(DMAIN, LOGL_ERROR, "Error binding CBSP port\n"); - return -EIO; + return rc; } - if (!(cbc->sbcap.mgr = cbc_sbcap_mgr_create(cbc))) { + if ((rc = cbc_sbcap_mgr_open_srv(cbc->sbcap.mgr)) < 0) { LOGP(DMAIN, LOGL_ERROR, "Error binding SBc-AP port\n"); - return -EIO; + return rc; } rc = rest_api_init(tall_rest_ctx, cbc->config.ecbe.local_host, cbc->config.ecbe.local_port); diff --git a/src/cbsp_link.c b/src/cbsp_link.c index cd1c308..baf2def 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -225,35 +225,44 @@ osmo_stream_srv_destroy(link->conn); } -/* initialize the CBC-side CBSP server */ -struct cbc_cbsp_mgr *cbc_cbsp_mgr_create(void *ctx) +/* + * CBSP Manager + */ +struct cbc_cbsp_mgr *cbc_cbsp_mgr_alloc(void *ctx) { - struct cbc_cbsp_mgr *cbc = talloc_zero(ctx, struct cbc_cbsp_mgr); - int rc; + struct cbc_cbsp_mgr *mgr; + + mgr = talloc_zero(ctx, struct cbc_cbsp_mgr); + OSMO_ASSERT(mgr); + mgr->rx_cb = cbc_cbsp_link_rx_cb; + INIT_LLIST_HEAD(&mgr->links); + + return mgr; +} + +/* initialize the CBC-side CBSP server */ +int cbc_cbsp_mgr_open_srv(struct cbc_cbsp_mgr *mgr) +{ char *bind_ip = g_cbc->config.cbsp.local_host; int bind_port = g_cbc->config.cbsp.local_port; + struct osmo_stream_srv_link *srv_link; + int rc; - if (bind_port == -1) - bind_port = CBSP_TCP_PORT; - - OSMO_ASSERT(cbc); - cbc->rx_cb = cbc_cbsp_link_rx_cb; - INIT_LLIST_HEAD(&cbc->links); - cbc->srv_link = osmo_stream_srv_link_create(cbc); - osmo_stream_srv_link_set_data(cbc->srv_link, cbc); - osmo_stream_srv_link_set_nodelay(cbc->srv_link, true); - osmo_stream_srv_link_set_port(cbc->srv_link, bind_port); + srv_link = osmo_stream_srv_link_create(mgr); + osmo_stream_srv_link_set_data(srv_link, mgr); + osmo_stream_srv_link_set_nodelay(srv_link, true); + osmo_stream_srv_link_set_port(srv_link, bind_port); if (bind_ip) - osmo_stream_srv_link_set_addr(cbc->srv_link, bind_ip); - osmo_stream_srv_link_set_accept_cb(cbc->srv_link, cbsp_cbc_accept_cb); - rc = osmo_stream_srv_link_open(cbc->srv_link); + osmo_stream_srv_link_set_addr(srv_link, bind_ip); + osmo_stream_srv_link_set_accept_cb(srv_link, cbsp_cbc_accept_cb); + rc = osmo_stream_srv_link_open(srv_link); if (rc < 0) { - osmo_stream_srv_link_destroy(cbc->srv_link); - talloc_free(cbc); - return NULL; + osmo_stream_srv_link_destroy(srv_link); + talloc_free(mgr); + return -EIO; } + mgr->srv_link = srv_link; LOGP(DCBSP, LOGL_NOTICE, "Listening for CBSP at %s\n", - osmo_stream_srv_link_get_sockname(cbc->srv_link)); - - return cbc; + osmo_stream_srv_link_get_sockname(mgr->srv_link)); + return 0; } diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 9194509..b4f54c1 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -255,31 +255,46 @@ osmo_stream_srv_destroy(link->conn); } -/* initialize the CBC-side SBc-AP server */ -struct cbc_sbcap_mgr *cbc_sbcap_mgr_create(void *ctx) +/* + * CBSP Manager + */ +struct cbc_sbcap_mgr *cbc_sbcap_mgr_alloc(void *ctx) { - struct cbc_sbcap_mgr *cbc = talloc_zero(ctx, struct cbc_sbcap_mgr); - int rc; + struct cbc_sbcap_mgr *mgr; + + mgr = talloc_zero(ctx, struct cbc_sbcap_mgr); + OSMO_ASSERT(mgr); + mgr->rx_cb = cbc_sbcap_link_rx_cb; + INIT_LLIST_HEAD(&mgr->links); + + return mgr; +} + +/* initialize the CBC-side SBc-AP server */ +int cbc_sbcap_mgr_open_srv(struct cbc_sbcap_mgr *mgr) +{ int bind_port = g_cbc->config.sbcap.local_port; + struct osmo_stream_srv_link *srv_link; + int rc; - if (bind_port == -1) - bind_port = SBcAP_SCTP_PORT; - - OSMO_ASSERT(cbc); - cbc->rx_cb = cbc_sbcap_link_rx_cb; - INIT_LLIST_HEAD(&cbc->links); - cbc->srv_link = osmo_stream_srv_link_create(cbc); - osmo_stream_srv_link_set_proto(cbc->srv_link, IPPROTO_SCTP); - osmo_stream_srv_link_set_data(cbc->srv_link, cbc); - osmo_stream_srv_link_set_nodelay(cbc->srv_link, true); - osmo_stream_srv_link_set_port(cbc->srv_link, bind_port); - osmo_stream_srv_link_set_addrs(cbc->srv_link, (const char **)g_cbc->config.sbcap.local_host, + srv_link = osmo_stream_srv_link_create(mgr); + osmo_stream_srv_link_set_proto(srv_link, IPPROTO_SCTP); + osmo_stream_srv_link_set_data(srv_link, mgr); + osmo_stream_srv_link_set_nodelay(srv_link, true); + osmo_stream_srv_link_set_port(srv_link, bind_port); + osmo_stream_srv_link_set_addrs(srv_link, + (const char **)g_cbc->config.sbcap.local_host, g_cbc->config.sbcap.num_local_host); - osmo_stream_srv_link_set_accept_cb(cbc->srv_link, sbcap_cbc_accept_cb); - rc = osmo_stream_srv_link_open(cbc->srv_link); - OSMO_ASSERT(rc == 0); + osmo_stream_srv_link_set_accept_cb(srv_link, sbcap_cbc_accept_cb); + rc = osmo_stream_srv_link_open(srv_link); + if (rc < 0) { + osmo_stream_srv_link_destroy(srv_link); + talloc_free(mgr); + return -EIO; + } + mgr->srv_link = srv_link; LOGP(DSBcAP, LOGL_NOTICE, "Listening for SBc-AP at %s\n", - osmo_stream_srv_link_get_sockname(cbc->srv_link)); + osmo_stream_srv_link_get_sockname(mgr->srv_link)); - return cbc; + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I14e49d8d2e603925d7f06a7edb710c0eceb02ea3 Gerrit-Change-Number: 28736 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022