October 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-bsc[master]: pcuif_proto: signal BTS model via PCUIF
by Jenkins Builder 05 Oct '23

05 Oct '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34649?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/pcu_sock.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11633): https://gerrit.osmocom.org/c/osmo-bsc/+/34649/comment/96b062e9_ffc33596 PS1, Line 305: switch(bts->type) { space required before the open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b58912ad7be3070829614853901aa19108ba2c0 Gerrit-Change-Number: 34649 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 05 Oct 2023 10:18:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
by Jenkins Builder 05 Oct '23

05 Oct '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF ...................................................................... Patch Set 1: (3 comments) File src/common/pcu_sock.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11632): https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/76d0eef8_51be9a97 PS1, Line 363: switch(bts->variant) { space required before the open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11632): https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/7620480e_b65ceca9 PS1, Line 367: case BTS_OSMO_OC2G: code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-11632): https://gerrit.osmocom.org/c/osmo-bts/+/34648/comment/d9b11963_d3bcbc7b PS1, Line 367: case BTS_OSMO_OC2G: please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?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: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 05 Oct 2023 10:16:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: pcuif_proto: signal BTS model via PCUIF
by dexter 05 Oct '23

05 Oct '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34649?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF ...................................................................... pcuif_proto: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU. Related: OS#6191 Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Change-Id: I4b58912ad7be3070829614853901aa19108ba2c0 --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/49/34649/1 diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index 9df85d9..066ef47 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -66,6 +66,17 @@ #define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ #define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ +/* BTS model */ +#define PCU_IF_BTS_MODEL_UNSPEC 0x00 +#define PCU_IF_BTS_MODEL_LC15 0x01 +#define PCU_IF_BTS_MODEL_OC2G 0x02 +#define PCU_IF_BTS_MODEL_OCTPHY 0x03 +#define PCU_IF_BTS_MODEL_SYSMO 0x04 +#define PCU_IF_BTS_MODEL_TRX 0x05 +#define PCU_IF_BTS_MODEL_VIRTUAL 0x06 +#define PCU_IF_BTS_MODEL_OMLDUMMY 0x07 +#define PCU_IF_BTS_MODEL_RBS 0x08 + #define PCU_IF_NUM_NSVC 2 #define PCU_IF_NUM_TRX 8 @@ -179,6 +190,7 @@ struct in_addr v4; struct in6_addr v6; } remote_ip[PCU_IF_NUM_NSVC]; + uint8_t bts_model; } __attribute__ ((packed)); /* E1 CCU connection parameters */ diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index d279093..6c278e3 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -302,6 +302,14 @@ info_ind_fill_trx(&info_ind->trx[trx->nr], trx); } + switch(bts->type) { + case GSM_BTS_TYPE_RBS2000: + info_ind->bts_model = PCU_IF_BTS_MODEL_RBS; + break; + default: + info_ind->bts_model = PCU_IF_BTS_MODEL_UNSPEC; + } + return pcu_sock_send(bts->network, msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34649?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4b58912ad7be3070829614853901aa19108ba2c0 Gerrit-Change-Number: 34649 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: pcuif_proto: signal BTS model via PCUIF
by dexter 05 Oct '23

