projects / lcr.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Cleanup: Make interface name be part of Port class
[lcr.git] / gsm.cpp
diff --git a/gsm.cpp b/gsm.cpp
index a4a220e..eeb91e8 100644 (file)
--- a/gsm.cpp
+++ b/gsm.cpp
@@ -20,7 +20,6 @@ extern "C" {
 #include "gsm_audio.h"
 }
 
-#include <mISDN/mISDNcompat.h>
 #include <assert.h>
 
 #define SOCKET_RETRY_TIMER     5
@@ -140,10 +139,10 @@ void Pgsm::send_mncc_rtp_connect(void)
                nrtp->payload_msg_type = GSM_TCHF_FRAME_EFR;
                break;
        case MEDIA_TYPE_AMR:
-               nrtp->payload_msg_type = GSM_TCHF_FRAME_AMR;
+               nrtp->payload_msg_type = GSM_TCH_FRAME_AMR;
                break;
        case MEDIA_TYPE_GSM_HR:
-               nrtp->payload_msg_type = GSM_TCHF_FRAME_HR;
+               nrtp->payload_msg_type = GSM_TCHH_FRAME;
                break;
        }
        nrtp->payload_type = p_g_payload_type;
@@ -156,7 +155,7 @@ static int delete_event(struct lcr_work *work, void *instance, int index);
 /*
  * constructor
  */
