Data-Over-Voice

[lcr.git] / sip.cpp

diff --git a/sip.cpp b/sip.cpp
index 4e33421..6dbb4b3 100644 (file)
--- a/sip.cpp
+++ b/sip.cpp
@@ -280,6 +280,8 @@ we only support alaw and ulaw!
        }
        while(n--)
                *to++ = flip[*from++];
+       if (psip->p_dov_rx)
+               psip->dov_rx(payload, payload_len);
        psip->bridge_tx(payload, payload_len);
 
        return 0;
@@ -597,10 +599,18 @@ we only support alaw and ulaw!
 /* receive from remote */
 int Psip::bridge_rx(unsigned char *data, int len)
 {
+       int ret;
+
        /* don't bridge, if tones are provided */
-       if (p_tone_name[0])
+       if (p_tone_name[0] || p_dov_tx)
                return -EBUSY;
 
+       if (p_dov_tx)
+               return -EBUSY;
+
+       if ((ret = Port::bridge_rx(data, len)))
+               return ret;
+
        /* write to rx buffer */
        while(len--) {
                p_s_rxdata[p_s_rxpos++] = flip[*data++];
@@ -2040,7 +2050,7 @@ void Psip::update_load(void)
                return;
 
        /* don't start timer if ... */
-       if (!p_tone_name[0])
+       if (!p_tone_name[0] && !p_dov_tx)
                return;
 
        p_s_next_tv_sec = 0;
@@ -2052,7 +2062,7 @@ static int load_timer(struct lcr_timer *timer, void *instance, int index)
        class Psip *psip = (class Psip *)instance;
 
        /* stop timer if ... */
-       if (!psip->p_tone_name[0])
+       if (!psip->p_tone_name[0] && !psip->p_dov_tx)
                return 0;
 
        psip->load_tx();
@@ -2106,6 +2116,9 @@ void Psip::load_tx(void)
        /* copy tones */
        if (p_tone_name[0]) {
                tosend -= read_audio(p, tosend);
+       } else
+       if (p_dov_tx) {
+               tosend -= dov_tx(p, tosend);
        }
        if (tosend) {
                PERROR("buffer is not completely filled\n");