X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=mISDN.cpp;h=a7facb68947e0c5a307f01fc2557181a9e4d573d;hp=bac0e846332e8a0bdce0a92027496e6bcb1cb328;hb=034d3a91404addedc1c7a3494862c79532b0b878;hpb=a1c8b8d89f31cbf5ac4151ac65e9e6545e75713a diff --git a/mISDN.cpp b/mISDN.cpp index bac0e84..a7facb6 100644 --- a/mISDN.cpp +++ b/mISDN.cpp @@ -965,7 +965,7 @@ void PmISDN::load_tx(void) p_m_load = 0; /* to send data, tone must be on */ - if ((p_tone_name[0] || p_m_crypt_msg_loops || p_m_inband_send_on) /* what tones? */ + if ((p_tone_name[0] || p_dov_tx || p_m_crypt_msg_loops || p_m_inband_send_on) /* what tones? */ && (p_m_load < p_m_preload) /* not too much load? */ && (p_state==PORT_STATE_CONNECT || p_m_mISDNport->tones || p_m_inband_send_on)) { /* connected or inband-tones? */ int tosend = p_m_preload - p_m_load, length; @@ -1005,6 +1005,11 @@ void PmISDN::load_tx(void) tosend -= length; } + /* copy dov */ + if (p_dov_tx) { + tosend -= dov_tx(p, tosend); + } + /* copy tones */ if (p_tone_name[0] && tosend) { tosend -= read_audio(p, tosend); @@ -1142,6 +1147,10 @@ void PmISDN::bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len return; } + /* dov is processed */ + if (p_dov_rx) + dov_rx(data, len); + /* inband is processed */ if (p_m_inband_receive_on) inband_receive(data, len); @@ -1500,7 +1509,7 @@ void PmISDN::update_rxoff(void) int tx_dejitter = 0; /* call bridges in user space OR crypto OR recording */ - if (p_bridge || p_m_crypt_msg_loops || p_m_crypt_listen || p_record || p_tap || p_m_inband_receive_on) { + if (p_bridge || p_m_crypt_msg_loops || p_m_crypt_listen || p_record || p_tap || p_m_inband_receive_on || p_dov_rx) { /* rx IS required */ if (p_m_rxoff) { /* turn on RX */ @@ -2313,7 +2322,7 @@ int PmISDN::bridge_rx(unsigned char *data, int length) /* check if high priority tones exist * ignore data in this case */ - if (p_tone_name[0] || p_m_crypt_msg_loops || p_m_inband_send_on) + if (p_tone_name[0] || p_dov_tx || p_m_crypt_msg_loops || p_m_inband_send_on) return -EBUSY; /* preload procedure