05 Oct '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34648?usp=email ) Change subject: pcuif_proto: signal BTS model via PCUIF ...................................................................... pcuif_proto: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU. Related: OS#6191 Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Change-Id: Ib51238a0e09d4484a539a7f822864189872698b6 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/34648/1 diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index a620993..4e2e702 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -60,6 +60,17 @@ #define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ #define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ +/* BTS model */ +#define PCU_IF_BTS_MODEL_UNSPEC 0x00 +#define PCU_IF_BTS_MODEL_LC15 0x01 +#define PCU_IF_BTS_MODEL_OC2G 0x02 +#define PCU_IF_BTS_MODEL_OCTPHY 0x03 +#define PCU_IF_BTS_MODEL_SYSMO 0x04 +#define PCU_IF_BTS_MODEL_TRX 0x05 +#define PCU_IF_BTS_MODEL_VIRTUAL 0x06 +#define PCU_IF_BTS_MODEL_OMLDUMMY 0x07 +#define PCU_IF_BTS_MODEL_RBS 0x08 + #define PCU_IF_NUM_NSVC 2 #define PCU_IF_NUM_TRX 8 @@ -173,6 +184,7 @@ struct in_addr v4; struct in6_addr v6; } remote_ip[PCU_IF_NUM_NSVC]; + uint8_t bts_model; } __attribute__ ((packed)); struct gsm_pcu_if_act_req { diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 79b39c4..07174dc 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -360,6 +360,32 @@ info_ind_fill_trx(&info_ind->trx[trx->nr], trx); } + switch(bts->variant) { + case BTS_OSMO_LITECELL15: + info_ind->bts_model = PCU_IF_BTS_MODEL_LC15; + break; + case BTS_OSMO_OC2G: + info_ind->bts_model = PCU_IF_BTS_MODEL_OC2G; + break; + case BTS_OSMO_OCTPHY: + info_ind->bts_model = PCU_IF_BTS_MODEL_OCTPHY; + break; + case BTS_OSMO_SYSMO: + info_ind->bts_model = PCU_IF_BTS_MODEL_SYSMO; + break; + case BTS_OSMO_TRX: + info_ind->bts_model = PCU_IF_BTS_MODEL_TRX; + break; + case BTS_OSMO_VIRTUAL: + info_ind->bts_model = PCU_IF_BTS_MODEL_VIRTUAL; + break; + case BTS_OSMO_OMLDUMMY: + info_ind->bts_model = PCU_IF_BTS_MODEL_OMLDUMMY; + break; + default: + info_ind->bts_model = PCU_IF_BTS_MODEL_UNSPEC; + } + return pcu_sock_send(msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34648?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: Ib51238a0e09d4484a539a7f822864189872698b6 Gerrit-Change-Number: 34648 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-pcu[master]: pcu_l1_if: signal BTS model via PCUIF
by dexter 05 Oct '23

05 Oct '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email ) Change subject: pcu_l1_if: signal BTS model via PCUIF ...................................................................... pcu_l1_if: signal BTS model via PCUIF At the moment the PCU has no way of knowing with which BTS model it is used with. However, some BTS models may require slightly different behaviour by the PCU, depending on which BTS model is used. So, lets add an additional bts_model field to struct gsm_pcu_if_info_ind in order to convey the exact BTS model to the PCU and store this information in struct gprs_rlcmac_bts Related: OS#6191 Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.h M src/pcu_l1_if.cpp 3 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/47/34647/1 diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index 9df85d9..066ef47 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -66,6 +66,17 @@ #define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ #define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ +/* BTS model */ +#define PCU_IF_BTS_MODEL_UNSPEC 0x00 +#define PCU_IF_BTS_MODEL_LC15 0x01 +#define PCU_IF_BTS_MODEL_OC2G 0x02 +#define PCU_IF_BTS_MODEL_OCTPHY 0x03 +#define PCU_IF_BTS_MODEL_SYSMO 0x04 +#define PCU_IF_BTS_MODEL_TRX 0x05 +#define PCU_IF_BTS_MODEL_VIRTUAL 0x06 +#define PCU_IF_BTS_MODEL_OMLDUMMY 0x07 +#define PCU_IF_BTS_MODEL_RBS 0x08 + #define PCU_IF_NUM_NSVC 2 #define PCU_IF_NUM_TRX 8 @@ -179,6 +190,7 @@ struct in_addr v4; struct in6_addr v6; } remote_ip[PCU_IF_NUM_NSVC]; + uint8_t bts_model; } __attribute__ ((packed)); /* E1 CCU connection parameters */ diff --git a/src/bts.h b/src/bts.h index 3fe4503..1d88cb5 100644 --- a/src/bts.h +++ b/src/bts.h @@ -275,6 +275,9 @@ struct llist_head pch_timer; struct osmo_time_cc all_allocated_pdch; + + /* BTS hardware model, see pcuif_proto.h */ + uint8_t bts_model; }; struct paging_req_cs { diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 4fcec31..ef11105 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -1013,6 +1013,9 @@ } } + LOGP(DL1IF, LOGL_INFO, "BTS model: %02x\n", info_ind->bts_model); + bts->bts_model = info_ind->bts_model; + bts->active = true; return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I48eb75f65ab54fdec41ef913e24c1f18cd4a4047 Gerrit-Change-Number: 34647 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: Drop use of deprectated vty callback is_config_node
by pespin 05 Oct '23

