diff options
author | Harald Welte <laforge@gnumonks.org> | 2011-08-19 16:44:00 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2011-08-19 16:44:00 +0200 |
commit | 7fad70c19806701decd1c958ab8001bf07c5f16d (patch) | |
tree | 01da8827caa0ba518009149070e705ab91e9637f /openbsc/src/libmsc/gsm_04_08.c | |
parent | 901d57db07d21f8e7d7f4b11421f63c44c2b2600 (diff) | |
parent | 013ae46ef67ee560aeaa38e39936a1ae7e35232f (diff) |
Merge branch 'master' of git.osmocom.org:openbsc
Diffstat (limited to 'openbsc/src/libmsc/gsm_04_08.c')
-rw-r--r-- | openbsc/src/libmsc/gsm_04_08.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index a6ed3e83e..bd452ed99 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -1602,7 +1602,7 @@ static int tch_map(struct gsm_lchan *lchan, struct gsm_lchan *remote_lchan) remote_bts->nr, remote_lchan->ts->trx->nr, remote_lchan->ts->nr); if (bts->type != remote_bts->type) { - DEBUGP(DCC, "Cannot switch calls between different BTS types yet\n"); + LOGP(DCC, LOGL_ERROR, "Cannot switch calls between different BTS types yet\n"); return -EINVAL; } @@ -1634,10 +1634,11 @@ static int tch_map(struct gsm_lchan *lchan, struct gsm_lchan *remote_lchan) break; case GSM_BTS_TYPE_BS11: case GSM_BTS_TYPE_RBS2000: + case GSM_BTS_TYPE_NOKIA_SITE: trau_mux_map_lchan(lchan, remote_lchan); break; default: - DEBUGP(DCC, "Unknown BTS type %u\n", bts->type); + LOGP(DCC, LOGL_ERROR, "Unknown BTS type %u\n", bts->type); return -EINVAL; } @@ -1680,7 +1681,7 @@ static int tch_recv_mncc(struct gsm_network *net, uint32_t callref, int enable) switch (bts->type) { case GSM_BTS_TYPE_NANOBTS: if (ipacc_rtp_direct) { - DEBUGP(DCC, "Error: RTP proxy is disabled\n"); + LOGP(DCC, LOGL_ERROR, "Error: RTP proxy is disabled\n"); return -EINVAL; } /* in case, we don't have a RTP socket yet, we note this @@ -1704,12 +1705,13 @@ static int tch_recv_mncc(struct gsm_network *net, uint32_t callref, int enable) break; case GSM_BTS_TYPE_BS11: case GSM_BTS_TYPE_RBS2000: + case GSM_BTS_TYPE_NOKIA_SITE: if (enable) return trau_recv_lchan(lchan, callref); return trau_mux_unmap(NULL, callref); break; default: - DEBUGP(DCC, "Unknown BTS type %u\n", bts->type); + LOGP(DCC, LOGL_ERROR, "Unknown BTS type %u\n", bts->type); return -EINVAL; } @@ -2989,9 +2991,10 @@ int mncc_tx_to_cc(struct gsm_network *net, int msg_type, void *arg) return rtp_send_frame(trans->conn->lchan->abis_ip.rtp_socket, arg); case GSM_BTS_TYPE_BS11: case GSM_BTS_TYPE_RBS2000: + case GSM_BTS_TYPE_NOKIA_SITE: return trau_send_frame(trans->conn->lchan, arg); default: - DEBUGP(DCC, "Unknown BTS type %u\n", bts->type); + LOGP(DCC, LOGL_ERROR, "Unknown BTS type %u\n", bts->type); } return -EINVAL; } |