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

Change in ...osmo_dia2gsup[master]: Bump version: 0.1.1

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28730 ) Change subject: Bump version: 0.1.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I30c104822a96d14f80cad320b801149f38b886b7 Gerrit-Change-Number: 28730 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 11:19:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: fix NULL pointer dereference in trx_if_open()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28727 ) Change subject: trxcon: fix NULL pointer dereference in trx_if_open() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id40e758f6736773f7695c02bdb8974ee422b2e63 Gerrit-Change-Number: 28727 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 11:18:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: remove unused #imports in sched_clck.c

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28726 ) Change subject: trxcon: remove unused #imports in sched_clck.c ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I41e08c2a970334f87fa9fca8d21a55295b9eddc5 Gerrit-Change-Number: 28726 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 11:18:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in ...osmo_dia2gsup[master]: Bump version: 0.1.1

by pespin

Attention is currently required from: osmith, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28730 ) Change subject: Bump version: 0.1.1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/28730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I30c104822a96d14f80cad320b801149f38b886b7 Gerrit-Change-Number: 28730 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 11:16:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in pysim[master]: Introduce APDU/TPDU trace decoder

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/28725 to look at the new patch set (#2). Change subject: Introduce APDU/TPDU trace decoder ...................................................................... Introduce APDU/TPDU trace decoder This introduces a new pySim.apdu module hierarchy, which contains classes that represent TPDU/APDUs as exchanged between SIM/UICC/USIM/ISIM card and UE. It contains instruction level decoders for SELECT, READ BINARY and friends, and then uses the pySim.filesystem.Runtime{Lchan,State} classes to keep track of the currently selected EF/DF/ADF for each logical channel, and uses the file-specific decoder classes of pySim to decode the actual file content that is being read or written. This provides a much more meaningful decode of protocol traces than wireshark will ever be able to give us. Furthermore, there's the new pySim.apdu_source set of classes which provides "input plugins" for obtaining APDU traces in a variety of formats. So far, GSMTAP UDP live capture and pyshark based RSPRO live and pcap file reading are imlpemented. Change-Id: I862d93163d495a294364168f7818641e47b18c0a Closes: OS#5126 --- M README.md A pySim-trace.py A pySim/apdu/__init__.py A pySim/apdu/global_platform.py A pySim/apdu/ts_102_221.py A pySim/apdu/ts_31_102.py A pySim/apdu_source/__init__.py A pySim/apdu_source/gsmtap.py A pySim/apdu_source/pyshark_rspro.py A pySim/gsmtap.py M pySim/ts_31_102.py M requirements.txt M setup.py 13 files changed, 1,754 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/25/28725/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I862d93163d495a294364168f7818641e47b18c0a Gerrit-Change-Number: 28725 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: cbc_vty: use install_element[_ve](), not install_lib_element[_ve]()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28715 ) Change subject: cbc_vty: use install_element[_ve](), not install_lib_element[_ve]() ...................................................................... cbc_vty: use install_element[_ve](), not install_lib_element[_ve]() As the naming suggests, install_lib_element[_ve]() should be used for commands registered by libraries. This API allows to enforce some rules for command attribute letters and should not be used by application specific commands. Change-Id: I8c0c8ac66dfc4fc2b8bf9102fba0df2dd988e7c9 --- M src/cbc_vty.c 1 file changed, 23 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 9f2c073..36d646d 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -671,38 +671,38 @@ void cbc_vty_init(void) { - install_lib_element_ve(&show_peers_cmd); - install_lib_element_ve(&show_message_cbs_cmd); - install_lib_element_ve(&show_messages_cbs_cmd); - install_lib_element_ve(&show_messages_etws_cmd); + install_element_ve(&show_peers_cmd); + install_element_ve(&show_message_cbs_cmd); + install_element_ve(&show_messages_cbs_cmd); + install_element_ve(&show_messages_etws_cmd); - install_lib_element(CONFIG_NODE, &cfg_cbc_cmd); + install_element(CONFIG_NODE, &cfg_cbc_cmd); install_node(&cbc_node, config_write_cbc); - install_lib_element(CBC_NODE, &cfg_permit_unknown_peers_cmd); + install_element(CBC_NODE, &cfg_permit_unknown_peers_cmd); - install_lib_element(CBC_NODE, &cfg_cbsp_cmd); + install_element(CBC_NODE, &cfg_cbsp_cmd); install_node(&cbsp_node, NULL); - install_lib_element(CBSP_NODE, &cfg_cbsp_local_ip_cmd); - install_lib_element(CBSP_NODE, &cfg_cbsp_local_port_cmd); + install_element(CBSP_NODE, &cfg_cbsp_local_ip_cmd); + install_element(CBSP_NODE, &cfg_cbsp_local_port_cmd); - install_lib_element(CBC_NODE, &cfg_ecbe_cmd); + install_element(CBC_NODE, &cfg_ecbe_cmd); install_node(&ecbe_node, NULL); - install_lib_element(ECBE_NODE, &cfg_ecbe_local_ip_cmd); - install_lib_element(ECBE_NODE, &cfg_ecbe_local_port_cmd); + install_element(ECBE_NODE, &cfg_ecbe_local_ip_cmd); + install_element(ECBE_NODE, &cfg_ecbe_local_port_cmd); - install_lib_element(CBC_NODE, &cfg_sbcap_cmd); + install_element(CBC_NODE, &cfg_sbcap_cmd); install_node(&sbcap_node, NULL); - install_lib_element(SBcAP_NODE, &cfg_sbcap_local_ip_cmd); - install_lib_element(SBcAP_NODE, &cfg_sbcap_no_local_ip_cmd); - install_lib_element(SBcAP_NODE, &cfg_sbcap_local_port_cmd); + install_element(SBcAP_NODE, &cfg_sbcap_local_ip_cmd); + install_element(SBcAP_NODE, &cfg_sbcap_no_local_ip_cmd); + install_element(SBcAP_NODE, &cfg_sbcap_local_port_cmd); - install_lib_element(CBC_NODE, &cfg_cbc_peer_cmd); - install_lib_element(CBC_NODE, &cfg_cbc_no_peer_cmd); + install_element(CBC_NODE, &cfg_cbc_peer_cmd); + install_element(CBC_NODE, &cfg_cbc_no_peer_cmd); install_node(&peer_node, NULL); - install_lib_element(PEER_NODE, &cfg_peer_proto_cmd); - install_lib_element(PEER_NODE, &cfg_peer_remote_port_cmd); - install_lib_element(PEER_NODE, &cfg_peer_no_remote_port_cmd); - install_lib_element(PEER_NODE, &cfg_peer_remote_ip_cmd); - install_lib_element(PEER_NODE, &cfg_peer_no_remote_ip_cmd); + install_element(PEER_NODE, &cfg_peer_proto_cmd); + install_element(PEER_NODE, &cfg_peer_remote_port_cmd); + install_element(PEER_NODE, &cfg_peer_no_remote_port_cmd); + install_element(PEER_NODE, &cfg_peer_remote_ip_cmd); + install_element(PEER_NODE, &cfg_peer_no_remote_ip_cmd); } -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I8c0c8ac66dfc4fc2b8bf9102fba0df2dd988e7c9 Gerrit-Change-Number: 28715 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> 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]: Make cbsp,sbcap mgr available in data model

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28716 ) Change subject: Make cbsp,sbcap mgr available in data model ...................................................................... Make cbsp,sbcap mgr available in data model Change-Id: I60c3ded80c38bcf50b831c6e9db719a8d2cba5b1 --- M include/osmocom/cbc/cbc_data.h M src/cbc_main.c 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h index 16861e7..d96e5ca 100644 --- a/include/osmocom/cbc/cbc_data.h +++ b/include/osmocom/cbc/cbc_data.h @@ -42,6 +42,8 @@ /********************************************************************************* * CBC itself *********************************************************************************/ +struct cbc_cbsp_mgr; +struct cbc_sbcap_mgr; struct cbc { struct { @@ -61,6 +63,13 @@ } ecbe; } config; + struct { + struct cbc_cbsp_mgr *mgr; + } cbsp; + struct { + struct cbc_sbcap_mgr *mgr; + } sbcap; + struct llist_head messages; /* cbc_message.list */ struct llist_head expired_messages; /* cbc_message.list */ struct llist_head peers; /* cbc_peer.list */ diff --git a/src/cbc_main.c b/src/cbc_main.c index dcc1725..f136ace 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -277,12 +277,12 @@ exit(1); } - if (cbc_cbsp_mgr_create(tall_cbc_ctx) == NULL) { + if (!(g_cbc->cbsp.mgr = cbc_cbsp_mgr_create(tall_cbc_ctx))) { perror("Error binding CBSP port"); exit(1); } - if (cbc_sbcap_mgr_create(tall_cbc_ctx) == NULL) { + if (!(g_cbc->sbcap.mgr = cbc_sbcap_mgr_create(tall_cbc_ctx))) { perror("Error binding SBc-AP port\n"); exit(1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I60c3ded80c38bcf50b831c6e9db719a8d2cba5b1 Gerrit-Change-Number: 28716 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> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Fix cbc_vty_go_parent() not being called

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28717 ) Change subject: Fix cbc_vty_go_parent() not being called ...................................................................... Fix cbc_vty_go_parent() not being called Change-Id: I946c503f5a40eafbee6e7fa359781548b74e45a6 --- M src/cbc_main.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/cbc_main.c b/src/cbc_main.c index f136ace..a670722 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -116,7 +116,6 @@ .copyright = cbc_copyright, .go_parent_cb = cbc_vty_go_parent, .version = PACKAGE_VERSION, - .go_parent_cb = NULL, .is_config_node = NULL, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I946c503f5a40eafbee6e7fa359781548b74e45a6 Gerrit-Change-Number: 28717 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> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: cbc_vty: write peer config nodes at the end

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28713 ) Change subject: cbc_vty: write peer config nodes at the end ...................................................................... cbc_vty: write peer config nodes at the end This way we end up with more "global" configs at the start of the file, which are read/applied first, and later all the per-peer information, which is a list of variable length. Change-Id: I7623ea5874552e57764327e94a9c3a4de7b71d67 --- M src/cbc_vty.c 1 file changed, 13 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/cbc_vty.c b/src/cbc_vty.c index ddf2891..9f2c073 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -321,11 +321,20 @@ return CMD_SUCCESS; } +static int config_write_ecbe(struct vty *vty); +static int config_write_cbsp(struct vty *vty); +static int config_write_sbcap(struct vty *vty); +static int config_write_peer(struct vty *vty); + static int config_write_cbc(struct vty *vty) { vty_out(vty, "cbc%s", VTY_NEWLINE); vty_out(vty, " unknown-peers %s%s", g_cbc->config.permit_unknown_peers ? "accept" : "reject", VTY_NEWLINE); + config_write_ecbe(vty); + config_write_cbsp(vty); + config_write_sbcap(vty); + config_write_peer(vty); return CMD_SUCCESS; } @@ -672,24 +681,24 @@ install_lib_element(CBC_NODE, &cfg_permit_unknown_peers_cmd); install_lib_element(CBC_NODE, &cfg_cbsp_cmd); - install_node(&cbsp_node, config_write_cbsp); + install_node(&cbsp_node, NULL); install_lib_element(CBSP_NODE, &cfg_cbsp_local_ip_cmd); install_lib_element(CBSP_NODE, &cfg_cbsp_local_port_cmd); install_lib_element(CBC_NODE, &cfg_ecbe_cmd); - install_node(&ecbe_node, config_write_ecbe); + install_node(&ecbe_node, NULL); install_lib_element(ECBE_NODE, &cfg_ecbe_local_ip_cmd); install_lib_element(ECBE_NODE, &cfg_ecbe_local_port_cmd); install_lib_element(CBC_NODE, &cfg_sbcap_cmd); - install_node(&sbcap_node, config_write_sbcap); + install_node(&sbcap_node, NULL); install_lib_element(SBcAP_NODE, &cfg_sbcap_local_ip_cmd); install_lib_element(SBcAP_NODE, &cfg_sbcap_no_local_ip_cmd); install_lib_element(SBcAP_NODE, &cfg_sbcap_local_port_cmd); install_lib_element(CBC_NODE, &cfg_cbc_peer_cmd); install_lib_element(CBC_NODE, &cfg_cbc_no_peer_cmd); - install_node(&peer_node, config_write_peer); + install_node(&peer_node, NULL); install_lib_element(PEER_NODE, &cfg_peer_proto_cmd); install_lib_element(PEER_NODE, &cfg_peer_remote_port_cmd); install_lib_element(PEER_NODE, &cfg_peer_no_remote_port_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I7623ea5874552e57764327e94a9c3a4de7b71d67 Gerrit-Change-Number: 28713 Gerrit-PatchSet: 3 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> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Refactor {cbsp,sbcap}_cbc_accept_cb

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28712 ) Change subject: Refactor {cbsp,sbcap}_cbc_accept_cb ...................................................................... Refactor {cbsp,sbcap}_cbc_accept_cb Delay allocating the structures until really needed. First do checks agains the opened connection, and if an issue is detected simply close the fd. Next, fetch or allocate the related peer. Finally, create the link from the fd. This makes it easier to add early extra checks later when peers will contain info on link_mode (client|server|disabled) later on. Change-Id: Id4f83ec6b0b14e556b1caa9c80e7f68d062fec57 --- M include/osmocom/cbc/cbsp_link.h M include/osmocom/cbc/sbcap_link.h M src/cbsp_link.c M src/cbsp_link_fsm.c M src/sbcap_link.c M src/sbcap_link_fsm.c 6 files changed, 139 insertions(+), 80 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/cbc/cbsp_link.h b/include/osmocom/cbc/cbsp_link.h index 6699222..7fcacdf 100644 --- a/include/osmocom/cbc/cbsp_link.h +++ b/include/osmocom/cbc/cbsp_link.h @@ -40,6 +40,8 @@ struct cbc_peer *peer; }; +struct cbc_cbsp_link *cbc_cbsp_link_alloc(struct cbc_cbsp_mgr *cbc, struct cbc_peer *peer); +void cbc_cbsp_link_free(struct cbc_cbsp_link *link); const char *cbc_cbsp_link_name(const struct cbc_cbsp_link *link); void cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp); void cbc_cbsp_link_close(struct cbc_cbsp_link *link); diff --git a/include/osmocom/cbc/sbcap_link.h b/include/osmocom/cbc/sbcap_link.h index a4618e1..5946544 100644 --- a/include/osmocom/cbc/sbcap_link.h +++ b/include/osmocom/cbc/sbcap_link.h @@ -38,6 +38,8 @@ struct cbc_peer *peer; }; +struct cbc_sbcap_link *cbc_sbcap_link_alloc(struct cbc_sbcap_mgr *cbc, struct cbc_peer *peer); +void cbc_sbcap_link_free(struct cbc_sbcap_link *link); const char *cbc_sbcap_link_name(const struct cbc_sbcap_link *link); void cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu); void cbc_sbcap_link_close(struct cbc_sbcap_link *link); diff --git a/src/cbsp_link.c b/src/cbsp_link.c index bc421f2..cd1c308 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -19,6 +19,7 @@ */ #include <errno.h> +#include <unistd.h> #include <sys/types.h> #include <sys/socket.h> @@ -37,6 +38,36 @@ #include <osmocom/cbc/cbsp_link_fsm.h> #include <osmocom/cbc/cbc_peer.h> +struct cbc_cbsp_link *cbc_cbsp_link_alloc(struct cbc_cbsp_mgr *cbc, struct cbc_peer *peer) +{ + struct cbc_cbsp_link *link; + + link = talloc_zero(cbc, struct cbc_cbsp_link); + OSMO_ASSERT(link); + + link->peer = peer; + + link->fi = osmo_fsm_inst_alloc(&cbsp_link_fsm, link, link, LOGL_DEBUG, NULL); + if (!link->fi) { + LOGPCC(link, LOGL_ERROR, "Unable to allocate FSM\n"); + talloc_free(link); + return NULL; + } + + llist_add_tail(&link->list, &cbc->links); + return link; +} + +void cbc_cbsp_link_free(struct cbc_cbsp_link *link) +{ + if (!link) + return; + llist_del(&link->list); + if (link->fi) + osmo_fsm_inst_free(link->fi); + talloc_free(link); +} + const char *cbc_cbsp_link_name(const struct cbc_cbsp_link *link) { OSMO_ASSERT(link); @@ -112,10 +143,10 @@ static int cbsp_cbc_accept_cb(struct osmo_stream_srv_link *srv_link, int fd) { struct cbc_cbsp_mgr *cbc = osmo_stream_srv_link_get_data(srv_link); - struct cbc_cbsp_link *link = talloc_zero(cbc, struct cbc_cbsp_link); + struct cbc_peer *peer; + struct cbc_cbsp_link *link; char remote_ip[INET6_ADDRSTRLEN], portbuf[6]; int remote_port; - OSMO_ASSERT(link); remote_ip[0] = '\0'; portbuf[0] = '\0'; @@ -124,45 +155,41 @@ LOGP(DCBSP, LOGL_NOTICE, "New CBSP link connection from %s:%u\n", remote_ip, remote_port); - link->conn = osmo_stream_srv_create(srv_link, srv_link, fd, cbsp_cbc_read_cb, cbsp_cbc_closed_cb, link); - if (!link->conn) { - LOGP(DCBSP, LOGL_ERROR, "Unable to create stream server for %s:%d\n", - remote_ip, remote_port); - talloc_free(link); - return -1; - } - link->fi = osmo_fsm_inst_alloc(&cbsp_link_fsm, link, link, LOGL_DEBUG, NULL); - if (!link->fi) { - LOGPCC(link, LOGL_ERROR, "Unable to allocate FSM\n"); - cbc_cbsp_link_close(link); - talloc_free(link); - return -1; - } - llist_add_tail(&link->list, &cbc->links); - /* Match link to peer */ - link->peer = cbc_peer_by_addr_proto(remote_ip, remote_port, CBC_PEER_PROTO_CBSP); - if (!link->peer) { - if (g_cbc->config.permit_unknown_peers) { - LOGPCC(link, LOGL_NOTICE, "Accepting unknown CBSP peer %s:%d\n", - remote_ip, remote_port); - link->peer = cbc_peer_create(NULL, CBC_PEER_PROTO_CBSP); - OSMO_ASSERT(link->peer); - link->peer->unknown_dynamic_peer = true; - } else { - LOGPCC(link, LOGL_NOTICE, "Rejecting unknown CBSP peer %s:%d (not permitted)\n", - remote_ip, remote_port); - cbc_cbsp_link_close(link); + peer = cbc_peer_by_addr_proto(remote_ip, remote_port, CBC_PEER_PROTO_CBSP); + if (!peer) { + if (!g_cbc->config.permit_unknown_peers) { + LOGP(DCBSP, LOGL_NOTICE, + "Rejecting unknown CBSP peer %s:%d (not permitted)\n", + remote_ip, remote_port); + close(fd); return -1; } - } else { - if (link->peer->link.cbsp) { - LOGPCC(link, LOGL_ERROR, "We already have a connection for peer %s\n", - link->peer->name); - /* FIXME */ - } - link->peer->link.cbsp = link; + LOGP(DCBSP, LOGL_NOTICE, "Accepting unknown CBSP peer %s:%d\n", + remote_ip, remote_port); + peer = cbc_peer_create(NULL, CBC_PEER_PROTO_CBSP); + OSMO_ASSERT(peer); + peer->unknown_dynamic_peer = true; } + if (peer->link.cbsp) { + LOGPCC(peer->link.cbsp, LOGL_ERROR, + "We already have a connection for peer %s, closing it\n", + peer->name); + cbc_cbsp_link_close(peer->link.cbsp); + } + link = cbc_cbsp_link_alloc(cbc, peer); + OSMO_ASSERT(link); + link->conn = osmo_stream_srv_create(srv_link, srv_link, fd, + cbsp_cbc_read_cb, cbsp_cbc_closed_cb, + link); + if (!link->conn) { + LOGPCC(link, LOGL_ERROR, + "Unable to create stream server for %s:%u\n", + remote_ip, remote_port); + cbc_cbsp_link_free(link); + return -1; + } + peer->link.cbsp = link; osmo_fsm_inst_dispatch(link->fi, CBSP_LINK_E_CMD_RESET, NULL); return 0; diff --git a/src/cbsp_link_fsm.c b/src/cbsp_link_fsm.c index d46a83e..eba21a7 100644 --- a/src/cbsp_link_fsm.c +++ b/src/cbsp_link_fsm.c @@ -197,13 +197,13 @@ struct cbc_cbsp_link *link = (struct cbc_cbsp_link *) fi->priv; cbc_cbsp_link_close(link); - llist_del(&link->list); - link->fi = NULL; /* reparent the fsm_inst to the cbc as we're about to free() it's talloc * parent 'link' */ + link->fi = NULL; talloc_steal(g_cbc, fi); - talloc_free(link); + + cbc_cbsp_link_free(link); } static const struct osmo_fsm_state cbsp_link_fsm_states[] = { diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 4656f6d..9194509 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -19,6 +19,7 @@ */ #include <errno.h> +#include <unistd.h> #include <sys/types.h> #include <sys/socket.h> #include <netdb.h> @@ -41,6 +42,36 @@ #include <osmocom/cbc/cbc_peer.h> #include <osmocom/cbc/debug.h> +struct cbc_sbcap_link *cbc_sbcap_link_alloc(struct cbc_sbcap_mgr *cbc, struct cbc_peer *peer) +{ + struct cbc_sbcap_link *link; + + link = talloc_zero(cbc, struct cbc_sbcap_link); + OSMO_ASSERT(link); + + link->peer = peer; + + link->fi = osmo_fsm_inst_alloc(&sbcap_link_fsm, link, link, LOGL_DEBUG, NULL); + if (!link->fi) { + LOGPSBCAPC(link, LOGL_ERROR, "Unable to allocate FSM\n"); + talloc_free(link); + return NULL; + } + + llist_add_tail(&link->list, &cbc->links); + return link; +} + +void cbc_sbcap_link_free(struct cbc_sbcap_link *link) +{ + if (!link) + return; + llist_del(&link->list); + if (link->fi) + osmo_fsm_inst_free(link->fi); + talloc_free(link); +} + const char *cbc_sbcap_link_name(const struct cbc_sbcap_link *link) { struct osmo_fd *ofd; @@ -140,10 +171,10 @@ static int sbcap_cbc_accept_cb(struct osmo_stream_srv_link *srv_link, int fd) { struct cbc_sbcap_mgr *cbc = osmo_stream_srv_link_get_data(srv_link); - struct cbc_sbcap_link *link = talloc_zero(cbc, struct cbc_sbcap_link); + struct cbc_peer *peer; + struct cbc_sbcap_link *link; char remote_ip[INET6_ADDRSTRLEN], portbuf[6]; int remote_port; - OSMO_ASSERT(link); remote_ip[0] = '\0'; portbuf[0] = '\0'; @@ -152,45 +183,42 @@ LOGP(DSBcAP, LOGL_NOTICE, "New SBc-AP link connection from %s:%u\n", remote_ip, remote_port); - link->conn = osmo_stream_srv_create(srv_link, srv_link, fd, sbcap_cbc_read_cb, sbcap_cbc_closed_cb, link); - if (!link->conn) { - LOGP(DSBcAP, LOGL_ERROR, "Unable to create stream server for %s:%d\n", - remote_ip, remote_port); - talloc_free(link); - return -1; - } - link->fi = osmo_fsm_inst_alloc(&sbcap_link_fsm, link, link, LOGL_DEBUG, NULL); - if (!link->fi) { - LOGPSBCAPC(link, LOGL_ERROR, "Unable to allocate FSM\n"); - cbc_sbcap_link_close(link); - talloc_free(link); - return -1; - } - llist_add_tail(&link->list, &cbc->links); - /* Match link to peer */ - link->peer = cbc_peer_by_addr_proto(remote_ip, remote_port, CBC_PEER_PROTO_SBcAP); - if (!link->peer) { - if (g_cbc->config.permit_unknown_peers) { - LOGPSBCAPC(link, LOGL_NOTICE, "Accepting unknown SBc-AP peer %s:%d\n", - remote_ip, remote_port); - link->peer = cbc_peer_create(NULL, CBC_PEER_PROTO_SBcAP); - OSMO_ASSERT(link->peer); - link->peer->unknown_dynamic_peer = true; - } else { - LOGPSBCAPC(link, LOGL_NOTICE, "Rejecting unknown SBc-AP peer %s:%d (not permitted)\n", - remote_ip, remote_port); - cbc_sbcap_link_close(link); + peer = cbc_peer_by_addr_proto(remote_ip, remote_port, CBC_PEER_PROTO_SBcAP); + if (!peer) { + if (!g_cbc->config.permit_unknown_peers) { + LOGP(DSBcAP, LOGL_NOTICE, + "Rejecting unknown SBc-AP peer %s:%d (not permitted)\n", + remote_ip, remote_port); + close(fd); return -1; } - } else { - if (link->peer->link.sbcap) { - LOGPSBCAPC(link, LOGL_ERROR, "We already have a connection for peer %s\n", - link->peer->name); - /* FIXME */ - } - link->peer->link.sbcap = link; + LOGP(DSBcAP, LOGL_NOTICE, "Accepting unknown SBc-AP peer %s:%d\n", + remote_ip, remote_port); + peer = cbc_peer_create(NULL, CBC_PEER_PROTO_SBcAP); + OSMO_ASSERT(peer); + peer->unknown_dynamic_peer = true; } + if (peer->link.sbcap) { + LOGPSBCAPC(peer->link.sbcap, LOGL_ERROR, + "We already have a connection for peer %s, closing it\n", + peer->name); + cbc_sbcap_link_close(peer->link.sbcap); + } + link = cbc_sbcap_link_alloc(cbc, peer); + OSMO_ASSERT(link); + + link->conn = osmo_stream_srv_create(srv_link, srv_link, fd, + sbcap_cbc_read_cb, sbcap_cbc_closed_cb, + link); + if (!link->conn) { + LOGPSBCAPC(link, LOGL_ERROR, + "Unable to create stream server for %s:%u\n", + remote_ip, remote_port); + cbc_sbcap_link_free(link); + return -1; + } + peer->link.sbcap = link; osmo_fsm_inst_dispatch(link->fi, SBcAP_LINK_E_CMD_RESET, NULL); return 0; diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index 9447520..0c66a62 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -95,13 +95,13 @@ struct cbc_sbcap_link *link = (struct cbc_sbcap_link *) fi->priv; cbc_sbcap_link_close(link); - llist_del(&link->list); - link->fi = NULL; /* reparent the fsm_inst to the cbc as we're about to free() it's talloc * parent 'link' */ + link->fi = NULL; talloc_steal(g_cbc, fi); - talloc_free(link); + + cbc_sbcap_link_free(link); } static const struct osmo_fsm_state sbcap_link_fsm_states[] = { -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Id4f83ec6b0b14e556b1caa9c80e7f68d062fec57 Gerrit-Change-Number: 28712 Gerrit-PatchSet: 3 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> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022