diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-06-16 13:23:55 +0800 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-06-16 15:42:38 +0800 |
| commit | b2be195b501d8327a493f93bc9fba41f8a699ba4 (patch) | |
| tree | fb27e7bf7c080946cfbc38b3beea7e90c50e2fcb /openbsc/src/gsm_04_08.c | |
| parent | ea01ca764fcf0912ac2ccd1a8818640518911a51 (diff) | |
bsc_api: Rename lchan_for_subscr to connection_for_subscr and update code
With handover and late/early assignment there might be two channels
for one subscriber and only the BSC knows which one to use, so use
the gsm_subscriber_connection everywhere...
Diffstat (limited to 'openbsc/src/gsm_04_08.c')
| -rw-r--r-- | openbsc/src/gsm_04_08.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/openbsc/src/gsm_04_08.c b/openbsc/src/gsm_04_08.c index b9249f295..0de10cc76 100644 --- a/openbsc/src/gsm_04_08.c +++ b/openbsc/src/gsm_04_08.c @@ -2798,7 +2798,7 @@ int mncc_send(struct gsm_network *net, int msg_type, void *arg) { int i, rc = 0; struct gsm_trans *trans = NULL, *transt; - struct gsm_lchan *lchan = NULL; + struct gsm_subscriber_connection *conn = NULL; struct gsm_bts *bts = NULL; struct gsm_mncc *data = arg, rel; @@ -2903,10 +2903,10 @@ int mncc_send(struct gsm_network *net, int msg_type, void *arg) return -ENOMEM; } /* Find lchan */ - lchan = lchan_for_subscr(subscr); + conn = connection_for_subscr(subscr); /* If subscriber has no lchan */ - if (!lchan) { + if (!conn) { /* find transaction with this subscriber already paging */ llist_for_each_entry(transt, &net->trans_list, entry) { /* Transaction of our lchan? */ @@ -2932,16 +2932,16 @@ int mncc_send(struct gsm_network *net, int msg_type, void *arg) return 0; } /* Assign lchan */ - trans->conn = &lchan->conn; + trans->conn = conn; use_subscr_con(trans->conn); subscr_put(subscr); } if (trans->conn) - lchan = trans->conn->lchan; + conn = trans->conn; /* if paging did not respond yet */ - if (!lchan) { + if (!conn) { DEBUGP(DCC, "(bts - trx - ts - ti -- sub %s) " "Received '%s' from MNCC in paging state\n", (trans->subscr)?(trans->subscr->extension):"-", @@ -2959,7 +2959,7 @@ int mncc_send(struct gsm_network *net, int msg_type, void *arg) DEBUGP(DCC, "(bts %d trx %d ts %d ti %02x sub %s) " "Received '%s' from MNCC in state %d (%s)\n", - lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr, + conn->bts->nr, conn->lchan->ts->trx->nr, conn->lchan->ts->nr, trans->transaction_id, (trans->conn->subscr)?(trans->conn->subscr->extension):"-", get_mncc_name(msg_type), trans->cc.state, |