- gerrit-log - lists.osmocom.org

[S] Change in libosmo-sccp[master]: cosmetic: rename ss7_asp_*_conn_cb to ss7_asp_*_conn_rx_cb
by laforge 14 Mar '24

14 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36169?usp=email ) Change subject: cosmetic: rename ss7_asp_*_conn_cb to ss7_asp_*_conn_rx_cb ...................................................................... cosmetic: rename ss7_asp_*_conn_cb to ss7_asp_*_conn_rx_cb The old/existing name says it is a connection call-back, but not what kind of all-back; let's introduce 'rx' to indicate it is a receive call-back. Change-Id: Iaaef8128d4a26ea75fbce7067a8ab935a319beb4 --- M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c M src/ss7_internal.h 3 files changed, 23 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index c5a2fc5..034f60d 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -795,7 +795,7 @@ } /* netif code tells us we can read something from the socket */ -int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) +int ss7_asp_ipa_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg) { int fd = osmo_stream_srv_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); @@ -808,7 +808,7 @@ } /* netif code tells us we can read something from the socket */ -int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) +int ss7_asp_xua_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); unsigned int ppid; @@ -868,7 +868,7 @@ } /* netif code tells us we can read something from the socket */ -int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) +int ss7_asp_m3ua_tcp_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); const struct xua_common_hdr *hdr; diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index e8e01b3..eeb6768 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -82,21 +82,21 @@ switch (oxs->cfg.proto) { case OSMO_SS7_ASP_PROT_IPA: - osmo_stream_srv_set_read_cb(srv, ss7_asp_ipa_srv_conn_cb); + 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); 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_cb); + 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_cb); + 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); } 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_cb); + osmo_stream_srv_set_read_cb(srv, &ss7_asp_xua_srv_conn_rx_cb); osmo_stream_srv_set_segmentation_cb(srv, NULL); break; } diff --git a/src/ss7_internal.h b/src/ss7_internal.h index 67c0ee3..688495b 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -24,9 +24,9 @@ bool ss7_asp_protocol_check_trans_proto(enum osmo_ss7_asp_protocol proto, int trans_proto); int ss7_default_trans_proto_for_asp_proto(enum osmo_ss7_asp_protocol proto); -int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); -int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); -int ss7_asp_m3ua_tcp_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); +int ss7_asp_ipa_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg); +int ss7_asp_xua_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg); +int ss7_asp_m3ua_tcp_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg); int ss7_asp_xua_srv_conn_closed_cb(struct osmo_stream_srv *srv); int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp); int ss7_asp_apply_primary_address(const struct osmo_ss7_asp *asp); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36169?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iaaef8128d4a26ea75fbce7067a8ab935a319beb4 Gerrit-Change-Number: 36169 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-sccp[master]: cosmetic: rename ss7_asp_*_conn_cb to ss7_asp_*_conn_rx_cb
by laforge 14 Mar '24

14 Mar '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36169?usp=email ) Change subject: cosmetic: rename ss7_asp_*_conn_cb to ss7_asp_*_conn_rx_cb ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36169?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iaaef8128d4a26ea75fbce7067a8ab935a319beb4 Gerrit-Change-Number: 36169 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 07:08:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: cosmetic: rename ss7_asp_*_conn_cb to ss7_asp_*_conn_rx_cb
by laforge 14 Mar '24

14 Mar '24

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36169?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+2 by pespin, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: cosmetic: rename ss7_asp_*_conn_cb to ss7_asp_*_conn_rx_cb ...................................................................... cosmetic: rename ss7_asp_*_conn_cb to ss7_asp_*_conn_rx_cb The old/existing name says it is a connection call-back, but not what kind of all-back; let's introduce 'rx' to indicate it is a receive call-back. Change-Id: Iaaef8128d4a26ea75fbce7067a8ab935a319beb4 --- M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c M src/ss7_internal.h 3 files changed, 23 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/69/36169/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36169?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iaaef8128d4a26ea75fbce7067a8ab935a319beb4 Gerrit-Change-Number: 36169 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr
by laforge 14 Mar '24

