Send channel type with the channel mode to indicate what rate was selected

[lcr.git] / gsm_bs.cpp

diff --git a/gsm_bs.cpp b/gsm_bs.cpp
index 4855a5c..7334242 100644 (file)
--- a/gsm_bs.cpp
+++ b/gsm_bs.cpp
@@ -100,14 +100,25 @@ void Pgsm_bs::call_conf_ind(unsigned int msg_type, unsigned int callref, struct
 
        new_state(PORT_STATE_OUT_PROCEEDING);
 
-       /* get list of offered payload types
-        * if list ist empty, the FR V1 is selected */
+       /* get list of offered payload types */
        select_payload_type(mncc, payload_types, media_types, &payloads, sizeof(payload_types));
-       /* if no given payload type is supported, we assume  */
+       /* if no given payload type is supported, we must release */
        if (!payloads) {
-               media_types[0] = MEDIA_TYPE_GSM;
-               payload_types[0] = PAYLOAD_TYPE_GSM;
-               payloads = 1;
+               mncc = create_mncc(MNCC_REL_REQ, callref);
+               gsm_trace_header(p_interface_name, this, MNCC_REL_REQ, DIRECTION_OUT);
+               mncc->fields |= MNCC_F_CAUSE;
+               mncc->cause.coding = 3;
+               mncc->cause.location = 1;
+               mncc->cause.value = 65;
+               add_trace("cause", "coding", "%d", mncc->cause.coding);
+               add_trace("cause", "location", "%d", mncc->cause.location);
+               add_trace("cause", "value", "%d", mncc->cause.value);
+               add_trace("reason", NULL, "Given lchan not supported");
+               end_trace();
+               send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc);
+               new_state(PORT_STATE_RELEASE);
+               trigger_work(&p_g_delete);
+               return;
        }
 
        /* select first payload type that matches the rtp list */
@@ -317,6 +328,7 @@ void Pgsm_bs::select_payload_type(struct gsm_mncc *mncc, unsigned char *payload_
 {
        int media_type;
        unsigned char payload_type;
+       void *encoder, *decoder;
 
        *payloads = 0;
 
@@ -334,26 +346,36 @@ void Pgsm_bs::select_payload_type(struct gsm_mncc *mncc, unsigned char *payload_
                                add_trace("speech", "version", "Full Rate given");
                                media_type = MEDIA_TYPE_GSM;
                                payload_type = PAYLOAD_TYPE_GSM;
+                               encoder = p_g_fr_encoder;
+                               decoder = p_g_fr_decoder;
                                break;
                        case 2:
                                add_trace("speech", "version", "EFR given");
                                media_type = MEDIA_TYPE_GSM_EFR;
                                payload_type = dynamic_type++;
+                               encoder = p_g_amr_encoder;
+                               decoder = p_g_amr_decoder;
                                break;
                        case 4:
                                add_trace("speech", "version", "AMR given");
                                media_type = MEDIA_TYPE_AMR;
                                payload_type = dynamic_type++;
+                               encoder = p_g_amr_encoder;
+                               decoder = p_g_amr_decoder;
                                break;
                        case 1:
                                add_trace("speech", "version", "Half Rate given");
                                media_type = MEDIA_TYPE_GSM_HR;
                                payload_type = dynamic_type++;
+                               encoder = p_g_hr_encoder;
+                               decoder = p_g_hr_decoder;
                                break;
                        case 5:
                                add_trace("speech", "version", "AMR Half Rate given");
                                media_type = MEDIA_TYPE_AMR;
                                payload_type = dynamic_type++;
+                               encoder = p_g_amr_encoder;
+                               decoder = p_g_amr_decoder;
                                break;
                        default:
                                add_trace("speech", "version", "%d given", mncc->bearer_cap.speech_ver[i]);
@@ -366,8 +388,8 @@ void Pgsm_bs::select_payload_type(struct gsm_mncc *mncc, unsigned char *payload_
                                continue;
                        }
                        if (!p_g_rtp_bridge) {
-                               if (media_type != MEDIA_TYPE_GSM) {
-                                       add_trace("speech", "ignored", "Not suitable for LCR");
+                               if (!encoder || !decoder) {
+                                       add_trace("speech", "ignored", "Codec not supported");
                                        continue;
                                }
                        }
@@ -477,17 +499,9 @@ void Pgsm_bs::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_
        p_capainfo.source_mode = B_MODE_TRANSPARENT;
        p_g_mode = p_capainfo.source_mode;
 
-       /* get list of offered payload types
-        * if list ist empty, the FR V1 is selected */
+       /* get list of offered payload types */
        select_payload_type(mncc, payload_types, media_types, &payloads, sizeof(payload_types));
-       /* if no given payload type is supported, we assume  */
-       if (!payloads) {
-               media_types[0] = MEDIA_TYPE_GSM;
-               payload_types[0] = PAYLOAD_TYPE_GSM;
-               payloads = 1;
-       }
-#if 0
-       /* if no given payload type is supported, we reject the call */
+       /* if no given payload type is supported, we must release */
        if (!payloads) {
                mncc = create_mncc(MNCC_REJ_REQ, callref);
                gsm_trace_header(p_interface_name, this, MNCC_REJ_REQ, DIRECTION_OUT);
@@ -498,13 +512,17 @@ void Pgsm_bs::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_
                add_trace("cause", "coding", "%d", mncc->cause.coding);
                add_trace("cause", "location", "%d", mncc->cause.location);
                add_trace("cause", "value", "%d", mncc->cause.value);
-               add_trace("reason", NULL, "Given speech codec(s) not supported");
+               add_trace("reason", NULL, "Given lchan not supported");
                end_trace();
                send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc);
                new_state(PORT_STATE_RELEASE);
                trigger_work(&p_g_delete);
                return;
        }
+#if 0
+       /* if no given payload type is supported, we reject the call */
+       if (!payloads) {
+       }
 #endif
 
        /* useruser */
@@ -616,6 +634,9 @@ int message_bsc(struct lcr_gsm *lcr_gsm, int msg_type, void *arg)
        }
 
        if (msg_type == GSM_TCHF_FRAME
+        || msg_type == GSM_TCHF_FRAME_EFR
+        || msg_type == GSM_TCHH_FRAME
+        || msg_type == GSM_TCH_FRAME_AMR
         || msg_type == GSM_BAD_FRAME) {
                if (port) {
                        /* inject DTMF, if enabled */
@@ -746,6 +767,13 @@ void Pgsm_bs::message_setup(unsigned int epoint_id, int message_id, union parame
        struct lcr_msg *message;
        struct epoint_list *epointlist;
        struct gsm_mncc *mncc;
+       struct interface *interface;
+
+       interface = getinterfacebyname(p_interface_name);
+       if (!interface) {
+               PERROR("Cannot find interface %s.\n", p_interface_name);
+               return;
+       }
 
        /* copy setup infos to port */
        memcpy(&p_callerinfo, &param->setup.callerinfo, sizeof(p_callerinfo));
@@ -949,6 +977,14 @@ void Pgsm_bs::message_setup(unsigned int epoint_id, int message_id, union parame
                add_trace("redir", "number", "%s", mncc->redirecting.number);
        }
 
+       if (interface->gsm_bs_hr) {
+               add_trace("lchan", "type", "TCH/H or TCH/F");
+               mncc->lchan_type = GSM_LCHAN_TCH_H;
+       } else {
+               add_trace("lchan", "type", "TCH/F");
+               mncc->lchan_type = GSM_LCHAN_TCH_F;
+       }
+
        end_trace();
        send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc);