- gerrit-log - lists.osmocom.org

[XS] Change in osmo-remsim[master]: Replace deprecated ipa_msg_push_header()
by pespin 19 Nov '24

19 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/38824?usp=email ) Change subject: Replace deprecated ipa_msg_push_header() ...................................................................... Replace deprecated ipa_msg_push_header() Use the libosmocore API, which does the same except setting the l2h pointer, which we don't really need here. Change-Id: I3769e1e4a4c0167fa077a1d9b09af81a1aaf5707 --- M src/rspro_client_fsm.c M src/server/rspro_server.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/24/38824/1 diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c index 72176ab..351c642 100644 --- a/src/rspro_client_fsm.c +++ b/src/rspro_client_fsm.c @@ -76,7 +76,7 @@ static void push_and_send(struct ipa_client_conn *ipa, struct msgb *msg_tx) { ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); + ipa_prepend_header(msg_tx, IPAC_PROTO_OSMO); ipa_client_conn_send(ipa, msg_tx); /* msg_tx is now queued and will be freed. */ } diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c index da27a2d..5803c8a 100644 --- a/src/server/rspro_server.c +++ b/src/server/rspro_server.c @@ -59,7 +59,7 @@ return; } ipa_prepend_header_ext(msg_tx, IPAC_PROTO_EXT_RSPRO); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); + ipa_prepend_header(msg_tx, IPAC_PROTO_OSMO); ipa_server_conn_send(conn->peer, msg_tx); } -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/38824?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: I3769e1e4a4c0167fa077a1d9b09af81a1aaf5707 Gerrit-Change-Number: 38824 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-abis[master]: ipaccess: Replace ipa_bts_id_resp() with libosmocore ipa_ccm_make_id_...
by pespin 19 Nov '24

19 Nov '24

Attention is currently required from: fixeria. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38813?usp=email ) Change subject: ipaccess: Replace ipa_bts_id_resp() with libosmocore ipa_ccm_make_id_resp_from_req() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38813?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7f32231bff792b01e33f604bbb8b68fe22876abb Gerrit-Change-Number: 38813 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Nov 2024 13:42:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[S] Change in libosmo-abis[master]: ipaccess: Use libosmocore API ipa_ccm_send_id_ack()
by pespin 19 Nov '24

19 Nov '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38812?usp=email ) Change subject: ipaccess: Use libosmocore API ipa_ccm_send_id_ack() ...................................................................... ipaccess: Use libosmocore API ipa_ccm_send_id_ack() This allows getting rid of the second use of rmsg variable, and simplify the return paths. Change-Id: Ib8e84718337d16467726de922b410abbaffdac3a --- M src/input/ipaccess.c 1 file changed, 6 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 9e06857..fb9eaf6 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -825,20 +825,6 @@ return nmsg; } -static struct msgb *ipa_bts_id_ack(void) -{ - struct msgb *nmsg2; - - nmsg2 = ipa_msg_alloc(0); - if (!nmsg2) - return NULL; - - *msgb_put(nmsg2, 1) = IPAC_MSGT_ID_ACK; - ipa_msg_push_header(nmsg2, IPAC_PROTO_IPACCESS); - - return nmsg2; -} - static void ipaccess_bts_updown_cb(struct ipa_client_conn *link, int up) { struct e1inp_line *line = link->line; @@ -869,7 +855,6 @@ if (hh->proto != IPAC_PROTO_IPACCESS) return 0; - struct msgb *rmsg; int ret = 0; uint8_t *data = msgb_l2(msg); int len = msgb_l2len(msg); @@ -891,6 +876,7 @@ /* this is a request for identification from the BSC. */ if (msg_type == IPAC_MSGT_ID_GET) { + struct msgb *rmsg; int trx_nr = 0; if (link->ofd->priv_nr >= E1INP_SIGN_RSL) @@ -903,24 +889,21 @@ if (ret != rmsg->len) { LOGP(DLINP, LOGL_ERROR, "cannot send ID_RESP message. Reason: %s\n", strerror(errno)); - goto err_rmsg; + msgb_free(rmsg); + goto err; } msgb_free(rmsg); /* send ID_ACK. */ - rmsg = ipa_bts_id_ack(); - ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); - if (ret != rmsg->len) { + ret = ipa_ccm_send_id_ack(link->ofd->fd); + if (ret <= 0) { LOGP(DLINP, LOGL_ERROR, "cannot send ID_ACK message. Reason: %s\n", strerror(errno)); - goto err_rmsg; + goto err; } - msgb_free(rmsg); } return 1; -err_rmsg: - msgb_free(rmsg); err: ipa_client_conn_close(link); return -1; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib8e84718337d16467726de922b410abbaffdac3a Gerrit-Change-Number: 38812 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-hlr[master]: gsup: Replace deprecated ipa_msg_push_header()
by pespin 19 Nov '24

