** **
\*****************************************************************************/
-
-
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <netinet/in.h>
#include <netdb.h>
#include <sys/socket.h>
-#include <pthread.h>
#else
-#include "mISDNlib.h"
-#include <linux/mISDNif.h>
+#include <mISDNuser/isdn_net.h>
+#include <mISDNuser/net_l3.h>
#endif
+
+#include "extension.h"
+#include "message.h"
+#include "lcrsocket.h"
+#include "cause.h"
#include "bchannel.h"
+#include "chan_lcr.h"
+#include "callerid.h"
+
#ifndef ISDN_PID_L4_B_USER
#define ISDN_PID_L4_B_USER 0x440000ff
int bchannel_initialize(void)
{
- char debug_log[128];
unsigned char buff[1025];
iframe_t *frm = (iframe_t *)buff;
int ret;
/*
* create stack
*/
-int bchannel_create(struct bchannel *channel)
+int bchannel_create(struct bchannel *bchannel)
{
unsigned char buff[1024];
int ret;
unsigned long on = 1;
struct sockadd_mISDN addr;
- if (channel->b_sock)
+ if (bchannel->b_sock)
{
- PERROR("Error: Socket already created for handle 0x%x\n", channel->handle);
+ PERROR("Error: Socket already created for handle 0x%x\n", bchannel->handle);
return(0);
}
/* open socket */
channel->b_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_L2DSP);
- if (channel->b_sock < 0)
+ if (bchannel->b_sock < 0)
{
- PERROR("Error: Failed to open bchannel-socket for handle 0x%x with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", channel->handle);
+ PERROR("Error: Failed to open bchannel-socket for handle 0x%x with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", bchannel->handle);
return(0);
}
/* set nonblocking io */
- ret = ioctl(channel->b_sock, FIONBIO, &on);
+ ret = ioctl(bchannel->b_sock, FIONBIO, &on);
if (ret < 0)
{
- PERROR("Error: Failed to set bchannel-socket handle 0x%x into nonblocking IO\n", channel->handle);
- close(channel->b_sock);
+ PERROR("Error: Failed to set bchannel-socket handle 0x%x into nonblocking IO\n", bchannel->handle);
+ close(bchannel->b_sock);
channel->b_sock = -1;
return(0);
}
/* bind socket to bchannel */
addr.family = AF_ISDN;
- addr.dev = (channel->handle>>8)-1;
- addr.channel = channel->handle && 0xff;
- ret = bind(channel->b_sock, (struct sockaddr *)&addr, sizeof(addr));
+ addr.dev = (bchannel->handle>>8)-1;
+ addr.channel = bchannel->handle && 0xff;
+ ret = bind(bchannel->b_sock, (struct sockaddr *)&addr, sizeof(addr));
if (ret < 0)
{
- PERROR("Error: Failed to bind bchannel-socket for handle 0x%x with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", channel->handle);
- close(channel->b_sock);
+ PERROR("Error: Failed to bind bchannel-socket for handle 0x%x with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", bchannel->handle);
+ close(bchannel->b_sock);
channel->b_sock = -1;
return(0);
}
layer_info_t li;
mISDN_pid_t pid;
- if (channel->b_stid)
+ if (bchannel->b_stid)
{
- PERROR("Error: stack already created for address 0x%x\n", channel->b_stid);
+ PERROR("Error: stack already created for address 0x%lx\n", bchannel->b_stid);
return(0);
}
- if (channel->b_addr)
+ if (bchannel->b_addr)
{
- PERROR("Error: stack already created for address 0x%x\n", channel->b_addr);
+ PERROR("Error: stack already created for address 0x%lx\n", bchannel->b_addr);
return(0);
}
/* create new layer */
- PDEBUG("creating new layer for stid 0x%x.\n" , channel->handle);
+ PDEBUG("creating new layer for stid 0x%lx.\n" , bchannel->handle);
memset(&li, 0, sizeof(li));
memset(&pid, 0, sizeof(pid));
li.object_id = -1;
li.extentions = 0;
- li.st = channel->handle;
+ li.st = bchannel->handle;
strcpy(li.name, "B L4");
li.pid.layermask = ISDN_LAYER((4));
li.pid.protocol[4] = ISDN_PID_L4_B_USER;
if (ret)
{
failed_new_layer:
- PERROR("mISDN_new_layer() failed to add bchannel for stid 0x%x.\n", channel->handle);
+ PERROR("mISDN_new_layer() failed to add bchannel for stid 0x%lx.\n", bchannel->handle);
goto failed;
}
if (!li.id)
{
goto failed_new_layer;
}
- channel->b_stid = channel->handle;
- channel->b_addr = li.id;
- PDEBUG("new layer (b_addr=0x%x)\n", channel->b_addr);
+ bchannel->b_stid = bchannel->handle;
+ bchannel->b_addr = li.id;
+ PDEBUG("new layer (b_addr=0x%x)\n", bchannel->b_addr);
/* create new stack */
pid.protocol[1] = ISDN_PID_L1_B_64TRANS;
pid.protocol[3] = ISDN_PID_L3_B_DSP;
pid.protocol[4] = ISDN_PID_L4_B_USER;
pid.layermask = ISDN_LAYER((1)) | ISDN_LAYER((2)) | ISDN_LAYER((3)) | ISDN_LAYER((4));
- ret = mISDN_set_stack(bchannel_device, channel->b_stid, &pid);
+ ret = mISDN_set_stack(bchannel_device, bchannel->b_stid, &pid);
if (ret)
{
stack_error:
- PERROR("mISDN_set_stack() failed (ret=%d) to add bchannel stid=0x%x\n", ret, channel->b_stid);
- mISDN_write_frame(bchannel_device, buff, channel->b_addr, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
+ PERROR("mISDN_set_stack() failed (ret=%d) to add bchannel stid=0x%lx\n", ret, bchannel->b_stid);
+ mISDN_write_frame(bchannel_device, buff, bchannel->b_addr, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
goto failed;
}
- ret = mISDN_get_setstack_ind(bchannel_device, channel->b_addr);
+ ret = mISDN_get_setstack_ind(bchannel_device, bchannel->b_addr);
if (ret)
goto stack_error;
/* get layer id */
- channel->b_addr = mISDN_get_layerid(bchannel_device, channel->b_stid, 4);
- if (!channel->b_addr)
+ bchannel->b_addr = mISDN_get_layerid(bchannel_device, bchannel->b_stid, 4);
+ if (!bchannel->b_addr)
goto stack_error;
#if 0
chan_trace_header(mISDNport, mISDNport->b_port[i], "BCHANNEL create stack", DIRECTION_OUT);
return(1);
failed:
- channel->b_stid = 0;
- channel->b_addr = 0;
+ bchannel->b_stid = 0;
+ bchannel->b_addr = 0;
return(0);
}
/*
* activate / deactivate request
*/
-void bchannel_activate(struct bchannel *channel, int activate)
+void bchannel_activate(struct bchannel *bchannel, int activate)
{
#ifdef SOCKET_MISDN
struct mISDNhead act;
act.prim = (activate)?DL_ESTABLISH_REQ:DL_RELEASE_REQ;
act.id = 0;
- ret = sendto(channel->b_sock, &act, MISDN_HEADER_LEN, 0, NULL, 0);
+ ret = sendto(bchannel->b_sock, &act, MISDN_HEADER_LEN, 0, NULL, 0);
if (!ret)
- PERROR("Failed to send to socket %d\n", channel->b_sock);
+ PERROR("Failed to send to socket %d\n", bchannel->b_sock);
#else
iframe_t act;
/* activate bchannel */
act.prim = (activate?DL_ESTABLISH:DL_RELEASE) | REQUEST;
- act.addr = channel->b_addr | FLG_MSG_DOWN;
+ act.addr = bchannel->b_addr | FLG_MSG_DOWN;
act.dinfo = 0;
act.len = 0;
mISDN_write(bchannel_device, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC);
#endif
- channel->b_state = BSTATE_ACTIVATING;
+ bchannel->b_state = BSTATE_ACTIVATING;
#if 0
/* trace */
chan_trace_header(mISDNport, mISDNport->b_port[i], activate?(char*)"BCHANNEL activate":(char*)"BCHANNEL deactivate", DIRECTION_OUT);
/*
* set features
*/
-static void bchannel_activated(struct bchannel *channel)
+static void bchannel_activated(struct bchannel *bchannel)
{
#ifdef SOCKET_MISDN
int handle;
- handle = channel->b_sock;
+ handle = bchannel->b_sock;
#else
unsigned long handle;
- handle = channel->b_addr;
+ handle = bchannel->b_addr;
#endif
/* set dsp features */
- if (channel->b_txdata)
- ph_control(handle, (channel->b_txdata)?CMX_TXDATA_ON:CMX_TXDATA_OFF, 0, "DSP-TXDATA", channel->b_txdata);
- if (channel->b_delay)
- ph_control(handle, CMX_DELAY, channel->b_delay, "DSP-DELAY", channel->b_delay);
- if (channel->b_tx_dejitter)
- ph_control(handle, (channel->b_tx_dejitter)?CMX_TX_DEJITTER:CMX_TX_DEJ_OFF, 0, "DSP-DELAY", channel->b_tx_dejitter);
- if (channel->b_tx_gain)
- ph_control(handle, VOL_CHANGE_TX, channel->b_tx_gain, "DSP-TX_GAIN", channel->b_tx_gain);
- if (channel->b_rx_gain)
- ph_control(handle, VOL_CHANGE_RX, channel->b_rx_gain, "DSP-RX_GAIN", channel->b_rx_gain);
- if (channel->b_pipeline[0])
- ph_control_block(handle, PIPELINE_CFG, channel->b_pipeline, strlen(channel->b_pipeline)+1, "DSP-PIPELINE", 0);
- if (channel->b_conf)
- ph_control(handle, CMX_CONF_JOIN, channel->b_conf, "DSP-CONF", channel->b_conf);
- if (channel->b_echo)
+ if (bchannel->b_txdata)
+ ph_control(handle, (bchannel->b_txdata)?CMX_TXDATA_ON:CMX_TXDATA_OFF, 0, "DSP-TXDATA", bchannel->b_txdata);
+ if (bchannel->b_delay)
+ ph_control(handle, CMX_DELAY, bchannel->b_delay, "DSP-DELAY", bchannel->b_delay);
+ if (bchannel->b_tx_dejitter)
+ ph_control(handle, (bchannel->b_tx_dejitter)?CMX_TX_DEJITTER:CMX_TX_DEJ_OFF, 0, "DSP-DELAY", bchannel->b_tx_dejitter);
+ if (bchannel->b_tx_gain)
+ ph_control(handle, VOL_CHANGE_TX, bchannel->b_tx_gain, "DSP-TX_GAIN", bchannel->b_tx_gain);
+ if (bchannel->b_rx_gain)
+ ph_control(handle, VOL_CHANGE_RX, bchannel->b_rx_gain, "DSP-RX_GAIN", bchannel->b_rx_gain);
+ if (bchannel->b_pipeline[0])
+ ph_control_block(handle, PIPELINE_CFG, bchannel->b_pipeline, strlen(bchannel->b_pipeline)+1, "DSP-PIPELINE", 0);
+ if (bchannel->b_conf)
+ ph_control(handle, CMX_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf);
+ if (bchannel->b_echo)
ph_control(handle, CMX_ECHO_ON, 0, "DSP-ECHO", 1);
- if (channel->b_tone)
- ph_control(handle, TONE_PATT_ON, channel->b_tone, "DSP-TONE", channel->b_tone);
- if (channel->b_rxoff)
+ if (bchannel->b_tone)
+ ph_control(handle, TONE_PATT_ON, bchannel->b_tone, "DSP-TONE", bchannel->b_tone);
+ if (bchannel->b_rxoff)
ph_control(handle, CMX_RECEIVE_OFF, 0, "DSP-RXOFF", 1);
-// if (channel->b_txmix)
+// if (bchannel->b_txmix)
// ph_control(handle, CMX_MIX_ON, 0, "DSP-MIX", 1);
- if (channel->b_dtmf)
+ if (bchannel->b_dtmf)
ph_control(handle, DTMF_TONE_START, 0, "DSP-DTMF", 1);
- if (channel->b_crypt_len)
- ph_control_block(handle, BF_ENABLE_KEY, channel->b_crypt_key, channel->b_crypt_len, "DSP-CRYPT", channel->b_crypt_len);
- if (channel->b_conf)
- ph_control(handle, CMX_CONF_JOIN, channel->b_conf, "DSP-CONF", channel->b_conf);
+ if (bchannel->b_crypt_len)
+ ph_control_block(handle, BF_ENABLE_KEY, bchannel->b_crypt_key, bchannel->b_crypt_len, "DSP-CRYPT", bchannel->b_crypt_len);
+ if (bchannel->b_conf)
+ ph_control(handle, CMX_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf);
- channel->b_state = BSTATE_ACTIVE;
+ bchannel->b_state = BSTATE_ACTIVE;
}
/*
* destroy stack
*/
-static void bchannel_destroy(struct bchannel *channel)
+static void bchannel_destroy(struct bchannel *bchannel)
{
#ifdef SOCKET_MISDN
#if 0
add_trace("socket", NULL, "%d", mISDNport->b_socket[i]);
end_trace();
#endif
- if (channel->b_sock > -1)
+ if (bchannel->b_sock > -1)
{
- close(channel->b_sock);
- channel->b_sock = -1;
+ close(bchannel->b_sock);
+ bchannel->b_sock = -1;
}
#else
unsigned char buff[1024];
end_trace();
#endif
/* remove our stack only if set */
- if (channel->b_addr)
+ if (bchannel->b_addr)
{
- PDEBUG("free stack (b_addr=0x%x)\n", channel->b_addr);
- mISDN_clear_stack(bchannel_device, channel->b_stid);
- mISDN_write_frame(bchannel_device, buff, channel->b_addr | FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
- channel->b_stid = 0;
- channel->b_addr = 0;
+ PDEBUG("free stack (b_addr=0x%x)\n", bchannel->b_addr);
+ mISDN_clear_stack(bchannel_device, bchannel->b_stid);
+ mISDN_write_frame(bchannel_device, buff, bchannel->b_addr | FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
+ bchannel->b_stid = 0;
+ bchannel->b_addr = 0;
}
#endif
- channel->b_state = BSTATE_IDLE;
+ bchannel->b_state = BSTATE_IDLE;
}
/*
* whenever we get audio data from bchannel, we process it here
*/
-static void bchannel_receive(struct bchannel *channel, unsigned long prim, unsigned long dinfo, unsigned char *data, int len)
+static void bchannel_receive(struct bchannel *bchannel, unsigned long prim, unsigned long dinfo, unsigned char *data, int len)
{
unsigned long cont = *((unsigned long *)data);
- unsigned char *data_temp;
- unsigned long length_temp;
- unsigned char *p;
- int l;
+// unsigned char *data_temp;
+// unsigned long length_temp;
+// unsigned char *p;
+// int l;
if (prim == (PH_CONTROL | INDICATION))
{
add_trace("DTMF", NULL, "%c", cont & DTMF_TONE_MASK);
end_trace();
#endif
- if (channel->rx_dtmf)
- channel->rx_dtmf(channel, cont & DTMF_TONE_MASK);
+ if (bchannel->rx_dtmf)
+ bchannel->rx_dtmf(bchannel, cont & DTMF_TONE_MASK);
return;
}
switch(cont)
switch(dinfo)
{
case CMX_TX_DATA:
- if (!channel->b_txdata)
+ if (!bchannel->b_txdata)
{
/* if tx is off, it may happen that fifos send us pending informations, we just ignore them */
PDEBUG("PmISDN(%s) ignoring tx data, because 'txdata' is turned off\n", p_name);
}
if (prim != PH_DATA_IND && prim != DL_DATA_IND)
{
- PERROR("Bchannel received unknown primitve: 0x%x\n", prim);
+ PERROR("Bchannel received unknown primitve: 0x%lx\n", prim);
return;
}
/* calls will not process any audio data unless
*/
/* if rx is off, it may happen that fifos send us pending informations, we just ignore them */
- if (channel->b_rxoff)
+ if (bchannel->b_rxoff)
{
PDEBUG("PmISDN(%s) ignoring data, because rx is turned off\n", p_name);
return;
}
- if (channel->rx_data)
- channel->rx_data(channel, data, len);
+ if (bchannel->rx_data)
+ bchannel->rx_data(bchannel, data, len);
}
/*
* transmit data to bchannel
*/
-void bchannel_transmit(struct bchannel *channel, unsigned char *data, int len)
+void bchannel_transmit(struct bchannel *bchannel, unsigned char *data, int len)
{
unsigned char buff[1025];
iframe_t *frm = (iframe_t *)buff;
- if (channel->b_state != BSTATE_ACTIVE)
+ if (bchannel->b_state != BSTATE_ACTIVE)
return;
#ifdef SOCKET_MISDN
frm->prim = DL_DATA_REQ;
frm->id = 0;
- ret = sendto(channel->b_sock, data, len, 0, NULL, 0);
+ ret = sendto(bchannel->b_sock, data, len, 0, NULL, 0);
if (!ret)
- PERROR("Failed to send to socket %d\n", channel->b_sock);
+ PERROR("Failed to send to socket %d\n", bchannel->b_sock);
#else
frm->prim = DL_DATA | REQUEST;
- frm->addr = channel->b_addr | FLG_MSG_DOWN;
+ frm->addr = bchannel->b_addr | FLG_MSG_DOWN;
frm->dinfo = 0;
frm->len = len;
if (frm->len)
/*
* join bchannel
*/
-void bchannel_join(struct bchannel *channel, unsigned short id)
+void bchannel_join(struct bchannel *bchannel, unsigned short id)
{
#ifdef SOCKET_MISDN
int handle;
- handle = channel->b_sock;
+ handle = bchannel->b_sock;
#else
unsigned long handle;
- handle = channel->b_addr;
+ handle = bchannel->b_addr;
#endif
if (id)
- channel->b_conf = (id<<16) + bchannel_pid;
+ bchannel->b_conf = (id<<16) + bchannel_pid;
else
- channel->b_conf = 0;
- if (channel->b_state == BSTATE_ACTIVE)
- ph_control(handle, CMX_CONF_JOIN, channel->b_conf, "DSP-CONF", channel->b_conf);
+ bchannel->b_conf = 0;
+ if (bchannel->b_state == BSTATE_ACTIVE)
+ ph_control(handle, CMX_CONF_JOIN, bchannel->b_conf, "DSP-CONF", bchannel->b_conf);
}
int bchannel_handle(void)
{
int ret, work = 0;
- struct bchannel *channel;
+ struct bchannel *bchannel;
int i;
char buffer[2048+MISDN_HEADER_LEN];
struct mISDNhead *hh = (struct mISDNhead *)buffer;
/* process all bchannels */
- channel = bchannel_first;
- while(channel)
+ bchannel = bchannel_first;
+ while(bchannel)
{
/* handle message from bchannel */
- if (channel->b_sock > -1)
+ if (bchannel->b_sock > -1)
{
- ret = recv(channel->b_sock, buffer, sizeof(buffer), 0);
+ ret = recv(bchannel->b_sock, buffer, sizeof(buffer), 0);
if (ret >= MISDN_HEADER_LEN)
{
work = 1;
case DL_DATA_IND:
case PH_SIGNAL_IND:
case PH_CONTROL | INDICATION:
- bchannel_receive(channel, hh->prim, hh->dinfo, buffer+MISDN_HEADER_LEN, ret-MISDN_HEADER_LEN);
+ bchannel_receive(bchannel, hh->prim, hh->dinfo, buffer+MISDN_HEADER_LEN, ret-MISDN_HEADER_LEN);
break;
case PH_ACTIVATE_IND:
case DL_ESTABLISH_IND:
case PH_ACTIVATE_CONF:
case DL_ESTABLISH_CONF:
- PDEBUG("DL_ESTABLISH confirm: bchannel is now activated (socket %d).\n", channel->b_sock);
- bchannel_activated(channel);
+ PDEBUG("DL_ESTABLISH confirm: bchannel is now activated (socket %d).\n", bchannel->b_sock);
+ bchannel_activated(bchannel);
break;
case PH_DEACTIVATE_IND:
case DL_RELEASE_IND:
case PH_DEACTIVATE_CONF:
case DL_RELEASE_CONF:
- PDEBUG("DL_RELEASE confirm: bchannel is now de-activated (socket %d).\n", channel->b_sock);
-// bchannel_deactivated(channel);
+ PDEBUG("DL_RELEASE confirm: bchannel is now de-activated (socket %d).\n", bchannel->b_sock);
+// bchannel_deactivated(bchannel);
break;
default:
- PERROR("child message not handled: prim(0x%x) socket(%d) msg->len(%d)\n", hh->prim, channel->b_sock, msg->len);
+ PERROR("child message not handled: prim(0x%x) socket(%d) msg->len(%d)\n", hh->prim, bchannel->b_sock, msg->len);
}
} else
{
if (ret < 0 && errno != EWOULDBLOCK)
- PERROR("Read from socket %d failed with return code %d\n", channel->b_sock, ret);
+ PERROR("Read from socket %d failed with return code %d\n", bchannel->b_sock, ret);
}
}
- channel = channel->next;
+ bchannel = bchannel->next;
}
/* if we received at least one b-frame, we will return 1 */
#else
int bchannel_handle(void)
{
- int i;
- struct bchannel *channel;
+ struct bchannel *bchannel;
iframe_t *frm;
unsigned char buffer[2048];
- struct mISDNhead *hh = (struct mISDNhead *)buffer;
int len;
/* no device, no read */
}
/* find the mISDNport that belongs to the stack */
- channel = bchannel_first;
- while(channel)
+ bchannel = bchannel_first;
+ while(bchannel)
{
- if (frm->addr == channel->b_addr)
+ if (frm->addr == bchannel->b_addr)
break;
- channel = channel->next;
+ bchannel = bchannel->next;
}
- if (!channel)
+ if (!bchannel)
{
- PERROR("message belongs to no channel: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, len);
+ PERROR("message belongs to no bchannel: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, len);
goto out;
}
case DL_DATA | INDICATION:
case PH_CONTROL | INDICATION:
case PH_SIGNAL | INDICATION:
- bchannel_receive(channel, frm->prim, frm->dinfo, (unsigned char *)frm->data.p, frm->len);
+ bchannel_receive(bchannel, frm->prim, frm->dinfo, (unsigned char *)frm->data.p, frm->len);
break;
case PH_ACTIVATE | INDICATION:
case PH_ACTIVATE | CONFIRM:
case DL_ESTABLISH | CONFIRM:
PDEBUG( "DL_ESTABLISH confirm: bchannel is now activated (address 0x%x).\n", frm->addr);
- bchannel_activated(channel);
+ bchannel_activated(bchannel);
break;
case PH_DEACTIVATE | INDICATION:
case PH_DEACTIVATE | CONFIRM:
case DL_RELEASE | CONFIRM:
PDEBUG("DL_RELEASE confirm: bchannel is now de-activated (address 0x%x).\n", frm->addr);
-// bchannel_deactivated(channel);
+// bchannel_deactivated(bchannel);
break;
default:
struct bchannel *bchannel_first = NULL;
struct bchannel *find_bchannel_handle(unsigned long handle)
{
- struct bchannel *channel = bchannel_first;
+ struct bchannel *bchannel = bchannel_first;
- while(channel)
+ while(bchannel)
{
- if (channel->handle == handle)
+ if (bchannel->handle == handle)
break;
- channel = channel->next;
+ bchannel = bchannel->next;
}
- return(channel);
+ return(bchannel);
}
+#if 0
struct bchannel *find_bchannel_ref(unsigned long ref)
{
- struct bchannel *channel = bchannel_first;
+ struct bchannel *bchannel = bchannel_first;
- while(channel)
+ while(bchannel)
{
- if (channel->ref == ref)
+ if (bchannel->ref == ref)
break;
- channel = channel->next;
+ bchannel = bchannel->next;
}
- return(channel);
+ return(bchannel);
}
+#endif
struct bchannel *alloc_bchannel(unsigned long handle)
{
- struct bchannel **channelp = &bchannel_first;
+ struct bchannel **bchannelp = &bchannel_first;
- while(*channelp)
- channelp = &((*channelp)->next);
+ while(*bchannelp)
+ bchannelp = &((*bchannelp)->next);
- *channelp = (struct bchannel *)malloc(sizeof(struct bchannel));
- if (!*channelp)
+ *bchannelp = (struct bchannel *)malloc(sizeof(struct bchannel));
+ if (!*bchannelp)
return(NULL);
- (*channelp)->handle = handle;
- (*channelp)->b_state = BSTATE_IDLE;
+ (*bchannelp)->handle = handle;
+ (*bchannelp)->b_state = BSTATE_IDLE;
- return(*channelp);
+ return(*bchannelp);
}
-void free_bchannel(struct bchannel *channel)
+void free_bchannel(struct bchannel *bchannel)
{
struct bchannel **temp = &bchannel_first;
while(*temp)
{
- if (*temp == channel)
+ if (*temp == bchannel)
{
*temp = (*temp)->next;
#ifdef SOCKET_MISDN
- if (channel->b_sock > -1)
+ if (bchannel->b_sock > -1)
#else
- if (channel->b_stid)
+ if (bchannel->b_stid)
#endif
- bchannel_destroy(channel);
- if (channel->call)
- {
- if (channel->call->channel)
- channel->call->channel = NULL;
- }
- if (channel->bridge_channel)
+ bchannel_destroy(bchannel);
+ if (bchannel->call)
{
- if (channel->bridge_channel->bridge_channel)
- channel->bridge_channel->bridge_channel = NULL;
+ if (bchannel->call->bchannel)
+ bchannel->call->bchannel = NULL;
}
- free(channel);
+ free(bchannel);
return;
}
temp = &((*temp)->next);
#include <sys/socket.h>
#include <sys/un.h>
-#include <pthread.h>
#include <semaphore.h>
-pthread_mutex_t chan_lock;
-
#include <asterisk/module.h>
#include <asterisk/channel.h>
#include <asterisk/config.h>
char lcr_type[]="lcr";
pthread_t chan_tid;
+ast_mutex_t chan_lock;
int quit;
int glob_channel = 0;
}
#if 0
+struct chan_call *find_call_ast(struct ast_channel *ast)
+{
+ struct chan_call *call = call_first;
+
+ while(call)
+ {
+ if (call->ast == ast)
+ break;
+ call = call->next;
+ }
+ return(call);
+}
+
struct chan_call *find_call_handle(unsigned long handle)
{
struct chan_call *call = call_first;
if (*temp == call)
{
*temp = (*temp)->next;
- if (call->channel)
+ if (call->bchannel)
{
- if (call->channel->call)
- call->channel->call = NULL;
+ if (call->bchannel->call)
+ call->bchannel->call = NULL;
+ }
+ if (call->bridge_call)
+ {
+ if (call->bridge_call->bridge_call)
+ call->bridge_call->bridge_call = NULL;
}
free(call);
return;
}
}
-unsigned short new_brige_id(void)
+unsigned short new_bridge_id(void)
{
- struct bchannel *channel;
+ struct chan_call *call;
unsigned short id = 1;
/* search for lowest bridge id that is not in use and not 0 */
while(id)
{
- channel = bchannel_first;
- while(channel)
+ call = call_first;
+ while(call)
{
- if (channel->bridge_id == id)
+ if (call->bridge_id == id)
break;
- channel = channel->next;
+ call = call->next;
}
- if (!channel)
+ if (!call)
break;
id++;
}
static void send_setup_to_lcr(struct chan_call *call)
{
union parameter newparam;
+ struct ast_channel *ast = call->ast;
if (!call->ast || !call->ref)
return;
memset(&newparam, 0, sizeof(union parameter));
newparam.setup.callerinfo.itype = INFO_ITYPE_CHAN;
newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN;
- if (call->ast->cid.cid_num) if (call->ast->cid.cid_num[0])
- strncpy(newparam.setup.callerinfo.id, call->ast->cid.cid_num, sizeof(newparam.setup.callerinfo.id)-1);
- if (call->ast->cid.cid_name) if (call->ast->cid.cid_name[0])
- strncpy(newparam.setup.callerinfo.name, call->ast->cid.cid_name, sizeof(newparam.setup.callerinfo.name)-1);
- if (call->ast->cid.cid_rdnis) if (call->ast->cid.cid_rdnis[0])
+ if (ast->cid.cid_num) if (ast->cid.cid_num[0])
+ strncpy(newparam.setup.callerinfo.id, ast->cid.cid_num, sizeof(newparam.setup.callerinfo.id)-1);
+ if (ast->cid.cid_name) if (ast->cid.cid_name[0])
+ strncpy(newparam.setup.callerinfo.name, ast->cid.cid_name, sizeof(newparam.setup.callerinfo.name)-1);
+ if (ast->cid.cid_rdnis) if (ast->cid.cid_rdnis[0])
{
- strncpy(newparam.setup.redirinfo.id, call->ast->cid.cid_rdnis, sizeof(newparam.setup.redirinfo.id)-1);
+ strncpy(newparam.setup.redirinfo.id, ast->cid.cid_rdnis, sizeof(newparam.setup.redirinfo.id)-1);
newparam.setup.redirinfo.itype = INFO_ITYPE_CHAN;
newparam.setup.redirinfo.ntype = INFO_NTYPE_UNKNOWN;
}
- switch(call->ast->cid.cid_pres & AST_PRES_RESTRICTION)
+ switch(ast->cid.cid_pres & AST_PRES_RESTRICTION)
{
case AST_PRES_ALLOWED:
newparam.setup.callerinfo.present = INFO_PRESENT_ALLOWED;
default:
newparam.setup.callerinfo.present = INFO_PRESENT_NULL;
}
- switch(call->ast->cid.cid_ton)
+ switch(ast->cid.cid_ton)
{
case 4:
newparam.setup.callerinfo.ntype = INFO_NTYPE_SUBSCRIBER;
default:
newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN;
}
- newparam.setup.capainfo.bearer_capa = call->ast->transfercapability;
+ newparam.setup.capainfo.bearer_capa = ast->transfercapability;
#warning todo
// newparam.setup.capainfo.bearer_user = alaw 3, ulaw 2;
newparam.setup.capainfo.bearer_mode = INFO_BMODE_CIRCUIT;
{
/* check bridge */
if (!call) return;
- if (!call->channel) return;
- if (!call->channel->bridge_channel) return;
- if (!call->channel->bridge_channel->call) return;
- if (!call->channel->bridge_channel->call->ref) return;
- send_message(MESSAGE_RELEASE, call->channel->bridge_channel->call->ref, param);
+ if (!call->bridge_call) return;
+ send_message(MESSAGE_RELEASE, call->bridge_call->ref, param);
}
/*
*/
static void lcr_in_disconnect(struct chan_call *call, int message_type, union parameter *param)
{
+ struct ast_channel *ast = call->ast;
union parameter newparam;
/* change state */
call->cause = param->disconnectinfo.cause;
call->location = param->disconnectinfo.location;
/* if bridge, forward disconnect and return */
- if (call->channel)
- if (call->channel->bridge_channel)
- if (call->channel->bridge_channel->call)
- {
- bridge_message_if_bridged(call, message_type, param);
- return;
- }
+ if (call->bridge_call)
+ {
+ bridge_message_if_bridged(call, message_type, param);
+ return;
+ }
/* release lcr */
newparam.disconnectinfo.cause = CAUSE_NORMAL;
newparam.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
send_message(MESSAGE_RELEASE, call->ref, &newparam);
call->ref = 0;
/* release asterisk */
- call->ast->hangupcause = call->cause;
- ast_queue_hangup(call->ast);
+ ast->hangupcause = call->cause;
+ ast_queue_hangup(ast);
/* change to release state */
call->state = CHAN_LCR_STATE_RELEASE;
}
*/
static void lcr_in_release(struct chan_call *call, int message_type, union parameter *param)
{
+ struct ast_channel *ast = call->ast;
+
/* release ref */
call->ref = 0;
/* change to release state */
call->location = param->disconnectinfo.location;
}
/* if we have an asterisk instance, send hangup, else we are done */
- if (call->ast)
+ if (ast)
{
- call->ast->hangupcause = call->cause;
- ast_queue_hangup(call->ast);
+ ast->hangupcause = call->cause;
+ ast_queue_hangup(ast);
} else
{
free_call(call);
if ((call = find_call_ref(ref)))
{
bchannel->call = call;
- call->channel = bchannel;
+ call->bchannel = bchannel;
#warning hier muesen alle stati gesetzt werden falls sie vor dem b-kanal verfügbar waren
- if (bchannel->bridge_id)
- bchannel_join(bchannel, bchannel->bridge_id);
+ if (call->bridge_id)
+ bchannel_join(bchannel, call->bridge_id);
}
if (bchannel_create(bchannel))
bchannel_activate(bchannel, 1);
break;
case MESSAGE_INFORMATION:
- lcr_in_disconnect(call, message_type, param);
+ lcr_in_information(call, message_type, param);
break;
case MESSAGE_NOTIFY:
{
int work;
- pthread_mutex_lock(&chan_lock);
+ ast_mutex_lock(&chan_lock);
while(!quit)
{
if (!work)
{
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
usleep(30000);
- pthread_mutex_lock(&chan_lock);
+ ast_mutex_lock(&chan_lock);
}
}
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
return NULL;
}
{
union parameter newparam;
struct ast_channel *ast;
+ struct chan_call *call;
- pthread_mutex_lock(&chan_lock);
+ ast_mutex_lock(&chan_lock);
/* create call instance */
call = alloc_call();
return NULL;
}
/* create asterisk channel instrance */
- ast = ast_channel_alloc(1);
+ ast = ast_channel_alloc(1, AST_STATE_RESERVED, NULL, NULL, "", NULL, "", 0, "%s/%d", lcr_type, ++glob_channel);
if (!ast)
{
free_call(call);
call->ast = ast;
ast->tech = &lcr_tech;
/* configure channel */
- ast->state = AST_STATE_RESERVED;
snprintf(ast->name, sizeof(ast->name), "%s/%d", lcr_type, ++glob_channel);
ast->name[sizeof(ast->name)-1] = '\0';
- ast->type = lcr_type;
+#warning todo
+#if 0
ast->nativeformat = configfile->lawformat;
ast->readformat = ast->rawreadformat = configfile->lawformat;
ast->writeformat = ast->rawwriteformat = configfile->lawformat;
+#endif
ast->hangupcause = 0;
/* send MESSAGE_NEWREF */
memset(&newparam, 0, sizeof(union parameter));
/* set state */
call->state = CHAN_LCR_STATE_OUT_PREPARE;
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
+
+ return ast;
}
/*
*/
static int lcr_call(struct ast_channel *ast, char *dest, int timeout)
{
- union parameter newparam;
struct chan_call *call=ast->tech_pvt;
- char buf[128];
- char *port_str, *dad, *p;
if (!call) return -1;
- pthread_mutex_lock(&chan_lock);
+ ast_mutex_lock(&chan_lock);
- hier muss noch
+#warning hier muss noch
+#if 0
ast_copy_string(buf, dest, sizeof(buf)-1);
p=buf;
port_str=strsep(&p, "/");
dad=strsep(&p, "/");
+#endif
/* send setup message, if we already have a callref */
if (call->ref)
send_setup_to_lcr(call);
- if (lcr_debug)
- ast_verbose("Call: ext:%s dest:(%s) -> dad(%s) \n", ast->exten,dest, dad);
+// if (lcr_debug)
+ // ast_verbose("Call: ext:%s dest:(%s) -> dad(%s) \n", ast->exten,dest, dad);
-#warning hier müssen wi eine der geholten REFs nehmen und ein SETUP schicken, die INFOS zum SETUP stehen im Ast pointer drin, bzw. werden hier übergeben.
-
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
return 0;
}
static int lcr_digit(struct ast_channel *ast, char digit)
{
+ struct chan_call *call = ast->tech_pvt;
union parameter newparam;
char buf[]="x";
if (digit > 126 || digit < 32)
return 0;
- pthread_mutex_lock(&chan_lock);
+ ast_mutex_lock(&chan_lock);
/* send information or queue them */
if (call->ref && call->state == CHAN_LCR_STATE_OUT_DIALING)
{
memset(&newparam, 0, sizeof(union parameter));
- newparam.dialinginfo.id[0] = digit;
- newparam.dialinginfo.id[1] = '\0';
+ newparam.information.id[0] = digit;
+ newparam.information.id[1] = '\0';
send_message(MESSAGE_INFORMATION, call->ref, &newparam);
} else
if (!call->ref
&& (call->state == CHAN_LCR_STATE_OUT_PREPARE || call->state == CHAN_LCR_STATE_OUT_SETUP));
{
*buf = digit;
- strncat(call->dialque, buf, strlen(char->dialque)-1);
+ strncat(call->dialque, buf, strlen(call->dialque)-1);
}
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
return(0);
}
-static int lcr_answer(struct ast_channel *c)
+static int lcr_answer(struct ast_channel *ast)
{
union parameter newparam;
- struct chan_call *call=c->tech_pvt;
+ struct chan_call *call = ast->tech_pvt;
if (!call) return -1;
- pthread_mutex_lock(&chan_lock);
+ ast_mutex_lock(&chan_lock);
- /* check bridged connectinfo */
- if (call->bchannel)
- if (call->bchannel->bridge_channel)
- if (call->bchannel->bridge_channel->call)
- {
- memcpy(call->connectinfo, call->bchannel->bridge_channel->call->connectinfo, sizeof(struct connect_info));
- }
+ /* copy connectinfo, if bridged */
+ if (call->bridge_call)
+ memcpy(&call->connectinfo, &call->bridge_call->connectinfo, sizeof(struct connect_info));
/* send connect message to lcr */
memset(&newparam, 0, sizeof(union parameter));
- memcpy(param->connectinfo, call->connectinfo, sizeof(struct connect_info));
+ memcpy(&newparam.connectinfo, &call->connectinfo, sizeof(struct connect_info));
send_message(MESSAGE_CONNECT, call->ref, &newparam);
/* change state */
call->state = CHAN_LCR_STATE_CONNECT;
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
return 0;
}
if (!call)
return 0;
- pthread_mutex_lock(&chan_lock);
+ ast_mutex_lock(&chan_lock);
/* disconnect asterisk, maybe not required */
ast->tech_pvt = NULL;
if (call->ref)
send_message(MESSAGE_RELEASE, call->ref, &newparam);
/* remove call */
free_call(call);
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
return 0;
} else
{
call->state = CHAN_LCR_STATE_RELEASE;
}
}
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
return 0;
}
static int lcr_write(struct ast_channel *ast, struct ast_frame *f)
{
- struct chan_call *call= ast->tech_pvt;
+ struct chan_call *call = ast->tech_pvt;
if (!call) return 0;
- pthread_mutex_lock(&chan_lock);
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_lock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
+ return 0;
}
{
struct chan_call *call = ast->tech_pvt;
if (!call) return 0;
- pthread_mutex_lock(&chan_lock);
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_lock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
+ return 0;
}
static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, size_t datalen)
{
+ struct chan_call *call = ast->tech_pvt;
union parameter newparam;
int res = -1;
if (!call) return -1;
- pthread_mutex_lock(&chan_lock);
+ ast_mutex_lock(&chan_lock);
switch (cond) {
case AST_CONTROL_BUSY:
/* change state */
call->state = CHAN_LCR_STATE_OUT_DISCONNECT;
/* return */
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
return 0;
case AST_CONTROL_CONGESTION:
/* return */
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
return -1;
case AST_CONTROL_RINGING:
/* send message to lcr */
/* change state */
call->state = CHAN_LCR_STATE_OUT_ALERTING;
/* return */
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
return 0;
case -1:
/* return */
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
return 0;
case AST_CONTROL_VIDUPDATE:
break;
default:
- ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, c->name);
+ ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, ast->name);
/* return */
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
return -1;
}
/* return */
- pthread_mutex_unlock(&chan_lock);
+ ast_mutex_unlock(&chan_lock);
return 0;
}
+/*
+ * bridge process
+ */
+enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
+ struct ast_channel *ast2, int flags,
+ struct ast_frame **fo,
+ struct ast_channel **rc, int timeoutms)
+
+{
+ struct chan_call *call1, *call2;
+ struct ast_channel *carr[2], *who;
+ int to = -1;
+ struct ast_frame *f;
+ int bridge_id;
+
+#if 0
+ if (config nobridge) {
+ ast_log(LOG_NOTICE, "Falling back to Asterisk bridging\n");
+ return AST_BRIDGE_FAILED;
+ }
+
+ if (! (flags&AST_BRIDGE_DTMF_CHANNEL_0) )
+ call1->ignore_dtmf=1;
+
+ if (! (flags&AST_BRIDGE_DTMF_CHANNEL_1) )
+ call2->ignore_dtmf=1;
+#endif
+
+ /* join via dsp (if the channels are currently open) */
+ bridge_id = new_bridge_id();
+ ast_mutex_lock(&chan_lock);
+ call1 = ast1->tech_pvt;
+ call2 = ast2->tech_pvt;
+ if (call1)
+ {
+ call1->bridge_id = bridge_id;
+ if (call1->bchannel)
+ bchannel_join(call1->bchannel, bridge_id);
+ }
+ if (call2)
+ {
+ call2->bridge_id = bridge_id;
+ if (call2->bchannel)
+ bchannel_join(call2->bchannel, bridge_id);
+ }
+ ast_mutex_unlock(&chan_lock);
+
+ while(1) {
+ who = ast_waitfor_n(carr, 2, &to);
+
+ if (!who) {
+ ast_log(LOG_NOTICE,"misdn_bridge: empty read, breaking out\n");
+ break;
+ }
+ f = ast_read(who);
+
+ if (!f || f->frametype == AST_FRAME_CONTROL) {
+ /* got hangup .. */
+ *fo=f;
+ *rc=who;
+ break;
+ }
+
+ if ( f->frametype == AST_FRAME_DTMF ) {
+ *fo=f;
+ *rc=who;
+ break;
+ }
+
+#warning kann einfach gesendet werden. dsp slittet automatisch, wenn frames kommen, bis der fifo leer ist.
+#if 0
+ if (f->frametype == AST_FRAME_VOICE) {
+
+ continue;
+ }
+#endif
+
+ if (who == ast1) {
+ ast_write(ast2,f);
+ }
+ else {
+ ast_write(ast1,f);
+ }
+
+ }
+
+ /* split channels */
+ ast_mutex_lock(&chan_lock);
+ call1 = ast1->tech_pvt;
+ call2 = ast2->tech_pvt;
+ if (call1)
+ {
+ call1->bridge_id = 0;
+ if (call1->bchannel)
+ bchannel_join(call1->bchannel, 0);
+ }
+ if (call2)
+ {
+ call2->bridge_id = 0;
+ if (call2->bchannel)
+ bchannel_join(call2->bchannel, 0);
+ }
+ ast_mutex_unlock(&chan_lock);
+
+
+ return AST_BRIDGE_COMPLETE;
+}
static struct ast_channel_tech lcr_tech = {
.type=lcr_type,
.description="Channel driver for connecting to Linux-Call-Router",
.capabilities=AST_FORMAT_ALAW,
.requester=lcr_request,
- .send_digit=lcr_digit,
+ .send_digit_begin=lcr_digit,
.call=lcr_call,
.bridge=lcr_bridge,
.hangup=lcr_hangup,
*/
static int lcr_show_lcr (int fd, int argc, char *argv[])
{
+ return 0;
}
static int lcr_show_calls (int fd, int argc, char *argv[])
{
+ return 0;
}
static int lcr_reload_routing (int fd, int argc, char *argv[])
{
+ return 0;
}
static int lcr_reload_interfaces (int fd, int argc, char *argv[])
{
+ return 0;
}
static int lcr_port_block (int fd, int argc, char *argv[])
{
+ return 0;
}
static int lcr_port_unblock (int fd, int argc, char *argv[])
{
+ return 0;
}
static int lcr_port_unload (int fd, int argc, char *argv[])
{
+ return 0;
}
static struct ast_cli_entry cli_show_lcr =
// lcr_cfg_update_ptp();
- pthread_mutex_init(&chan_lock, NULL);
+ ast_mutex_init(&chan_lock);
if (!(lcr_sock = open_socket())) {
ast_log(LOG_ERROR, "Unable to connect\n");
#endif
quit = 1;
- if ((pthread_create(&chan_tid, NULL, chan_thread, arg)<0))
+ if ((pthread_create(&chan_tid, NULL, chan_thread, NULL)<0))
{
- failed to create thread
+ /* failed to create thread */
bchannel_deinitialize();
close_socket(lcr_sock);
ast_channel_unregister(&lcr_tech);
projects / lcr.git / commitdiff