diff options
| author | Harald Welte <laforge@gnumonks.org> | 2010-05-15 23:02:24 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2010-05-15 23:02:24 +0200 |
| commit | 90af194a9d823b4b74e4025866da92f92e98cdff (patch) | |
| tree | 4eef912d46beb5185b551d471b74b5addfed5037 | |
| parent | 43f3b69c4329b29bfca2d21c825bda0e54528b02 (diff) | |
[GPRS] NS: Always start NS-ALIVE procedure after RESET
So far, we only started the ALIVE procedure on RESET-ACK if the
remote end was the SGSN. This resulted in the BSS->Proxy connections
only being tested for alive-status from the BSS side, but not from
our side.
Also: export nsvc_by_nsvci() function as a public API function.
| -rw-r--r-- | openbsc/include/openbsc/gprs_ns.h | 1 | ||||
| -rw-r--r-- | openbsc/src/gprs/gprs_ns.c | 15 |
2 files changed, 7 insertions, 9 deletions
diff --git a/openbsc/include/openbsc/gprs_ns.h b/openbsc/include/openbsc/gprs_ns.h index 24a79745..08519f24 100644 --- a/openbsc/include/openbsc/gprs_ns.h +++ b/openbsc/include/openbsc/gprs_ns.h @@ -208,6 +208,7 @@ struct gprs_nsvc *nsip_connect(struct gprs_ns_inst *nsi, struct gprs_nsvc *nsvc_create(struct gprs_ns_inst *nsi, uint16_t nsvci); void nsvc_delete(struct gprs_nsvc *nsvc); struct gprs_nsvc *nsvc_by_nsei(struct gprs_ns_inst *nsi, uint16_t nsei); +struct gprs_nsvc *nsvc_by_nsvci(struct gprs_ns_inst *nsi, uint16_t nsvci); /* Initiate a RESET procedure (including timer start, ...)*/ int gprs_nsvc_reset(struct gprs_nsvc *nsvc, uint8_t cause); diff --git a/openbsc/src/gprs/gprs_ns.c b/openbsc/src/gprs/gprs_ns.c index 6a6cfe15..2315f232 100644 --- a/openbsc/src/gprs/gprs_ns.c +++ b/openbsc/src/gprs/gprs_ns.c @@ -108,8 +108,7 @@ static const struct rate_ctr_group_desc nsvc_ctrg_desc = { }; /* Lookup struct gprs_nsvc based on NSVCI */ -static struct gprs_nsvc *nsvc_by_nsvci(struct gprs_ns_inst *nsi, - uint16_t nsvci) +struct gprs_nsvc *nsvc_by_nsvci(struct gprs_ns_inst *nsi, uint16_t nsvci) { struct gprs_nsvc *nsvc; llist_for_each_entry(nsvc, &nsi->gprs_nsvcs, list) { @@ -280,7 +279,7 @@ int gprs_ns_tx_status(struct gprs_nsvc *nsvc, uint8_t cause, if (!msg) return -ENOMEM; - LOGP(DNS, LOGL_INFO, "NSEI=%u Tx NS STATUS (NSVCI=%u, cause=%s)\n", + LOGP(DNS, LOGL_NOTICE, "NSEI=%u Tx NS STATUS (NSVCI=%u, cause=%s)\n", nsvc->nsei, nsvc->nsvci, gprs_ns_cause_str(cause)); msg->l2h = msgb_put(msg, sizeof(*nsh)); @@ -694,9 +693,7 @@ int gprs_ns_rcvmsg(struct gprs_ns_inst *nsi, struct msgb *msg, rc = gprs_ns_tx_alive_ack(nsvc); break; case NS_PDUT_ALIVE_ACK: - /* stop Tns-alive */ - bsc_del_timer(&nsvc->timer); - /* start Tns-test */ + /* stop Tns-alive and start Tns-test */ nsvc_start_timer(nsvc, NSVC_TIMER_TNS_TEST); if (nsvc->remote_end_is_sgsn) { /* FIXME: this should be one level higher */ @@ -723,10 +720,10 @@ int gprs_ns_rcvmsg(struct gprs_ns_inst *nsi, struct msgb *msg, if (nsvc->persistent || nsvc->remote_end_is_sgsn) { /* stop RESET timer */ bsc_del_timer(&nsvc->timer); - /* Initiate TEST proc.: Send ALIVE and start timer */ - rc = gprs_ns_tx_simple(nsvc, NS_PDUT_ALIVE); - nsvc_start_timer(nsvc, NSVC_TIMER_TNS_ALIVE); } + /* Initiate TEST proc.: Send ALIVE and start timer */ + rc = gprs_ns_tx_simple(nsvc, NS_PDUT_ALIVE); + nsvc_start_timer(nsvc, NSVC_TIMER_TNS_ALIVE); break; case NS_PDUT_UNBLOCK: /* Section 7.2: unblocking procedure */ |