19 Nov '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/38823?usp=email ) Change subject: gsup: Replace deprecated ipa_msg_push_header() ...................................................................... gsup: Replace deprecated ipa_msg_push_header() Change-Id: I7a4d05a0b09032d8133d8775fb4707a4da8f0cf3 --- M src/gsup_server.c M src/gsupclient/gsup_client.c 2 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/23/38823/1 diff --git a/src/gsup_server.c b/src/gsup_server.c index 20ea162..1510bd0 100644 --- a/src/gsup_server.c +++ b/src/gsup_server.c @@ -26,6 +26,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/abis/ipa.h> #include <osmocom/abis/ipaccess.h> +#include <osmocom/gsm/ipa.h> #include <osmocom/gsm/gsm48_ie.h> #include <osmocom/gsm/apn.h> #include <osmocom/gsm/gsm23003.h> @@ -49,7 +50,7 @@ int proto_ext, struct msgb *msg_tx) { ipa_prepend_header_ext(msg_tx, proto_ext); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); + ipa_prepend_header(msg_tx, IPAC_PROTO_OSMO); ipa_server_conn_send(conn->conn, msg_tx); } diff --git a/src/gsupclient/gsup_client.c b/src/gsupclient/gsup_client.c index 3329361..e7d03f2 100644 --- a/src/gsupclient/gsup_client.c +++ b/src/gsupclient/gsup_client.c @@ -26,6 +26,7 @@ #include <osmocom/gsupclient/gsup_client.h> #include <osmocom/abis/ipa.h> +#include <osmocom/gsm/ipa.h> #include <osmocom/gsm/oap_client.h> #include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/core/msgb.h> @@ -44,7 +45,7 @@ msg->l2h = msgb_put(msg, 1); msg->l2h[0] = IPAC_MSGT_PING; - ipa_msg_push_header(msg, IPAC_PROTO_IPACCESS); + ipa_prepend_header(msg, IPAC_PROTO_IPACCESS); ipa_client_conn_send(gsupc->link, msg); } @@ -114,7 +115,7 @@ struct msgb *msg_tx) { ipa_prepend_header_ext(msg_tx, proto_ext); - ipa_msg_push_header(msg_tx, IPAC_PROTO_OSMO); + ipa_prepend_header(msg_tx, IPAC_PROTO_OSMO); ipa_client_conn_send(gsupc->link, msg_tx); /* msg_tx is now queued and will be freed. */ } -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/38823?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I7a4d05a0b09032d8133d8775fb4707a4da8f0cf3 Gerrit-Change-Number: 38823 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-abis[master]: ipaccess: Use libosmocore API ipa_ccm_send_id_ack()
by fixeria 19 Nov '24

19 Nov '24

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38812?usp=email ) Change subject: ipaccess: Use libosmocore API ipa_ccm_send_id_ack() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib8e84718337d16467726de922b410abbaffdac3a Gerrit-Change-Number: 38812 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Nov 2024 13:37:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-abis[master]: ipaccess: Use libosmocore API ipa_ccm_send_id_ack()
by osmith 19 Nov '24

