#include "main.h"
#include "myisdn.h"
-extern "C" {
-#define MISDN_OLD_AF_COMPATIBILITY 1
-#include <compat_af_isdn.h>
-}
-#include <q931.h>
+#include <mISDN/mISDNcompat.h>
+int __af_isdn = MISDN_AF_ISDN;
+#include <mISDN/q931.h>
#undef offsetof
#ifdef __compiler_offsetof
unsigned int mt_assign_pid = ~0;
int mISDNsocket = -1;
+static int upqueue_pipe[2];
+static struct lcr_fd upqueue_fd;
+int upqueue_avail = 0;
+
+static int mISDN_upqueue(struct lcr_fd *fd, unsigned int what, void *instance, int i);
+static int mISDN_timeout(struct lcr_timer *timer, void *instance, int i);
int mISDN_initialize(void)
{
char filename[256];
- init_af_isdn();
-
/* try to open raw socket to check kernel */
mISDNsocket = socket(PF_ISDN, SOCK_RAW, ISDN_P_BASE);
if (mISDNsocket < 0) {
- fprintf(stderr, "Cannot open mISDN due to '%s'. (Does your Kernel support socket based mISDN?)\n", strerror(errno));
+ fprintf(stderr, "Cannot open mISDN due to '%s'. (Does your Kernel support socket based mISDN? Protocol family is %d.)\n", strerror(errno), PF_ISDN);
return(-1);
}
} else
mISDN_debug_init(0, NULL, NULL, NULL);
+ if (pipe(upqueue_pipe) < 0)
+ FATAL("Failed to open pipe\n");
+ memset(&upqueue_fd, 0, sizeof(upqueue_fd));
+ upqueue_fd.fd = upqueue_pipe[0];
+ register_fd(&upqueue_fd, LCR_FD_READ, mISDN_upqueue, NULL, 0);
+
return(0);
}
if (mISDNsocket > -1)
close(mISDNsocket);
+
+ if (upqueue_fd.inuse) {
+ unregister_fd(&upqueue_fd);
+ close(upqueue_pipe[0]);
+ close(upqueue_pipe[1]);
+ }
+ upqueue_avail = 0;
}
+int load_timer(struct lcr_timer *timer, void *instance, int index);
+
/*
* constructor
*/
p_m_b_exclusive = 0;
p_m_b_reserve = 0;
p_m_b_mode = mode;
- p_m_delete = 0;
p_m_hold = 0;
p_m_tx_gain = mISDNport->ifport->interface->tx_gain;
p_m_rx_gain = mISDNport->ifport->interface->rx_gain;
p_m_inband_send_on = 0;
p_m_inband_receive_on = 0;
p_m_dtmf = !mISDNport->ifport->nodtmf;
- p_m_timeout = 0;
- p_m_timer = 0;
+ memset(&p_m_timeout, 0, sizeof(p_m_timeout));
+ add_timer(&p_m_timeout, mISDN_timeout, this, 0);
p_m_remote_ref = 0; /* channel shall be exported to given remote */
p_m_remote_id = 0; /* remote admin socket */
SCPY(p_m_pipeline, mISDNport->ifport->interface->pipeline);
/* audio */
+ memset(&p_m_loadtimer, 0, sizeof(p_m_loadtimer));
+ add_timer(&p_m_loadtimer, load_timer, this, 0);
p_m_load = 0;
p_m_last_tv_sec = 0;
{
struct lcr_msg *message;
+ del_timer(&p_m_timeout);
+ del_timer(&p_m_loadtimer);
+
/* remove bchannel relation */
drop_bchannel();
end_trace();
}
+static int b_sock_callback(struct lcr_fd *fd, unsigned int what, void *instance, int i);
/*
* subfunction for bchannel_event
static int _bchannel_create(struct mISDNport *mISDNport, int i)
{
int ret;
- unsigned int on = 1;
struct sockaddr_mISDN addr;
- if (mISDNport->b_socket[i] > -1) {
+ if (mISDNport->b_sock[i].inuse) {
PERROR("Error: Socket already created for index %d\n", i);
return(0);
}
/* open socket */
//#warning testing without DSP
-// mISDNport->b_socket[i] = socket(PF_ISDN, SOCK_DGRAM, (mISDNport->b_mode[i]==B_MODE_HDLC)?ISDN_P_B_HDLC:ISDN_P_B_RAW);
- mISDNport->b_socket[i] = socket(PF_ISDN, SOCK_DGRAM, (mISDNport->b_mode[i]==B_MODE_HDLC)?ISDN_P_B_L2DSPHDLC:ISDN_P_B_L2DSP);
- if (mISDNport->b_socket[i] < 0) {
+// mISDNport->b_sock[i].fd = socket(PF_ISDN, SOCK_DGRAM, (mISDNport->b_mode[i]==B_MODE_HDLC)?ISDN_P_B_HDLC:ISDN_P_B_RAW);
+ mISDNport->b_sock[i].fd = socket(PF_ISDN, SOCK_DGRAM, (mISDNport->b_mode[i]==B_MODE_HDLC)?ISDN_P_B_L2DSPHDLC:ISDN_P_B_L2DSP);
+ if (mISDNport->b_sock[i].fd < 0) {
PERROR("Error: Failed to open bchannel-socket for index %d with mISDN-DSP layer. Did you load mISDN_dsp.ko?\n", i);
return(0);
}
-
- /* set nonblocking io */
- ret = ioctl(mISDNport->b_socket[i], FIONBIO, &on);
- if (ret < 0) {
- PERROR("Error: Failed to set bchannel-socket index %d into nonblocking IO\n", i);
- close(mISDNport->b_socket[i]);
- mISDNport->b_socket[i] = -1;
- return(0);
- }
+ /* register callback for read */
+ register_fd(&mISDNport->b_sock[i], LCR_FD_READ, b_sock_callback, mISDNport, i);
+
/* bind socket to bchannel */
addr.family = AF_ISDN;
addr.dev = mISDNport->portnum;
addr.channel = i+1+(i>=15);
- ret = bind(mISDNport->b_socket[i], (struct sockaddr *)&addr, sizeof(addr));
+ ret = bind(mISDNport->b_sock[i].fd, (struct sockaddr *)&addr, sizeof(addr));
if (ret < 0) {
PERROR("Error: Failed to bind bchannel-socket for index %d with mISDN-DSP layer (errno=%d). Did you load mISDN_dsp.ko?\n", i, errno);
- close(mISDNport->b_socket[i]);
- mISDNport->b_socket[i] = -1;
+ close(mISDNport->b_sock[i].fd);
+ unregister_fd(&mISDNport->b_sock[i]);
return(0);
}
chan_trace_header(mISDNport, mISDNport->b_port[i], "BCHANNEL create socket", DIRECTION_OUT);
add_trace("channel", NULL, "%d", i+1+(i>=15));
- add_trace("socket", NULL, "%d", mISDNport->b_socket[i]);
+ add_trace("socket", NULL, "%d", mISDNport->b_sock[i].fd);
end_trace();
return(1);
* subfunction for bchannel_event
* activate / deactivate request
*/
-static void _bchannel_activate(struct mISDNport *mISDNport, int i, int activate)
+static void _bchannel_activate(struct mISDNport *mISDNport, int i, int activate, int timeout)
{
struct mISDNhead act;
int ret;
- if (mISDNport->b_socket[i] < 0)
+ if (!mISDNport->b_sock[i].inuse)
return;
act.prim = (activate)?PH_ACTIVATE_REQ:PH_DEACTIVATE_REQ;
act.id = 0;
- ret = sendto(mISDNport->b_socket[i], &act, MISDN_HEADER_LEN, 0, NULL, 0);
+ ret = sendto(mISDNport->b_sock[i].fd, &act, MISDN_HEADER_LEN, 0, NULL, 0);
if (ret <= 0)
- PERROR("Failed to send to socket %d\n", mISDNport->b_socket[i]);
+ PERROR("Failed to send to socket %d\n", mISDNport->b_sock[i].fd);
/* trace */
chan_trace_header(mISDNport, mISDNport->b_port[i], activate ? "BCHANNEL activate" : "BCHANNEL deactivate", DIRECTION_OUT);
add_trace("channel", NULL, "%d", i+1+(i>=15));
- if (mISDNport->b_timer[i])
+ if (timeout)
add_trace("event", NULL, "timeout recovery");
end_trace();
}
struct PmISDN *port;
int handle, mode;
- if (mISDNport->b_socket[i] < 0)
+ if (!mISDNport->b_sock[i].inuse)
return;
- handle = mISDNport->b_socket[i];
+ handle = mISDNport->b_sock[i].fd;
port = mISDNport->b_port[i];
mode = mISDNport->b_mode[i];
if (!port) {
PDEBUG(DEBUG_BCHANNEL, "we change conference from conf=%d to conf=%d.\n", oldconf, newconf);
if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], (newconf)?DSP_CONF_JOIN:DSP_CONF_SPLIT, newconf, "DSP-CONF", newconf);
+ ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, (newconf)?DSP_CONF_JOIN:DSP_CONF_SPLIT, newconf, "DSP-CONF", newconf);
} else
PDEBUG(DEBUG_BCHANNEL, "we already have conf=%d.\n", newconf);
}
*/
static void _bchannel_destroy(struct mISDNport *mISDNport, int i)
{
- if (mISDNport->b_socket[i] < 0)
+ if (!mISDNport->b_sock[i].inuse)
return;
chan_trace_header(mISDNport, mISDNport->b_port[i], "BCHANNEL remove socket", DIRECTION_OUT);
add_trace("channel", NULL, "%d", i+1+(i>=15));
- add_trace("socket", NULL, "%d", mISDNport->b_socket[i]);
+ add_trace("socket", NULL, "%d", mISDNport->b_sock[i].fd);
end_trace();
- close(mISDNport->b_socket[i]);
- mISDNport->b_socket[i] = -1;
+ close(mISDNport->b_sock[i].fd);
+ unregister_fd(&mISDNport->b_sock[i]);
}
{
class PmISDN *b_port = mISDNport->b_port[i];
int state = mISDNport->b_state[i];
- double timer = mISDNport->b_timer[i];
+ int timer = -1; // no change
unsigned int p_m_remote_ref = 0;
unsigned int p_m_remote_id = 0;
int p_m_tx_gain = 0;
case B_STATE_IDLE:
if (p_m_remote_ref) {
/* export bchannel */
- message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type);
+ message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type, 0);
chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
add_trace("type", NULL, "assign");
add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
} else {
/* create stack and send activation request */
if (_bchannel_create(mISDNport, i)) {
- _bchannel_activate(mISDNport, i, 1);
+ _bchannel_activate(mISDNport, i, 1, 0);
state = B_STATE_ACTIVATING;
- timer = now_d + B_TIMER_ACTIVATING;
+ timer = B_TIMER_ACTIVATING;
}
}
break;
/* in case, the bchannel is exported right after seize_bchannel */
/* export bchannel */
/* p_m_remote_id is set, when this event happens. */
- message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type);
+ message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type, 0);
chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
add_trace("type", NULL, "assign");
add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
case B_STATE_ACTIVE:
/* bchannel is active, so we deactivate */
- _bchannel_activate(mISDNport, i, 0);
+ _bchannel_activate(mISDNport, i, 0, 0);
state = B_STATE_DEACTIVATING;
- timer = now_d + B_TIMER_DEACTIVATING;
+ timer = B_TIMER_DEACTIVATING;
break;
default:
case B_STATE_REMOTE:
/* bchannel is exported, so we re-import */
- message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0);
+ message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0, 0);
chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
add_trace("type", NULL, "remove");
add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
b_port->p_m_load = 0;
} else {
/* bchannel is active, but exported OR not used anymore (or has wrong stack config), so we deactivate */
- _bchannel_activate(mISDNport, i, 0);
+ _bchannel_activate(mISDNport, i, 0, 0);
state = B_STATE_DEACTIVATING;
- timer = now_d + B_TIMER_DEACTIVATING;
+ timer = B_TIMER_DEACTIVATING;
}
break;
* OR bchannel is not used anymore
* OR bchannel has been exported to an obsolete ref,
* so reimport, to later export to new remote */
- message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0);
+ message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0, 0);
chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
add_trace("type", NULL, "remove");
add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
case B_STATE_ACTIVE:
/* bchannel is active, so we deactivate */
- _bchannel_activate(mISDNport, i, 0);
+ _bchannel_activate(mISDNport, i, 0, 0);
state = B_STATE_DEACTIVATING;
- timer = now_d + B_TIMER_DEACTIVATING;
+ timer = B_TIMER_DEACTIVATING;
break;
case B_STATE_REMOTE:
/* bchannel is exported, so we re-import */
- message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0);
+ message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0, 0);
chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
add_trace("type", NULL, "remove");
add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
if (b_port) {
/* bchannel is now deactivate, but is requied by Port class, so we reactivate / export */
if (p_m_remote_ref) {
- message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type);
+ message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type, 0);
chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
add_trace("type", NULL, "assign");
add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
mISDNport->b_remote_ref[i] = p_m_remote_ref;
} else {
if (_bchannel_create(mISDNport, i)) {
- _bchannel_activate(mISDNport, i, 1);
+ _bchannel_activate(mISDNport, i, 1, 0);
state = B_STATE_ACTIVATING;
- timer = now_d + B_TIMER_ACTIVATING;
+ timer = B_TIMER_ACTIVATING;
}
}
}
if (b_port) {
/* bchannel is now imported, but is requied by Port class, so we reactivate / export */
if (p_m_remote_ref) {
- message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type);
+ message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type, 0);
chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
add_trace("type", NULL, "assign");
add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
mISDNport->b_remote_ref[i] = p_m_remote_ref;
} else {
if (_bchannel_create(mISDNport, i)) {
- _bchannel_activate(mISDNport, i, 1);
+ _bchannel_activate(mISDNport, i, 1, 0);
state = B_STATE_ACTIVATING;
- timer = now_d + B_TIMER_ACTIVATING;
+ timer = B_TIMER_ACTIVATING;
}
}
}
break;
case B_STATE_ACTIVATING:
- _bchannel_activate(mISDNport, i, 1);
- timer = now_d + B_TIMER_ACTIVATING;
+ _bchannel_activate(mISDNport, i, 1, 1);
+ timer = B_TIMER_ACTIVATING;
break;
case B_STATE_DEACTIVATING:
- _bchannel_activate(mISDNport, i, 0);
- timer = now_d + B_TIMER_DEACTIVATING;
+ _bchannel_activate(mISDNport, i, 0, 1);
+ timer = B_TIMER_DEACTIVATING;
break;
default:
}
mISDNport->b_state[i] = state;
- mISDNport->b_timer[i] = timer;
+ if (timer == 0)
+ unsched_timer(&mISDNport->b_timer[i]);
+ else if (timer > 0)
+ schedule_timer(&mISDNport->b_timer[i], timer, 0);
}
+--------------------+----------------------+
*/
-int PmISDN::handler(void)
+void PmISDN::update_load(void)
+{
+ /* don't trigger load event if: */
+ if (!p_tone_name[0] && !p_m_crypt_msg_loops && !p_m_inband_send_on)
+ return;
+
+ /* don't trigger load event if event already active */
+ if (p_m_loadtimer.active)
+ return;
+
+ schedule_timer(&p_m_loadtimer, 0, 0); /* no delay the first time */
+}
+
+int load_timer(struct lcr_timer *timer, void *instance, int index)
+{
+ class PmISDN *isdnport = (class PmISDN *)instance;
+
+ isdnport->load_tx();
+
+ return 0;
+}
+
+void PmISDN::load_tx(void)
{
- struct lcr_msg *message;
int elapsed = 0;
int ret;
-
- if ((ret = Port::handler()))
- return(ret);
+ struct timeval current_time;
/* get elapsed */
+ gettimeofday(¤t_time, NULL);
if (p_m_last_tv_sec) {
- elapsed = 8000 * (now_tv.tv_sec - p_m_last_tv_sec)
- + 8 * (now_tv.tv_usec/1000 - p_m_last_tv_msec);
- } else {
- /* set clock of first process ever in this instance */
- p_m_last_tv_sec = now_tv.tv_sec;
- p_m_last_tv_msec = now_tv.tv_usec/1000;
+ elapsed = 8000 * (current_time.tv_sec - p_m_last_tv_sec)
+ + 8 * (current_time.tv_usec/1000 - p_m_last_tv_msec);
}
- /* process only if we have a minimum of samples, to make packets not too small */
- if (elapsed >= ISDN_TRANSMIT
- && p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) {
- /* set clock of last process! */
- p_m_last_tv_sec = now_tv.tv_sec;
- p_m_last_tv_msec = now_tv.tv_usec/1000;
+ /* set clock of last process! */
+ p_m_last_tv_sec = current_time.tv_sec;
+ p_m_last_tv_msec = current_time.tv_usec/1000;
+ /* process only if we have samples and we are active */
+ if (elapsed && p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE) {
/* update load */
if (elapsed < p_m_load)
p_m_load -= elapsed;
/* to send data, tone must be on */
if ((p_tone_name[0] || p_m_crypt_msg_loops || p_m_inband_send_on) /* what tones? */
- && (p_m_load < ISDN_LOAD) /* enough load? */
+ && (p_m_load < ISDN_LOAD) /* not too much load? */
&& (p_state==PORT_STATE_CONNECT || p_m_mISDNport->tones || p_m_inband_send_on)) { /* connected or inband-tones? */
int tosend = ISDN_LOAD - p_m_load, length;
unsigned char buf[MISDN_HEADER_LEN+tosend];
/* next loop */
p_m_crypt_msg_current = 0;
p_m_crypt_msg_loops--;
+ if (!p_m_crypt_msg_loops)
+ update_rxoff();
// puts("eine loop weniger");
}
if (ISDN_LOAD - p_m_load - tosend > 0) {
frm->prim = PH_DATA_REQ;
frm->id = 0;
- ret = sendto(p_m_mISDNport->b_socket[p_m_b_index], buf, MISDN_HEADER_LEN+ISDN_LOAD-p_m_load-tosend, 0, NULL, 0);
+ ret = sendto(p_m_mISDNport->b_sock[p_m_b_index].fd, buf, MISDN_HEADER_LEN+ISDN_LOAD-p_m_load-tosend, 0, NULL, 0);
if (ret <= 0)
- PERROR("Failed to send to socket %d (samples = %d)\n", p_m_mISDNport->b_socket[p_m_b_index], ISDN_LOAD-p_m_load-tosend);
+ PERROR("Failed to send to socket %d (samples = %d)\n", p_m_mISDNport->b_sock[p_m_b_index].fd, ISDN_LOAD-p_m_load-tosend);
p_m_load += ISDN_LOAD - p_m_load - tosend;
}
}
}
- // NOTE: deletion is done by the child class
-
- /* handle timeouts */
- if (p_m_timeout) {
- if (p_m_timer+p_m_timeout < now_d) {
- PDEBUG(DEBUG_ISDN, "(%s) timeout after %d seconds detected (state=%d).\n", p_name, p_m_timeout, p_state);
- p_m_timeout = 0;
- /* send timeout to endpoint */
- message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_TIMEOUT);
- message->param.state = p_state;
- message_put(message);
- return(1);
- }
+ if (p_tone_name[0] || p_m_crypt_msg_loops || p_m_inband_send_on || p_m_load) {
+ schedule_timer(&p_m_loadtimer, 0, ISDN_TRANSMIT*125);
}
-
- return(0); /* nothing done */
}
+/* handle timeouts */
+static int mISDN_timeout(struct lcr_timer *timer, void *instance, int i)
+{
+ class PmISDN *isdnport = (class PmISDN *)instance;
+ struct lcr_msg *message;
+
+ PDEBUG(DEBUG_ISDN, "(%s) timeout after %d seconds detected (state=%d).\n", isdnport->p_name, isdnport->p_m_timeout.timeout.tv_sec, isdnport->p_state);
+ /* send timeout to endpoint */
+ message = message_create(isdnport->p_serial, ACTIVE_EPOINT(isdnport->p_epointlist), PORT_TO_EPOINT, MESSAGE_TIMEOUT);
+ message->param.state = isdnport->p_state;
+ message_put(message);
+
+ return 0;
+}
+
/*
* whenever we get audio data from bchannel, we process it here
if ((cont&(~DTMF_TONE_MASK)) == DTMF_TONE_VAL) {
chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN);
add_trace("DTMF", NULL, "%c", cont & DTMF_TONE_MASK);
+ if (!p_m_dtmf)
+ add_trace("info", NULL, "DTMF is disabled");
end_trace();
+ if (!p_m_dtmf)
+ return;
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_DTMF);
message->param.dtmf = cont & DTMF_TONE_MASK;
PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL INDICATION DTMF digit '%c'\n", p_name, message->param.dtmf);
PDEBUG(DEBUG_ISDN, "we set echo to echo=%d.\n", p_m_echo);
if (p_m_b_channel)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], p_m_echo?DSP_ECHO_ON:DSP_ECHO_OFF, 0, "DSP-ECHO", p_m_echo);
+ ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, p_m_echo?DSP_ECHO_ON:DSP_ECHO_OFF, 0, "DSP-ECHO", p_m_echo);
}
}
if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE && p_m_mISDNport->b_mode[p_m_b_index] == B_MODE_TRANSPARENT) {
PDEBUG(DEBUG_ISDN, "we reset tone from id=%d to OFF.\n", p_m_tone);
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], DSP_TONE_PATT_OFF, 0, "DSP-TONE", 0);
+ ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, DSP_TONE_PATT_OFF, 0, "DSP-TONE", 0);
}
p_m_tone = 0;
Port::set_tone(dir, tone);
PDEBUG(DEBUG_ISDN, "we set tone to id=%d.\n", p_m_tone);
if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE && p_m_mISDNport->b_mode[p_m_b_index] == B_MODE_TRANSPARENT)
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], p_m_tone?DSP_TONE_PATT_ON:DSP_TONE_PATT_OFF, p_m_tone, "DSP-TONE", p_m_tone);
+ ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, p_m_tone?DSP_TONE_PATT_ON:DSP_TONE_PATT_OFF, p_m_tone, "DSP-TONE", p_m_tone);
}
/* turn user-space tones off in cases of no tone OR dsp tone */
Port::set_tone("",NULL);
PDEBUG(DEBUG_BCHANNEL, "we change tx-volume to shift=%d.\n", p_m_tx_gain);
if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE && p_m_mISDNport->b_mode[p_m_b_index] == B_MODE_TRANSPARENT)
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], DSP_VOL_CHANGE_TX, p_m_tx_gain, "DSP-TX_GAIN", p_m_tx_gain);
+ ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, DSP_VOL_CHANGE_TX, p_m_tx_gain, "DSP-TX_GAIN", p_m_tx_gain);
} else
PDEBUG(DEBUG_BCHANNEL, "we already have tx-volume shift=%d.\n", p_m_rx_gain);
if (p_m_rx_gain != param->mISDNsignal.rx_gain) {
PDEBUG(DEBUG_BCHANNEL, "we change rx-volume to shift=%d.\n", p_m_rx_gain);
if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE && p_m_mISDNport->b_mode[p_m_b_index] == B_MODE_TRANSPARENT)
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], DSP_VOL_CHANGE_RX, p_m_rx_gain, "DSP-RX_GAIN", p_m_rx_gain);
+ ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, DSP_VOL_CHANGE_RX, p_m_rx_gain, "DSP-RX_GAIN", p_m_rx_gain);
} else
PDEBUG(DEBUG_BCHANNEL, "we already have rx-volume shift=%d.\n", p_m_rx_gain);
break;
if (p_m_joindata != param->mISDNsignal.joindata) {
p_m_joindata = param->mISDNsignal.joindata;
PDEBUG(DEBUG_BCHANNEL, "we change to joindata=%d.\n", p_m_joindata);
+ update_rxoff();
} else
PDEBUG(DEBUG_BCHANNEL, "we already have joindata=%d.\n", p_m_joindata);
break;
PDEBUG(DEBUG_BCHANNEL, "we change delay mode to delay=%d.\n", p_m_delay);
if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE && p_m_mISDNport->b_mode[p_m_b_index] == B_MODE_TRANSPARENT)
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], p_m_delay?DSP_DELAY:DSP_JITTER, p_m_delay, "DSP-DELAY", p_m_delay);
+ ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, p_m_delay?DSP_DELAY:DSP_JITTER, p_m_delay, "DSP-DELAY", p_m_delay);
} else
PDEBUG(DEBUG_BCHANNEL, "we already have delay=%d.\n", p_m_delay);
break;
PDEBUG(DEBUG_BCHANNEL, "we set encryption to crypt=%d. (0 means OFF)\n", p_m_crypt);
if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE && p_m_mISDNport->b_mode[p_m_b_index] == B_MODE_TRANSPARENT)
- ph_control_block(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], p_m_crypt?DSP_BF_ENABLE_KEY:DSP_BF_DISABLE, p_m_crypt_key, p_m_crypt_key_len, "DSP-CRYPT", p_m_crypt_key_len);
+ ph_control_block(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, p_m_crypt?DSP_BF_ENABLE_KEY:DSP_BF_DISABLE, p_m_crypt_key, p_m_crypt_key_len, "DSP-CRYPT", p_m_crypt_key_len);
break;
case CC_DACT_REQ: /* deactivate session encryption */
case CR_LISTEN_REQ: /* start listening to messages */
p_m_crypt_listen = 1;
+ update_rxoff();
p_m_crypt_listen_state = 0;
break;
case CR_UNLISTEN_REQ: /* stop listening to messages */
p_m_crypt_listen = 0;
+ update_rxoff();
break;
case CR_MESSAGE_REQ: /* send message */
}
p_m_crypt_msg_current = 0; /* reset */
p_m_crypt_msg_loops = 6; /* enable */
+ update_rxoff();
+ update_load();
#if 0
/* disable txmix, or we get corrupt data due to audio process */
if (p_m_txmix && p_m_b_index>=0 && p_m_mISDNport->b_mode[p_m_b_index] == B_MODE_TRANSPARENT) {
PDEBUG(DEBUG_BCHANNEL, "for sending CR_MESSAGE_REQ, we reset txmix from txmix=%d.\n", p_m_txmix);
- ph_control(p_m_mISDNport, this, p_mISDNport->b_socket[p_m_b_index], DSP_MIX_OFF, 0, "DSP-TXMIX", 0);
+ ph_control(p_m_mISDNport, this, p_mISDNport->b_sock[p_m_b_index].fd, DSP_MIX_OFF, 0, "DSP-TXMIX", 0);
}
#endif
break;
return(0);
}
+void PmISDN::update_rxoff(void)
+{
+ /* call bridges in user space OR crypto OR recording */
+ if (p_m_joindata || p_m_crypt_msg_loops || p_m_crypt_listen || p_record || p_m_inband_receive_on) {
+ /* rx IS required */
+ if (p_m_rxoff) {
+ /* turn on RX */
+ p_m_rxoff = 0;
+ PDEBUG(DEBUG_BCHANNEL, "%s: receive data is required, so we turn them on\n", __FUNCTION__);
+ if (p_m_b_index > -1)
+ if (p_m_mISDNport->b_port[p_m_b_index] && p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
+ ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, DSP_RECEIVE_ON, 0, "DSP-RXOFF", 0);
+ }
+ } else {
+ /* rx NOT required */
+ if (!p_m_rxoff) {
+ /* turn off RX */
+ p_m_rxoff = 1;
+ PDEBUG(DEBUG_BCHANNEL, "%s: receive data is not required, so we turn them off\n", __FUNCTION__);
+ if (p_m_b_index > -1)
+ if (p_m_mISDNport->b_port[p_m_b_index] && p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
+ ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, DSP_RECEIVE_OFF, 0, "DSP-RXOFF", 1);
+ }
+ }
+ /* recording */
+ if (p_record) {
+ /* txdata IS required */
+ if (!p_m_txdata) {
+ /* turn on RX */
+ p_m_txdata = 1;
+ PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is required, so we turn them on\n", __FUNCTION__);
+ if (p_m_b_index > -1)
+ if (p_m_mISDNport->b_port[p_m_b_index] && p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
+ ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, DSP_TXDATA_ON, 0, "DSP-TXDATA", 1);
+ }
+ } else {
+ /* txdata NOT required */
+ if (p_m_txdata) {
+ /* turn off RX */
+ p_m_txdata = 0;
+ PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is not required, so we turn them off\n", __FUNCTION__);
+ if (p_m_b_index > -1)
+ if (p_m_mISDNport->b_port[p_m_b_index] && p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
+ ph_control(p_m_mISDNport, this, p_m_mISDNport->b_sock[p_m_b_index].fd, DSP_TXDATA_OFF, 0, "DSP-TXDATA", 0);
+ }
+ }
+}
-/*
- * main loop for processing messages from mISDN
- */
-int mISDN_handler(void)
+static int mISDN_upqueue(struct lcr_fd *fd, unsigned int what, void *instance, int i)
{
- int ret, work = 0;
struct mISDNport *mISDNport;
- class PmISDN *isdnport;
- int i;
- unsigned char buffer[2048+MISDN_HEADER_LEN];
- struct mISDNhead *hh = (struct mISDNhead *)buffer;
struct mbuffer *mb;
struct l3_msg *l3m;
+ char byte;
+ int ret;
+
+ /* unset global semaphore */
+ upqueue_avail = 0;
+ // with a very small incident, upqueue_avail may be set by mISDN thread and
+ // another byte may be sent to the pipe, which causes a call to this function
+ // again with nothing in the upqueue. this is no problem.
+ ret = read(fd->fd, &byte, 1);
/* process all ports */
mISDNport = mISDNport_first;
while(mISDNport) {
- /* process all bchannels */
- i = 0;
- while(i < mISDNport->b_num) {
- /* process timer events for bchannel handling */
- if (mISDNport->b_timer[i]) {
- if (mISDNport->b_timer[i] <= now_d)
- bchannel_event(mISDNport, i, B_EVENT_TIMEOUT);
- }
- /* handle port of bchannel */
- isdnport=mISDNport->b_port[i];
- if (isdnport) {
- /* call bridges in user space OR crypto OR recording */
- if (isdnport->p_m_joindata || isdnport->p_m_crypt_msg_loops || isdnport->p_m_crypt_listen || isdnport->p_record || isdnport->p_m_inband_receive_on) {
- /* rx IS required */
- if (isdnport->p_m_rxoff) {
- /* turn on RX */
- isdnport->p_m_rxoff = 0;
- PDEBUG(DEBUG_BCHANNEL, "%s: receive data is required, so we turn them on\n", __FUNCTION__);
- if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
- ph_control(mISDNport, isdnport, mISDNport->b_socket[i], DSP_RECEIVE_ON, 0, "DSP-RXOFF", 0);
- return(1);
- }
- } else {
- /* rx NOT required */
- if (!isdnport->p_m_rxoff) {
- /* turn off RX */
- isdnport->p_m_rxoff = 1;
- PDEBUG(DEBUG_BCHANNEL, "%s: receive data is not required, so we turn them off\n", __FUNCTION__);
- if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
- ph_control(mISDNport, isdnport, mISDNport->b_socket[i], DSP_RECEIVE_OFF, 0, "DSP-RXOFF", 1);
- return(1);
- }
- }
- /* recording */
- if (isdnport->p_record) {
- /* txdata IS required */
- if (!isdnport->p_m_txdata) {
- /* turn on RX */
- isdnport->p_m_txdata = 1;
- PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is required, so we turn them on\n", __FUNCTION__);
- if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
- ph_control(mISDNport, isdnport, mISDNport->b_socket[i], DSP_TXDATA_ON, 0, "DSP-TXDATA", 1);
- return(1);
- }
- } else {
- /* txdata NOT required */
- if (isdnport->p_m_txdata) {
- /* turn off RX */
- isdnport->p_m_txdata = 0;
- PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is not required, so we turn them off\n", __FUNCTION__);
- if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
- ph_control(mISDNport, isdnport, mISDNport->b_socket[i], DSP_TXDATA_OFF, 0, "DSP-TXDATA", 0);
- return(1);
- }
- }
- }
-
- /* handle message from bchannel */
- if (mISDNport->b_socket[i] > -1) {
- ret = recv(mISDNport->b_socket[i], buffer, sizeof(buffer), 0);
- if (ret >= (int)MISDN_HEADER_LEN) {
- work = 1;
- switch(hh->prim) {
- /* we don't care about confirms, we use rx data to sync tx */
- case PH_DATA_CNF:
- break;
-
- /* we receive audio data, we respond to it AND we send tones */
- case PH_DATA_IND:
- case DL_DATA_IND:
- case PH_DATA_REQ:
- case DL_DATA_REQ:
- case PH_CONTROL_IND:
- if (mISDNport->b_port[i])
- mISDNport->b_port[i]->bchannel_receive(hh, buffer+MISDN_HEADER_LEN, ret-MISDN_HEADER_LEN);
- else
- PDEBUG(DEBUG_BCHANNEL, "b-channel is not associated to an ISDNPort (socket %d), ignoring.\n", mISDNport->b_socket[i]);
- break;
-
- case PH_ACTIVATE_IND:
- case DL_ESTABLISH_IND:
- case PH_ACTIVATE_CNF:
- case DL_ESTABLISH_CNF:
- PDEBUG(DEBUG_BCHANNEL, "DL_ESTABLISH confirm: bchannel is now activated (socket %d).\n", mISDNport->b_socket[i]);
- bchannel_event(mISDNport, i, B_EVENT_ACTIVATED);
- break;
-
- case PH_DEACTIVATE_IND:
- case DL_RELEASE_IND:
- case PH_DEACTIVATE_CNF:
- case DL_RELEASE_CNF:
- PDEBUG(DEBUG_BCHANNEL, "DL_RELEASE confirm: bchannel is now de-activated (socket %d).\n", mISDNport->b_socket[i]);
- bchannel_event(mISDNport, i, B_EVENT_DEACTIVATED);
- break;
-
- default:
- PERROR("child message not handled: prim(0x%x) socket(%d) msg->len(%d)\n", hh->prim, mISDNport->b_socket[i], ret-MISDN_HEADER_LEN);
- }
- } else {
- if (ret < 0 && errno != EWOULDBLOCK)
- PERROR("Read from port %d, index %d failed with return code %d\n", mISDNport->portnum, i, ret);
- }
- }
-
- i++;
- }
-
/* handle queued up-messages (d-channel) */
- if (!mISDNport->gsm) {
+ if (!mISDNport->isloopback) {
while ((mb = mdequeue(&mISDNport->upqueue))) {
l3m = &mb->l3;
switch(l3m->type) {
if (l3m->pid < 128)
mISDNport->l2mask[l3m->pid >> 3] |= (1 << (l3m->pid & 7));
if ((!mISDNport->ntmode || mISDNport->ptp) && l3m->pid < 127) {
- if (mISDNport->l2establish) {
- mISDNport->l2establish = 0;
+ if (mISDNport->l2establish.active) {
+ unsched_timer(&mISDNport->l2establish);
PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n");
}
}
case MT_L2RELEASE:
if (l3m->pid < 128)
mISDNport->l2mask[l3m->pid >> 3] &= ~(1 << (l3m->pid & 7));
- if (!mISDNport->l2establish) {
+ if (!mISDNport->l2establish.active) {
l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_IND, DIRECTION_IN);
add_trace("tei", NULL, "%d", l3m->pid);
end_trace();
if (!mISDNport->ntmode || mISDNport->ptp)
mISDNport->l2link = 0;
}
- if (!mISDNport->gsm && (!mISDNport->ntmode || mISDNport->ptp) && l3m->pid < 127) {
- if (!mISDNport->l2establish && mISDNport->l2hold) {
+ if (!mISDNport->isloopback && (!mISDNport->ntmode || mISDNport->ptp) && l3m->pid < 127) {
+ if (!mISDNport->l2establish.active && mISDNport->l2hold) {
PDEBUG(DEBUG_ISDN, "set timer and establish.\n");
- time(&mISDNport->l2establish);
+ schedule_timer(&mISDNport->l2establish, 5, 0);
mISDNport->ml3->to_layer3(mISDNport->ml3, MT_L2ESTABLISH, 0, NULL);
}
}
free_l3_msg(l3m);
}
}
+ mISDNport = mISDNport->next;
+ }
+ return 0;
+}
-#if 0
- if (mISDNport->l1timeout && now>mISDNport->l1timeout)
- { ---}
- PDEBUG(DEBUG_ISDN, "the L1 establish timer expired, we release all pending messages.\n", mISDNport->portnum);
- mISDNport->l1timeout = 0;
-#endif
+/* l2 establish timer fires */
+static int l2establish_timeout(struct lcr_timer *timer, void *instance, int i)
+{
+ struct mISDNport *mISDNport = (struct mISDNport *)instance;
- /* layer 2 establish timer */
- if (mISDNport->l2establish) {
- if (now-mISDNport->l2establish > 5) {
- mISDNport->l2establish = 0;
- if (!mISDNport->gsm && mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode)) {
+ if (!mISDNport->isloopback && mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode)) {
+// PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link portnum=%d.\n", mISDNport->portnum);
+ mISDNport->ml3->to_layer3(mISDNport->ml3, MT_L2ESTABLISH, 0, NULL);
+ schedule_timer(&mISDNport->l2establish, 5, 0); /* 5 seconds */
+ }
-// PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link portnum=%d.\n", mISDNport->portnum);
- mISDNport->ml3->to_layer3(mISDNport->ml3, MT_L2ESTABLISH, 0, NULL);
- time(&mISDNport->l2establish);
- return(1);
- }
- }
- }
+ return 0;
+}
+/* handle frames from bchannel */
+static int b_sock_callback(struct lcr_fd *fd, unsigned int what, void *instance, int i)
+{
+ struct mISDNport *mISDNport = (struct mISDNport *)instance;
+ unsigned char buffer[2048+MISDN_HEADER_LEN];
+ struct mISDNhead *hh = (struct mISDNhead *)buffer;
+ int ret;
- mISDNport = mISDNport->next;
+ ret = recv(fd->fd, buffer, sizeof(buffer), 0);
+ if (ret < 0) {
+ PERROR("read error frame, errno %d\n", errno);
+ return 0;
+ }
+ if (ret < (int)MISDN_HEADER_LEN) {
+ PERROR("read short frame, got %d, expected %d\n", ret, (int)MISDN_HEADER_LEN);
+ return 0;
+ }
+ switch(hh->prim) {
+ /* we don't care about confirms, we use rx data to sync tx */
+ case PH_DATA_CNF:
+ break;
+
+ /* we receive audio data, we respond to it AND we send tones */
+ case PH_DATA_IND:
+ case DL_DATA_IND:
+ case PH_DATA_REQ:
+ case DL_DATA_REQ:
+ case PH_CONTROL_IND:
+ if (mISDNport->b_port[i])
+ mISDNport->b_port[i]->bchannel_receive(hh, buffer+MISDN_HEADER_LEN, ret-MISDN_HEADER_LEN);
+ else
+ PDEBUG(DEBUG_BCHANNEL, "b-channel is not associated to an ISDNPort (socket %d), ignoring.\n", fd->fd);
+ break;
+
+ case PH_ACTIVATE_IND:
+ case DL_ESTABLISH_IND:
+ case PH_ACTIVATE_CNF:
+ case DL_ESTABLISH_CNF:
+ PDEBUG(DEBUG_BCHANNEL, "DL_ESTABLISH confirm: bchannel is now activated (socket %d).\n", fd->fd);
+ bchannel_event(mISDNport, i, B_EVENT_ACTIVATED);
+ break;
+
+ case PH_DEACTIVATE_IND:
+ case DL_RELEASE_IND:
+ case PH_DEACTIVATE_CNF:
+ case DL_RELEASE_CNF:
+ PDEBUG(DEBUG_BCHANNEL, "DL_RELEASE confirm: bchannel is now de-activated (socket %d).\n", fd->fd);
+ bchannel_event(mISDNport, i, B_EVENT_DEACTIVATED);
+ break;
+
+ default:
+ PERROR("child message not handled: prim(0x%x) socket(%d) msg->len(%d)\n", hh->prim, fd->fd, ret-MISDN_HEADER_LEN);
}
- /* if we received at least one b-frame, we will return 1 */
- return(work);
+ return 0;
}
+/* process timer events for bchannel handling */
+static int b_timer_timeout(struct lcr_timer *timer, void *instance, int i)
+{
+ struct mISDNport *mISDNport = (struct mISDNport *)instance;
+puts("fires");
+
+ bchannel_event(mISDNport, i, B_EVENT_TIMEOUT);
+
+ return 0;
+}
+
+
int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
{
/* IMPORTAINT:
l3m->type = cmd;
l3m->pid = pid;
mqueue_tail(&mISDNport->upqueue, mb);
+ if (!upqueue_avail) {
+ // multiple threads may cause multiple calls of this section, but this
+ // results only in multiple processing of the upqueue read.
+ // this is no problem.
+ upqueue_avail = 1;
+ char byte = 0;
+ int ret;
+ ret = write(upqueue_pipe[1], &byte, 1);
+ }
return 0;
}
/*
* global function to add a new card (port)
*/
-struct mISDNport *mISDNport_open(int port, char *portname, int ptp, int force_nt, int te_special, int l1hold, int l2hold, struct interface *interface, int gsm, unsigned int ss5)
+struct mISDNport *mISDNport_open(struct interface_port *ifport)
{
int ret;
struct mISDNport *mISDNport, **mISDNportp;
+ int port = ifport->portnum;
+ int ptp = ifport->ptp;
+ int force_nt = ifport->nt;
+ int l1hold = ifport->l1hold;
+ int l2hold = ifport->l2hold;
+ int loop = 0;
+ int ss5 = ifport->ss5;
int i, cnt;
int pri, bri, pots;
int nt, te;
struct mISDN_devinfo devinfo;
unsigned int protocol, prop;
+#if defined WITH_GSM_BS && defined WITH_GSM_MS
+ loop = ifport->gsm_ms | ifport->gsm_bs;
+#else
+#ifdef WITH_GSM_BS
+ loop = ifport->gsm_bs;
+#endif
+#ifdef WITH_GSM_MS
+ loop = ifport->gsm_ms;
+#endif
+#endif
+//printf("%s == %s\n", ifport->portname, options.loopback_int);
+ if (!strcmp(ifport->portname, options.loopback_lcr))
+ loop = 1;
+
+ if (loop) {
+ if (mISDNloop_open())
+ return NULL;
+ }
+
/* check port counts */
ret = ioctl(mISDNsocket, IMGETCOUNT, &cnt);
if (ret < 0) {
return(NULL);
}
if (port < 0) {
- port = mISDN_getportbyname(mISDNsocket, cnt, portname);
+ port = mISDN_getportbyname(mISDNsocket, cnt, ifport->portname);
if (port < 0) {
- if (gsm)
- PERROR_RUNTIME("Port name '%s' not found, did you load loopback interface for GSM?.\n", portname);
+ if (loop)
+ PERROR_RUNTIME("Port name '%s' not found, did you load loopback interface?.\n", ifport->portname);
else
- PERROR_RUNTIME("Port name '%s' not found, use 'misdn_info' tool to list all existing ports.\n", portname);
+ PERROR_RUNTIME("Port name '%s' not found, use 'misdn_info' tool to list all existing ports.\n", ifport->portname);
return(NULL);
}
// note: 'port' has still the port number
while(*mISDNportp)
mISDNportp = &((*mISDNportp)->next);
mISDNport = (struct mISDNport *)MALLOC(sizeof(struct mISDNport));
- if (gsm | ss5) {
- /* gsm/ss5 link is always active */
+ add_timer(&mISDNport->l2establish, l2establish_timeout, mISDNport, 0);
+ if (loop | ss5) {
+ /* loop/ss5 link is always active */
mISDNport->l1link = 1;
mISDNport->l2link = 1;
} else {
mISDNport->l1link = -1;
mISDNport->l2link = -1;
}
- mISDNport->gsm = gsm;
+#ifdef WITH_GSM_BS
+ mISDNport->gsm_bs = ifport->gsm_bs;
+#endif
+#ifdef WITH_GSM_MS
+ mISDNport->gsm_ms = ifport->gsm_ms;
+#endif
+ mISDNport->isloopback = loop;
pmemuse++;
*mISDNportp = mISDNport;
if (l2hold) // supports layer 2 hold
prop |= (1 << MISDN_FLG_L2_HOLD);
/* open layer 3 and init upqueue */
- if (gsm) {
+ if (loop) {
unsigned long on = 1;
struct sockaddr_mISDN addr;
if (devinfo.nrbchan < 8) {
- PERROR_RUNTIME("GSM port %d must have at least 8 b-channels.\n", port);
- mISDNport_close(mISDNport);
- return(NULL);
+ printf("loop port %d has a low number of bchannels. (only %d) remember that all interfaces that requires a loopback could run out of channels\n", port, devinfo.nrbchan);
+// mISDNport_close(mISDNport);
+// return(NULL);
}
- if ((mISDNport->lcr_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_NT_S0)) < 0) {
- PERROR_RUNTIME("GSM port %d failed to open socket.\n", port);
+ if ((mISDNport->lcr_sock = socket(PF_ISDN, SOCK_DGRAM, (bri) ? ISDN_P_TE_S0 : ISDN_P_TE_E1)) < 0) {
+ PERROR_RUNTIME("loop port %d failed to open socket.\n", port);
mISDNport_close(mISDNport);
return(NULL);
}
/* set nonblocking io */
if (ioctl(mISDNport->lcr_sock, FIONBIO, &on) < 0) {
- PERROR_RUNTIME("GSM port %d failed to set socket into nonblocking io.\n", port);
+ PERROR_RUNTIME("loop port %d failed to set socket into nonblocking io.\n", port);
mISDNport_close(mISDNport);
return(NULL);
}
addr.dev = port;
addr.channel = 0;
if (bind(mISDNport->lcr_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
- PERROR_RUNTIME("GSM port %d failed to bind socket. (errno %d)\n", port, errno);
+ PERROR_RUNTIME("loop port %d failed to bind socket. (errno %d)\n", port, errno);
mISDNport_close(mISDNport);
return(NULL);
}
mqueue_purge(&mISDNport->upqueue);
PERROR_RUNTIME("open_layer3() failed for port %d\n", port);
start_trace(port,
- interface,
+ ifport->interface,
NULL,
NULL,
DIRECTION_NONE,
mISDNport->b_num = devinfo.nrbchan;
mISDNport->portnum = port;
mISDNport->ntmode = nt;
- mISDNport->tespecial = te_special;
+ mISDNport->tespecial = ifport->tespecial;
mISDNport->pri = pri;
mISDNport->ptp = ptp;
mISDNport->l1hold = l1hold;
i = 0;
while(i < mISDNport->b_num) {
mISDNport->b_state[i] = B_STATE_IDLE;
- mISDNport->b_socket[i] = -1;
+ add_timer(&mISDNport->b_timer[i], b_timer_timeout, mISDNport, i);
i++;
}
/* if ptp, pull up the link */
- if (!mISDNport->gsm && mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode)) {
+ if (!mISDNport->isloopback && mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode)) {
mISDNport->ml3->to_layer3(mISDNport->ml3, MT_L2ESTABLISH, 0, NULL);
l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT);
add_trace("tei", NULL, "%d", 0);
end_trace();
- time(&mISDNport->l2establish);
+ schedule_timer(&mISDNport->l2establish, 5, 0); /* 5 seconds */
}
/* for nt-mode ptmp the link is always up */
PDEBUG(DEBUG_BCHANNEL, "using 'mISDN_dsp.o' module\n");
start_trace(mISDNport->portnum,
- interface,
+ ifport->interface,
NULL,
NULL,
DIRECTION_NONE,
/* free bchannels */
i = 0;
while(i < mISDNport->b_num) {
- if (mISDNport->b_socket[i] > -1) {
+ if (mISDNport->b_sock[i].inuse) {
_bchannel_destroy(mISDNport, i);
PDEBUG(DEBUG_BCHANNEL, "freeing %s port %d bchannel (index %d).\n", (mISDNport->ntmode)?"NT":"TE", mISDNport->portnum, i);
}
+ if (mISDNport->b_timer[i].inuse) {
+ del_timer(&mISDNport->b_timer[i]);
+ }
i++;
}
+ del_timer(&mISDNport->l2establish);
/* close layer 3, if open */
- if (!mISDNport->gsm && mISDNport->ml3) {
+ if (!mISDNport->isloopback && mISDNport->ml3) {
close_layer3(mISDNport->ml3);
}
/* close gsm socket, if open */
- if (mISDNport->gsm && mISDNport->lcr_sock > -1) {
+ if (mISDNport->isloopback && mISDNport->lcr_sock > -1) {
close(mISDNport->lcr_sock);
}
/* purge upqueue */
- if (!mISDNport->gsm)
+ if (!mISDNport->isloopback)
mqueue_purge(&mISDNport->upqueue);
/* remove from list */
* if transmit buffer in DSP module is empty,
* preload it to DSP_LOAD to prevent jitter gaps.
*/
- if (p_m_load==0 && ISDN_LOAD>0) {
+ if (p_m_load == 0 && ISDN_LOAD > 0) {
hh->prim = PH_DATA_REQ;
hh->id = 0;
memset(buf+MISDN_HEADER_LEN, (options.law=='a')?0x2a:0xff, ISDN_LOAD);
- ret = sendto(p_m_mISDNport->b_socket[p_m_b_index], buf, MISDN_HEADER_LEN+ISDN_LOAD, 0, NULL, 0);
+ ret = sendto(p_m_mISDNport->b_sock[p_m_b_index].fd, buf, MISDN_HEADER_LEN+ISDN_LOAD, 0, NULL, 0);
if (ret <= 0)
- PERROR("Failed to send to socket %d\n", p_m_mISDNport->b_socket[p_m_b_index]);
+ PERROR("Failed to send to socket %d\n", p_m_mISDNport->b_sock[p_m_b_index].fd);
p_m_load += ISDN_LOAD;
+ schedule_timer(&p_m_loadtimer, 0, ISDN_TRANSMIT*125);
}
/* drop if load would exceed ISDN_MAXLOAD
hh->prim = PH_DATA_REQ;
hh->id = 0;
memcpy(buf+MISDN_HEADER_LEN, data, length);
- ret = sendto(p_m_mISDNport->b_socket[p_m_b_index], buf, MISDN_HEADER_LEN+length, 0, NULL, 0);
+ ret = sendto(p_m_mISDNport->b_sock[p_m_b_index].fd, buf, MISDN_HEADER_LEN+length, 0, NULL, 0);
if (ret <= 0)
- PERROR("Failed to send to socket %d\n", p_m_mISDNport->b_socket[p_m_b_index]);
+ PERROR("Failed to send to socket %d\n", p_m_mISDNport->b_sock[p_m_b_index].fd);
p_m_load += length;
}
{
PDEBUG(DEBUG_PORT, "turning inband signalling send on.\n");
p_m_inband_send_on = 1;
+ /* trigger inband transmit */
+ update_load();
}
void PmISDN::inband_send_off(void)
/* this must work during constructor, see ss5.cpp */
PDEBUG(DEBUG_PORT, "turning inband signalling receive on.\n");
p_m_inband_receive_on = 1;
+ update_rxoff();
}
void PmISDN::inband_receive_off(void)
{
PDEBUG(DEBUG_PORT, "turning inband signalling receive off.\n");
p_m_inband_receive_on = 0;
+ update_rxoff();
}
void PmISDN::mute_on(void)
projects / lcr.git / blobdiff