diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2013-03-31 12:01:25 +0200 |
|---|---|---|
| committer | Ivan Kluchnikov <kluchnikovi@gmail.com> | 2015-05-26 15:55:13 +0300 |
| commit | 8d0f77c8ffe328cd80b6f01e721220cd6867a98d (patch) | |
| tree | e00a6209fd3b77537d35d99fe92cbd49dccd9ead /openbsc/src/libmsc/gsm_04_08.c | |
| parent | 4e3a2670550ef0cabd8e682395ea385967824049 (diff) | |
osmo-nitb support for codec negotiation
The caller's most preferred codec is selected out of the union of codecs,
which both parties support.
Since codec negotiation is done automatically, there is no need to define
codec for TCH/F and TCH/H via VTY anymore.
Conflicts:
openbsc/src/libmsc/gsm_04_08.c
openbsc/src/libmsc/vty_interface_layer3.c
Diffstat (limited to 'openbsc/src/libmsc/gsm_04_08.c')
| -rw-r--r-- | openbsc/src/libmsc/gsm_04_08.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 8cfa2e674..9997a11d1 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -3208,6 +3208,8 @@ int mncc_tx_to_cc(struct gsm_network *net, int msg_type, void *arg) /* If subscriber has no lchan */ if (!conn) { + uint8_t type; + /* find transaction with this subscriber already paging */ llist_for_each_entry(transt, &net->trans_list, entry) { /* Transaction of our lchan? */ @@ -3227,9 +3229,20 @@ int mncc_tx_to_cc(struct gsm_network *net, int msg_type, void *arg) /* store setup informations until paging was successfull */ memcpy(&trans->cc.msg, data, sizeof(struct gsm_mncc)); + switch (data->lchan_type) { + case GSM_LCHAN_TCH_F: + type = RSL_CHANNEED_TCH_F; + break; + case GSM_LCHAN_TCH_H: + type = RSL_CHANNEED_TCH_ForH; + break; + default: + type = RSL_CHANNEED_SDCCH; + } + /* Request a channel */ trans->paging_request = subscr_request_channel(subscr, - RSL_CHANNEED_TCH_F, setup_trig_pag_evt, + type, setup_trig_pag_evt, trans); if (!trans->paging_request) { LOGP(DCC, LOGL_ERROR, "Failed to allocate paging token.\n"); @@ -3237,6 +3250,7 @@ int mncc_tx_to_cc(struct gsm_network *net, int msg_type, void *arg) trans_free(trans); return 0; } + subscr_put(subscr); return 0; } |