Adding negotiation of speech codecs between GSM and SIP when using rtp-bridge

[lcr.git] / gsm_ms.cpp

diff --git a/gsm_ms.cpp b/gsm_ms.cpp
index ae99930..0cbcca1 100644 (file)
--- a/gsm_ms.cpp
+++ b/gsm_ms.cpp
@@ -23,6 +23,8 @@ static int dtmf_timeout(struct lcr_timer *timer, void *instance, int index);
 #define DTMF_ST_STOP           3       /* DTMF stopped, waiting for resp. */
 #define DTMF_ST_SPACE          4       /* wait space between tones */
 
+#define RTP_PT_GSM_FULL                3
+
 /*
  * constructor
  */
@@ -67,14 +69,10 @@ void Pgsm_ms::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_
 {
        class Endpoint *epoint;
        struct lcr_msg *message;
-       struct gsm_mncc *mode, *proceeding, *frame;
-       struct interface *interface = interface_first;
+       struct gsm_mncc *proceeding, *frame;
+       struct interface *interface;
 
-       while (interface) {
-               if (!strcmp(interface->name, p_g_interface_name))
-                       break;
-               interface = interface->next;
-       }
+       interface = getinterfacebyname(p_g_interface_name);
        if (!interface) {
                PERROR("Cannot find interface %s.\n", p_g_interface_name);
                return;
@@ -279,13 +277,7 @@ void Pgsm_ms::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_
        epointlist_new(epoint->ep_serial);
 
        /* modify lchan to GSM codec V1 */
-       gsm_trace_header(p_g_interface_name, this, MNCC_LCHAN_MODIFY, DIRECTION_OUT);
-       mode = create_mncc(MNCC_LCHAN_MODIFY, p_g_callref);
-       mode->lchan_mode = 0x01; /* GSM V1 */
-       mode->lchan_type = 0x02;
-       add_trace("mode", NULL, "0x%02x", mode->lchan_mode);
-       end_trace();
-       send_and_free_mncc(p_g_lcr_gsm, mode->msg_type, mode);
+       modify_lchan(RTP_PT_GSM_FULL);
 
        /* send call proceeding */
        gsm_trace_header(p_g_interface_name, this, MNCC_CALL_CONF_REQ, DIRECTION_OUT);
@@ -325,7 +317,6 @@ void Pgsm_ms::setup_ind(unsigned int msg_type, unsigned int callref, struct gsm_
  */
 int message_ms(struct lcr_gsm *gsm_ms, int msg_type, void *arg)
 {
-       struct interface *interface = gsm_ms->interface;
        struct gsm_mncc *mncc = (struct gsm_mncc *)arg;
        unsigned int callref = mncc->callref;
        class Port *port;
@@ -350,24 +341,21 @@ int message_ms(struct lcr_gsm *gsm_ms, int msg_type, void *arg)
                port = port->next;
        }
 
-       if (msg_type == GSM_TCHF_FRAME) {
+       if (msg_type == GSM_TCHF_FRAME
+        || msg_type == GSM_TCHF_BAD_FRAME) {
                if (port)
                        pgsm_ms->frame_receive(arg);
                return 0;
        }
 
        if (!port) {
+               struct interface *interface;
+
                if (msg_type != MNCC_SETUP_IND)
                        return(0);
-#if 0
-               /* find gsm ms port */
-               mISDNport = mISDNport_first;
-               while(mISDNport) {
-                       if (mISDNport->gsm_ms && !strcmp(mISDNport->ifport->gsm_ms_name, gsm_ms->name))
-                               break;
-                       mISDNport = mISDNport->next;
-               }
-               if (!mISDNport) {
+
+               interface = getinterfacebyname(gsm_ms->interface_name);
+               if (!interface) {
                        struct gsm_mncc *rej;
 
                        rej = create_mncc(MNCC_REJ_REQ, callref);
@@ -379,11 +367,11 @@ int message_ms(struct lcr_gsm *gsm_ms, int msg_type, void *arg)
                        add_trace("cause", "coding", "%d", rej->cause.coding);
                        add_trace("cause", "location", "%d", rej->cause.location);
                        add_trace("cause", "value", "%d", rej->cause.value);
+                       add_trace("reason", NULL, "interface %s not found", gsm_ms->interface_name);
                        end_trace();
                        send_and_free_mncc(gsm_ms, rej->msg_type, rej);
                        return 0;
                }
-#endif
                /* creating port object, transparent until setup with hdlc */
                SPRINT(name, "%s-%d-in", interface->name, 0);
                if (!(pgsm_ms = new Pgsm_ms(PORT_TYPE_GSM_MS_IN, name, NULL, interface)))
@@ -730,7 +718,7 @@ int gsm_ms_new(struct interface *interface)
        /* create gsm instance */
        gsm_ms = (struct lcr_gsm *)MALLOC(sizeof(struct lcr_gsm));
 
-       gsm_ms->interface = interface;
+       SCPY(gsm_ms->interface_name, interface->name);
        gsm_ms->type = LCR_GSM_TYPE_MS;
        SCPY(gsm_ms->name, interface->gsm_ms_name);
        gsm_ms->sun.sun_family = AF_UNIX;