- gerrit-log - lists.osmocom.org

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: cosmetic: fix wrong arity in comment
by pespin 21 Jan '25

21 Jan '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39387?usp=email ) Change subject: s1ap_proxy: cosmetic: fix wrong arity in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39387?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Idfe81c8905a61a23f2a44057ddcf17184e75b85f Gerrit-Change-Number: 39387 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Jan 2025 11:30:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: cosmetic: fix wrong arity in comment
by fixeria 21 Jan '25

21 Jan '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39387?usp=email ) Change subject: s1ap_proxy: cosmetic: fix wrong arity in comment ...................................................................... s1ap_proxy: cosmetic: fix wrong arity in comment Change-Id: Idfe81c8905a61a23f2a44057ddcf17184e75b85f --- M src/s1ap_proxy.erl 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/87/39387/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 3414e79..365f141 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -574,7 +574,7 @@ %% Iterate over the given list of 'ProtocolIE-Field' IEs, -%% calling function handle_ie/1 for IEs matching the given IEI. +%% calling function handle_ie/3 for IEs matching the given IEI. %% Additionally look for {MME,eNB}-UE-S1AP-ID IEs and store their values. -type handle_ies_result() :: {ok, list()} | {error, term()}. -spec handle_ies(s1ap_ie_id(), list(), proxy_state()) -> {handle_ies_result(), proxy_state()}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39387?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Idfe81c8905a61a23f2a44057ddcf17184e75b85f Gerrit-Change-Number: 39387 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: fix IEI path leak in handle_ies/4
by fixeria 21 Jan '25

21 Jan '25

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39388?usp=email ) Change subject: s1ap_proxy: fix IEI path leak in handle_ies/4 ...................................................................... s1ap_proxy: fix IEI path leak in handle_ies/4 Function handle_ies/3 prepends a new item to the IEI path and calls function handle_ies/4. The later was expected to remove that item from the IEI path upon returning the new #proxy_state. This was done correctly in the successful scenario, however the error case was overlooked in 00f51fe. As a result of this, whenever handle_ie/3 returns an error, the IEI path is not properly cleaned and stale IEIs remain in the #proxy_state. Fix this by removing the head IEI in the same place where we push it. Change-Id: I64629a215c05e8d577a8943ae872945d61b5107c Fixes: 00f51fe ("s1ap_proxy: handle_ies(): pass IEI path to handle_ie()") Related: SYS#7288 --- M src/s1ap_proxy.erl 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/88/39388/1 diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 365f141..f04fb61 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -578,8 +578,12 @@ %% Additionally look for {MME,eNB}-UE-S1AP-ID IEs and store their values. -type handle_ies_result() :: {ok, list()} | {error, term()}. -spec handle_ies(s1ap_ie_id(), list(), proxy_state()) -> {handle_ies_result(), proxy_state()}. -handle_ies(IEI, IEs, #proxy_state{path = P} = S) -> - handle_ies([], IEI, IEs, S#proxy_state{path = [IEI | P]}). +handle_ies(IEI, IEs, #proxy_state{path = P} = S0) -> + %% prepend IEI to the path and call handle_ies/4 + {Result, S1} = handle_ies([], IEI, IEs, + S0#proxy_state{path = [IEI | P]}), + %% remove IEI from the path and return the result + {Result, S1#proxy_state{path = P}}. handle_ies(Acc, IEI, [IE | IEs], #proxy_state{path = P} = S0) -> @@ -610,10 +614,9 @@ handle_ies([IE | Acc], IEI, IEs, S0) end; -handle_ies(Acc, IEI, [], - #proxy_state{path = [IEI | P]} = S) -> +handle_ies(Acc, _IEI, [], S) -> IEs = lists:reverse(Acc), - {{ok, IEs}, S#proxy_state{path = P}}. + {{ok, IEs}, S}. build_erab_setup_response_failure(#proxy_state{erabs = ERABs, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39388?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I64629a215c05e8d577a8943ae872945d61b5107c Gerrit-Change-Number: 39388 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[L] Change in osmo-mgw[master]: mgw: CRCX: Split mgcp header pars parsing into a previous step
by pespin 21 Jan '25

21 Jan '25

Attention is currently required from: daniel, laforge, neels, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39224?usp=email ) Change subject: mgw: CRCX: Split mgcp header pars parsing into a previous step ...................................................................... Patch Set 6: (1 comment) Patchset: PS6: ping -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39224?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3ee5158c254213203830fe9c38de11c15b4b19c1 Gerrit-Change-Number: 39224 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Jan 2025 11:27:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmo-bsc[master]: Use use new osmo_stream_{cli,srv}_set_segmentation_cb2
by pespin 21 Jan '25

21 Jan '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39386?usp=email ) Change subject: Use use new osmo_stream_{cli,srv}_set_segmentation_cb2 ...................................................................... Use use new osmo_stream_{cli,srv}_set_segmentation_cb2 The older API osmo_stream_{cli,srv}_set_segmentation_cb() is now deprecated, use the newer one. Change-Id: I420da09c248fc2e58bfac3e91fe38bddb1de4018 Depends: libosmo-netif.git 519912781a463fa25bf3c7b18def11076e377fb6 --- M TODO-RELEASE M src/ipaccess/ipaccess-config-e1-driver.c M src/osmo-bsc/cbsp_link.c 3 files changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/39386/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 193735c..777f047 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmo-sigtran >2.0.1 Use API osmo_ss7_route_get_dest_as(), osmo_ss7_instance_get_id(), osmo_ss7_as_get_asp_protocol() +libosmo-netif >1.5.1 Use osmo_stream_srv_set_segmentation_cb2() diff --git a/src/ipaccess/ipaccess-config-e1-driver.c b/src/ipaccess/ipaccess-config-e1-driver.c index 17a5dde..456a84b 100644 --- a/src/ipaccess/ipaccess-config-e1-driver.c +++ b/src/ipaccess/ipaccess-config-e1-driver.c @@ -353,6 +353,11 @@ return -EBADF; } +static int ipaccess_bts_segmentation_cb2(struct osmo_stream_cli *cli, struct msgb *msg) +{ + return osmo_ipa_segmentation_cb(msg); +} + static int ipaccess_bts_connect_cb(struct osmo_stream_cli *cli) { struct e1inp_ts *e1i_ts = osmo_stream_cli_get_data(cli); @@ -428,7 +433,7 @@ /* Reconnect is handled by upper layers: */ osmo_stream_cli_set_reconnect_timeout(cli, -1); - osmo_stream_cli_set_segmentation_cb(cli, osmo_ipa_segmentation_cb); + osmo_stream_cli_set_segmentation_cb2(cli, ipaccess_bts_segmentation_cb2); osmo_stream_cli_set_connect_cb(cli, ipaccess_bts_connect_cb); osmo_stream_cli_set_disconnect_cb(cli, ipaccess_bts_disconnect_cb); osmo_stream_cli_set_read_cb2(cli, ipaccess_bts_read_cb); diff --git a/src/osmo-bsc/cbsp_link.c b/src/osmo-bsc/cbsp_link.c index 3a86ea3..0dc33c3 100644 --- a/src/osmo-bsc/cbsp_link.c +++ b/src/osmo-bsc/cbsp_link.c @@ -62,6 +62,11 @@ return 0; } +static int cbsp_srv_segmentation_cb2(struct osmo_stream_srv *conn, struct msgb *msg) +{ + return osmo_cbsp_segmentation_cb(msg); +} + static int cbsp_srv_read_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) { struct bsc_cbc_link *cbc = osmo_stream_srv_get_data(conn); @@ -124,7 +129,7 @@ osmo_stream_srv_set_name(srv, "cbsp"); osmo_stream_srv_set_read_cb(srv, cbsp_srv_read_cb); osmo_stream_srv_set_closed_cb(srv, cbsp_srv_closed_cb); - osmo_stream_srv_set_segmentation_cb(srv, osmo_cbsp_segmentation_cb); + osmo_stream_srv_set_segmentation_cb2(srv, cbsp_srv_segmentation_cb2); cbc->server.srv = srv; if (cbc->server.sock_name) @@ -166,6 +171,11 @@ return 0; } +static int cbsp_client_segmentation_cb2(struct osmo_stream_cli *cli, struct msgb *msg) +{ + return osmo_cbsp_segmentation_cb(msg); +} + static int cbsp_client_read_cb(struct osmo_stream_cli *cli, int res, struct msgb *msg) { struct bsc_cbc_link *cbc = osmo_stream_cli_get_data(cli); @@ -247,7 +257,7 @@ osmo_stream_cli_set_connect_cb(cbc->client.cli, cbsp_client_connect_cb); osmo_stream_cli_set_disconnect_cb(cbc->client.cli, cbsp_client_disconnect_cb); osmo_stream_cli_set_read_cb2(cbc->client.cli, cbsp_client_read_cb); - osmo_stream_cli_set_segmentation_cb(cbc->client.cli, osmo_cbsp_segmentation_cb); + osmo_stream_cli_set_segmentation_cb2(cbc->client.cli, cbsp_client_segmentation_cb2); } /* CBC side */ osmo_stream_cli_set_addr(cbc->client.cli, cbc->client.remote_addr.ip); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39386?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I420da09c248fc2e58bfac3e91fe38bddb1de4018 Gerrit-Change-Number: 39386 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-remsim[master]: Use use new osmo_stream_{cli,srv}_set_segmentation_cb2
by pespin 21 Jan '25

