Fixed version issue of chan_lcr

[lcr.git] / remote.cpp

diff --git a/remote.cpp b/remote.cpp
index d181fb8..4917f3b 100644 (file)
--- a/remote.cpp
+++ b/remote.cpp
@@ -80,6 +80,16 @@ int Premote::message_epoint(unsigned int epoint_id, int message_type, union para
                        else
                                SCPY(param->setup.dialinginfo.context, "lcr");
                }
+               memcpy(&p_dialinginfo, &param->setup.dialinginfo, sizeof(p_dialinginfo));
+               memcpy(&p_capainfo, &param->setup.capainfo, sizeof(p_capainfo));
+               memcpy(&p_callerinfo, &param->setup.callerinfo, sizeof(p_callerinfo));
+               memcpy(&p_redirinfo, &param->setup.redirinfo, sizeof(p_redirinfo));
+               /* screen */
+               do_screen(1, p_callerinfo.id, sizeof(p_callerinfo.id), &p_callerinfo.ntype, &p_callerinfo.present, p_interface_name);
+               do_screen(1, p_callerinfo.id2, sizeof(p_callerinfo.id2), &p_callerinfo.ntype2, &p_callerinfo.present2, p_interface_name);
+               do_screen(1, p_redirinfo.id, sizeof(p_redirinfo.id), &p_redirinfo.ntype, &p_redirinfo.present, p_interface_name);
+               memcpy(&param->setup.callerinfo, &p_callerinfo, sizeof(p_callerinfo));
+               memcpy(&param->setup.redirinfo, &p_redirinfo, sizeof(p_redirinfo));
 
                new_state(PORT_STATE_OUT_SETUP);
                break;
@@ -93,6 +103,7 @@ int Premote::message_epoint(unsigned int epoint_id, int message_type, union para
                break;
 
        case MESSAGE_CONNECT:
+               memcpy(&p_connectinfo, &param->connectinfo, sizeof(p_connectinfo));
                new_state(PORT_STATE_CONNECT);
                break;
 
@@ -128,8 +139,22 @@ void Premote::message_remote(int message_type, union parameter *param)
 
        switch (message_type) {
        case MESSAGE_TRAFFIC:
+               /* record audio */
+               if (p_record)
+                       record(param->traffic.data, param->traffic.len, 0); // from down
+               if (p_tap)
+                       tap(param->traffic.data, param->traffic.len, 0); // from down
                bridge_tx(param->traffic.data, param->traffic.len);
-               break;
+               if (p_tone_name[0]) {
+                       read_audio(param->traffic.data, param->traffic.len);
+                       /* record audio */
+                       if (p_record)
+                               record(param->traffic.data, param->traffic.len, 1); // from up
+                       if (p_tap)
+                               tap(param->traffic.data, param->traffic.len, 1); // from up
+                       admin_message_from_lcr(p_r_remote_id, p_r_ref, MESSAGE_TRAFFIC, param);
+               }
+               return;
 
        case MESSAGE_SETUP:
                interface = getinterfacebyname(p_interface_name);
@@ -160,6 +185,11 @@ void Premote::message_remote(int message_type, union parameter *param)
 
                epointlist_new(epoint->ep_serial);
 
+               memcpy(&p_dialinginfo, &param->setup.dialinginfo, sizeof(p_dialinginfo));
+               memcpy(&p_capainfo, &param->setup.capainfo, sizeof(p_capainfo));
+               memcpy(&p_callerinfo, &param->setup.callerinfo, sizeof(p_callerinfo));
+               memcpy(&p_redirinfo, &param->setup.redirinfo, sizeof(p_redirinfo));
+
                new_state(PORT_STATE_IN_SETUP);
                break;
 
@@ -172,6 +202,7 @@ void Premote::message_remote(int message_type, union parameter *param)
                break;
 
        case MESSAGE_CONNECT:
+               memcpy(&p_connectinfo, &param->connectinfo, sizeof(p_connectinfo));
                new_state(PORT_STATE_CONNECT);
                break;
 
@@ -207,6 +238,9 @@ int Premote::bridge_rx(unsigned char *data, int len)
         && p_state != PORT_STATE_CONNECT)
                return 0;
 
+       if (p_tone_name[0])
+               return 0;
+
        memset(&newparam, 0, sizeof(union parameter));
        /* split, if exeeds data size */
        while(len) {
@@ -215,6 +249,11 @@ int Premote::bridge_rx(unsigned char *data, int len)
                len -= l;
                memcpy(newparam.traffic.data, data, l);
                data += l;
+               /* record audio */
+               if (p_record)
+                       record(data, len, 1); // from up
+               if (p_tap)
+                       tap(data, len, 1); // from up
                admin_message_from_lcr(p_r_remote_id, p_r_ref, MESSAGE_TRAFFIC, &newparam);
        }