-Pgsm::Pgsm(int type, char *portname, struct port_settings *settings, struct interface *interface) : Port(type, portname, settings)
+Pgsm::Pgsm(int type, char *portname, struct port_settings *settings, struct interface *interface) : Port(type, portname, settings, interface)
 {
        p_g_tones = 0;
        if (interface->is_tones == IS_YES)
@@ -169,7 +168,6 @@ Pgsm::Pgsm(int type, char *portname, struct port_settings *settings, struct inte
                p_g_rtp_bridge = 1;
        p_g_rtp_payloads = 0;
        memset(&p_g_samples, 0, sizeof(p_g_samples));
-       SCPY(p_g_interface_name, interface->name); 
        p_callerinfo.itype = (interface->extension)?INFO_ITYPE_ISDN_EXTENSION:INFO_ITYPE_ISDN;
        memset(&p_g_delete, 0, sizeof(p_g_delete));
        add_work(&p_g_delete, delete_event, this, 0);
@@ -230,7 +228,7 @@ void Pgsm::frame_receive(void *arg)
        if (!p_g_decoder)
                return;
 
-       if (frame->msg_type != GSM_TCHF_BAD_FRAME) {
+       if (frame->msg_type != GSM_BAD_FRAME) {
                if ((frame->data[0]>>4) != 0xd)
                        PERROR("received GSM frame with wrong magig 0x%x\n", frame->data[0]>>4);
        
@@ -365,7 +363,7 @@ void Pgsm::modify_lchan(int media_type)
                return;
 
        p_g_media_type = media_type;
-       gsm_trace_header(p_g_interface_name, this, MNCC_LCHAN_MODIFY, DIRECTION_OUT);
+       gsm_trace_header(p_interface_name, this, MNCC_LCHAN_MODIFY, DIRECTION_OUT);
        mode = create_mncc(MNCC_LCHAN_MODIFY, p_g_callref);
        switch (media_type) {
        case MEDIA_TYPE_GSM_EFR:
@@ -376,12 +374,8 @@ void Pgsm::modify_lchan(int media_type)
                add_trace("speech", "version", "AMR given");
                mode->lchan_mode = 0x41; /* GSM V3 */
                break;
-       case MEDIA_TYPE_GSM_HR:
-               add_trace("speech", "version", "Half Rate given");
-               mode->lchan_mode = 0x05; /* GSM V1 HR */
-               break;
        default:
-               add_trace("speech", "version", "Full Rate given");
+               add_trace("speech", "version", "Full/Half Rate given");
                mode->lchan_mode = 0x01; /* GSM V1 */
        }
        mode->lchan_type = 0x02; /* FIXME: unused */
@@ -396,7 +390,7 @@ void Pgsm::call_proc_ind(unsigned int msg_type, unsigned int callref, struct gsm
        struct lcr_msg *message;
        struct gsm_mncc *frame;
 
-       gsm_trace_header(p_g_interface_name, this, msg_type, DIRECTION_IN);
+       gsm_trace_header(p_interface_name, this, msg_type, DIRECTION_IN);
        end_trace();
 
        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROCEEDING);
@@ -405,7 +399,7 @@ void Pgsm::call_proc_ind(unsigned int msg_type, unsigned int callref, struct gsm
        new_state(PORT_STATE_OUT_PROCEEDING);
 
        if (p_g_earlyb && !p_g_tch_connected) { /* only if ... */
-               gsm_trace_header(p_g_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
+               gsm_trace_header(p_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
                end_trace();
                frame = create_mncc(MNCC_FRAME_RECV, p_g_callref);
                send_and_free_mncc(p_g_lcr_gsm, frame->msg_type, frame);
@@ -419,7 +413,7 @@ void Pgsm::alert_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
        struct lcr_msg *message;
        struct gsm_mncc *frame;
 
-       gsm_trace_header(p_g_interface_name, this, msg_type, DIRECTION_IN);
+       gsm_trace_header(p_interface_name, this, msg_type, DIRECTION_IN);
        end_trace();
 
        message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_ALERTING);
@@ -428,7 +422,7 @@ void Pgsm::alert_ind(unsigned int msg_type, unsigned int callref, struct gsm_mnc
        new_state(PORT_STATE_OUT_ALERTING);
 
        if (p_g_earlyb && !p_g_tch_connected) { /* only if ... */
-               gsm_trace_header(p_g_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
+               gsm_trace_header(p_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
                end_trace();
                frame = create_mncc(MNCC_FRAME_RECV, p_g_callref);
                send_and_free_mncc(p_g_lcr_gsm, frame->msg_type, frame);
@@ -447,9 +441,9 @@ void Pgsm::setup_cnf(unsigned int msg_type, unsigned int callref, struct gsm_mnc
        p_connectinfo.present = INFO_PRESENT_ALLOWED;
        p_connectinfo.screen = INFO_SCREEN_NETWORK;
        p_connectinfo.ntype = INFO_NTYPE_UNKNOWN;
-       SCPY(p_connectinfo.interface, p_g_interface_name);
+       SCPY(p_connectinfo.interface, p_interface_name);
 
-       gsm_trace_header(p_g_interface_name, this, msg_type, DIRECTION_IN);
+       gsm_trace_header(p_interface_name, this, msg_type, DIRECTION_IN);
        if (p_connectinfo.id[0])
                add_trace("connect", "number", "%s", p_connectinfo.id);
        else if (mncc->imsi[0])
@@ -459,7 +453,7 @@ void Pgsm::setup_cnf(unsigned int msg_type, unsigned int callref, struct gsm_mnc
        end_trace();
 
        /* send resp */
-       gsm_trace_header(p_g_interface_name, this, MNCC_SETUP_COMPL_REQ, DIRECTION_OUT);
+       gsm_trace_header(p_interface_name, this, MNCC_SETUP_COMPL_REQ, DIRECTION_OUT);
        resp = create_mncc(MNCC_SETUP_COMPL_REQ, p_g_callref);
        end_trace();
        send_and_free_mncc(p_g_lcr_gsm, resp->msg_type, resp);
@@ -467,7 +461,7 @@ void Pgsm::setup_cnf(unsigned int msg_type, unsigned int callref, struct gsm_mnc
        new_state(PORT_STATE_CONNECT);
 
        if (!p_g_tch_connected) { /* only if ... */
-               gsm_trace_header(p_g_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
+               gsm_trace_header(p_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
                end_trace();
                frame = create_mncc(MNCC_FRAME_RECV, p_g_callref);
                send_and_free_mncc(p_g_lcr_gsm, frame->msg_type, frame);
@@ -507,13 +501,13 @@ void Pgsm::setup_compl_ind(unsigned int msg_type, unsigned int callref, struct g
 {
        struct gsm_mncc *frame;
 
-       gsm_trace_header(p_g_interface_name, this, msg_type, DIRECTION_IN);
+       gsm_trace_header(p_interface_name, this, msg_type, DIRECTION_IN);
        end_trace();
 
        new_state(PORT_STATE_CONNECT);
 
        if (!p_g_tch_connected) { /* only if ... */
-               gsm_trace_header(p_g_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
+               gsm_trace_header(p_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
                end_trace();
                frame = create_mncc(MNCC_FRAME_RECV, p_g_callref);
                send_and_free_mncc(p_g_lcr_gsm, frame->msg_type, frame);
@@ -528,7 +522,7 @@ void Pgsm::disc_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc
        int cause = 16, location = 0;
        struct gsm_mncc *resp;
 
-       gsm_trace_header(p_g_interface_name, this, msg_type, DIRECTION_IN);
+       gsm_trace_header(p_interface_name, this, msg_type, DIRECTION_IN);
        if (mncc->fields & MNCC_F_CAUSE) {
                location = mncc->cause.location;
                cause = mncc->cause.value;
@@ -540,7 +534,7 @@ void Pgsm::disc_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc
 
        /* send release */
        resp = create_mncc(MNCC_REL_REQ, p_g_callref);
-       gsm_trace_header(p_g_interface_name, this, MNCC_REL_REQ, DIRECTION_OUT);
+       gsm_trace_header(p_interface_name, this, MNCC_REL_REQ, DIRECTION_OUT);
 #if 0
        resp->fields |= MNCC_F_CAUSE;
        resp->cause.coding = 3;
@@ -572,7 +566,7 @@ void Pgsm::rel_ind(unsigned int msg_type, unsigned int callref, struct gsm_mncc
        int location = 0, cause = 16;
        struct lcr_msg *message;
 
-       gsm_trace_header(p_g_interface_name, this, msg_type, DIRECTION_IN);
+       gsm_trace_header(p_interface_name, this, msg_type, DIRECTION_IN);
        if (mncc->fields & MNCC_F_CAUSE) {
                location = mncc->cause.location;
                cause = mncc->cause.value;
@@ -600,7 +594,7 @@ void Pgsm::notify_ind(unsigned int msg_type, unsigned int callref, struct gsm_mn
 {
        struct lcr_msg *message;
 
-       gsm_trace_header(p_g_interface_name, this, msg_type, DIRECTION_IN);
+       gsm_trace_header(p_interface_name, this, msg_type, DIRECTION_IN);
        add_trace("notify", NULL, "%d", mncc->notify);
        end_trace();
 
@@ -626,7 +620,7 @@ void Pgsm::message_notify(unsigned int epoint_id, int message_id, union paramete
                        memcpy(&p_g_notify_pending->param, param, sizeof(union parameter));
                } else {
                        /* sending notification */
-                       gsm_trace_header(p_g_interface_name, this, MNCC_NOTIFY_REQ, DIRECTION_OUT);
+                       gsm_trace_header(p_interface_name, this, MNCC_NOTIFY_REQ, DIRECTION_OUT);
                        add_trace("notify", NULL, "%d", notify);
                        end_trace();
                        mncc = create_mncc(MNCC_NOTIFY_REQ, p_g_callref);
@@ -703,7 +697,7 @@ void Pgsm::message_alerting(unsigned int epoint_id, int message_id, union parame
        struct gsm_mncc *mncc;
 
        /* send alert */
-       gsm_trace_header(p_g_interface_name, this, MNCC_ALERT_REQ, DIRECTION_OUT);
+       gsm_trace_header(p_interface_name, this, MNCC_ALERT_REQ, DIRECTION_OUT);
        mncc = create_mncc(MNCC_ALERT_REQ, p_g_callref);
        if (p_g_tones) {
                mncc->fields |= MNCC_F_PROGRESS;
@@ -720,7 +714,7 @@ void Pgsm::message_alerting(unsigned int epoint_id, int message_id, union parame
        new_state(PORT_STATE_IN_ALERTING);
 
        if (p_g_tones && !p_g_tch_connected) { /* only if ... */
-               gsm_trace_header(p_g_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
+               gsm_trace_header(p_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
                end_trace();
                mncc = create_mncc(MNCC_FRAME_RECV, p_g_callref);
                send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc);
@@ -736,11 +730,11 @@ void Pgsm::message_connect(unsigned int epoint_id, int message_id, union paramet
        /* copy connected information */
        memcpy(&p_connectinfo, &param->connectinfo, sizeof(p_connectinfo));
        /* screen outgoing caller id */
-       do_screen(1, p_connectinfo.id, sizeof(p_connectinfo.id), &p_connectinfo.ntype, &p_connectinfo.present, p_g_interface_name);
+       do_screen(1, p_connectinfo.id, sizeof(p_connectinfo.id), &p_connectinfo.ntype, &p_connectinfo.present, p_interface_name);
 
        /* send connect */
        mncc = create_mncc(MNCC_SETUP_RSP, p_g_callref);
-       gsm_trace_header(p_g_interface_name, this, MNCC_SETUP_RSP, DIRECTION_OUT);
+       gsm_trace_header(p_interface_name, this, MNCC_SETUP_RSP, DIRECTION_OUT);
        /* caller information */
        mncc->fields |= MNCC_F_CONNECTED;
        mncc->connected.plan = 1;
@@ -815,7 +809,7 @@ void Pgsm::message_disconnect(unsigned int epoint_id, int message_id, union para
 
        /* send disconnect */
        mncc = create_mncc(MNCC_DISC_REQ, p_g_callref);
-       gsm_trace_header(p_g_interface_name, this, MNCC_DISC_REQ, DIRECTION_OUT);
+       gsm_trace_header(p_interface_name, this, MNCC_DISC_REQ, DIRECTION_OUT);
        if (p_g_tones) {
                mncc->fields |= MNCC_F_PROGRESS;
                mncc->progress.coding = 3; /* GSM */
@@ -838,7 +832,7 @@ void Pgsm::message_disconnect(unsigned int epoint_id, int message_id, union para
        new_state(PORT_STATE_OUT_DISCONNECT);
 
        if (p_g_tones && !p_g_tch_connected) { /* only if ... */
-               gsm_trace_header(p_g_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
+               gsm_trace_header(p_interface_name, this, MNCC_FRAME_RECV, DIRECTION_OUT);
                end_trace();
                mncc = create_mncc(MNCC_FRAME_RECV, p_g_callref);
                send_and_free_mncc(p_g_lcr_gsm, mncc->msg_type, mncc);
@@ -854,7 +848,7 @@ void Pgsm::message_release(unsigned int epoint_id, int message_id, union paramet
 
        /* send release */
        mncc = create_mncc(MNCC_REL_REQ, p_g_callref);
-       gsm_trace_header(p_g_interface_name, this, MNCC_REL_REQ, DIRECTION_OUT);
+       gsm_trace_header(p_interface_name, this, MNCC_REL_REQ, DIRECTION_OUT);
        mncc->fields |= MNCC_F_CAUSE;
        mncc->cause.coding = 3;
        mncc->cause.location = param->disconnectinfo.location;
Linux-Call-Router