21 Jan '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/39385?usp=email ) Change subject: Use use new osmo_stream_{cli,srv}_set_segmentation_cb2 ...................................................................... Use use new osmo_stream_{cli,srv}_set_segmentation_cb2 The older API osmo_stream_{cli,srv}_set_segmentation_cb() is now deprecated, use the newer one. Depends: libosmo-netif.git 519912781a463fa25bf3c7b18def11076e377fb6 Change-Id: I02c55179a144e3bbd1f760f5429e16c6e327111e --- M TODO-RELEASE M src/rspro_client_fsm.c M src/server/rspro_server.c 3 files changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/85/39385/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 730a421..f88e857 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -10,3 +10,4 @@ libosmocore > 1.9.0 working (compiling) gsmtap_inst_fd2() libosmo-simtrace2 >= 0.9.0 required to compile (sim presence polarity) libosmo-netif >1.5.1 osmo_ipa_ka_fsm_inst APIs +libosmo-netif >1.5.1 Use osmo_stream_srv_set_segmentation_cb2() diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index d847f3b..c4ff16c 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -139,6 +139,11 @@ { 0, NULL } }; +static int srvc_ipa_segmentation_cb2(struct osmo_stream_cli *cli, struct msgb *msg) +{ + return osmo_ipa_segmentation_cb(msg); +} + static int srvc_connect_cb(struct osmo_stream_cli *cli) { struct rspro_server_conn *srvc = osmo_stream_cli_get_data(cli); @@ -469,7 +474,7 @@ /* Reconnect is handled by upper layers: */ osmo_stream_cli_set_reconnect_timeout(srvc->conn, -1); - osmo_stream_cli_set_segmentation_cb(srvc->conn, osmo_ipa_segmentation_cb); + osmo_stream_cli_set_segmentation_cb2(srvc->conn, srvc_ipa_segmentation_cb2); osmo_stream_cli_set_connect_cb(srvc->conn, srvc_connect_cb); osmo_stream_cli_set_disconnect_cb(srvc->conn, srvc_disconnect_cb); osmo_stream_cli_set_read_cb2(srvc->conn, srvc_read_cb); diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c index 1cc1af1..e650910 100644 --- a/src/server/rspro_server.c +++ b/src/server/rspro_server.c @@ -708,6 +708,11 @@ return -1; } +static int sock_ipa_segmentation_cb2(struct osmo_stream_srv *conn, struct msgb *msg) +{ + return osmo_ipa_segmentation_cb(msg); +} + /* data was received from one of the client connections to the RSPRO socket */ static int sock_read_cb(struct osmo_stream_srv *peer, int res, struct msgb *msg) { @@ -812,7 +817,7 @@ goto out_err; osmo_stream_srv_set_read_cb(conn->peer, sock_read_cb); osmo_stream_srv_set_closed_cb(conn->peer, sock_closed_cb); - osmo_stream_srv_set_segmentation_cb(conn->peer, osmo_ipa_segmentation_cb); + osmo_stream_srv_set_segmentation_cb2(conn->peer, sock_ipa_segmentation_cb2); /* don't allocate 'fi' as slave from 'conn', as 'fi' needs to survive 'conn' during * teardown */ -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/39385?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I02c55179a144e3bbd1f760f5429e16c6e327111e Gerrit-Change-Number: 39385 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-abis[master]: Use use new osmo_stream_{cli,srv}_set_segmentation_cb2
by pespin 21 Jan '25

21 Jan '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39384?usp=email ) Change subject: Use use new osmo_stream_{cli,srv}_set_segmentation_cb2 ...................................................................... Use use new osmo_stream_{cli,srv}_set_segmentation_cb2 The older API osmo_stream_{cli,srv}_set_segmentation_cb() is now deprecated, use the newer one. Change-Id: I3735728e309f5c0368f6c21edde160c4f86aee01 Depends: libosmo-netif.git 519912781a463fa25bf3c7b18def11076e377fb6 --- M TODO-RELEASE M src/input/ipaccess.c 2 files changed, 17 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/84/39384/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index e540591..3500f72 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,3 +1,4 @@ + # When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install # according to https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release # In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info… @@ -13,4 +14,5 @@ libosmocore >1.10.0 bigger iofd tx_queue.max_length default value libosmo-abis API break Remove ipaccess_fd_cb() libosmo-netif >1.5.1 osmo_ipa_ka_fsm_inst APIs -libosmo-abis Remove API ipa_proxy_vty_init() \ No newline at end of file +libosmo-abis Remove API ipa_proxy_vty_init() +libosmo-netif >1.5.1 Use osmo_stream_srv_set_segmentation_cb2() diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 6a7d753..3d61638 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -543,6 +543,11 @@ } } +static int ipaccess_bsc_conn_segmentation_cb2(struct osmo_stream_srv *conn, struct msgb *msg) +{ + return osmo_ipa_segmentation_cb(msg); +} + static int ipaccess_bsc_conn_read_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg) { enum ipaccess_proto ipa_proto = osmo_ipa_msgb_cb_proto(msg); @@ -704,7 +709,7 @@ osmo_stream_srv_set_name(conn, conn_name); osmo_stream_srv_set_read_cb(conn, ipaccess_bsc_conn_read_cb); osmo_stream_srv_set_closed_cb(conn, ipaccess_bsc_conn_closed_cb); - osmo_stream_srv_set_segmentation_cb(conn, osmo_ipa_segmentation_cb); + osmo_stream_srv_set_segmentation_cb2(conn, ipaccess_bsc_conn_segmentation_cb2); /* We use bfd->fd in here for osmo_stats_tcp, and bfd->data to access osmo_stream_srv from e1i_ts. */ bfd = &e1i_ts->driver.ipaccess.fd; @@ -759,7 +764,7 @@ osmo_stream_srv_set_name(conn, conn_name); osmo_stream_srv_set_read_cb(conn, ipaccess_bsc_conn_read_cb); osmo_stream_srv_set_closed_cb(conn, ipaccess_bsc_conn_closed_cb); - osmo_stream_srv_set_segmentation_cb(conn, osmo_ipa_segmentation_cb); + osmo_stream_srv_set_segmentation_cb2(conn, ipaccess_bsc_conn_segmentation_cb2); /* We use bfd->fd in here for osmo_stats_tcp, and bfd->data to access osmo_stream_srv from e1i_ts. */ bfd = &e1i_ts->driver.ipaccess.fd; @@ -855,6 +860,11 @@ return -1; } +static int ipaccess_bts_segmentation_cb2(struct osmo_stream_cli *cli, struct msgb *msg) +{ + return osmo_ipa_segmentation_cb(msg); +} + static int ipaccess_bts_read_cb(struct osmo_stream_cli *cli, int res, struct msgb *msg) { enum ipaccess_proto ipa_proto = osmo_ipa_msgb_cb_proto(msg); @@ -1047,7 +1057,7 @@ /* Reconnect is handled by upper layers: */ osmo_stream_cli_set_reconnect_timeout(cli, -1); - osmo_stream_cli_set_segmentation_cb(cli, osmo_ipa_segmentation_cb); + osmo_stream_cli_set_segmentation_cb2(cli, ipaccess_bts_segmentation_cb2); osmo_stream_cli_set_connect_cb(cli, ipaccess_bts_connect_cb); osmo_stream_cli_set_disconnect_cb(cli, ipaccess_bts_disconnect_cb); osmo_stream_cli_set_read_cb2(cli, ipaccess_bts_read_cb); @@ -1125,7 +1135,7 @@ /* Reconnect is handled by upper layers: */ osmo_stream_cli_set_reconnect_timeout(cli, -1); - osmo_stream_cli_set_segmentation_cb(cli, osmo_ipa_segmentation_cb); + osmo_stream_cli_set_segmentation_cb2(cli, ipaccess_bts_segmentation_cb2); osmo_stream_cli_set_connect_cb(cli, ipaccess_bts_connect_cb); osmo_stream_cli_set_disconnect_cb(cli, ipaccess_bts_disconnect_cb); osmo_stream_cli_set_read_cb2(cli, ipaccess_bts_read_cb); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I3735728e309f5c0368f6c21edde160c4f86aee01 Gerrit-Change-Number: 39384 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: Use use new osmo_stream_{cli,srv}_set_segmentation_cb2
by pespin 21 Jan '25

