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

Since openbsc does not know about the TCH rate it must switch to, it is
essential to given the channel type, so it can select the right traffic
channel. In case of AMR, openbsc must check by itself, which channel type
is available and will be used.

diff --git a/gsm.cpp b/gsm.cpp
index ec33695..e8f7886 100644 (file)
--- a/gsm.cpp
+++ b/gsm.cpp
@@ -434,10 +434,6 @@ int Pgsm::audio_send(unsigned char *data, int len)
        if (p_tap)
                tap(data, len, 1); // from up
 
-       /* encoder init failed */
-       if (!p_g_fr_encoder)
-               return -EINVAL;
-
        /* (currently) not connected, so don't flood tch! */
        if (!p_g_tch_connected)
                return -EINVAL;
@@ -576,16 +572,23 @@ void Pgsm::modify_lchan(int media_type)
        case MEDIA_TYPE_GSM_EFR:
                add_trace("speech", "version", "EFR given");
                mode->lchan_mode = 0x21; /* GSM V2 */
+               mode->lchan_type = 0x02; /* TCH/F */
                break;
        case MEDIA_TYPE_AMR:
                add_trace("speech", "version", "AMR given");
                mode->lchan_mode = 0x41; /* GSM V3 */
+               /* as we don't know the available channels, this type will be set by openbsc automatically */
+               mode->lchan_type = 0x02; /* TCH/F */
                break;
+       case MEDIA_TYPE_GSM_HR:
+               add_trace("speech", "version", "Half Rate given");
+               mode->lchan_mode = 0x01; /* GSM V1 */
+               mode->lchan_type = 0x03; /* TCH/H */
        default:
-               add_trace("speech", "version", "Full/Half Rate given");
+               add_trace("speech", "version", "Full Rate given");
                mode->lchan_mode = 0x01; /* GSM V1 */
+               mode->lchan_type = 0x02; /* TCH/F */
        }
-       mode->lchan_type = 0x02; /* FIXME: unused */
        add_trace("mode", NULL, "0x%02x", mode->lchan_mode);
        end_trace();
        send_and_free_mncc(p_g_lcr_gsm, mode->msg_type, mode);

diff --git a/gsm_bs.cpp b/gsm_bs.cpp
index 97be942..7334242 100644 (file)
--- a/gsm_bs.cpp
+++ b/gsm_bs.cpp
@@ -100,39 +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 select from channel type */
+       /* if no given payload type is supported, we must release */
        if (!payloads) {
-               switch (mncc->lchan_type) {
-               case GSM_LCHAN_TCH_F:
-                       media_types[0] = MEDIA_TYPE_GSM;
-                       payload_types[0] = PAYLOAD_TYPE_GSM;
-                       payloads = 1;
-                       break;
-               case GSM_LCHAN_TCH_H:
-                       media_types[0] = MEDIA_TYPE_GSM_HR;
-                       payload_types[0] = 96; /* dynamic */
-                       payloads = 1;
-                       break;
-               default:
-                       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;
-               }
+               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 */
@@ -342,7 +328,6 @@ void Pgsm_bs::select_payload_type(struct gsm_mncc *mncc, unsigned char *payload_
 {
        int media_type;
        unsigned char payload_type;
-       int half;
        void *encoder, *decoder;
 
        *payloads = 0;
@@ -355,7 +340,6 @@ void Pgsm_bs::select_payload_type(struct gsm_mncc *mncc, unsigned char *payload_
 
                add_trace("bearer", "capa", "given by MS");
                for (i = 0; mncc->bearer_cap.speech_ver[i] >= 0; i++) {
-                       half = 0;
                        /* select payload type we support */
                        switch (mncc->bearer_cap.speech_ver[i]) {
                        case 0:
@@ -385,7 +369,6 @@ void Pgsm_bs::select_payload_type(struct gsm_mncc *mncc, unsigned char *payload_
                                payload_type = dynamic_type++;
                                encoder = p_g_hr_encoder;
                                decoder = p_g_hr_decoder;
-                               half = 1;
                                break;
                        case 5:
                                add_trace("speech", "version", "AMR Half Rate given");
@@ -393,7 +376,6 @@ void Pgsm_bs::select_payload_type(struct gsm_mncc *mncc, unsigned char *payload_
                                payload_type = dynamic_type++;
                                encoder = p_g_amr_encoder;
                                decoder = p_g_amr_decoder;
-                               half = 1;
                                break;
                        default:
                                add_trace("speech", "version", "%d given", mncc->bearer_cap.speech_ver[i]);
@@ -405,14 +387,6 @@ void Pgsm_bs::select_payload_type(struct gsm_mncc *mncc, unsigned char *payload_
                                add_trace("speech", "ignored", "Not supported by LCR");
                                continue;
                        }
-                       if (!half && mncc->lchan_type != GSM_LCHAN_TCH_F) {
-                               add_trace("speech", "ignored", "Not TCH/F");
-                               continue;
-                       }
-                       if (half && mncc->lchan_type != GSM_LCHAN_TCH_H) {
-                               add_trace("speech", "ignored", "Not TCH/H");
-                               continue;
-                       }
                        if (!p_g_rtp_bridge) {
                                if (!encoder || !decoder) {
                                        add_trace("speech", "ignored", "Codec not supported");
@@ -525,39 +499,25 @@ 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 select from channel type */
+       /* if no given payload type is supported, we must release */
        if (!payloads) {
-               switch (mncc->lchan_type) {
-               case GSM_LCHAN_TCH_F:
-                       media_types[0] = MEDIA_TYPE_GSM;
-                       payload_types[0] = PAYLOAD_TYPE_GSM;
-                       payloads = 1;
-                       break;
-               case GSM_LCHAN_TCH_H:
-                       media_types[0] = MEDIA_TYPE_GSM_HR;
-                       payload_types[0] = 96; /* dynamic */
-                       payloads = 1;
-                       break;
-               default:
-                       mncc = create_mncc(MNCC_REJ_REQ, callref);
-                       gsm_trace_header(p_interface_name, this, MNCC_REJ_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;
-               }
+               mncc = create_mncc(MNCC_REJ_REQ, callref);
+               gsm_trace_header(p_interface_name, this, MNCC_REJ_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;
        }
 #if 0
        /* if no given payload type is supported, we reject the call */