williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make libtimer to be osmo_* compatible in some places

Browse Source
This commit is contained in:
Andreas Eversberg
2023-01-20 18:03:44 +01:00
parent 3bc3e67abb
commit f4abbaf027
25 changed files with 141 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libosmocc/endpoint.c
View File

@@ -278,9 +278,9 @@ reject:
}
/* send attach indication to socket */
void send_attach_ind(struct timer *timer)
void send_attach_ind(void *data)
{
osmo_cc_endpoint_t *ep = (osmo_cc_endpoint_t *)timer->priv;
osmo_cc_endpoint_t *ep = data;
osmo_cc_call_t *call;
osmo_cc_msg_t *msg;
@@ -1447,7 +1447,7 @@ int osmo_cc_new(osmo_cc_endpoint_t *ep, const char *version, const char *name, u
/* attach to remote host */
timer_init(&ep->attach_timer, send_attach_ind, ep);
if (ep->remote_host) {
send_attach_ind(&ep->attach_timer);
send_attach_ind(ep->attach_timer.data);
}
}

8
src/libosmocc/socket.c
View File

@@ -80,9 +80,9 @@ static void rej_msg(osmo_cc_socket_t *os, uint32_t callref, uint8_t socket_cause
os->recv_msg_cb(os->priv, callref, msg);
}
void tx_keepalive_timeout(struct timer *timer)
static void tx_keepalive_timeout(void *data)
{
osmo_cc_conn_t *conn = (osmo_cc_conn_t *)timer->priv;
osmo_cc_conn_t *conn = data;
osmo_cc_msg_t *msg;
/* send keepalive message */
@@ -93,9 +93,9 @@ void tx_keepalive_timeout(struct timer *timer)
static void close_conn(osmo_cc_conn_t *conn, uint8_t socket_cause);
void rx_keepalive_timeout(struct timer *timer)
static void rx_keepalive_timeout(void *data)
{
osmo_cc_conn_t *conn = (osmo_cc_conn_t *)timer->priv;
osmo_cc_conn_t *conn = data;
PDEBUG(DCC, DEBUG_ERROR, "OsmoCC-Socket failed due to timeout.\n");
close_conn(conn, OSMO_CC_SOCKET_CAUSE_TIMEOUT);