July 2022 - gerrit-log - lists.osmocom.org

Change in osmo-cbc[master]: cbc-apitool: print usage instead of crashing if no subcmd passed

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28738 ) Change subject: cbc-apitool: print usage instead of crashing if no subcmd passed ...................................................................... cbc-apitool: print usage instead of crashing if no subcmd passed The "required" param was added in python 3.7. Change-Id: Ia8d13beeb8da64644d1aaf36deeddda4de889a6c --- M contrib/cbc-apitool.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/contrib/cbc-apitool.py b/contrib/cbc-apitool.py index 20d9819..299846a 100755 --- a/contrib/cbc-apitool.py +++ b/contrib/cbc-apitool.py @@ -117,7 +117,7 @@ parser.add_argument("-p", "--port", help="TCP port to connect to", type=int, default=12345) parser.add_argument("-v", "--verbose", help="increase output verbosity", action='count', default=0) - subparsers = parser.add_subparsers() + subparsers = parser.add_subparsers(required=True) parser_c_cbs = subparsers.add_parser('create-cbs', help='Create a new CBS message') parser_c_cbs.add_argument("--msg-id", type=int, help='Message Identifier', required=True) 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ia8d13beeb8da64644d1aaf36deeddda4de889a6c Gerrit-Change-Number: 28738 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Fix encoding of Warning-Type

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28740 ) Change subject: sbcap: Fix encoding of Warning-Type ...................................................................... sbcap: Fix encoding of Warning-Type Change-Id: I9f6a0779c20ba86962aaaebc9b40ad162d2f2f3e --- M src/sbcap_msg.c M tests/sbcap/sbcap_test.c M tests/sbcap/sbcap_test.ok 3 files changed, 8 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/sbcap_msg.c b/src/sbcap_msg.c index d38f861..7dc3410 100644 --- a/src/sbcap_msg.c +++ b/src/sbcap_msg.c @@ -84,7 +84,6 @@ const struct smscb_message *smscb = &cbcmsg->msg; SBcAP_SBC_AP_PDU_t *pdu; SBcAP_Write_Replace_Warning_Request_IEs_t *ie; - uint16_t ie_warning_type; unsigned int i; uint8_t *ptr; #if 0 @@ -150,17 +149,15 @@ if (smscb->is_etws) { /* Warning Type, 3GPP TS 36.413 sec 9.2.1.50: */ - ie_warning_type = smscb->etws.warning_type; - if (smscb->etws.user_alert) - ie_warning_type |= 0x0100; - if (smscb->etws.popup_on_display) - ie_warning_type |= 0x0080; /* static const long asn_VAL_8_SBcAP_id_Warning_Type = 18; */ ie = sbcap_alloc_Write_Replace_Warning_Request_IE(18, SBcAP_Criticality_ignore, SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Warning_Type); - ie->value.choice.Warning_Type.buf = MALLOC(sizeof(ie_warning_type)); - ie->value.choice.Warning_Type.size = sizeof(ie_warning_type); - memcpy(ie->value.choice.Warning_Type.buf, &ie_warning_type, sizeof(ie_warning_type)); + ie->value.choice.Warning_Type.buf = MALLOC(2); + ie->value.choice.Warning_Type.size = 2; + ie->value.choice.Warning_Type.buf[0] = ((smscb->etws.warning_type & 0x7f) << 1); + if (smscb->etws.user_alert) + ie->value.choice.Warning_Type.buf[0] |= 0x01; + ie->value.choice.Warning_Type.buf[1] = (smscb->etws.popup_on_display) ? 0x80 : 0x0; ASN_SEQUENCE_ADD(as_pdu, ie); /* Warning Security Information, 3GPP TS 36.413 sec 9.2.1.51: */ diff --git a/tests/sbcap/sbcap_test.c b/tests/sbcap/sbcap_test.c index 747d0b2..9c8a60f 100644 --- a/tests/sbcap/sbcap_test.c +++ b/tests/sbcap/sbcap_test.c @@ -14,7 +14,7 @@ struct msgb *msg; SBcAP_SBC_AP_PDU_t *pdu; SBcAP_Write_Replace_Warning_Request_IEs_t *ie; - uint16_t ie_warning_type = 0x01; + uint8_t ie_warning_type[2] = {(0x01 << 1) | 0x01, 0x80}; uint8_t ie_dcs = 2; uint8_t ie_warning_sec_info[50] = {0x30, 0x40, 0x12, 0x23, 0x45}; uint8_t ie_warning_msg_content[SBCAP_WARN_MSG_CONTENTS_IE_MAX_LEN] = {0x30, 0x40, 0x12, 0x23, 0x45}; @@ -68,8 +68,6 @@ SBcAP_Write_Replace_Warning_Request_IEs__value_PR_Warning_Type); ie->value.choice.Warning_Type.buf = MALLOC(sizeof(ie_warning_type)); ie->value.choice.Warning_Type.size = sizeof(ie_warning_type); - ie_warning_type |= 0x0100; - ie_warning_type |= 0x0080; memcpy(ie->value.choice.Warning_Type.buf, &ie_warning_type, sizeof(ie_warning_type)); ASN_SEQUENCE_ADD(as_pdu, ie); diff --git a/tests/sbcap/sbcap_test.ok b/tests/sbcap/sbcap_test.ok index b67583a..e679721 100644 --- a/tests/sbcap/sbcap_test.ok +++ b/tests/sbcap/sbcap_test.ok @@ -1,5 +1,5 @@ ==== test_asn1c_enc ==== -Encoded message: 00 00 00 76 00 00 08 00 05 00 02 ab 01 00 0b 00 02 ab cd 00 0a 00 02 00 1e 00 07 00 02 00 59 00 12 40 02 81 01 00 11 40 32 30 40 12 23 45 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 40 01 02 00 10 40 16 00 13 30 40 12 23 45 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +Encoded message: 00 00 00 76 00 00 08 00 05 00 02 ab 01 00 0b 00 02 ab cd 00 0a 00 02 00 1e 00 07 00 02 00 59 00 12 40 02 03 80 00 11 40 32 30 40 12 23 45 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 40 01 02 00 10 40 16 00 13 30 40 12 23 45 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ==== test_asn1c_dec ==== Decoding message: 20 00 00 14 00 00 03 00 05 00 02 00 2b 00 0b 00 02 41 70 00 01 00 01 00 Decoded message successfully 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I9f6a0779c20ba86962aaaebc9b40ad162d2f2f3e Gerrit-Change-Number: 28740 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: vty: Print created and expired times for each message

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28785 ) Change subject: vty: Print created and expired times for each message ...................................................................... vty: Print created and expired times for each message This also allows differentiating between expired and active messages. Change-Id: I9ee49b99546a44be706700c3db94d45210c47e54 --- M src/cbc_vty.c 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/85/28785/1 diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 7e5a9db..2b21c53 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -102,13 +102,26 @@ static void dump_one_cbc_msg(struct vty *vty, const struct cbc_message *cbc_msg) { const struct smscb_message *smscb = &cbc_msg->msg; + char str_created[32], str_expired[32]; + struct tm tm_created = {0}; + struct tm tm_expired = {0}; + + localtime_r(&cbc_msg->time.created, &tm_created); + strftime(str_created, sizeof(str_created), "%Y-%m-%dT%H:%M:%SZ", &tm_created); + if (cbc_msg->time.expired > 0) { + localtime_r(&cbc_msg->time.expired, &tm_expired); + strftime(str_expired, sizeof(str_expired), "%Y-%m-%dT%H:%M:%SZ", &tm_expired); + } else { + OSMO_STRLCPY_ARRAY(str_expired, "active"); + } OSMO_ASSERT(!smscb->is_etws); - vty_out(vty, "| %04X| %04X|%-20s|%-13s| %-4u|%c| %02x|%s", + vty_out(vty, "| %04X| %04X|%-20s|%-13s| %-4u|%c| %02x|%-28s|%-28s|%s", smscb->message_id, smscb->serial_nr, cbc_msg->cbe_name, get_value_string(cbsp_category_names, cbc_msg->priority), cbc_msg->rep_period, cbc_msg->extended_cbch ? 'E' : 'N', smscb->cbs.dcs, + str_created, str_expired, VTY_NEWLINE); } @@ -119,7 +132,7 @@ struct cbc_message *cbc_msg; vty_out(vty, -"|MsgId|SerNo| CBE Name | Category |Period|E|DCS|%s", VTY_NEWLINE); +"|MsgId|SerNo| CBE Name | Category |Period|E|DCS| Created | Expired |%s", VTY_NEWLINE); vty_out(vty, "|-----|-----|--------------------|-------------|------|-|---|%s", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I9ee49b99546a44be706700c3db94d45210c47e54 Gerrit-Change-Number: 28785 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: vty: Add command to delete expired messages

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28786 ) Change subject: vty: Add command to delete expired messages ...................................................................... vty: Add command to delete expired messages Otherwise there's no way to remove expired messages, which keep filling the expired list forever. Change-Id: Ie7ed2d9ec8fc23cdc4cb007dce4150458085a6a3 --- M include/osmocom/cbc/cbc_message.h M src/cbc_vty.c M src/smscb_message_fsm.c 3 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/86/28786/1 diff --git a/include/osmocom/cbc/cbc_message.h b/include/osmocom/cbc/cbc_message.h index daf992d..405123f 100644 --- a/include/osmocom/cbc/cbc_message.h +++ b/include/osmocom/cbc/cbc_message.h @@ -99,6 +99,7 @@ }; struct cbc_message *cbc_message_alloc(void *ctx, const struct cbc_message *cbcmsg); +void cbc_message_free(struct cbc_message *cbcmsg); int cbc_message_new(const struct cbc_message *cbcmsg, struct rest_it_op *op); void cbc_message_delete(struct cbc_message *cbcmsg, struct rest_it_op *op); struct cbc_message *cbc_message_by_id(uint16_t message_id); diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 2b21c53..188d793 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -151,6 +151,27 @@ return CMD_SUCCESS; } +DEFUN(delete_message_expired, delete_message_expired_cmd, + "delete message expired id <0-65535>", + "Delete message from the local expired list\n" + "Delete message from the local expired list\n" + "Delete message from the local expired list\n" + "Message ID\n" "Message ID\n") +{ + struct cbc_message *cbc_msg; + cbc_msg = cbc_message_by_id(atoi(argv[0])); + if (!cbc_msg) { + vty_out(vty, "Unknown Messsage ID %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + if (cbc_msg->time.expired == 0) { + vty_out(vty, "Messsage ID %s has not yet expired!%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + cbc_message_free(cbc_msg); + return CMD_SUCCESS; +} + static const char *cbc_cell_id2str(const struct cbc_cell_id *cid) { static char buf[256]; @@ -716,6 +737,7 @@ install_element_ve(&show_message_cbs_cmd); install_element_ve(&show_messages_cbs_cmd); install_element_ve(&show_messages_etws_cmd); + install_element_ve(&delete_message_expired_cmd); install_element(CONFIG_NODE, &cfg_cbc_cmd); install_node(&cbc_node, config_write_cbc); diff --git a/src/smscb_message_fsm.c b/src/smscb_message_fsm.c index 0796587..ba17910 100644 --- a/src/smscb_message_fsm.c +++ b/src/smscb_message_fsm.c @@ -384,6 +384,11 @@ return smscb; } +void cbc_message_free(struct cbc_message *cbcmsg) +{ + osmo_fsm_inst_term(cbcmsg->fi, OSMO_FSM_TERM_REGULAR, NULL); +} + __attribute__((constructor)) void smscb_fsm_constructor(void) { OSMO_ASSERT(osmo_fsm_register(&smscb_fsm) == 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie7ed2d9ec8fc23cdc4cb007dce4150458085a6a3 Gerrit-Change-Number: 28786 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Split cbsp/sbcap server socket creation from struct allocation

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28736 ) Change subject: Split cbsp/sbcap server socket creation from struct allocation ...................................................................... Split cbsp/sbcap server socket creation from struct allocation This will be needed when we add client support, since clients will require the mgr structs to be available during VTY parsing. Change-Id: I14e49d8d2e603925d7f06a7edb710c0eceb02ea3 --- M include/osmocom/cbc/cbsp_link.h M include/osmocom/cbc/sbcap_link.h M src/cbc_data.c M src/cbsp_link.c M src/sbcap_link.c 5 files changed, 82 insertions(+), 50 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/cbc/cbsp_link.h b/include/osmocom/cbc/cbsp_link.h index 7fcacdf..9f964e8 100644 --- a/include/osmocom/cbc/cbsp_link.h +++ b/include/osmocom/cbc/cbsp_link.h @@ -24,7 +24,8 @@ int (*rx_cb)(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *dec); }; -struct cbc_cbsp_mgr *cbc_cbsp_mgr_create(void *ctx); +struct cbc_cbsp_mgr *cbc_cbsp_mgr_alloc(void *ctx); +int cbc_cbsp_mgr_open_srv(struct cbc_cbsp_mgr *mgr); /* a CBSP link with a single (remote) peer connected to us */ struct cbc_cbsp_link { diff --git a/include/osmocom/cbc/sbcap_link.h b/include/osmocom/cbc/sbcap_link.h index 5946544..da804a3 100644 --- a/include/osmocom/cbc/sbcap_link.h +++ b/include/osmocom/cbc/sbcap_link.h @@ -26,7 +26,8 @@ /* receive call-back; called for every received message */ int (*rx_cb)(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu); }; -struct cbc_sbcap_mgr *cbc_sbcap_mgr_create(void *ctx); +struct cbc_sbcap_mgr *cbc_sbcap_mgr_alloc(void *ctx); +int cbc_sbcap_mgr_open_srv(struct cbc_sbcap_mgr *mgr); /* an SBc-AP link with a single (remote) peer connected to us */ struct cbc_sbcap_link { diff --git a/src/cbc_data.c b/src/cbc_data.c index 5d5a64f..2e350e9 100644 --- a/src/cbc_data.c +++ b/src/cbc_data.c @@ -54,6 +54,12 @@ OSMO_ASSERT(cbc->it_q.rest2main); osmo_fd_register(&cbc->it_q.rest2main->event_ofd); + cbc->cbsp.mgr = cbc_cbsp_mgr_alloc(cbc); + OSMO_ASSERT(cbc->cbsp.mgr); + + cbc->sbcap.mgr = cbc_sbcap_mgr_alloc(cbc); + OSMO_ASSERT(cbc->sbcap.mgr); + return cbc; } @@ -64,14 +70,14 @@ tall_rest_ctx = talloc_named_const(cbc, 0, "REST"); - if (!(cbc->cbsp.mgr = cbc_cbsp_mgr_create(cbc))) { + if ((rc = cbc_cbsp_mgr_open_srv(cbc->cbsp.mgr)) < 0) { LOGP(DMAIN, LOGL_ERROR, "Error binding CBSP port\n"); - return -EIO; + return rc; } - if (!(cbc->sbcap.mgr = cbc_sbcap_mgr_create(cbc))) { + if ((rc = cbc_sbcap_mgr_open_srv(cbc->sbcap.mgr)) < 0) { LOGP(DMAIN, LOGL_ERROR, "Error binding SBc-AP port\n"); - return -EIO; + return rc; } rc = rest_api_init(tall_rest_ctx, cbc->config.ecbe.local_host, cbc->config.ecbe.local_port); diff --git a/src/cbsp_link.c b/src/cbsp_link.c index cd1c308..baf2def 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -225,35 +225,44 @@ osmo_stream_srv_destroy(link->conn); } -/* initialize the CBC-side CBSP server */ -struct cbc_cbsp_mgr *cbc_cbsp_mgr_create(void *ctx) +/* + * CBSP Manager + */ +struct cbc_cbsp_mgr *cbc_cbsp_mgr_alloc(void *ctx) { - struct cbc_cbsp_mgr *cbc = talloc_zero(ctx, struct cbc_cbsp_mgr); - int rc; + struct cbc_cbsp_mgr *mgr; + + mgr = talloc_zero(ctx, struct cbc_cbsp_mgr); + OSMO_ASSERT(mgr); + mgr->rx_cb = cbc_cbsp_link_rx_cb; + INIT_LLIST_HEAD(&mgr->links); + + return mgr; +} + +/* initialize the CBC-side CBSP server */ +int cbc_cbsp_mgr_open_srv(struct cbc_cbsp_mgr *mgr) +{ char *bind_ip = g_cbc->config.cbsp.local_host; int bind_port = g_cbc->config.cbsp.local_port; + struct osmo_stream_srv_link *srv_link; + int rc; - if (bind_port == -1) - bind_port = CBSP_TCP_PORT; - - OSMO_ASSERT(cbc); - cbc->rx_cb = cbc_cbsp_link_rx_cb; - INIT_LLIST_HEAD(&cbc->links); - cbc->srv_link = osmo_stream_srv_link_create(cbc); - osmo_stream_srv_link_set_data(cbc->srv_link, cbc); - osmo_stream_srv_link_set_nodelay(cbc->srv_link, true); - osmo_stream_srv_link_set_port(cbc->srv_link, bind_port); + srv_link = osmo_stream_srv_link_create(mgr); + osmo_stream_srv_link_set_data(srv_link, mgr); + osmo_stream_srv_link_set_nodelay(srv_link, true); + osmo_stream_srv_link_set_port(srv_link, bind_port); if (bind_ip) - osmo_stream_srv_link_set_addr(cbc->srv_link, bind_ip); - osmo_stream_srv_link_set_accept_cb(cbc->srv_link, cbsp_cbc_accept_cb); - rc = osmo_stream_srv_link_open(cbc->srv_link); + osmo_stream_srv_link_set_addr(srv_link, bind_ip); + osmo_stream_srv_link_set_accept_cb(srv_link, cbsp_cbc_accept_cb); + rc = osmo_stream_srv_link_open(srv_link); if (rc < 0) { - osmo_stream_srv_link_destroy(cbc->srv_link); - talloc_free(cbc); - return NULL; + osmo_stream_srv_link_destroy(srv_link); + talloc_free(mgr); + return -EIO; } + mgr->srv_link = srv_link; LOGP(DCBSP, LOGL_NOTICE, "Listening for CBSP at %s\n", - osmo_stream_srv_link_get_sockname(cbc->srv_link)); - - return cbc; + osmo_stream_srv_link_get_sockname(mgr->srv_link)); + return 0; } diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 9194509..b4f54c1 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -255,31 +255,46 @@ osmo_stream_srv_destroy(link->conn); } -/* initialize the CBC-side SBc-AP server */ -struct cbc_sbcap_mgr *cbc_sbcap_mgr_create(void *ctx) +/* + * CBSP Manager + */ +struct cbc_sbcap_mgr *cbc_sbcap_mgr_alloc(void *ctx) { - struct cbc_sbcap_mgr *cbc = talloc_zero(ctx, struct cbc_sbcap_mgr); - int rc; + struct cbc_sbcap_mgr *mgr; + + mgr = talloc_zero(ctx, struct cbc_sbcap_mgr); + OSMO_ASSERT(mgr); + mgr->rx_cb = cbc_sbcap_link_rx_cb; + INIT_LLIST_HEAD(&mgr->links); + + return mgr; +} + +/* initialize the CBC-side SBc-AP server */ +int cbc_sbcap_mgr_open_srv(struct cbc_sbcap_mgr *mgr) +{ int bind_port = g_cbc->config.sbcap.local_port; + struct osmo_stream_srv_link *srv_link; + int rc; - if (bind_port == -1) - bind_port = SBcAP_SCTP_PORT; - - OSMO_ASSERT(cbc); - cbc->rx_cb = cbc_sbcap_link_rx_cb; - INIT_LLIST_HEAD(&cbc->links); - cbc->srv_link = osmo_stream_srv_link_create(cbc); - osmo_stream_srv_link_set_proto(cbc->srv_link, IPPROTO_SCTP); - osmo_stream_srv_link_set_data(cbc->srv_link, cbc); - osmo_stream_srv_link_set_nodelay(cbc->srv_link, true); - osmo_stream_srv_link_set_port(cbc->srv_link, bind_port); - osmo_stream_srv_link_set_addrs(cbc->srv_link, (const char **)g_cbc->config.sbcap.local_host, + srv_link = osmo_stream_srv_link_create(mgr); + osmo_stream_srv_link_set_proto(srv_link, IPPROTO_SCTP); + osmo_stream_srv_link_set_data(srv_link, mgr); + osmo_stream_srv_link_set_nodelay(srv_link, true); + osmo_stream_srv_link_set_port(srv_link, bind_port); + osmo_stream_srv_link_set_addrs(srv_link, + (const char **)g_cbc->config.sbcap.local_host, g_cbc->config.sbcap.num_local_host); - osmo_stream_srv_link_set_accept_cb(cbc->srv_link, sbcap_cbc_accept_cb); - rc = osmo_stream_srv_link_open(cbc->srv_link); - OSMO_ASSERT(rc == 0); + osmo_stream_srv_link_set_accept_cb(srv_link, sbcap_cbc_accept_cb); + rc = osmo_stream_srv_link_open(srv_link); + if (rc < 0) { + osmo_stream_srv_link_destroy(srv_link); + talloc_free(mgr); + return -EIO; + } + mgr->srv_link = srv_link; LOGP(DSBcAP, LOGL_NOTICE, "Listening for SBc-AP at %s\n", - osmo_stream_srv_link_get_sockname(cbc->srv_link)); + osmo_stream_srv_link_get_sockname(mgr->srv_link)); - return cbc; + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I14e49d8d2e603925d7f06a7edb710c0eceb02ea3 Gerrit-Change-Number: 28736 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: cbc-apitool: Fix port stored in var as a string

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28737 ) Change subject: cbc-apitool: Fix port stored in var as a string ...................................................................... cbc-apitool: Fix port stored in var as a string Passing "-p 12345" on the cmd line, fixes: """ File "/osmo-cbc/contrib/./cbc-apitool.py", line 20, in build_url return "http://%s:%u%s%s" % (server_host, server_port, BASE_PATH, suffix) TypeError: %u format: a real number is required, not str """ Change-Id: Ief688bb8c2a6cfa410608a6896ce3cb5df4eb48e --- M contrib/cbc-apitool.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/contrib/cbc-apitool.py b/contrib/cbc-apitool.py index 0c5028a..20d9819 100755 --- a/contrib/cbc-apitool.py +++ b/contrib/cbc-apitool.py @@ -114,7 +114,7 @@ parser = argparse.ArgumentParser() parser.add_argument("-H", "--host", help="Host to connect to", default="localhost") - parser.add_argument("-p", "--port", help="TCP port to connect to", default=12345) + parser.add_argument("-p", "--port", help="TCP port to connect to", type=int, default=12345) parser.add_argument("-v", "--verbose", help="increase output verbosity", action='count', default=0) subparsers = parser.add_subparsers() -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ief688bb8c2a6cfa410608a6896ce3cb5df4eb48e Gerrit-Change-Number: 28737 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: in sdp logging: add payload type number like 'AMR#111'

by neels

Attention is currently required from: neels. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28782 to look at the new patch set (#3). Change subject: in sdp logging: add payload type number like 'AMR#111' ...................................................................... in sdp logging: add payload type number like 'AMR#111' Related: SYS#5066 Change-Id: Icbb4e89ce2947bf787c3ee14e3e115d406e43de2 --- M src/libmsc/sdp_msg.c M tests/sdp_msg/sdp_msg_test.ok 2 files changed, 15 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/28782/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icbb4e89ce2947bf787c3ee14e3e115d406e43de2 Gerrit-Change-Number: 28782 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in pysim[master]: filesystem: We can select not just immediate parent DF but all ancestors

by laforge

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/28768 to look at the new patch set (#3). Change subject: filesystem: We can select not just immediate parent DF but all ancestors ...................................................................... filesystem: We can select not just immediate parent DF but all ancestors I didn't check the specs, but at least experience with real-world cards (and modems) shows that it's not just permitted to select the immediate parent DF, but all ancestors of the currently selected file. So adjust the get_selectables() method to not just return the immediate parent, but to recurse all the way up and report the FID of any ancestor DF. Change-Id: Ic9037aa9a13af6fb0c2c22b673aa4afa78575b49 --- M pySim/filesystem.py 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/68/28768/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic9037aa9a13af6fb0c2c22b673aa4afa78575b49 Gerrit-Change-Number: 28768 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in pysim[master]: filesystem: We can select not just immediate parent DF but all ancestors

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28768 ) Change subject: filesystem: We can select not just immediate parent DF but all ancestors ...................................................................... Patch Set 1: (1 comment) File pySim/filesystem.py: https://gerrit.osmocom.org/c/pysim/+/28768/comment/ca6ad946_401a751f PS1, Line 197: alias: str = None > Unused argument. Also, should be Optional[str]. Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic9037aa9a13af6fb0c2c22b673aa4afa78575b49 Gerrit-Change-Number: 28768 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Jul 2022 12:23:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: filesystem: We can select not just immediate parent DF but all ancestors

by laforge

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/28768 to look at the new patch set (#2). Change subject: filesystem: We can select not just immediate parent DF but all ancestors ...................................................................... filesystem: We can select not just immediate parent DF but all ancestors I didn't check the specs, but at least experience with real-world cards (and modems) shows that it's not just permitted to select the immediate parent DF, but all ancestors of the currently selected file. So adjust the get_selectables() method to not just return the immediate parent, but to recurse all the way up and report the FID of any ancestor DF. Change-Id: Ic9037aa9a13af6fb0c2c22b673aa4afa78575b49 --- M pySim/filesystem.py 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/68/28768/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic9037aa9a13af6fb0c2c22b673aa4afa78575b49 Gerrit-Change-Number: 28768 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022