14 Mar '24

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email ) Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Mar 2024 07:01:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: sysmobts_mgr_temp: Migrate to ctrl_cmd_send2()
by laforge 14 Mar '24

14 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36144?usp=email ) Change subject: sysmobts_mgr_temp: Migrate to ctrl_cmd_send2() ...................................................................... sysmobts_mgr_temp: Migrate to ctrl_cmd_send2() ctrl_cmd_send() is now a deprecated API function. Change-Id: I663669a1bcf7b58d6a6175cbb51c333f5cfaedd7 Depends: libosmocore.git Change-Id Ic81af56e7ea6921ba39168727ef64c308e9c6754 --- M TODO-RELEASE M src/osmo-bts-sysmo/misc/sysmobts_mgr_temp.c 2 files changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 2bbfab5..96426a5 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line libosmogsm >1.9.0 added new PRIM_INFO to include/osmocom/gsm/l1sap.h libosmogsm >1.9.0 use of RLP code in libosmogsm +libosmoctrl >1.9.0 use ctrl_cmd_send2() diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_temp.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_temp.c index 02d3245..eea6879 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_temp.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_temp.c @@ -233,7 +233,7 @@ rep->variable = "oml-alert"; rep->value = oml_alert; LOGP(DTEMP, LOGL_ERROR, "OML alert sent: %d\n", - ctrl_cmd_send(&ctrl->write_queue, rep)); + ctrl_cmd_send2(ctrl, rep)); talloc_free(rep); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36144?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I663669a1bcf7b58d6a6175cbb51c333f5cfaedd7 Gerrit-Change-Number: 36144 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bts[master]: sysmobts_mgr_temp: Migrate to ctrl_cmd_send2()
by laforge 14 Mar '24

14 Mar '24

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36144?usp=email ) Change subject: sysmobts_mgr_temp: Migrate to ctrl_cmd_send2() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36144?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I663669a1bcf7b58d6a6175cbb51c333f5cfaedd7 Gerrit-Change-Number: 36144 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 14 Mar 2024 07:00:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr
by pespin 14 Mar '24

14 Mar '24

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email ) Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... Patch Set 1: -Code-Review (1 comment) Patchset: PS1: Missing update in TODO-RELEASE. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 23:11:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr
by pespin 14 Mar '24

14 Mar '24

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email ) Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: I'm not sure I agree this is really needed, but fine. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Mar 2024 23:11:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: gsup_server: Fix format error in log line
by pespin 14 Mar '24

14 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36261?usp=email ) Change subject: gsup_server: Fix format error in log line ...................................................................... gsup_server: Fix format error in log line Change-Id: I4c724a65e49fc8bcaad7598fc07f3ddcbc9fa35f --- M src/gsup_server.erl 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 1e11c3e..8a62df6 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -260,7 +260,7 @@ % Our GSUP CEAI implementation for "IKEv2 Information Delete Request" cancel_location_request(Imsi) -> - lager:info("cancel_location_request(~p): ~p~n", [Imsi]), + lager:info("cancel_location_request(~p)~n", [Imsi]), gen_server:cast(?SERVER, {cancel_location_request, Imsi}). %% ------------------------------------------------------------------ -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36261?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I4c724a65e49fc8bcaad7598fc07f3ddcbc9fa35f Gerrit-Change-Number: 36261 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: jenkins.sh: use available Makefile, clean before building
by pespin 14 Mar '24

14 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36264?usp=email ) Change subject: jenkins.sh: use available Makefile, clean before building ...................................................................... jenkins.sh: use available Makefile, clean before building The project needs to go through clean procedure to clean up the generated diameter files, so that they are generated from newer dia files again. Change-Id: Id3f2d71c184cf387fa178d5138d401686a8d0a63 --- M contrib/jenkins.sh 1 file changed, 16 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 87eae34..a900a5c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,5 @@ #!/bin/sh -ex -rebar3 compile -rebar3 escriptize -rebar3 eunit +make clean || true +make +make check -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36264?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Id3f2d71c184cf387fa178d5138d401686a8d0a63 Gerrit-Change-Number: 36264 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log