21 Jan '25

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39383?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Use use new osmo_stream_{cli,srv}_set_segmentation_cb2 ...................................................................... Use use new osmo_stream_{cli,srv}_set_segmentation_cb2 The older API osmo_stream_{cli,srv}_set_segmentation_cb() is now deprecated, use the newer one. Depends: libosmo-netif.git 519912781a463fa25bf3c7b18def11076e377fb6 Change-Id: I2be4d3a650fa5231f2fdd55325a8d9238d1ba70c --- M TODO-RELEASE M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c 3 files changed, 30 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/83/39383/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39383?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I2be4d3a650fa5231f2fdd55325a8d9238d1ba70c Gerrit-Change-Number: 39383 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[S] Change in libosmo-sigtran[master]: Use use new osmo_stream_{cli,srv}_set_segmentation_cb2
by pespin 21 Jan '25

21 Jan '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39383?usp=email ) Change subject: Use use new osmo_stream_{cli,srv}_set_segmentation_cb2 ...................................................................... Use use new osmo_stream_{cli,srv}_set_segmentation_cb2 The older API osmo_stream_{cli,srv}_set_segmentation_cb() is now deprecated, use the newer one. Depends: libosmo-netif.git 519912781a463fa25bf3c7b18def11076e377fb6 Change-Id: I2be4d3a650fa5231f2fdd55325a8d9238d1ba70c --- M TODO-RELEASE M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c 3 files changed, 30 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/83/39383/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 101d9cd..c8cc534 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -16,3 +16,4 @@ libosmo-sigtran add API osmo_ss7_as_get_asp_protocol(), osmo_ss7_as_select_asp() libosmo-sigtran add API osmo_ss7_user: create(), get_instance(), set_prim_cb(), set_priv(), get_priv() libosmo-sigtran Make private struct osmo_ss7_instance +libosmo-netif >1.5.0 Use osmo_stream_srv_set_segmentation_cb2() diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index d81d25c..9d4fa98 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -608,6 +608,8 @@ static int xua_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg); static int ipa_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg); static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg); +static int ipa_cli_segmentation_cb2(struct osmo_stream_cli *conn, struct msgb *msg); +static int m3ua_tcp_cli_segmentation_cb2(struct osmo_stream_cli *conn, struct msgb *msg); static int xua_cli_connect_cb(struct osmo_stream_cli *cli); static int xua_cli_close_and_reconnect(struct osmo_stream_cli *cli); @@ -652,22 +654,22 @@ case OSMO_SS7_ASP_PROT_IPA: OSMO_ASSERT(asp->cfg.trans_proto == IPPROTO_TCP); osmo_stream_cli_set_read_cb2(asp->client, ipa_cli_read_cb); - osmo_stream_cli_set_segmentation_cb(asp->client, osmo_ipa_segmentation_cb); + osmo_stream_cli_set_segmentation_cb2(asp->client, ipa_cli_segmentation_cb2); break; case OSMO_SS7_ASP_PROT_M3UA: if (asp->cfg.trans_proto == IPPROTO_SCTP) { osmo_stream_cli_set_read_cb2(asp->client, xua_cli_read_cb); - osmo_stream_cli_set_segmentation_cb(asp->client, NULL); + osmo_stream_cli_set_segmentation_cb2(asp->client, NULL); } else if (asp->cfg.trans_proto == IPPROTO_TCP) { osmo_stream_cli_set_read_cb2(asp->client, m3ua_tcp_cli_read_cb); - osmo_stream_cli_set_segmentation_cb(asp->client, xua_tcp_segmentation_cb); + osmo_stream_cli_set_segmentation_cb2(asp->client, m3ua_tcp_cli_segmentation_cb2); } else OSMO_ASSERT(0); break; default: OSMO_ASSERT(asp->cfg.trans_proto == IPPROTO_SCTP); osmo_stream_cli_set_read_cb2(asp->client, xua_cli_read_cb); - osmo_stream_cli_set_segmentation_cb(asp->client, NULL); + osmo_stream_cli_set_segmentation_cb2(asp->client, NULL); break; } osmo_stream_cli_set_data(asp->client, asp); @@ -980,6 +982,11 @@ return 0; } +static int ipa_cli_segmentation_cb2(struct osmo_stream_cli *cli, struct msgb *msg) +{ + return osmo_ipa_segmentation_cb(msg); +} + /* read call-back for IPA/SCCPlite socket */ static int ipa_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg) { @@ -1003,6 +1010,11 @@ return ipa_rx_msg(asp, msg, fd & 0xf); } +static int m3ua_tcp_cli_segmentation_cb2(struct osmo_stream_cli *conn, struct msgb *msg) +{ + return xua_tcp_segmentation_cb(msg); +} + /* read call-back for M3UA-over-TCP socket */ static int m3ua_tcp_cli_read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg) { diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index 4962bfd..7d7e54a 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -61,6 +61,16 @@ * SS7 xUA Server ***********************************************************************/ +static int xua_srv_ipa_segmentation_cb2(struct osmo_stream_srv *conn, struct msgb *msg) +{ + return osmo_ipa_segmentation_cb(msg); +} + +static int xua_srv_tcp_segmentation_cb2(struct osmo_stream_srv *conn, struct msgb *msg) +{ + return osmo_ipa_segmentation_cb(msg); +} + /* server has accept()ed a new SCTP association, let's find the ASP for * it (if any) */ static int xua_accept_cb(struct osmo_stream_srv_link *link, int fd) @@ -88,21 +98,21 @@ switch (oxs->cfg.proto) { case OSMO_SS7_ASP_PROT_IPA: osmo_stream_srv_set_read_cb(srv, ss7_asp_ipa_srv_conn_rx_cb); - osmo_stream_srv_set_segmentation_cb(srv, osmo_ipa_segmentation_cb); + osmo_stream_srv_set_segmentation_cb2(srv, xua_srv_ipa_segmentation_cb2); break; case OSMO_SS7_ASP_PROT_M3UA: if (oxs->cfg.trans_proto == IPPROTO_SCTP) osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_rx_cb); else if (oxs->cfg.trans_proto == IPPROTO_TCP) { osmo_stream_srv_set_read_cb(srv, &ss7_asp_m3ua_tcp_srv_conn_rx_cb); - osmo_stream_srv_set_segmentation_cb(srv, xua_tcp_segmentation_cb); + osmo_stream_srv_set_segmentation_cb2(srv, xua_srv_tcp_segmentation_cb2); } else OSMO_ASSERT(0); break; default: OSMO_ASSERT(oxs->cfg.trans_proto == IPPROTO_SCTP); osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_rx_cb); - osmo_stream_srv_set_segmentation_cb(srv, NULL); + osmo_stream_srv_set_segmentation_cb2(srv, NULL); break; } osmo_stream_srv_set_closed_cb(srv, ss7_asp_xua_srv_conn_closed_cb); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39383?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I2be4d3a650fa5231f2fdd55325a8d9238d1ba70c Gerrit-Change-Number: 39383 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-netif[master]: examples,tests: stream: use new osmo_stream_{cli,srv}_set_segmentatio...
by pespin 21 Jan '25

21 Jan '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/39382?usp=email ) Change subject: examples,tests: stream: use new osmo_stream_{cli,srv}_set_segmentation_cb2 ...................................................................... examples,tests: stream: use new osmo_stream_{cli,srv}_set_segmentation_cb2 The older API osmo_stream_{cli,srv}_set_segmentation_cb() is now deprecated, use the newer one. Change-Id: I5d6131c65ad6d47f1567dde498a0637c48a0fde9 --- M examples/ipa-stream-client.c M examples/ipa-stream-server.c M tests/stream/stream_test.c 3 files changed, 25 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/82/39382/1 diff --git a/examples/ipa-stream-client.c b/examples/ipa-stream-client.c index 2604266..9e27faa 100644 --- a/examples/ipa-stream-client.c +++ b/examples/ipa-stream-client.c @@ -142,6 +142,11 @@ return 0; } +static int cli_segmentation_cb2(struct osmo_stream_cli *cli, struct msgb *msg) +{ + return osmo_ipa_segmentation_cb(msg); +} + static void *tall_test; int main(int argc, char *argv[]) @@ -184,7 +189,7 @@ exit(EXIT_FAILURE); } - osmo_stream_cli_set_segmentation_cb(conn, osmo_ipa_segmentation_cb); + osmo_stream_cli_set_segmentation_cb2(conn, cli_segmentation_cb2); LOGP(DIPATEST, LOGL_NOTICE, "Entering main loop\n"); diff --git a/examples/ipa-stream-server.c b/examples/ipa-stream-server.c index e87eab4..71f4c6d 100644 --- a/examples/ipa-stream-server.c +++ b/examples/ipa-stream-server.c @@ -69,6 +69,11 @@ return 0; } +static int srv_segmentation_cb2(struct osmo_stream_srv *conn, struct msgb *msg) +{ + return osmo_ipa_segmentation_cb(msg); +} + static int accept_cb(struct osmo_stream_srv_link *srv, int fd) { if (conn != NULL) { @@ -86,7 +91,7 @@ osmo_stream_srv_set_name(conn, "ipa_srv"); osmo_stream_srv_set_read_cb(conn, read_cb); osmo_stream_srv_set_closed_cb(conn, close_cb); - osmo_stream_srv_set_segmentation_cb(conn, osmo_ipa_segmentation_cb); + osmo_stream_srv_set_segmentation_cb2(conn, srv_segmentation_cb2); return 0; } diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index f2f1d4f..4fae6de 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -140,6 +140,11 @@ return cli; } +static int cli_segmentation_cb2(struct osmo_stream_cli *cli, struct msgb *msg) +{ + return osmo_ipa_segmentation_cb(msg); +} + /* Without explicit timeout set with osmo_stream_cli_set_reconnect_timeout() default value is used. static struct osmo_stream_cli *init_client_reconnection_broken1(struct osmo_stream_cli *cli, bool autoreconnect) { @@ -337,6 +342,10 @@ return 0; } +static int srv_segmentation_cb2(struct osmo_stream_srv *conn, struct msgb *msg) +{ + return osmo_ipa_segmentation_cb(msg); +} static void test_recon(void *ctx, const char *host, unsigned port, unsigned steps, struct osmo_stream_srv_link *lnk, bool autoreconnect) @@ -568,7 +577,7 @@ fprintf(stderr, "Cannot open stream client\n"); return NULL; } - osmo_stream_cli_set_segmentation_cb(osc, osmo_ipa_segmentation_cb); + osmo_stream_cli_set_segmentation_cb2(osc, cli_segmentation_cb2); return osc; } @@ -629,7 +638,7 @@ fprintf(stderr, "Error while creating connection\n"); return -1; } - osmo_stream_srv_set_segmentation_cb(oss, osmo_ipa_segmentation_cb); + osmo_stream_srv_set_segmentation_cb2(oss, srv_segmentation_cb2); osmo_stream_srv_set_read_cb(oss, test_segm_ipa_stream_srv_srv_read_cb); return 0; } @@ -785,7 +794,7 @@ fprintf(stderr, "Cannot allocate message\n"); return -ENOMEM; } - osmo_stream_srv_set_segmentation_cb(oss, osmo_ipa_segmentation_cb); + osmo_stream_srv_set_segmentation_cb2(oss, srv_segmentation_cb2); osmo_stream_srv_set_read_cb(oss, test_segm_ipa_stream_cli_srv_read_cb); /* Send 4 and 1/3 messages, as done analogously in test_segm_ipa_stream_srv_cli_connect_cb() */ @@ -851,7 +860,7 @@ osmo_stream_cli_set_port(osc, 1112); osmo_stream_cli_set_read_cb2(osc, test_segm_ipa_stream_cli_cli_read_cb); osmo_stream_cli_set_nodelay(osc, true); - osmo_stream_cli_set_segmentation_cb(osc, osmo_ipa_segmentation_cb); + osmo_stream_cli_set_segmentation_cb2(osc, cli_segmentation_cb2); if (osmo_stream_cli_open(osc) < 0) { fprintf(stderr, "Cannot open stream client\n"); return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/39382?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5d6131c65ad6d47f1567dde498a0637c48a0fde9 Gerrit-Change-Number: 39382 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log