05 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34620?usp=email ) Change subject: Drop use of deprectated vty callback is_config_node ...................................................................... Drop use of deprectated vty callback is_config_node While compiling: vty.c:169:3: warning: 'is_config_node' is deprecated: Implicit parent node tracking has replaced the use of this callback. This callback is no longer called, ever, and can be left NULL. [-Wdeprecated-declarations] .is_config_node = bts_vty_is_config_node, ^ Change-Id: I54c5aa5911611b181f80e76556b150f25dd5b60c --- M include/osmo-bts/vty.h M src/common/vty.c M src/osmo-bts-lc15/misc/lc15bts_mgr_vty.c M src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c M src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c 5 files changed, 16 insertions(+), 88 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/include/osmo-bts/vty.h b/include/osmo-bts/vty.h index 4716f7c..d326c5c 100644 --- a/include/osmo-bts/vty.h +++ b/include/osmo-bts/vty.h @@ -21,7 +21,6 @@ struct phy_instance *vty_get_phy_instance(struct vty *vty, int phy_nr, int inst_nr); int bts_vty_go_parent(struct vty *vty); -int bts_vty_is_config_node(struct vty *vty, int node); int bts_vty_init(void *ctx); diff --git a/src/common/vty.c b/src/common/vty.c index f14cc92..014042d 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -140,20 +140,6 @@ return vty->node; } -int bts_vty_is_config_node(struct vty *vty, int node) -{ - switch (node) { - case TRX_NODE: - case BTS_NODE: - case PHY_NODE: - case PHY_INST_NODE: - case OSMUX_NODE: - return 1; - default: - return 0; - } -} - static const char osmobts_copyright[] = "Copyright (C) 2010-2011 by Harald Welte, Andreas Eversberg and On-Waves\r\n" "Copyright (C) 2011-2022 by sysmocom - s.f.m.c. GmbH\r\n" @@ -166,7 +152,6 @@ .version = PACKAGE_VERSION, .copyright = osmobts_copyright, .go_parent_cb = bts_vty_go_parent, - .is_config_node = bts_vty_is_config_node, .usr_attr_desc = { [BTS_VTY_ATTR_NEW_LCHAN] = \ "This command applies for newly created lchans", diff --git a/src/osmo-bts-lc15/misc/lc15bts_mgr_vty.c b/src/osmo-bts-lc15/misc/lc15bts_mgr_vty.c index 424ff18..2cf39de 100644 --- a/src/osmo-bts-lc15/misc/lc15bts_mgr_vty.c +++ b/src/osmo-bts-lc15/misc/lc15bts_mgr_vty.c @@ -89,39 +89,10 @@ return vty->node; } -static int is_config_node(struct vty *vty, int node) -{ - switch (node) { - case MGR_NODE: - case ACT_NORM_NODE: - case ACT_WARN_NODE: - case ACT_CRIT_NODE: - case LIMIT_SUPPLY_TEMP_NODE: - case LIMIT_SOC_NODE: - case LIMIT_FPGA_NODE: - case LIMIT_RMSDET_NODE: - case LIMIT_OCXO_NODE: - case LIMIT_TX0_TEMP_NODE: - case LIMIT_TX1_TEMP_NODE: - case LIMIT_PA0_TEMP_NODE: - case LIMIT_PA1_TEMP_NODE: - case LIMIT_SUPPLY_VOLT_NODE: - case LIMIT_TX0_VSWR_NODE: - case LIMIT_TX1_VSWR_NODE: - case LIMIT_SUPPLY_PWR_NODE: - case LIMIT_PA0_PWR_NODE: - case LIMIT_PA1_PWR_NODE: - return 1; - default: - return 0; - } -} - static struct vty_app_info vty_info = { .name = "lc15bts-mgr", .version = PACKAGE_VERSION, .go_parent_cb = go_to_parent, - .is_config_node = is_config_node, .copyright = copyright, }; diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c index 27698a7..431227d 100644 --- a/src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c +++ b/src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c @@ -86,35 +86,10 @@ return vty->node; } -static int is_config_node(struct vty *vty, int node) -{ - switch (node) { - case MGR_NODE: - case ACT_NORM_NODE: - case ACT_WARN_NODE: - case ACT_CRIT_NODE: - case LIMIT_SUPPLY_TEMP_NODE: - case LIMIT_SOC_NODE: - case LIMIT_FPGA_NODE: - case LIMIT_RMSDET_NODE: - case LIMIT_OCXO_NODE: - case LIMIT_TX_TEMP_NODE: - case LIMIT_PA_TEMP_NODE: - case LIMIT_SUPPLY_VOLT_NODE: - case LIMIT_VSWR_NODE: - case LIMIT_SUPPLY_PWR_NODE: - case LIMIT_PA_PWR_NODE: - return 1; - default: - return 0; - } -} - static struct vty_app_info vty_info = { .name = "oc2gbts-mgr", .version = PACKAGE_VERSION, .go_parent_cb = go_to_parent, - .is_config_node = is_config_node, .copyright = copyright, }; diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c index fb3987b..54d8d36 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_vty.c @@ -69,28 +69,10 @@ return vty->node; } -static int is_config_node(struct vty *vty, int node) -{ - switch (node) { - case MGR_NODE: - case ACT_NORM_NODE: - case ACT_WARN_NODE: - case ACT_CRIT_NODE: - case LIMIT_RF_NODE: - case LIMIT_DIGITAL_NODE: - case LIMIT_BOARD_NODE: - case LIMIT_PA_NODE: - return 1; - default: - return 0; - } -} - static struct vty_app_info vty_info = { .name = "sysmobts-mgr", .version = PACKAGE_VERSION, .go_parent_cb = go_to_parent, - .is_config_node = is_config_node, .copyright = copyright, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34620?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: I54c5aa5911611b181f80e76556b150f25dd5b60c Gerrit-Change-Number: 34620 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: ASCI: Fix false return value checks, discovered by Coverity Scan
by jolly 05 Oct '23

05 Oct '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34646?usp=email ) Change subject: ASCI: Fix false return value checks, discovered by Coverity Scan ...................................................................... ASCI: Fix false return value checks, discovered by Coverity Scan See: CID 32637 - 323644 Related: OS#5364 Change-Id: If72590bb94597e434386bbcd312919a71abf0aae --- M src/host/layer23/src/mobile/gsm44068_gcc_bcc.c 1 file changed, 19 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/46/34646/1 diff --git a/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c b/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c index fa0e7bd..7bb8b29 100644 --- a/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c +++ b/src/host/layer23/src/mobile/gsm44068_gcc_bcc.c @@ -622,7 +622,7 @@ { struct gsm_trans *trans = fi->priv; uint8_t *cause = data; - uint8_t transaction_id; + int rc; switch (event) { case VGCS_GCC_EV_TERM_REQ: @@ -649,13 +649,13 @@ /* Change to GROUP CALL INITIATED state. */ osmo_fsm_inst_state_chg(fi, VGCS_GCC_ST_U1_GROUP_CALL_INITIATED, 0, 0); /* Choose transaction ID. */ - transaction_id = trans_assign_trans_id(trans->ms, trans->protocol, 0); - if (transaction_id < 0) { + rc = trans_assign_trans_id(trans->ms, trans->protocol, 0); + if (rc < 0) { /* No free transaction ID. */ trans_free(trans); return; } - trans->transaction_id = transaction_id; + trans->transaction_id = rc; /* Send SETUP towards network. */ gsm44068_tx_setup(trans, trans->callref, false, 0, false, NULL, 0, false, 0); break; @@ -1500,7 +1500,7 @@ struct gsm_trans *trans; trans = trans_alloc(ms, pdisc, 0xff, callref); - if (trans < 0) + if (!trans) return NULL; trans->gcc.fi = osmo_fsm_inst_alloc((pdisc == GSM48_PDISC_GROUP_CC) ? &vgcs_gcc_fsm : &vgcs_bcc_fsm, trans, trans, LOGL_DEBUG, NULL); @@ -1664,7 +1664,7 @@ return 0; /* Incoming notification, creation transaction. */ trans = trans_alloc_vgcs(ms, pdisc, 0xff, mmh->ref); - if (trans < 0) + if (!trans) return -ENOMEM; } else { LOG_GCC_PR(pdisc, mmh->ref, LOGL_ERROR, "Received GCC/BCC message for unknown transaction.\n"); @@ -1816,7 +1816,7 @@ /* Create new transaction. ORIG will be set when entering U2sl state. */ trans = trans_alloc_vgcs(ms, protocol, 0xff, callref); - if (trans < 0) + if (!trans) return -ENOMEM; /* Setup new call. */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34646?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If72590bb94597e434386bbcd312919a71abf0aae Gerrit-Change-Number: 34646 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-dev[master]: Update URLs: git.osmocom.org -> gerrit.osmocom.org
by osmith 05 Oct '23

05 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34580?usp=email ) Change subject: Update URLs: git.osmocom.org -> gerrit.osmocom.org ...................................................................... Update URLs: git.osmocom.org -> gerrit.osmocom.org Related: https://osmocom.org/projects/cellular-infrastructure/wiki/Git_infrastructure Change-Id: Iba2ab71c06e413da4cb82fb1b85b4658d6773743 --- M gen_makefile.py M virt-nitb/README 2 files changed, 13 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve diff --git a/gen_makefile.py b/gen_makefile.py index 34f8c96..a00234f 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -70,8 +70,8 @@ help='''Parent dir for all build trees (default: directly in the make-dir).''') -parser.add_argument('-u', '--url', dest='url', default='https://git.osmocom.org', - help='''git clone base URL. Default is 'https://git.osmocom.org'. +parser.add_argument('-u', '--url', dest='url', default='https://gerrit.osmocom.org', + help='''git clone base URL. Default is 'https://gerrit.osmocom.org'. e.g. with a config like this in your ~/.ssh/config: host go hostname gerrit.osmocom.org diff --git a/virt-nitb/README b/virt-nitb/README index d9fbb65..c43c305 100644 --- a/virt-nitb/README +++ b/virt-nitb/README @@ -3,7 +3,7 @@ Steps: - build osmocom-bb - git clone https://git.osmocom.org/osmocom-bb + git clone https://gerrit.osmocom.org/osmocom-bb cd osmocom-bb/src make nofirmware cd ../.. -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34580?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iba2ab71c06e413da4cb82fb1b85b4658d6773743 Gerrit-Change-Number: 34580 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-dev[master]: Update URLs: git.osmocom.org -> gerrit.osmocom.org
by osmith 05 Oct '23

05 Oct '23

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34580?usp=email ) Change subject: Update URLs: git.osmocom.org -> gerrit.osmocom.org ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34580?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iba2ab71c06e413da4cb82fb1b85b4658d6773743 Gerrit-Change-Number: 34580 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Oct 2023 07:43:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-dev[master]: Update URLs: git.osmocom.org -> gerrit.osmocom.org
by osmith 05 Oct '23

05 Oct '23

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/34580?usp=email ) Change subject: Update URLs: git.osmocom.org -> gerrit.osmocom.org ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: trivial change in osmo-dev, merging -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/34580?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iba2ab71c06e413da4cb82fb1b85b4658d6773743 Gerrit-Change-Number: 34580 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Oct 2023 07:43:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0