November 2024 - gerrit-log - lists.osmocom.org

[XS] Change in libosmo-abis[master]: ipaccess: reduce scope of ka_fsm variable

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38807?usp=email ) Change subject: ipaccess: reduce scope of ka_fsm variable ...................................................................... Patch Set 1: Code-Review+1 -- 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: comment 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Nov 2024 19:34:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

[XS] Change in libosmo-abis[master]: ipaccess: Simplify code after early return if block

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38806?usp=email ) Change subject: ipaccess: Simplify code after early return if block ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: > Oh yes, in this code, every small step towards clarification helps in not falling below a big rock g […] It's two unrelated if-blocks, so IMO the patch makes it cleaner. CR+2 from me. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38806?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: I406b4f4e973c9b75b102aea3d6fe6aab73d91185 Gerrit-Change-Number: 38806 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Nov 2024 19:33:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[XS] Change in libosmo-abis[master]: ipaccess: Fix wrong pointer passed in sign_link_up user callback

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38805?usp=email ) Change subject: ipaccess: Fix wrong pointer passed in sign_link_up user callback ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38805?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: I8e514360d5ed1c311af97f8fa728a2ff0a027522 Gerrit-Change-Number: 38805 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Nov 2024 19:32:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: ipaccess: Replace ipa_msg_push_header() with libosmocore ipa_prepend_...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38814?usp=email ) Change subject: ipaccess: Replace ipa_msg_push_header() with libosmocore ipa_prepend_header() ...................................................................... ipaccess: Replace ipa_msg_push_header() with libosmocore ipa_prepend_header() Change-Id: I59b216c8a5e5a8744d337773ccf6f8d674b9513d --- M include/osmocom/abis/ipa.h M src/input/ipa.c M src/input/ipa_keepalive.c 3 files changed, 1 insertion(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/14/38814/1 diff --git a/include/osmocom/abis/ipa.h b/include/osmocom/abis/ipa.h index 0a36d78..62d45d3 100644 --- a/include/osmocom/abis/ipa.h +++ b/include/osmocom/abis/ipa.h @@ -114,8 +114,6 @@ int ipaccess_bts_handle_ccm(struct ipa_client_conn *link, struct ipaccess_unit *dev, struct msgb *msg); -void ipa_msg_push_header(struct msgb *msg, uint8_t proto); - /*********************************************************************** * IPA Keep-Alive FSM diff --git a/src/input/ipa.c b/src/input/ipa.c index 5b064e0..a42ee6c 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -26,16 +26,6 @@ #define LOGIPA(link, level, fmt, args...) LOGP(DLINP, level, "%s:%u " fmt, link->addr, link->port, ## args) -void ipa_msg_push_header(struct msgb *msg, uint8_t proto) -{ - struct ipaccess_head *hh; - - msg->l2h = msg->data; - hh = (struct ipaccess_head *) msgb_push(msg, sizeof(*hh)); - hh->proto = proto; - hh->len = htons(msgb_l2len(msg)); -} - void ipa_client_conn_close(struct ipa_client_conn *link) { osmo_timer_del(&link->timer); diff --git a/src/input/ipa_keepalive.c b/src/input/ipa_keepalive.c index 6a8ae93..f105ded 100644 --- a/src/input/ipa_keepalive.c +++ b/src/input/ipa_keepalive.c @@ -38,7 +38,7 @@ return NULL; msgb_put_u8(msg, IPAC_MSGT_PING); - ipa_msg_push_header(msg, IPAC_PROTO_IPACCESS); + ipa_prepend_header(msg, IPAC_PROTO_IPACCESS); return msg; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38814?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: I59b216c8a5e5a8744d337773ccf6f8d674b9513d Gerrit-Change-Number: 38814 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in libosmo-abis[master]: ipaccess: Use libosmocore API ipa_ccm_send_id_ack()

by pespin

pespin has uploaded this change for review. ( 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(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/12/38812/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 9e06857..ab2fec9 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) @@ -900,27 +886,23 @@ 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); + msgb_free(rmsg); if (ret != rmsg->len) { LOGP(DLINP, LOGL_ERROR, "cannot send ID_RESP message. Reason: %s\n", strerror(errno)); - goto err_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: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib8e84718337d16467726de922b410abbaffdac3a Gerrit-Change-Number: 38812 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[M] Change in libosmo-abis[master]: ipaccess: Replace ipa_bts_id_resp() with libosmocore ipa_ccm_make_id_...

by pespin

pespin has uploaded this change for review. ( 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() ...................................................................... ipaccess: Replace ipa_bts_id_resp() with libosmocore ipa_ccm_make_id_resp_from_req() Related: OS#2717 Change-Id: I7f32231bff792b01e33f604bbb8b68fe22876abb --- M src/input/ipaccess.c 1 file changed, 2 insertions(+), 89 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/13/38813/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index ab2fec9..2b41f09 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -742,89 +742,6 @@ return ret; } -#define IPA_STRING_MAX 64 - -static struct msgb * -ipa_bts_id_resp(const struct ipaccess_unit *dev, uint8_t *data, int len, int trx_nr) -{ - struct msgb *nmsg; - char str[IPA_STRING_MAX]; - uint8_t *tag; - - memset(str, 0, sizeof(str)); - - nmsg = ipa_msg_alloc(0); - if (!nmsg) - return NULL; - - *msgb_put(nmsg, 1) = IPAC_MSGT_ID_RESP; - while (len) { - if (len < 2) { - LOGP(DLINP, LOGL_NOTICE, - "Short read of ipaccess tag\n"); - msgb_free(nmsg); - return NULL; - } - switch (data[1]) { - case IPAC_IDTAG_UNIT: - snprintf(str, sizeof(str), "%u/%u/%u", - dev->site_id, dev->bts_id, trx_nr); - break; - case IPAC_IDTAG_MACADDR: - snprintf(str, sizeof(str), - "%02x:%02x:%02x:%02x:%02x:%02x", - dev->mac_addr[0], dev->mac_addr[1], - dev->mac_addr[2], dev->mac_addr[3], - dev->mac_addr[4], dev->mac_addr[5]); - break; - case IPAC_IDTAG_LOCATION1: - if (dev->location1) - osmo_strlcpy(str, dev->location1, sizeof(str)); - break; - case IPAC_IDTAG_LOCATION2: - if (dev->location2) - osmo_strlcpy(str, dev->location2, sizeof(str)); - break; - case IPAC_IDTAG_EQUIPVERS: - if (dev->equipvers) - osmo_strlcpy(str, dev->equipvers, sizeof(str)); - break; - case IPAC_IDTAG_SWVERSION: - if (dev->swversion) - osmo_strlcpy(str, dev->swversion, sizeof(str)); - break; - case IPAC_IDTAG_UNITNAME: - snprintf(str, sizeof(str), - "%s-%02x-%02x-%02x-%02x-%02x-%02x", - dev->unit_name, - dev->mac_addr[0], dev->mac_addr[1], - dev->mac_addr[2], dev->mac_addr[3], - dev->mac_addr[4], dev->mac_addr[5]); - break; - case IPAC_IDTAG_SERNR: - if (dev->serno) - osmo_strlcpy(str, dev->serno, sizeof(str)); - break; - default: - LOGP(DLINP, LOGL_NOTICE, - "Unknown ipaccess tag 0x%02x\n", *data); - msgb_free(nmsg); - return NULL; - } - - LOGP(DLINP, LOGL_INFO, " tag %d: %s\n", data[1], str); - tag = msgb_put(nmsg, 3 + strlen(str) + 1); - tag[0] = 0x00; - tag[1] = 1 + strlen(str) + 1; - tag[2] = data[1]; - memcpy(tag + 3, str, strlen(str) + 1); - data += 2; - len -= 2; - } - ipa_msg_push_header(nmsg, IPAC_PROTO_IPACCESS); - return nmsg; -} - static void ipaccess_bts_updown_cb(struct ipa_client_conn *link, int up) { struct e1inp_line *line = link->line; @@ -877,14 +794,10 @@ /* 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) - 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); + dev->site_id, dev->bts_id, dev->trx_id); + rmsg = ipa_ccm_make_id_resp_from_req(dev, data + 1, len - 1); ret = ipa_send(link->ofd->fd, rmsg->data, rmsg->len); msgb_free(rmsg); if (ret != rmsg->len) { -- 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: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7f32231bff792b01e33f604bbb8b68fe22876abb Gerrit-Change-Number: 38813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[XS] Change in libosmo-abis[master]: cosmetic: ipa_keepalive.c: Fix trailing whitespace

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/11/38811/1 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: newchange 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>

7 months, 1 week

1
0
0 0

[XS] Change in libosmo-abis[master]: ipaccess: Clarify access to msgb ipa payload in code path

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38808?usp=email ) Change subject: ipaccess: Clarify access to msgb ipa payload in code path ...................................................................... ipaccess: Clarify access to msgb ipa payload in code path The pointer to the data payload is gathered at a later place after the first byte of the pointer has actually already been read. Clean it up so that it becomes obvious when and how the payload is accessed. Change-Id: I5eac24bdf72021e500c554bdc6d8449bf37d2231 --- M src/input/ipaccess.c 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/08/38808/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index dc523ef..51e6087 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -871,7 +871,10 @@ /* special handling for IPA CCM. */ if (hh->proto == IPAC_PROTO_IPACCESS) { - uint8_t msg_type = *(msg->l2h); + uint8_t *data = msgb_l2(msg); + int len = msgb_l2len(msg); + OSMO_ASSERT(len > 0); + uint8_t msg_type = *data; /* peek the pong for our keepalive fsm */ if (line && msg_type == IPAC_MSGT_PONG) { @@ -886,8 +889,6 @@ /* this is a request for identification from the BSC. */ if (msg_type == IPAC_MSGT_ID_GET) { - uint8_t *data = msgb_l2(msg); - int len = msgb_l2len(msg); int trx_nr = 0; if (link->ofd->priv_nr >= E1INP_SIGN_RSL) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38808?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: I5eac24bdf72021e500c554bdc6d8449bf37d2231 Gerrit-Change-Number: 38808 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[M] Change in libosmo-abis[master]: ipaccess: Get rid of extra indentation level in long code block

by pespin

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/10/38810/1 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: newchange 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>

7 months, 1 week

1
0
0 0

[XS] Change in libosmo-abis[master]: ipaccess: Reduce scope of line local variable

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38809?usp=email ) Change subject: ipaccess: Reduce scope of line local variable ...................................................................... ipaccess: Reduce scope of line local variable Change-Id: I9789cbce74f71505e9b7be1445a0a97007ee37da --- M src/input/ipaccess.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/09/38809/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 51e6087..92a42f9 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -866,8 +866,6 @@ struct ipaccess_head *hh = (struct ipaccess_head *) msg->data; struct msgb *rmsg; int ret = 0; - /* line might not exist if != bsc||bts */ - struct e1inp_line *line = link->line; /* special handling for IPA CCM. */ if (hh->proto == IPAC_PROTO_IPACCESS) { @@ -875,6 +873,8 @@ 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; /* peek the pong for our keepalive fsm */ if (line && msg_type == IPAC_MSGT_PONG) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38809?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: I9789cbce74f71505e9b7be1445a0a97007ee37da Gerrit-Change-Number: 38809 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024