cellular-infrastructure
/
osmo-cbc
mirror of https://gerrit.osmocom.org/osmo-cbc
9
0
Fork 0
Code Issues Releases Wiki Activity

Use cbc_{cbsp,sbcap}_link_close when possible 

This way we abstract whether the underlaying stream is a TCP/SCTP client
or server.

Change-Id: Ie020b9b5ee93ae8d0c9e7266177728185e8635f2
This commit is contained in:
Pau Espin 2022-07-20 20:27:47 +02:00
parent 907c4013c4
commit 351b2c8c2b
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cbsp_link.c
View File

@ -75,7 +75,7 @@ static int cbsp_cbc_read_cb(struct osmo_stream_srv *conn)
}
/* destroy connection */
osmo_stream_srv_destroy(conn);
cbc_cbsp_link_close(link);
return -EBADF;
}
OSMO_ASSERT(msg);
@ -134,7 +134,7 @@ static int cbsp_cbc_accept_cb(struct osmo_stream_srv_link *srv_link, int fd)
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");
osmo_stream_srv_destroy(link->conn);
cbc_cbsp_link_close(link);
talloc_free(link);
return -1;
}
@ -152,7 +152,7 @@ static int cbsp_cbc_accept_cb(struct osmo_stream_srv_link *srv_link, int fd)
} else {
LOGPCC(link, LOGL_NOTICE, "Rejecting unknown CBSP peer %s:%d (not permitted)\n",
remote_ip, remote_port);
osmo_stream_srv_destroy(link->conn);
cbc_cbsp_link_close(link);
return -1;
}
} else {
@ -194,7 +194,8 @@ 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)
{
osmo_stream_srv_destroy(link->conn);
if (link->conn)
osmo_stream_srv_destroy(link->conn);
}
/* initialize the CBC-side CBSP server */

3
src/cbsp_link_fsm.c
View File

@ -196,8 +196,7 @@ static void cbsp_link_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_c
{
struct cbc_cbsp_link *link = (struct cbc_cbsp_link *) fi->priv;
if (link->conn)
osmo_stream_srv_destroy(link->conn);
cbc_cbsp_link_close(link);
llist_del(&link->list);
link->fi = NULL;

13
src/sbcap_link.c
View File

@ -73,10 +73,10 @@ static int sbcap_cbc_read_cb(struct osmo_stream_srv *conn)
LOGPSBCAPC(link, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n",
__func__, rc, flags);
if (rc < 0) {
osmo_stream_srv_destroy(conn);
cbc_sbcap_link_close(link);
goto out;
} else if (rc == 0) {
osmo_stream_srv_destroy(conn);
cbc_sbcap_link_close(link);
} else {
msgb_put(msg, rc);
}
@ -87,7 +87,7 @@ static int sbcap_cbc_read_cb(struct osmo_stream_srv *conn)
osmo_sctp_sn_type_str(notif->sn_header.sn_type));
switch (notif->sn_header.sn_type) {
case SCTP_SHUTDOWN_EVENT:
osmo_stream_srv_destroy(conn);
cbc_sbcap_link_close(link);
break;
case SCTP_ASSOC_CHANGE:
LOGPSBCAPC(link, LOGL_DEBUG, "Rx sctp notif SCTP_ASSOC_CHANGE: %s\n",
@ -162,7 +162,7 @@ static int sbcap_cbc_accept_cb(struct osmo_stream_srv_link *srv_link, int fd)
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");
osmo_stream_srv_destroy(link->conn);
cbc_sbcap_link_close(link);
talloc_free(link);
return -1;
}
@ -180,7 +180,7 @@ static int sbcap_cbc_accept_cb(struct osmo_stream_srv_link *srv_link, int fd)
} else {
LOGPSBCAPC(link, LOGL_NOTICE, "Rejecting unknown SBc-AP peer %s:%d (not permitted)\n",
remote_ip, remote_port);
osmo_stream_srv_destroy(link->conn);
cbc_sbcap_link_close(link);
return -1;
}
} else {
@ -223,7 +223,8 @@ ret_free:
void cbc_sbcap_link_close(struct cbc_sbcap_link *link)
{
osmo_stream_srv_destroy(link->conn);
if (link->conn)
osmo_stream_srv_destroy(link->conn);
}
/* initialize the CBC-side SBc-AP server */

3
src/sbcap_link_fsm.c
View File

@ -94,8 +94,7 @@ static void sbcap_link_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_
{
struct cbc_sbcap_link *link = (struct cbc_sbcap_link *) fi->priv;
if (link->conn)
osmo_stream_srv_destroy(link->conn);
cbc_sbcap_link_close(link);
llist_del(&link->list);
link->fi = NULL;