Change in osmo-cbc[master]: Rename fields in cbc_{cbsp,sbcap}_mgr

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28703 ) Change subject: Rename fields in cbc_{cbsp,sbcap}_mgr ...................................................................... Rename fields in cbc_{cbsp,sbcap}_mgr * link -> srv_link to avoid confusing with cbsp/sbcap links * clients -> links, since it holds links, which in the future will be both TCP/SCTP clients and servers. Change-Id: I4717f49413af45b45059c1601a667f4161b4ca8a --- M include/osmocom/cbc/cbsp_link.h M include/osmocom/cbc/sbcap_link.h M src/cbsp_link.c M src/sbcap_link.c 4 files changed, 30 insertions(+), 30 deletions(-) Approvals: Jenkins Builder: Verified osmith: 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 7ff5471..6699222 100644 --- a/include/osmocom/cbc/cbsp_link.h +++ b/include/osmocom/cbc/cbsp_link.h @@ -15,10 +15,10 @@ /* Holder of all CBSP conn related information: */ struct cbc_cbsp_mgr { /* libosmo-netif stream server */ - struct osmo_stream_srv_link *link; + struct osmo_stream_srv_link *srv_link; - /* BSCs / clients connected to this CBC */ - struct llist_head clients; + /* BSCs / links connected to this CBC */ + struct llist_head links; /* receive call-back; called for every received message */ int (*rx_cb)(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *dec); @@ -28,7 +28,7 @@ /* a CBSP link with a single (remote) peer connected to us */ struct cbc_cbsp_link { - /* entry in osmo_cbsp_cbc.clients */ + /* entry in osmo_cbsp_cbc.links */ struct llist_head list; /* stream server connection for this link */ struct osmo_stream_srv *conn; diff --git a/include/osmocom/cbc/sbcap_link.h b/include/osmocom/cbc/sbcap_link.h index 348782a..a4618e1 100644 --- a/include/osmocom/cbc/sbcap_link.h +++ b/include/osmocom/cbc/sbcap_link.h @@ -18,10 +18,10 @@ /* Holder of all SBc-AP conn related information: */ struct cbc_sbcap_mgr { /* libosmo-netif stream server */ - struct osmo_stream_srv_link *link; + struct osmo_stream_srv_link *srv_link; - /* MMEs / clients connected to this CBC */ - struct llist_head clients; + /* MMEs / links connected to this CBC */ + struct llist_head links; /* receive call-back; called for every received message */ int (*rx_cb)(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu); @@ -30,7 +30,7 @@ /* an SBc-AP link with a single (remote) peer connected to us */ struct cbc_sbcap_link { - /* entry in osmo_sbcap_cbc.clients */ + /* entry in osmo_sbcap_cbc.links */ struct llist_head list; /* stream server connection for this link */ struct osmo_stream_srv *conn; diff --git a/src/cbsp_link.c b/src/cbsp_link.c index 355d345..1aa8159 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -138,7 +138,7 @@ talloc_free(link); return -1; } - llist_add_tail(&link->list, &cbc->clients); + 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); @@ -210,22 +210,22 @@ OSMO_ASSERT(cbc); cbc->rx_cb = cbc_cbsp_link_rx_cb; - INIT_LLIST_HEAD(&cbc->clients); - cbc->link = osmo_stream_srv_link_create(cbc); - osmo_stream_srv_link_set_data(cbc->link, cbc); - osmo_stream_srv_link_set_nodelay(cbc->link, true); - osmo_stream_srv_link_set_port(cbc->link, bind_port); + 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); if (bind_ip) - osmo_stream_srv_link_set_addr(cbc->link, bind_ip); - osmo_stream_srv_link_set_accept_cb(cbc->link, cbsp_cbc_accept_cb); - rc = osmo_stream_srv_link_open(cbc->link); + 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); if (rc < 0) { - osmo_stream_srv_link_destroy(cbc->link); + osmo_stream_srv_link_destroy(cbc->srv_link); talloc_free(cbc); return NULL; } LOGP(DCBSP, LOGL_NOTICE, "Listening for CBSP at %s\n", - osmo_stream_srv_link_get_sockname(cbc->link)); + osmo_stream_srv_link_get_sockname(cbc->srv_link)); return cbc; } diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 502eaca..19912f8 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -166,7 +166,7 @@ talloc_free(link); return -1; } - llist_add_tail(&link->list, &cbc->clients); + 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); @@ -238,19 +238,19 @@ OSMO_ASSERT(cbc); cbc->rx_cb = cbc_sbcap_link_rx_cb; - INIT_LLIST_HEAD(&cbc->clients); - cbc->link = osmo_stream_srv_link_create(cbc); - osmo_stream_srv_link_set_proto(cbc->link, IPPROTO_SCTP); - osmo_stream_srv_link_set_data(cbc->link, cbc); - osmo_stream_srv_link_set_nodelay(cbc->link, true); - osmo_stream_srv_link_set_port(cbc->link, bind_port); - osmo_stream_srv_link_set_addrs(cbc->link, (const char **)g_cbc->config.sbcap.local_host, + 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, g_cbc->config.sbcap.num_local_host); - osmo_stream_srv_link_set_accept_cb(cbc->link, sbcap_cbc_accept_cb); - rc = osmo_stream_srv_link_open(cbc->link); + 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); LOGP(DSBcAP, LOGL_NOTICE, "Listening for SBc-AP at %s\n", - osmo_stream_srv_link_get_sockname(cbc->link)); + osmo_stream_srv_link_get_sockname(cbc->srv_link)); return cbc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I4717f49413af45b45059c1601a667f4161b4ca8a Gerrit-Change-Number: 28703 Gerrit-PatchSet: 1 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-MessageType: merged