aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/src/osmo-bsc_nat/bsc_nat.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@gnumonks.org>2017-05-08 20:57:52 +0200
committerPablo Neira Ayuso <pablo@gnumonks.org>2017-05-10 11:21:24 +0200
commit5121576b0c6c323ae5f92d8d987b8c0899d99db0 (patch)
treec0157908247ea2f068fa942575753be416e43402 /openbsc/src/osmo-bsc_nat/bsc_nat.c
parent7b62d54b52457ecae649ead12e67369b3e09c235 (diff)
src: use osmo_timer_setup()
Use new function available in libosmocore to set up timers. Compile tested only. Change-Id: Ibcfd915688e97d370a888888a83a7c95cbe16819
Diffstat (limited to 'openbsc/src/osmo-bsc_nat/bsc_nat.c')
-rw-r--r--openbsc/src/osmo-bsc_nat/bsc_nat.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c
index 80e89fd53..daa066d05 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 bsc_ping_timeout(void *_bsc)
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 @@ static int ipaccess_listen_bsc_cb(struct osmo_fd *bfd, unsigned int what)
/*
* 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 @@ int main(int argc, char **argv)
/* 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) {