19 Nov '24

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38812?usp=email ) Change subject: ipaccess: Use libosmocore API ipa_ccm_send_id_ack() ...................................................................... Patch Set 2: Code-Review+1 (2 comments) File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/38812/comment/7f1f2bf7_a64eede4… : PS1, Line 890: if (ret != rmsg->len) { > free rmsg, then access rmsg->len looks like an error Done https://gerrit.osmocom.org/c/libosmo-abis/+/38812/comment/fef036db_b3d727c5… : PS1, Line 890: rmsg->len > Thanks! Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib8e84718337d16467726de922b410abbaffdac3a Gerrit-Change-Number: 38812 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Nov 2024 13:35:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in libosmo-abis[master]: ipaccess: Use libosmocore API ipa_ccm_send_id_ack()
by pespin 19 Nov '24

19 Nov '24

Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, fixeria, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/38812?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by fixeria, Code-Review-1 by osmith, Verified+1 by Jenkins Builder Change subject: ipaccess: Use libosmocore API ipa_ccm_send_id_ack() ...................................................................... ipaccess: Use libosmocore API ipa_ccm_send_id_ack() This allows getting rid of the second use of rmsg variable, and simplify the return paths. Change-Id: Ib8e84718337d16467726de922b410abbaffdac3a --- M src/input/ipaccess.c 1 file changed, 6 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/12/38812/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38812?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib8e84718337d16467726de922b410abbaffdac3a Gerrit-Change-Number: 38812 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in libosmo-abis[master]: cosmetic: ipa_keepalive.c: Fix trailing whitespace
by pespin 19 Nov '24

19 Nov '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38811?usp=email ) Change subject: cosmetic: ipa_keepalive.c: Fix trailing whitespace ...................................................................... cosmetic: ipa_keepalive.c: Fix trailing whitespace Change-Id: Ide143b002e59baac9b86b8c05f43518fb21568c9 --- M src/input/ipa_keepalive.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/input/ipa_keepalive.c b/src/input/ipa_keepalive.c index de68879..6a8ae93 100644 --- a/src/input/ipa_keepalive.c +++ b/src/input/ipa_keepalive.c @@ -286,7 +286,7 @@ { struct osmo_fsm_inst *fi; struct ipa_fsm_priv *ifp; - + fi = __ipa_conn_alloc_keepalive_fsm(ctx, params, id); if (!fi) return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38811?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ide143b002e59baac9b86b8c05f43518fb21568c9 Gerrit-Change-Number: 38811 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-abis[master]: ipaccess: Get rid of extra indentation level in long code block
by pespin 19 Nov '24

19 Nov '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38810?usp=email ) Change subject: ipaccess: Get rid of extra indentation level in long code block ...................................................................... ipaccess: Get rid of extra indentation level in long code block Change-Id: I41c703d5585d8e1225a10a8b190871f0294f4315 --- M src/input/ipaccess.c 1 file changed, 48 insertions(+), 49 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 92a42f9..9e06857 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -864,61 +864,60 @@ struct ipaccess_unit *dev, struct msgb *msg) { struct ipaccess_head *hh = (struct ipaccess_head *) msg->data; - struct msgb *rmsg; - int ret = 0; /* special handling for IPA CCM. */ - if (hh->proto == IPAC_PROTO_IPACCESS) { - uint8_t *data = msgb_l2(msg); - int len = msgb_l2len(msg); - OSMO_ASSERT(len > 0); - uint8_t msg_type = *data; - /* line might not exist if != bsc||bts */ - struct e1inp_line *line = link->line; + if (hh->proto != IPAC_PROTO_IPACCESS) + return 0; - /* peek the pong for our keepalive fsm */ - if (line && msg_type == IPAC_MSGT_PONG) { - struct osmo_fsm_inst *ka_fsm = ipaccess_line_ts(link->ofd, line)->driver.ipaccess.ka_fsm; - ipa_keepalive_fsm_pong_received(ka_fsm); - } + struct msgb *rmsg; + int ret = 0; + uint8_t *data = msgb_l2(msg); + int len = msgb_l2len(msg); + OSMO_ASSERT(len > 0); + uint8_t msg_type = *data; + /* line might not exist if != bsc||bts */ + struct e1inp_line *line = link->line; - /* ping, pong and acknowledgment cases. */ - ret = ipa_ccm_rcvmsg_bts_base(msg, link->ofd); - if (ret < 0) - goto err; - - /* this is a request for identification from the BSC. */ - if (msg_type == IPAC_MSGT_ID_GET) { - int trx_nr = 0; - - if (link->ofd->priv_nr >= E1INP_SIGN_RSL) - trx_nr = link->ofd->priv_nr - E1INP_SIGN_RSL; - - LOGP(DLINP, LOGL_NOTICE, "received ID_GET for unit ID %u/%u/%u\n", - dev->site_id, dev->bts_id, trx_nr); - rmsg = ipa_bts_id_resp(dev, data + 1, len - 1, trx_nr); - ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); - if (ret != rmsg->len) { - LOGP(DLINP, LOGL_ERROR, "cannot send ID_RESP message. Reason: %s\n", - strerror(errno)); - goto err_rmsg; - } - msgb_free(rmsg); - - /* send ID_ACK. */ - rmsg = ipa_bts_id_ack(); - ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); - if (ret != rmsg->len) { - LOGP(DLINP, LOGL_ERROR, "cannot send ID_ACK message. Reason: %s\n", - strerror(errno)); - goto err_rmsg; - } - msgb_free(rmsg); - } - return 1; + /* peek the pong for our keepalive fsm */ + if (line && msg_type == IPAC_MSGT_PONG) { + struct osmo_fsm_inst *ka_fsm = ipaccess_line_ts(link->ofd, line)->driver.ipaccess.ka_fsm; + ipa_keepalive_fsm_pong_received(ka_fsm); } - return 0; + /* ping, pong and acknowledgment cases. */ + ret = ipa_ccm_rcvmsg_bts_base(msg, link->ofd); + if (ret < 0) + goto err; + + /* this is a request for identification from the BSC. */ + if (msg_type == IPAC_MSGT_ID_GET) { + int trx_nr = 0; + + if (link->ofd->priv_nr >= E1INP_SIGN_RSL) + trx_nr = link->ofd->priv_nr - E1INP_SIGN_RSL; + + LOGP(DLINP, LOGL_NOTICE, "received ID_GET for unit ID %u/%u/%u\n", + dev->site_id, dev->bts_id, trx_nr); + rmsg = ipa_bts_id_resp(dev, data + 1, len - 1, trx_nr); + ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); + if (ret != rmsg->len) { + LOGP(DLINP, LOGL_ERROR, "cannot send ID_RESP message. Reason: %s\n", + strerror(errno)); + goto err_rmsg; + } + msgb_free(rmsg); + + /* send ID_ACK. */ + rmsg = ipa_bts_id_ack(); + ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); + if (ret != rmsg->len) { + LOGP(DLINP, LOGL_ERROR, "cannot send ID_ACK message. Reason: %s\n", + strerror(errno)); + goto err_rmsg; + } + msgb_free(rmsg); + } + return 1; err_rmsg: msgb_free(rmsg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38810?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I41c703d5585d8e1225a10a8b190871f0294f4315 Gerrit-Change-Number: 38810 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-abis[master]: ipaccess: reduce scope of ka_fsm variable
by pespin 19 Nov '24

19 Nov '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38807?usp=email ) Change subject: ipaccess: reduce scope of ka_fsm variable ...................................................................... ipaccess: reduce scope of ka_fsm variable Change-Id: I8236b1fef4d90275678bf80d866c84402c20840c --- M src/input/ipaccess.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index cab812c..dc523ef 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -872,11 +872,10 @@ /* special handling for IPA CCM. */ if (hh->proto == IPAC_PROTO_IPACCESS) { uint8_t msg_type = *(msg->l2h); - struct osmo_fsm_inst* ka_fsm = NULL; /* peek the pong for our keepalive fsm */ if (line && msg_type == IPAC_MSGT_PONG) { - ka_fsm = ipaccess_line_ts(link->ofd, line)->driver.ipaccess.ka_fsm; + struct osmo_fsm_inst *ka_fsm = ipaccess_line_ts(link->ofd, line)->driver.ipaccess.ka_fsm; ipa_keepalive_fsm_pong_received(ka_fsm); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38807?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I8236b1fef4d90275678bf80d866c84402c20840c Gerrit-Change-Number: 38807 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log