osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

[gprs] NS: replace nsvc->timer_is_tns_alive with nsvc->timer_mode 

This will allow to use the timer in more than 2 modes
This commit is contained in:
Harald Welte 2010-05-03 20:16:13 +02:00
parent bbc9fac7b7
commit 80405458a0
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openbsc/include/openbsc/gprs_ns.h
View File

@ -118,6 +118,14 @@ struct gprs_ns_inst {
}; };
}; };
enum nsvc_timer_mode {
/* standard timers */
NSVC_TIMER_TNS_TEST,
NSVC_TIMER_TNS_ALIVE,
/* custom timer */
NSVC_TIMER_RESET,
};
struct gprs_nsvc { struct gprs_nsvc {
struct llist_head list; struct llist_head list;
struct gprs_ns_inst *nsi; struct gprs_ns_inst *nsi;
@ -128,8 +136,8 @@ struct gprs_nsvc {
uint32_t state; uint32_t state;
uint32_t remote_state; uint32_t remote_state;
struct timer_list alive_timer; struct timer_list timer;
int timer_is_tns_alive; enum nsvc_timer_mode timer_mode;
int alive_retries; int alive_retries;
int remote_end_is_sgsn; int remote_end_is_sgsn;

25
openbsc/src/gprs_ns.c
View File

@ -182,11 +182,12 @@ static int gprs_ns_tx_simple(struct gprs_nsvc *nsvc, uint8_t pdu_type)
#define NS_TIMER_TEST 30, 0 /* every 10 seconds we check if the BTS is still alive */ #define NS_TIMER_TEST 30, 0 /* every 10 seconds we check if the BTS is still alive */
#define NS_ALIVE_RETRIES 10 /* after 3 failed retransmit we declare BTS as dead */ #define NS_ALIVE_RETRIES 10 /* after 3 failed retransmit we declare BTS as dead */
static void gprs_ns_alive_cb(void *data) static void gprs_ns_timer_cb(void *data)
{ {
struct gprs_nsvc *nsvc = data; struct gprs_nsvc *nsvc = data;
if (nsvc->timer_is_tns_alive) { switch (nsvc->timer_mode) {
case NSVC_TIMER_TNS_ALIVE:
/* Tns-alive case: we expired without response ! */ /* Tns-alive case: we expired without response ! */
nsvc->alive_retries++; nsvc->alive_retries++;
if (nsvc->alive_retries > NS_ALIVE_RETRIES) { if (nsvc->alive_retries > NS_ALIVE_RETRIES) {
@ -197,13 +198,15 @@ static void gprs_ns_alive_cb(void *data)
/* FIXME: inform higher layers */ /* FIXME: inform higher layers */
return; return;
} }
} else { break;
case NSVC_TIMER_TNS_TEST:
/* Tns-test case: send NS-ALIVE PDU */ /* Tns-test case: send NS-ALIVE PDU */
gprs_ns_tx_simple(nsvc, NS_PDUT_ALIVE); gprs_ns_tx_simple(nsvc, NS_PDUT_ALIVE);
/* start Tns-alive timer */ /* start Tns-alive timer */
nsvc->timer_is_tns_alive = 1; nsvc->timer_mode = NSVC_TIMER_TNS_ALIVE;
break;
} }
bsc_schedule_timer(&nsvc->alive_timer, NS_TIMER_ALIVE); bsc_schedule_timer(&nsvc->timer, NS_TIMER_ALIVE);
} }
/* Section 9.2.6 */ /* Section 9.2.6 */
@ -330,9 +333,9 @@ static int gprs_ns_rx_reset(struct gprs_nsvc *nsvc, struct msgb *msg)
/* mark the NS-VC as blocked and alive */ /* mark the NS-VC as blocked and alive */
/* start the test procedure */ /* start the test procedure */
nsvc->alive_timer.cb = gprs_ns_alive_cb; nsvc->timer.cb = gprs_ns_timer_cb;
nsvc->alive_timer.data = nsvc; nsvc->timer.data = nsvc;
bsc_schedule_timer(&nsvc->alive_timer, NS_TIMER_ALIVE); bsc_schedule_timer(&nsvc->timer, NS_TIMER_ALIVE);
return gprs_ns_tx_reset_ack(nsvc); return gprs_ns_tx_reset_ack(nsvc);
} }
@ -370,10 +373,10 @@ int gprs_ns_rcvmsg(struct gprs_ns_inst *nsi, struct msgb *msg,
break; break;
case NS_PDUT_ALIVE_ACK: case NS_PDUT_ALIVE_ACK:
/* stop Tns-alive */ /* stop Tns-alive */
bsc_del_timer(&nsvc->alive_timer); bsc_del_timer(&nsvc->timer);
/* start Tns-test */ /* start Tns-test */
nsvc->timer_is_tns_alive = 0; nsvc->timer_mode = NSVC_TIMER_TNS_TEST;
bsc_schedule_timer(&nsvc->alive_timer, NS_TIMER_TEST); bsc_schedule_timer(&nsvc->timer, NS_TIMER_TEST);
break; break;
case NS_PDUT_UNITDATA: case NS_PDUT_UNITDATA:
/* actual user data */ /* actual user data */