src: use osmo_timer_setup()
Use new function available in libosmocore to set up timers. Compile
tested only.
Change-Id: Ibcfd915688e97d370a888888a83a7c95cbe16819
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c
index 80e89fd..daa066d 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c
@@ -180,10 +180,8 @@
static void start_ping_pong(struct bsc_connection *bsc)
{
- bsc->pong_timeout.data = bsc;
- bsc->pong_timeout.cb = bsc_pong_timeout;
- bsc->ping_timeout.data = bsc;
- bsc->ping_timeout.cb = bsc_ping_timeout;
+ osmo_timer_setup(&bsc->pong_timeout, bsc_pong_timeout, bsc);
+ osmo_timer_setup(&bsc->ping_timeout, bsc_ping_timeout, bsc);
bsc_ping_timeout(bsc);
}
@@ -1446,8 +1444,7 @@
/*
* start the hangup timer
*/
- bsc->id_timeout.data = bsc;
- bsc->id_timeout.cb = ipaccess_close_bsc;
+ osmo_timer_setup(&bsc->id_timeout, ipaccess_close_bsc, bsc);
osmo_timer_schedule(&bsc->id_timeout, nat->auth_timeout, 0);
return 0;
}
@@ -1711,8 +1708,7 @@
/* recycle timer */
sccp_set_log_area(DSCCP);
- sccp_close.cb = sccp_close_unconfirmed;
- sccp_close.data = NULL;
+ osmo_timer_setup(&sccp_close, sccp_close_unconfirmed, NULL);
osmo_timer_schedule(&sccp_close, SCCP_CLOSE_TIME, 0);
while (1) {
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
index 057a583..3453758 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c
@@ -279,8 +279,8 @@
pending->cmd = cmd;
/* Setup the timeout */
- pending->timeout.data = pending;
- pending->timeout.cb = pending_timeout_cb;
+ osmo_timer_setup(&pending->timeout, pending_timeout_cb,
+ pending);
/* TODO: Make timeout configurable */
osmo_timer_schedule(&pending->timeout, 10, 0);
llist_add_tail(&pending->list_entry, &bsc->cmd_pending);
diff --git a/openbsc/src/osmo-bsc_nat/bsc_ussd.c b/openbsc/src/osmo-bsc_nat/bsc_ussd.c
index 2f68381..0ba6327 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_ussd.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_ussd.c
@@ -216,8 +216,7 @@
{
struct msgb *msg;
- conn->auth_timeout.data = conn;
- conn->auth_timeout.cb = ussd_auth_cb;
+ osmo_timer_setup(&conn->auth_timeout, ussd_auth_cb, conn);
osmo_timer_schedule(&conn->auth_timeout, conn->nat->auth_timeout, 0);
msg = msgb_alloc_headroom(4096, 128, "auth message");