**---------------------------------------------------------------------------**
** Copyright: Andreas Eversberg **
** **
-** mISDN port abstraction for dss1 and sip **
+** mISDN port abstraction for dss1 **
** **
\*****************************************************************************/
-
#include "main.h"
-#include <poll.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#ifdef SOCKET_MISDN
-#include <netinet/udp.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include <linux/mISDNif.h>
-#include <q931.h>
-#include <mlayer3.h>
-#else
+#include "myisdn.h"
+#ifndef SOCKET_MISDN
+// old mISDN
extern "C" {
#include <mISDNuser/net_l2.h>
}
+
+#ifndef CMX_TXDATA_ON
+#define OLD_MISDN
+#endif
+#ifndef CMX_TXDATA_OFF
+#define OLD_MISDN
+#endif
+#ifndef CMX_DELAY
+#define OLD_MISDN
+#endif
+#ifndef PIPELINE_CFG
+#define OLD_MISDN
+#endif
+#ifndef CMX_TX_DATA
+#define OLD_MISDN
+#endif
+
+#ifdef OLD_MISDN
+#warning
+#warning *********************************************************
+#warning *
+#warning * It seems that you use an older version of mISDN.
+#warning * Features like voice recording or echo will not work.
+#warning * Also it causes problems with loading modules and may
+#warning * not work at all.
+#warning *
+#warning * Please upgrade to newer version. A working version can
+#warning * be found at www.linux-call-router.de.
+#warning *
+#warning * Do not use the mISDN_1_1 branch, it does not have all
+#warning * the features that are required. Use the master branch
+#warning * instead.
+#warning *
+#warning *********************************************************
+#warning
+#error
#endif
#ifndef ISDN_PID_L4_B_USER
#define ISDN_PID_L4_B_USER 0x440000ff
#endif
+#else
+// socket mISDN
+extern "C" {
+}
+#include <q931.h>
+
+#undef offsetof
+#ifdef __compiler_offsetof
+#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
+#else
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
+
+#define container_of(ptr, type, member) ({ \
+ const typeof( ((type *)0)->member ) *__mptr = (ptr); \
+ (type *)( (char *)__mptr - offsetof(type,member) );})
+#endif
+
+// timeouts if activating/deactivating response from mISDN got lost
+#define B_TIMER_ACTIVATING 1 // seconds
+#define B_TIMER_DEACTIVATING 1 // seconds
+
/* list of mISDN ports */
struct mISDNport *mISDNport_first;
unsigned char mISDN_rand[256];
int mISDN_rand_count = 0;
-#ifdef MISDN_SOCKET
+#ifdef SOCKET_MISDN
+unsigned long mt_assign_pid = ~0;
+
int mISDNsocket = -1;
int mISDN_initialize(void)
{
+ char filename[256];
+
/* 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?)\n", strerror(errno));
return(-1);
}
- /* initialize stuff of the NT lib */
+ /* open debug, if enabled and not only stack debugging */
+ if (options.deb && (options.deb != DEBUG_STACK))
+ {
+ SPRINT(filename, "%s/debug.log", INSTALL_DATA);
+ debug_fp = fopen(filename, "a");
+ }
+
if (options.deb & DEBUG_STACK)
{
- global_debug = 0xffffffff & ~DBGM_MSG;
-// global_debug = DBGM_L3DATA;
+ SPRINT(filename, "%s/debug_mISDN.log", INSTALL_DATA);
+ mISDN_debug_init(0xffffffff, filename, filename, filename);
} else
- global_debug = DBGM_MAN;
- SPRINT(debug_log, "%s/debug.log", INSTALL_DATA);
- if (options.deb & DEBUG_LOG)
- mISDN_debug_init(global_debug, debug_log, debug_log, debug_log);
- else
- mISDN_debug_init(global_debug, NULL, NULL, NULL);
+ mISDN_debug_init(0, NULL, NULL, NULL);
/* init mlayer3 */
init_layer3(4); // buffer of 4
mISDN_debug_close();
+ if (debug_fp)
+ fclose(debug_fp);
+ debug_fp = NULL;
+
if (mISDNsocket > -1)
close(mISDNsocket);
}
unsigned char buff[1025];
debug_close();
+ global_debug = 0;
- if (mISDNdevice >= 0)
+ if (mISDNdevice > -1)
{
/* free entity */
mISDN_write_frame(mISDNdevice, buff, 0, MGR_DELENTITY | REQUEST, entity, 0, NULL, TIMEOUT_1SEC);
*/
PmISDN::~PmISDN()
{
- struct message *message;
+ struct lcr_msg *message;
/* remove bchannel relation */
drop_bchannel();
/* init trace with given values */
start_trace(mISDNport?mISDNport->portnum:0,
(mISDNport)?((mISDNport->ifport)?mISDNport->ifport->interface:NULL):NULL,
- port?numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype):NULL,
+ port?numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype, options.national, options.international):NULL,
port?port->p_dialinginfo.id:NULL,
direction,
CATEGORY_CH,
char *name;
unsigned long value;
} isdn_message[] = {
- {"TIMEOUT", CC_TIMEOUT},
- {"SETUP", CC_SETUP},
- {"SETUP_ACK", CC_SETUP_ACKNOWLEDGE},
- {"PROCEEDING", CC_PROCEEDING},
- {"ALERTING", CC_ALERTING},
- {"CONNECT", CC_CONNECT},
- {"CONNECT RES", CC_CONNECT},
- {"CONNECT_ACK", CC_CONNECT_ACKNOWLEDGE},
- {"DISCONNECT", CC_DISCONNECT},
- {"RELEASE", CC_RELEASE},
- {"RELEASE_COMP", CC_RELEASE_COMPLETE},
- {"INFORMATION", CC_INFORMATION},
- {"PROGRESS", CC_PROGRESS},
- {"NOTIFY", CC_NOTIFY},
- {"SUSPEND", CC_SUSPEND},
- {"SUSPEND_ACK", CC_SUSPEND_ACKNOWLEDGE},
- {"SUSPEND_REJ", CC_SUSPEND_REJECT},
- {"RESUME", CC_RESUME},
- {"RESUME_ACK", CC_RESUME_ACKNOWLEDGE},
- {"RESUME_REJ", CC_RESUME_REJECT},
- {"HOLD", CC_HOLD},
- {"HOLD_ACK", CC_HOLD_ACKNOWLEDGE},
- {"HOLD_REJ", CC_HOLD_REJECT},
- {"RETRIEVE", CC_RETRIEVE},
- {"RETRIEVE_ACK", CC_RETRIEVE_ACKNOWLEDGE},
- {"RETRIEVE_REJ", CC_RETRIEVE_REJECT},
- {"FACILITY", CC_FACILITY},
- {"STATUS", CC_STATUS},
- {"RESTART", CC_RESTART},
- {"RELEASE_CR", CC_RELEASE_CR},
- {"NEW_CR", CC_NEW_CR},
- {"DL_ESTABLISH", DL_ESTABLISH},
- {"DL_RELEASE", DL_RELEASE},
- {"PH_ACTIVATE", PH_ACTIVATE},
- {"PH_DEACTIVATE", PH_DEACTIVATE},
+ {"PH_ACTIVATE", L1_ACTIVATE_REQ},
+ {"PH_DEACTIVATE", L1_DEACTIVATE_REQ},
+ {"DL_ESTABLISH", L2_ESTABLISH_REQ},
+ {"DL_RELEASE", L2_RELEASE_REQ},
+ {"UNKNOWN", L3_UNKNOWN},
+ {"MT_TIMEOUT", L3_TIMEOUT_REQ},
+ {"MT_SETUP", L3_SETUP_REQ},
+ {"MT_SETUP_ACK", L3_SETUP_ACKNOWLEDGE_REQ},
+ {"MT_PROCEEDING", L3_PROCEEDING_REQ},
+ {"MT_ALERTING", L3_ALERTING_REQ},
+ {"MT_CONNECT", L3_CONNECT_REQ},
+ {"MT_CONNECT_ACK", L3_CONNECT_ACKNOWLEDGE_REQ},
+ {"MT_DISCONNECT", L3_DISCONNECT_REQ},
+ {"MT_RELEASE", L3_RELEASE_REQ},
+ {"MT_RELEASE_COMP", L3_RELEASE_COMPLETE_REQ},
+ {"MT_INFORMATION", L3_INFORMATION_REQ},
+ {"MT_PROGRESS", L3_PROGRESS_REQ},
+ {"MT_NOTIFY", L3_NOTIFY_REQ},
+ {"MT_SUSPEND", L3_SUSPEND_REQ},
+ {"MT_SUSPEND_ACK", L3_SUSPEND_ACKNOWLEDGE_REQ},
+ {"MT_SUSPEND_REJ", L3_SUSPEND_REJECT_REQ},
+ {"MT_RESUME", L3_RESUME_REQ},
+ {"MT_RESUME_ACK", L3_RESUME_ACKNOWLEDGE_REQ},
+ {"MT_RESUME_REJ", L3_RESUME_REJECT_REQ},
+ {"MT_HOLD", L3_HOLD_REQ},
+ {"MT_HOLD_ACK", L3_HOLD_ACKNOWLEDGE_REQ},
+ {"MT_HOLD_REJ", L3_HOLD_REJECT_REQ},
+ {"MT_RETRIEVE", L3_RETRIEVE_REQ},
+ {"MT_RETRIEVE_ACK", L3_RETRIEVE_ACKNOWLEDGE_REQ},
+ {"MT_RETRIEVE_REJ", L3_RETRIEVE_REJECT_REQ},
+ {"MT_FACILITY", L3_FACILITY_REQ},
+ {"MT_STATUS", L3_STATUS_REQ},
+ {"MT_RESTART", L3_RESTART_REQ},
+#ifdef SOCKET_MISDN
+ {"MT_NEW_L3ID", L3_NEW_L3ID_REQ},
+ {"MT_RELEASE_L3ID", L3_RELEASE_L3ID_REQ},
+#else
+ {"MT_NEW_CR", L3_NEW_CR_REQ},
+ {"MT_RELEASE_CR", L3_RELEASE_CR_REQ},
+#endif
{NULL, 0},
};
" INDICATION",
" RESPONSE",
};
-void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsigned long prim, int direction)
+void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsigned long msg, int direction)
{
int i;
char msgtext[64] = "<<UNKNOWN MESSAGE>>";
i = 0;
while(isdn_message[i].name)
{
- if (isdn_message[i].value == (prim&0xffffff00))
+ if (isdn_message[i].value == (msg&0xffffff00))
{
SCPY(msgtext, isdn_message[i].name);
break;
}
i++;
}
- SCAT(msgtext, isdn_prim[prim&0x00000003]);
+ SCAT(msgtext, isdn_prim[msg&0x00000003]);
/* add direction */
- if (direction && (prim&0xffffff00)!=CC_NEW_CR && (prim&0xffffff00)!=CC_RELEASE_CR)
+#ifdef SOCKET_MISDN
+ if (direction && (msg&0xffffff00)!=L3_NEW_L3ID_REQ && (msg&0xffffff00)!=L3_RELEASE_L3ID_REQ)
+#else
+ if (direction && (msg&0xffffff00)!=L3_NEW_CR_REQ && (msg&0xffffff00)!=L3_RELEASE_CR_REQ)
+#endif
{
if (mISDNport)
{
/* init trace with given values */
start_trace(mISDNport?mISDNport->portnum:0,
mISDNport?mISDNport->ifport->interface:NULL,
- port?numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype):NULL,
+ port?numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype, options.national, options.international):NULL,
port?port->p_dialinginfo.id:NULL,
direction,
CATEGORY_CH,
#ifdef SOCKET_MISDN
unsigned char buffer[MISDN_HEADER_LEN+sizeof(int)+sizeof(int)];
struct mISDNhead *ctrl = (struct mISDNhead *)buffer;
- unsigned long *d = buffer+MISDN_HEADER_LEN;
+ unsigned long *d = (unsigned long *)(buffer+MISDN_HEADER_LEN);
int ret;
ctrl->prim = PH_CONTROL_REQ;
mISDN_write(mISDNdevice, ctrl, mISDN_HEADER_LEN+ctrl->len, TIMEOUT_1SEC);
#endif
chan_trace_header(mISDNport, isdnport, "BCHANNEL control", DIRECTION_OUT);
+#ifdef SOCKET_MISDN
+ if (c1 == DSP_CONF_JOIN)
+#else
if (c1 == CMX_CONF_JOIN)
+#endif
add_trace(trace_name, NULL, "0x%08x", trace_value);
else
add_trace(trace_name, NULL, "%d", trace_value);
#ifdef SOCKET_MISDN
unsigned char buffer[MISDN_HEADER_LEN+sizeof(int)+c2_len];
struct mISDNhead *ctrl = (struct mISDNhead *)buffer;
- unsigned long *d = buffer+MISDN_HEADER_LEN;
+ unsigned long *d = (unsigned long *)(buffer+MISDN_HEADER_LEN);
int ret;
ctrl->prim = PH_CONTROL_REQ;
*/
static int _bchannel_create(struct mISDNport *mISDNport, int i)
{
- unsigned char buff[1024];
int ret;
#ifdef SOCKET_MISDN
unsigned long on = 1;
- struct sockadd_mISDN addr;
+ struct sockaddr_mISDN addr;
if (mISDNport->b_socket[i])
{
/* bind socket to bchannel */
addr.family = AF_ISDN;
- addr.dev = mISDNport->port-1;
+ addr.dev = mISDNport->portnum-1;
addr.channel = i+1+(i>=15);
- ret = bind(di->bchan, (struct sockaddr *)&addr, sizeof(addr));
+ ret = bind(mISDNport->b_socket[i], (struct sockaddr *)&addr, sizeof(addr));
if (ret < 0)
{
PERROR("Error: Failed to bind bchannel-socket for index %d with mISDN-DSP layer. Did you load mISDNdsp.ko?\n", i);
add_trace("channel", NULL, "%d", i+1+(i>=15));
add_trace("socket", NULL, "%d", mISDNport->b_socket[i]);
end_trace();
+
+ return(1);
#else
+ unsigned char buff[1024];
layer_info_t li;
mISDN_pid_t pid;
add_trace("stack", "id", "0x%08x", mISDNport->b_stid[i]);
add_trace("stack", "address", "0x%08x", mISDNport->b_addr[i]);
end_trace();
-#endif
return(1);
failed:
mISDNport->b_addr[i] = 0;
return(0);
+#endif
}
/* trace */
chan_trace_header(mISDNport, mISDNport->b_port[i], activate?(char*)"BCHANNEL activate":(char*)"BCHANNEL deactivate", DIRECTION_OUT);
add_trace("channel", NULL, "%d", i+1+(i>=15));
+ if (mISDNport->b_timer[i])
+ add_trace("event", NULL, "timeout recovery");
end_trace();
}
int handle;
handle = mISDNport->b_socket[i];
+ port = mISDNport->b_port[i];
+ if (!port)
+ {
+ PERROR("bchannel index i=%d not associated with a port object\n", i);
+ return;
+ }
+
+ /* set dsp features */
+ if (port->p_m_txdata)
+ ph_control(mISDNport, port, handle, (port->p_m_txdata)?DSP_TXDATA_ON:DSP_TXDATA_OFF, 0, "DSP-TXDATA", port->p_m_txdata);
+ if (port->p_m_delay)
+ ph_control(mISDNport, port, handle, DSP_DELAY, port->p_m_delay, "DSP-DELAY", port->p_m_delay);
+ if (port->p_m_tx_gain)
+ ph_control(mISDNport, port, handle, DSP_VOL_CHANGE_TX, port->p_m_tx_gain, "DSP-TX_GAIN", port->p_m_tx_gain);
+ if (port->p_m_rx_gain)
+ ph_control(mISDNport, port, handle, DSP_VOL_CHANGE_RX, port->p_m_rx_gain, "DSP-RX_GAIN", port->p_m_rx_gain);
+ if (port->p_m_pipeline[0])
+ ph_control_block(mISDNport, port, handle, DSP_PIPELINE_CFG, port->p_m_pipeline, strlen(port->p_m_pipeline)+1, "DSP-PIPELINE", 0);
+ if (port->p_m_conf)
+ ph_control(mISDNport, port, handle, DSP_CONF_JOIN, port->p_m_conf, "DSP-CONF", port->p_m_conf);
+ if (port->p_m_echo)
+ ph_control(mISDNport, port, handle, DSP_ECHO_ON, 0, "DSP-ECHO", 1);
+ if (port->p_m_tone)
+ ph_control(mISDNport, port, handle, DSP_TONE_PATT_ON, port->p_m_tone, "DSP-TONE", port->p_m_tone);
+ if (port->p_m_rxoff)
+ ph_control(mISDNport, port, handle, DSP_RECEIVE_OFF, 0, "DSP-RXOFF", 1);
+// if (port->p_m_txmix)
+// ph_control(mISDNport, port, handle, DSP_MIX_ON, 0, "DSP-MIX", 1);
+ if (port->p_m_dtmf)
+ ph_control(mISDNport, port, handle, DTMF_TONE_START, 0, "DSP-DTMF", 1);
+ if (port->p_m_crypt)
+ ph_control_block(mISDNport, port, handle, DSP_BF_ENABLE_KEY, port->p_m_crypt_key, port->p_m_crypt_key_len, "DSP-CRYPT", port->p_m_crypt_key_len);
#else
unsigned long handle;
handle = mISDNport->b_addr[i];
-#endif
port = mISDNport->b_port[i];
if (!port)
{
}
/* set dsp features */
+#ifndef OLD_MISDN
if (port->p_m_txdata)
ph_control(mISDNport, port, handle, (port->p_m_txdata)?CMX_TXDATA_ON:CMX_TXDATA_OFF, 0, "DSP-TXDATA", port->p_m_txdata);
if (port->p_m_delay)
ph_control(mISDNport, port, handle, CMX_DELAY, port->p_m_delay, "DSP-DELAY", port->p_m_delay);
+#endif
if (port->p_m_tx_gain)
ph_control(mISDNport, port, handle, VOL_CHANGE_TX, port->p_m_tx_gain, "DSP-TX_GAIN", port->p_m_tx_gain);
if (port->p_m_rx_gain)
ph_control(mISDNport, port, handle, VOL_CHANGE_RX, port->p_m_rx_gain, "DSP-RX_GAIN", port->p_m_rx_gain);
+#ifndef OLD_MISDN
if (port->p_m_pipeline[0])
ph_control_block(mISDNport, port, handle, PIPELINE_CFG, port->p_m_pipeline, strlen(port->p_m_pipeline)+1, "DSP-PIPELINE", 0);
+#endif
if (port->p_m_conf)
ph_control(mISDNport, port, handle, CMX_CONF_JOIN, port->p_m_conf, "DSP-CONF", port->p_m_conf);
if (port->p_m_echo)
ph_control(mISDNport, port, handle, DTMF_TONE_START, 0, "DSP-DTMF", 1);
if (port->p_m_crypt)
ph_control_block(mISDNport, port, handle, BF_ENABLE_KEY, port->p_m_crypt_key, port->p_m_crypt_key_len, "DSP-CRYPT", port->p_m_crypt_key_len);
+#endif
}
/*
{
class PmISDN *b_port = mISDNport->b_port[i];
int state = mISDNport->b_state[i];
+ double timer = mISDNport->b_timer[i];
unsigned long p_m_remote_ref = 0;
unsigned long p_m_remote_id = 0;
int p_m_tx_gain = 0;
{
_bchannel_activate(mISDNport, i, 1);
state = B_STATE_ACTIVATING;
+ timer = now_d + B_TIMER_ACTIVATING;
}
}
break;
/* bchannel is active, so we deactivate */
_bchannel_activate(mISDNport, i, 0);
state = B_STATE_DEACTIVATING;
+ timer = now_d + B_TIMER_DEACTIVATING;
break;
default:
break;
case B_EVENT_ACTIVATED:
+ timer = 0;
switch(state)
{
case B_STATE_ACTIVATING:
/* bchannel is active, but exported OR not used anymore (or has wrong stack config), so we deactivate */
_bchannel_activate(mISDNport, i, 0);
state = B_STATE_DEACTIVATING;
+ timer = now_d + B_TIMER_DEACTIVATING;
}
break;
/* bchannel is active, so we deactivate */
_bchannel_activate(mISDNport, i, 0);
state = B_STATE_DEACTIVATING;
+ timer = now_d + B_TIMER_DEACTIVATING;
break;
case B_STATE_REMOTE:
break;
case B_EVENT_DEACTIVATED:
+ timer = 0;
switch(state)
{
case B_STATE_IDLE:
{
_bchannel_activate(mISDNport, i, 1);
state = B_STATE_ACTIVATING;
+ timer = now_d + B_TIMER_ACTIVATING;
}
}
}
{
_bchannel_activate(mISDNport, i, 1);
state = B_STATE_ACTIVATING;
+ timer = now_d + B_TIMER_ACTIVATING;
}
}
}
}
break;
+ case B_EVENT_TIMEOUT:
+ timer = 0;
+ switch(state)
+ {
+ case B_STATE_IDLE:
+ /* ignore due to deactivation confirm after unloading */
+ break;
+
+ case B_STATE_ACTIVATING:
+ _bchannel_activate(mISDNport, i, 1);
+ timer = now_d + B_TIMER_ACTIVATING;
+ break;
+
+ case B_STATE_DEACTIVATING:
+ _bchannel_activate(mISDNport, i, 0);
+ timer = now_d + B_TIMER_DEACTIVATING;
+ break;
+
+ default:
+ PERROR("Illegal event %d at state %d, please correct.\n", event, state);
+ }
+ break;
+
default:
PERROR("Illegal event %d, please correct.\n", event);
}
mISDNport->b_state[i] = state;
+ mISDNport->b_timer[i] = timer;
}
while(i < ii)
{
#ifdef SOCKET_MISDN
- if (mISDNport->b_socket[i] == handle)
-#else
if ((unsigned long)(mISDNport->portnum<<8)+i+1+(i>=15) == handle)
+#else
+ if (mISDNport->b_addr[i] == handle)
#endif
break;
i++;
}
if (!mISDNport)
{
- PERROR("received assign/remove ack for handle=%x, but handle does not exist in any mISDNport structure.\n", handle);
+ PERROR("received assign/remove ack for bchannel's handle=%x, but handle does not exist in any mISDNport structure.\n", handle);
break;
}
/* mISDNport may now be set or NULL */
*/
int PmISDN::handler(void)
{
- struct message *message;
+ struct lcr_msg *message;
int elapsed = 0;
int ret;
#ifdef SOCKET_MISDN
unsigned char buf[MISDN_HEADER_LEN+tosend];
struct mISDNhead *frm = (struct mISDNhead *)buf;
- unsigned long *d = buf+MISDN_HEADER_LEN;
+ unsigned char *p = buf+MISDN_HEADER_LEN;
#else
unsigned char buf[mISDN_HEADER_LEN+tosend];
iframe_t *frm = (iframe_t *)buf;
#ifdef SOCKET_MISDN
frm->prim = DL_DATA_REQ;
frm->id = 0;
- ret = sendto(handle, buffer, MISDN_HEADER_LEN+ISDN_LOAD-p_m_load-tosend, 0, NULL, 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);
if (!ret)
- PERROR("Failed to send to socket %d\n", handle);
+ PERROR("Failed to send to socket %d\n", p_m_mISDNport->b_socket[p_m_b_index]);
#else
frm->prim = DL_DATA | REQUEST;
frm->addr = p_m_mISDNport->b_addr[p_m_b_index] | FLG_MSG_DOWN;
frm->dinfo = 0;
frm->len = ISDN_LOAD - p_m_load - tosend;
-#endif
if (frm->len)
mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+frm->len, TIMEOUT_1SEC);
- p_m_load += frm->len;
+#endif
+ p_m_load += ISDN_LOAD - p_m_load - tosend;
}
}
* whenever we get audio data from bchannel, we process it here
*/
#ifdef SOCKET_MISDN
-void PmISDN::bchannel_receive(mISDNhead *hh, unsigned char *data, int len)
+void PmISDN::bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len)
{
unsigned long cont = *((unsigned long *)data);
#else
#endif
unsigned char *data_temp;
unsigned long length_temp;
- struct message *message;
+ struct lcr_msg *message;
unsigned char *p;
int l;
}
switch(cont)
{
+#ifdef SOCKET_MISDN
+ case DSP_BF_REJECT:
+#else
case BF_REJECT:
+#endif
chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN);
add_trace("DSP-CRYPT", NULL, "error");
end_trace();
message_put(message);
break;
+#ifdef SOCKET_MISDN
+ case DSP_BF_ACCEPT:
+#else
case BF_ACCEPT:
+#endif
chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN);
add_trace("DSP-CRYPT", NULL, "ok");
end_trace();
return;
}
#ifdef SOCKET_MISDN
- if (hh->prim == PH_SIGNAL_IND)
+ if (hh->prim == PH_CONTROL_IND)
+ {
+ switch(hh->id)
#else
- if (frm->prim == (PH_SIGNAL | INDICATION))
-#endif
+ if (frm->prim == (PH_SIGNAL | INDICATION)
+ || frm->prim == (PH_CONTROL | INDICATION))
{
switch(frm->dinfo)
+#endif
{
+#ifndef OLD_MISDN
+#ifdef SOCKET_MISDN
+ case DSP_TX_DATA:
+#else
case CMX_TX_DATA:
+#endif
if (!p_m_txdata)
{
/* if tx is off, it may happen that fifos send us pending informations, we just ignore them */
if (p_record)
record(data, len, 1); // from up
break;
+#endif
default:
- chan_trace_header(p_m_mISDNport, this, "BCHANNEL signal", DIRECTION_IN);
+ chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ add_trace("unknown", NULL, "0x%x", hh->id);
+#else
add_trace("unknown", NULL, "0x%x", frm->dinfo);
+#endif
end_trace();
}
return;
if (p_m_b_channel)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
#ifdef SOCKET_MISDN
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], p_m_echo?CMX_ECHO_ON:CMX_ECHO_OFF, 0, "DSP-ECHO", p_m_echo);
+ 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);
#else
ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], p_m_echo?CMX_ECHO_ON:CMX_ECHO_OFF, 0, "DSP-ECHO", p_m_echo);
#endif
{
nodsp:
if (p_m_tone)
- if (p_m_b_index >= 0)
+ if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
{
PDEBUG(DEBUG_ISDN, "we reset tone from id=%d to OFF.\n", p_m_tone);
#ifdef SOCKET_MISDN
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], TONE_PATT_OFF, 0, "DSP-TONE", 0);
+ ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], DSP_TONE_PATT_OFF, 0, "DSP-TONE", 0);
#else
ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], TONE_PATT_OFF, 0, "DSP-TONE", 0);
#endif
/* set new tone */
p_m_tone = id;
PDEBUG(DEBUG_ISDN, "we set tone to id=%d.\n", p_m_tone);
- if (p_m_b_index >= 0)
+ if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
#ifdef SOCKET_MISDN
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], p_m_tone?TONE_PATT_ON:TONE_PATT_OFF, p_m_tone, "DSP-TONE", p_m_tone);
+ 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);
#else
ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], p_m_tone?TONE_PATT_ON:TONE_PATT_OFF, p_m_tone, "DSP-TONE", p_m_tone);
#endif
/* MESSAGE_mISDNSIGNAL */
-//extern struct message *dddebug;
+//extern struct lcr_msg *dddebug;
void PmISDN::message_mISDNsignal(unsigned long epoint_id, int message_id, union parameter *param)
{
switch(param->mISDNsignal.message)
{
p_m_tx_gain = param->mISDNsignal.tx_gain;
PDEBUG(DEBUG_BCHANNEL, "we change tx-volume to shift=%d.\n", p_m_tx_gain);
- if (p_m_b_index >= 0)
+ if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
#ifdef SOCKET_MISDN
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], VOL_CHANGE_TX, p_m_tx_gain, "DSP-TX_GAIN", p_m_tx_gain);
+ 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);
#else
ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], VOL_CHANGE_TX, p_m_tx_gain, "DSP-TX_GAIN", p_m_tx_gain);
#endif
{
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 >= 0)
+ if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
#ifdef SOCKET_MISDN
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], VOL_CHANGE_RX, p_m_rx_gain, "DSP-RX_GAIN", p_m_rx_gain);
+ 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);
#else
ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], VOL_CHANGE_RX, p_m_rx_gain, "DSP-RX_GAIN", p_m_rx_gain);
#endif
{
p_m_conf = param->mISDNsignal.conf;
PDEBUG(DEBUG_BCHANNEL, "we change conference to conf=%d.\n", p_m_conf);
- if (p_m_b_index >= 0)
+ if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
#ifdef SOCKET_MISDN
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], (p_m_conf)?CMX_CONF_JOIN:CMX_CONF_SPLIT, p_m_conf, "DSP-CONF", p_m_conf);
+ ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], (p_m_conf)?DSP_CONF_JOIN:DSP_CONF_SPLIT, p_m_conf, "DSP-CONF", p_m_conf);
#else
ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], (p_m_conf)?CMX_CONF_JOIN:CMX_CONF_SPLIT, p_m_conf, "DSP-CONF", p_m_conf);
#endif
{
p_m_delay = param->mISDNsignal.delay;
PDEBUG(DEBUG_BCHANNEL, "we change delay mode to delay=%d.\n", p_m_delay);
- if (p_m_b_index >= 0)
+#ifndef OLD_MISDN
+ if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
#ifdef SOCKET_MISDN
- ph_control(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], p_m_delay?CMX_DELAY:CMX_JITTER, p_m_delay, "DSP-DELAY", p_m_delay);
+ 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);
#else
ph_control(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], p_m_delay?CMX_DELAY:CMX_JITTER, p_m_delay, "DSP-DELAY", p_m_delay);
#endif
+#endif
} else
PDEBUG(DEBUG_BCHANNEL, "we already have delay=%d.\n", p_m_delay);
break;
/* MESSAGE_CRYPT */
void PmISDN::message_crypt(unsigned long epoint_id, int message_id, union parameter *param)
{
- struct message *message;
+ struct lcr_msg *message;
switch(param->crypt.type)
{
memcpy(p_m_crypt_key, param->crypt.data, p_m_crypt_key_len);
crypt_off:
PDEBUG(DEBUG_BCHANNEL, "we set encryption to crypt=%d. (0 means OFF)\n", p_m_crypt);
- if (p_m_b_index >= 0)
+ if (p_m_b_index > -1)
if (p_m_mISDNport->b_state[p_m_b_index] == B_STATE_ACTIVE)
#ifdef SOCKET_MISDN
- ph_control_block(p_m_mISDNport, this, p_m_mISDNport->b_socket[p_m_b_index], p_m_crypt?BF_ENABLE_KEY: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_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);
#else
ph_control_block(p_m_mISDNport, this, p_m_mISDNport->b_addr[p_m_b_index], p_m_crypt?BF_ENABLE_KEY:BF_DISABLE, p_m_crypt_key, p_m_crypt_key_len, "DSP-CRYPT", p_m_crypt_key_len);
#endif
{
PDEBUG(DEBUG_BCHANNEL, "for sending CR_MESSAGE_REQ, we reset txmix from txmix=%d.\n", p_m_txmix);
#ifdef SOCKET_MISDN
- ph_control(p_m_mISDNport, this, p_mISDNport->b_socket[p_m_b_index], CMX_MIX_OFF, 0, "DSP-TXMIX", 0);
+ ph_control(p_m_mISDNport, this, p_mISDNport->b_socket[p_m_b_index], DSP_MIX_OFF, 0, "DSP-TXMIX", 0);
#else
ph_control(p_m_mISDNport, this, p_mISDNport->b_addr[p_m_b_index], CMX_MIX_OFF, 0, "DSP-TXMIX", 0);
#endif
struct mISDNport *mISDNport;
class PmISDN *isdnport;
int i;
- char buffer[2048+MISDN_HEADER_LEN];
+ unsigned char buffer[2048+MISDN_HEADER_LEN];
struct mISDNhead *hh = (struct mISDNhead *)buffer;
+ struct mbuffer *mb;
+ struct l3_msg *l3m;
/* process all ports */
mISDNport = mISDNport_first;
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)
isdnport->p_m_rxoff = 0;
PDEBUG(DEBUG_BCHANNEL, "%s: receive data is required, so we turn them on\n");
if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
- ph_control(mISDNport, isdnport, mISDNport->b_socket[isdnport->p_m_b_index], CMX_RECEIVE_ON, 0, "DSP-RXOFF", 0);
+ ph_control(mISDNport, isdnport, mISDNport->b_socket[isdnport->p_m_b_index], DSP_RECEIVE_ON, 0, "DSP-RXOFF", 0);
return(1);
}
} else
isdnport->p_m_rxoff = 1;
PDEBUG(DEBUG_BCHANNEL, "%s: receive data is not required, so we turn them off\n");
if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
- ph_control(mISDNport, isdnport, mISDNport->b_socket[isdnport->p_m_b_index], CMX_RECEIVE_OFF, 0, "DSP-RXOFF", 1);
+ ph_control(mISDNport, isdnport, mISDNport->b_socket[isdnport->p_m_b_index], DSP_RECEIVE_OFF, 0, "DSP-RXOFF", 1);
return(1);
}
}
isdnport->p_m_txdata = 1;
PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is required, so we turn them on\n");
if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
- ph_control(mISDNport, isdnport, mISDNport->b_socket[isdnport->p_m_b_index], CMX_TXDATA_ON, 0, "DSP-TXDATA", 1);
+ ph_control(mISDNport, isdnport, mISDNport->b_socket[isdnport->p_m_b_index], DSP_TXDATA_ON, 0, "DSP-TXDATA", 1);
return(1);
}
} else
isdnport->p_m_txdata = 0;
PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is not required, so we turn them off\n");
if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
- ph_control(mISDNport, isdnport, mISDNport->b_socket[isdnport->p_m_b_index], CMX_TXDATA_OFF, 0, "DSP-TXDATA", 0);
+ ph_control(mISDNport, isdnport, mISDNport->b_socket[isdnport->p_m_b_index], DSP_TXDATA_OFF, 0, "DSP-TXDATA", 0);
return(1);
}
}
}
/* handle message from bchannel */
- if (mISDNport->b_stack[i] > -1)
+ if (mISDNport->b_socket[i] > -1)
{
- ret = recv(mISDNport->b_stack[i], buffer, sizeof(buffer), 0);
- if (ret >= MISDN_HEADER_LEN)
+ 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_CONF:
- case DL_DATA_CONF:
+ 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_SIGNAL_IND:
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_stack[i]);
+ 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_CONF:
- case DL_ESTABLISH_CONF:
+ 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_CONF:
- case DL_RELEASE_CONF:
+ 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], msg->len);
+ 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
{
i++;
}
+
+ /* handle queued up-messages (d-channel) */
+ while ((mb = mdequeue(&mISDNport->upqueue)))
+ {
+ l3m = &mb->l3;
+ switch(l3m->type)
+ {
+#warning SOCKET TBD: Layer 1 indication
+#if 0
+ case MT_L1ACTIVATE:
+ l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_IND, DIRECTION_IN);
+ end_trace();
+ mISDNport->l1link = 1;
+ break;
+
+ case MT_L1DEACTIVATE:
+ l1l2l3_trace_header(mISDNport, NULL, L1_DEACTIVATE_IND, DIRECTION_IN);
+ end_trace();
+ mISDNport->l1link = 0;
+ break;
+
+ case MT_L1CONTROL:
+ PDEBUG(DEBUG_ISDN, "Received PH_CONTROL for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name);
+ // special config commands for interface (ip-address/LOS/AIS/RDI/SLIP)
+ break;
+#endif
+
+ case MT_L2ESTABLISH:
+ l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_IND, DIRECTION_IN);
+ end_trace();
+ if ((!mISDNport->ntmode || mISDNport->ptp) && l3m->pid < 127)
+ {
+ if (mISDNport->l2establish)
+ {
+ mISDNport->l2establish = 0;
+ PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n");
+ }
+ mISDNport->l2link = 1;
+ }
+ break;
+
+ case MT_L2RELEASE:
+ l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_IND, DIRECTION_IN);
+ end_trace();
+ if ((!mISDNport->ntmode || mISDNport->ptp) && l3m->pid < 127)
+ {
+ mISDNport->l2link = 0;
+ if (mISDNport->l2hold)
+ {
+ time(&mISDNport->l2establish);
+ PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n");
+ }
+ }
+ break;
+
+ default:
+ /* l3-data is sent to LCR */
+ stack2manager(mISDNport, l3m->type, l3m->pid, l3m);
+ }
+ }
+
+ /* free message */
+ free_l3_msg(l3m);
+
#if 0
if (mISDNport->l1timeout && now>mISDNport->l1timeout)
{ ---}
{
if (now-mISDNport->l2establish > 5)
{
+ mISDNport->l2establish = 0;
+ if (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_layer2(mISDNport->ml3, DL_ESTABLISH_REQ);
- l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH_REQ, DIRECTION_OUT);
- end_trace();
- return(1);
+ 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);
+ l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT);
+ end_trace();
+ time(&mISDNport->l2establish);
+ return(1);
+ }
}
}
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);
+ }
isdnport=mISDNport->b_port[i];
if (isdnport)
{
/* turn on RX */
isdnport->p_m_txdata = 1;
PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is required, so we turn them on\n");
+#ifndef OLD_MISDN
if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
ph_control(mISDNport, isdnport, mISDNport->b_addr[isdnport->p_m_b_index], CMX_TXDATA_ON, 0, "DSP-TXDATA", 1);
+#endif
return(1);
}
} else
/* turn off RX */
isdnport->p_m_txdata = 0;
PDEBUG(DEBUG_BCHANNEL, "%s: transmit data is not required, so we turn them off\n");
+#ifndef OLD_MISDN
if (mISDNport->b_port[i] && mISDNport->b_state[i] == B_STATE_ACTIVE)
ph_control(mISDNport, isdnport, mISDNport->b_addr[isdnport->p_m_b_index], CMX_TXDATA_OFF, 0, "DSP-TXDATA", 0);
+#endif
return(1);
}
}
{
if (now-mISDNport->l2establish > 5)
{
- if (mISDNport->ntmode)
+ mISDNport->l2establish = 0;
+ if (mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode))
{
- PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link NT portnum=%d.\n", mISDNport->portnum);
- time(&mISDNport->l2establish);
- /* establish */
- dmsg = create_l2msg(DL_ESTABLISH | REQUEST, 0, 0);
- if (mISDNport->nst.manager_l3(&mISDNport->nst, dmsg))
- free_msg(dmsg);
- } else {
- iframe_t act;
-
- PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link TE portnum=%d.\n", mISDNport->portnum);
+ if (mISDNport->ntmode)
+ {
+ PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link NT portnum=%d.\n", mISDNport->portnum);
+ time(&mISDNport->l2establish);
+ /* establish */
+ dmsg = create_l2msg(DL_ESTABLISH | REQUEST, 0, 0);
+ if (mISDNport->nst.manager_l3(&mISDNport->nst, dmsg))
+ free_msg(dmsg);
+ } else {
+ iframe_t act;
+
+ PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link TE portnum=%d.\n", mISDNport->portnum);
+ time(&mISDNport->l2establish);
+ /* establish */
+ act.prim = DL_ESTABLISH | REQUEST;
+ act.addr = (mISDNport->upper_id & ~LAYER_ID_MASK) | 3 | FLG_MSG_DOWN;
+ act.dinfo = 0;
+ act.len = 0;
+ mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC);
+ }
+ l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT);
+ end_trace();
time(&mISDNport->l2establish);
- /* establish */
- act.prim = DL_ESTABLISH | REQUEST;
- act.addr = (mISDNport->upper_id & ~LAYER_ID_MASK) | 3 | FLG_MSG_DOWN;
- act.dinfo = 0;
- act.len = 0;
- mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC);
+ return(1);
}
- l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH | REQUEST, DIRECTION_OUT);
- end_trace();
- return(1);
}
}
if ((dmsg = msg_dequeue(&mISDNport->downqueue)))
if (!mISDNport)
{
PERROR("message belongs to no mISDNport: prim(0x%x) addr(0x%x) msg->len(%d)\n", frm->prim, frm->addr, msg->len);
+ // show a list of all mISDNports and their address
+#if 0
+ mISDNport = mISDNport_first;
+ while(mISDNport)
+ {
+ PERROR(" port %s %x -> %x\n", mISDNport->name, (frm->addr&MASTER_ID_MASK), (unsigned int)(mISDNport->upper_id&MASTER_ID_MASK));
+ mISDNport = mISDNport->next;
+ }
+#endif
goto out;
}
case MGR_SHORTSTATUS | CONFIRM:
switch(frm->dinfo) {
case SSTATUS_L1_ACTIVATED:
- l1l2l3_trace_header(mISDNport, NULL, PH_ACTIVATE | (frm->prim & 0x3), DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
goto ss_act;
case SSTATUS_L1_DEACTIVATED:
- l1l2l3_trace_header(mISDNport, NULL, PH_DEACTIVATE | (frm->prim & 0x3), DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L1_DEACTIVATE_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
goto ss_deact;
case SSTATUS_L2_ESTABLISHED:
- l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH | (frm->prim & 0x3), DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
goto ss_estab;
case SSTATUS_L2_RELEASED:
- l1l2l3_trace_header(mISDNport, NULL, DL_RELEASE | (frm->prim & 0x3), DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
goto ss_rel;
}
case PH_ACTIVATE | CONFIRM:
case PH_ACTIVATE | INDICATION:
- l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
if (mISDNport->ntmode)
{
case PH_DEACTIVATE | CONFIRM:
case PH_DEACTIVATE | INDICATION:
- l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L1_DEACTIVATE_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
if (mISDNport->ntmode)
{
case DL_ESTABLISH | INDICATION:
case DL_ESTABLISH | CONFIRM:
- l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */
ss_estab:
- if (mISDNport->l2establish)
+ if (!mISDNport->ntmode || mISDNport->ptp)
{
- mISDNport->l2establish = 0;
- PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n");
+ if (mISDNport->l2establish)
+ {
+ mISDNport->l2establish = 0;
+ PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n");
+ }
+ mISDNport->l2link = 1;
}
- mISDNport->l2link = 1;
break;
case DL_RELEASE | INDICATION:
case DL_RELEASE | CONFIRM:
- l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, DL_RELEASE_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */
ss_rel:
- mISDNport->l2link = 0;
- if (mISDNport->ptp)
+ if (!mISDNport->ntmode || mISDNport->ptp)
{
- time(&mISDNport->l2establish);
- PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n");
+ mISDNport->l2link = 0;
+ if (mISDNport->l2hold)
+ {
+ time(&mISDNport->l2establish);
+ PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n");
+ }
}
break;
#ifdef SOCKET_MISDN
int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
{
- struct mISDNport *mISDNport = ml3->private;
-
+ /* IMPORTAINT:
+ *
+ * l3m must be queued, except for MT_ASSIGN
+ *
+ */
+ struct mISDNport *mISDNport = (struct mISDNport *)ml3->priv;
+ struct mbuffer *mb;
+
+ /* special MT_ASSIGN handling:
+ *
+ * if we request a PID from mlayer, we always do it while lcr is locked.
+ * therefore we must check the MT_ASSIGN reply first before we lock.
+ * this is because the MT_ASSIGN reply is received with the requesting
+ * process, not by the mlayer thread!
+ * this means, that the reply is sent during call of the request.
+ * we must check if we get a reply and we know that we lcr is currently
+ * locked.
+ */
if (cmd == MT_ASSIGN)
{
- ueberdenken!!!
+ /* let's do some checking if someone changes stack behaviour */
+ if (mt_assign_pid != 0)
+ FATAL("someone played with the mISDNuser stack. MT_ASSIGN not currently expected.\n");
+ if ((pid >> 16) != MISDN_CES_MASTER)
+ FATAL("someone played with the mISDNuser stack. MT_ASSIGN is expected with master CES.\n");
+ mt_assign_pid = pid;
+ return(0);
}
- /* lock LCR */
- achtung MT_ASSIGN kommt hier an
- lock it baby
-
- /* d-message */
- switch(cmd)
- {
- case MGR_SHORTSTATUS_IND:
- case MGR_SHORTSTATUS_CONF:
- switch(frm->dinfo) {
- case SSTATUS_L1_ACTIVATED:
- l1l2l3_trace_header(mISDNport, NULL, PH_ACTIVATE_IND, DIRECTION_IN);
- end_trace();
- goto ss_act;
- case SSTATUS_L1_DEACTIVATED:
- l1l2l3_trace_header(mISDNport, NULL, PH_DEACTIVATE_IND, DIRECTION_IN);
- end_trace();
- goto ss_deact;
- case SSTATUS_L2_ESTABLISHED:
- l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH_IND, DIRECTION_IN);
- end_trace();
- goto ss_estab;
- case SSTATUS_L2_RELEASED:
- l1l2l3_trace_header(mISDNport, NULL, DL_RELEASE_IND, DIRECTION_IN);
- end_trace();
- goto ss_rel;
- }
- break;
-
- case PH_ACTIVATE_CONF:
- case PH_ACTIVATE_IND:
- l1l2l3_trace_header(mISDNport, NULL, cmd, DIRECTION_IN);
- end_trace();
- ss_act:
- mISDNport->l1link = 1;
-#if 0
- if (mISDNport->ntmode)
- setup_queue(mISDNport, 1);
-#endif
- break;
-
- case PH_DEACTIVATE | CONFIRM:
- case PH_DEACTIVATE | INDICATION:
- l1l2l3_trace_header(mISDNport, NULL, cmd, DIRECTION_IN);
- end_trace();
- ss_deact:
- mISDNport->l1link = 0;
-raus mit der setup-queue, da dies im stack geschieht
-#if 0
- if (mISDNport->ntmode)
- setup_queue(mISDNport, 0);
-#endif
- break;
-
- case PH_CONTROL_CONFIRM:
- case PH_CONTROL_INDICATION:
- PDEBUG(DEBUG_ISDN, "Received PH_CONTROL for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name);
- break;
-
- case DL_ESTABLISH_IND:
- case DL_ESTABLISH_CONF:
- l1l2l3_trace_header(mISDNport, NULL, cmd, DIRECTION_IN);
- end_trace();
- if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */
- ss_estab:
- if (mISDNport->l2establish)
- {
- mISDNport->l2establish = 0;
- PDEBUG(DEBUG_ISDN, "the link became active before l2establish timer expiry.\n");
- }
- mISDNport->l2link = 1;
- break;
-
- case DL_RELEASE_IND:
- case DL_RELEASE_CONF:
- l1l2l3_trace_header(mISDNport, NULL, cmd, DIRECTION_IN);
- end_trace();
- ss_rel:
- mISDNport->l2link = 0;
- if (mISDNport->ptp)
- {
- time(&mISDNport->l2establish);
- PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n");
- }
- break;
-
- default:
- /* l3-data is sent to LCR */
- message_from_mlayer3(mISDNport, cmd, pid, l3m);
- }
-
- /* unlock LCR */
- unlock it baby
-
- /* free message */
- if (l3m)
- free_l3_msg(l3m);
- return(0);
-
+ /* queue message, create, if required */
+ if (!l3m)
+ {
+ l3m = alloc_l3_msg();
+ if (!l3m)
+ FATAL("No memory for layer 3 message\n");
+ }
+ mb = container_of(l3m, struct mbuffer, l3);
+ l3m->type = cmd;
+ l3m->pid = pid;
+ mqueue_tail(&mISDNport->upqueue, mb);
+ return 0;
}
+
#endif
/*
* global function to add a new card (port)
*/
-struct mISDNport *mISDNport_open(int port, int ptp, int ptmp, int force_nt, struct interface *interface)
+struct mISDNport *mISDNport_open(int port, int ptp, int force_nt, int l2hold, struct interface *interface)
{
int ret;
- unsigned char buff[1025];
- iframe_t *frm = (iframe_t *)buff;
struct mISDNport *mISDNport, **mISDNportp;
int i, cnt;
- int pri, bri, ports;
+ int pri, bri, pots;
int nt, te;
#ifdef SOCKET_MISDN
- struct mlayer3 *ml3;
+// struct mlayer3 *ml3;
struct mISDN_devinfo devinfo;
+ unsigned int protocol, prop;
ret = ioctl(mISDNsocket, IMGETCOUNT, &cnt);
if (ret < 0)
return(NULL);
}
#else
+ unsigned char buff[1025];
+ iframe_t *frm = (iframe_t *)buff;
// interface_info_t ii;
net_stack_t *nst;
manager_t *mgr;
return(NULL);
}
- pri = bri = ports = nt = te = 0;
+ pri = bri = pots = nt = te = 0;
#ifdef SOCKET_MISDN
devinfo.id = port - 1;
- ret = ioctl(socket, IMGETDEVINFO, &devinfo);
+ ret = ioctl(mISDNsocket, IMGETDEVINFO, &devinfo);
if (ret <= 0)
{
PERROR_RUNTIME("Cannot get device information for port %d. (ioctl IMGETDEVINFO failed ret=%d)\n", i, ret);
- break;
+ return(NULL);
}
/* output the port info */
if (devinfo.Dprotocols & (1 << ISDN_P_TE_S0))
bri = 1;
nt = 1;
}
-#ifdef ISDN_P_TE_E1
if (devinfo.Dprotocols & (1 << ISDN_P_TE_E1))
{
pri = 1;
te = 1;
}
-#endif
-#ifdef ISDN_P_NT_E1
if (devinfo.Dprotocols & (1 << ISDN_P_NT_E1))
{
pri = 1;
nt = 1;
}
-#endif
#ifdef ISDN_P_FXS
if (devinfo.Dprotocols & (1 << ISDN_P_FXS))
{
#endif
if (force_nt && !nt)
{
- PERROR_RUNTIME("Port %d does not support NT-mode.\n", port);
+ PERROR_RUNTIME("Port %d does not support NT-mode\n", port);
return(NULL);
}
if (bri && pri)
PERROR_RUNTIME("Port %d does not support NT-mode nor TE-mode!\n", port);
return(NULL);
}
- /* force nt, by turning off TE */
+ /* set NT by turning off TE */
if (force_nt && nt)
te = 0;
/* if TE an NT is supported (and not forced to NT), turn off NT */
pmemuse++;
*mISDNportp = mISDNport;
+ /* if pri, set PTP */
+ if (pri)
+ ptp = 1;
+
+ /* set l2hold */
+ switch (l2hold)
+ {
+ case -1: // off
+ l2hold = 0;
+ break;
+ case 1: // on
+ l2hold = 0;
+ break;
+ default:
+ if (ptp)
+ l2hold = 1;
+ else
+ l2hold = 0;
+ break;
+ }
+
/* allocate ressources of port */
#ifdef SOCKET_MISDN
/* open layer 3 */
- protocol = (nt)?L3_PROTOCOL_DSS1_USER:L3_PROTOCOL_DSS1_NETWORK;
+ protocol = (nt)?L3_PROTOCOL_DSS1_USER:L3_PROTOCOL_DSS1_NET;
prop = 0;
- if (ptp)
- prop |= FLG_PTP;
- if (ptmp && pri)
- prop |= FLG_FORCE_PTMP;
- mISDNport->ml3 = open_layer3(port-1, protocol, prop , do_dchannel, mISDNport);
+ if (ptp) // ptp forced
+ prop |= (1 << MISDN_FLG_PTP);
+ if (nt) // supports hold/retrieve on nt-mode
+ prop |= (1 << MISDN_FLG_NET_HOLD);
+ if (l2hold) // supports layer 2 hold
+ prop |= (1 << MISDN_FLG_L2_HOLD);
+ mISDNport->ml3 = open_layer3(port-1, protocol, prop , do_layer3, mISDNport);
if (!mISDNport->ml3)
{
PERROR_RUNTIME("Cannot get layer(%d) id of port %d\n", nt?2:4, port);
msg_queue_init(&mISDNport->downqueue);
mISDNport->d_stid = stinf->id;
PDEBUG(DEBUG_ISDN, "d_stid = 0x%x.\n", mISDNport->d_stid);
- if ((stinf->pid.protocol[2]&ISDN_PID_L2_DF_PTP) || (nt&&ptp) || pri)
- {
- PDEBUG(DEBUG_ISDN, "Port is point-to-point.\n");
- ptp = 1;
- if (ptmp && nt)
- {
- PDEBUG(DEBUG_ISDN, "Port is forced to point-to-multipoint.\n");
- ptp = 0;
- }
- }
/* create layer intance */
memset(&li, 0, sizeof(li));
mISDNport->ntmode = nt;
mISDNport->pri = pri;
mISDNport->ptp = ptp;
+ mISDNport->l2hold = l2hold;
PDEBUG(DEBUG_ISDN, "Port has %d b-channels.\n", mISDNport->b_num);
i = 0;
while(i < mISDNport->b_num)
{
mISDNport->b_state[i] = B_STATE_IDLE;
#ifdef SOCKET_MISDN
- mISDNport->b_socket = -1;
+ mISDNport->b_socket[i] = -1;
#else
mISDNport->b_stid[i] = stinf->child[i];
PDEBUG(DEBUG_ISDN, "b_stid[%d] = 0x%x.\n", i, mISDNport->b_stid[i]);
i++;
}
+#ifdef SOCKET_MISDN
+ /* if ptp, pull up the link */
+ if (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);
+ end_trace();
+ time(&mISDNport->l2establish);
+ }
+#else
/* if te-mode, query state link */
if (!mISDNport->ntmode)
{
mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC);
}
/* if ptp AND te-mode, pull up the link */
- if (mISDNport->ptp && !mISDNport->ntmode)
+ if (mISDNport->l2hold && !mISDNport->ntmode)
{
iframe_t act;
/* L2 */
act.dinfo = 0;
act.len = 0;
mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC);
+
+ l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT);
+ end_trace();
+ time(&mISDNport->l2establish);
}
/* if ptp AND nt-mode, pull up the link */
- if (mISDNport->ptp && mISDNport->ntmode)
+ if (mISDNport->l2hold && mISDNport->ntmode && mISDNport->ptp)
{
msg_t *dmsg;
/* L2 */
dmsg = create_l2msg(DL_ESTABLISH | REQUEST, 0, 0);
if (mISDNport->nst.manager_l3(&mISDNport->nst, dmsg))
free_msg(dmsg);
+ l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT);
+ end_trace();
+ time(&mISDNport->l2establish);
}
+#endif
+
+#ifdef SOCKET_MISDN
+ /* init stack queue */
+ mqueue_init(&mISDNport->upqueue);
+#endif
+
/* initially, we assume that the link is down, exept for nt-ptmp */
mISDNport->l2link = (mISDNport->ntmode && !mISDNport->ptp)?1:0;
struct mISDNport **mISDNportp;
class Port *port;
class PmISDN *isdnport;
+#ifdef SOCKET_MISDN
+#else
net_stack_t *nst;
unsigned char buf[32];
+#endif
int i;
/* remove all port instance that are linked to this mISDNport */
i = 0;
while(i < mISDNport->b_num)
{
+#ifdef SOCKET_MISDN
+ if (mISDNport->b_socket[i] > -1)
+#else
if (mISDNport->b_addr[i])
+#endif
{
_bchannel_destroy(mISDNport, i);
PDEBUG(DEBUG_BCHANNEL, "freeing %s port %d bchannel (index %d).\n", (mISDNport->ntmode)?"NT":"TE", mISDNport->portnum, i);
#ifdef SOCKET_MISDN
close_layer3(mISDNport->ml3);
+ mqueue_purge(&mISDNport->upqueue);
#else
/* free ressources of port */
msg_queue_purge(&mISDNport->downqueue);
void mISDN_port_info(void)
{
int ret;
- int i, ii, p;
+ int i, ii;
int useable, nt, te, pri, bri, pots;
- unsigned char buff[1025];
- iframe_t *frm = (iframe_t *)buff;
#ifdef SOCKET_MISDN
struct mISDN_devinfo devinfo;
- int socket;
+ int sock;
/* open mISDN */
- socket = socket(PF_ISDN, SOCK_RAW, ISDN_P_BASE);
- if (socket < 0)
+ sock = socket(PF_ISDN, SOCK_RAW, ISDN_P_BASE);
+ if (sock < 0)
{
fprintf(stderr, "Cannot open mISDN due to %s. (Does your Kernel support socket based mISDN?)\n", strerror(errno));
exit(EXIT_FAILURE);
/* get number of stacks */
i = 1;
- ret = ioctl(socket, IMGETCOUNT, &ii);
+ ret = ioctl(sock, IMGETCOUNT, &ii);
if (ret < 0)
{
fprintf(stderr, "Cannot get number of mISDN devices. (ioctl IMGETCOUNT failed ret=%d)\n", ret);
goto done;
}
#else
+ int p;
+ unsigned char buff[1025];
+ iframe_t *frm = (iframe_t *)buff;
stack_info_t *stinf;
int device;
#ifdef SOCKET_MISDN
devinfo.id = i - 1;
- ret = ioctl(socket, IMGETDEVINFO, &devinfo);
+ ret = ioctl(sock, IMGETDEVINFO, &devinfo);
if (ret <= 0)
{
fprintf(stderr, "Cannot get device information for port %d. (ioctl IMGETDEVINFO failed ret=%d)\n", i, ret);
bri = 1;
nt = 1;
}
-#ifdef ISDN_P_TE_E1
if (devinfo.Dprotocols & (1 << ISDN_P_TE_E1))
{
pri = 1;
te = 1;
}
-#endif
-#ifdef ISDN_P_NT_E1
if (devinfo.Dprotocols & (1 << ISDN_P_NT_E1))
{
pri = 1;
nt = 1;
}
-#endif
#ifdef ISDN_P_FXS
if (devinfo.Dprotocols & (1 << ISDN_P_FXS))
{
nt = 1;
}
#endif
- if ((te || nt) && (bri || pri || ports))
- usable = 1;
+ if ((te || nt) && (bri || pri || pots))
+ useable = 1;
if (te && bri)
printf("TE-mode BRI S/T interface line (for phone lines)");
printf("FXS POTS interface port (for analog lines)");
if (nt && pots)
printf("FXO POTS interface port (for analog phones)");
- if (ports)
+ if (pots)
{
- usable = 0;
+ useable = 0;
printf("\n -> Analog interfaces are not supported.");
} else
- if (!usable)
+ if (!useable)
{
printf("unsupported interface protocol bits 0x%016x", devinfo.Dprotocols);
}
printf("\n");
- printf(" - %d B-channels\n", devinfo.nfbchan);
+ printf(" - %d B-channels\n", devinfo.nrbchan);
#else
ret = mISDN_get_stack_info(device, i, buff, sizeof(buff));
if (ret <= 0)
done:
#ifdef SOCKET_MISDN
- close(sd);
+ close(sock);
#else
/* close mISDN */
if ((ret = mISDN_close(device)))
{
#ifdef SOCKET_MISDN
unsigned char buf[MISDN_HEADER_LEN+((length>ISDN_LOAD)?length:ISDN_LOAD)];
- struct mISDNhead *frm = (struct mISDNhead *)buf;
+ struct mISDNhead *hh = (struct mISDNhead *)buf;
+ int ret;
if (p_m_b_index < 0)
return;
*/
if (p_m_load==0 && ISDN_LOAD>0)
{
-
- memcpy(buf+mISDN_HEADER_LEN, data, ISDN_LOAD);
+#ifdef SOCKET_MISDN
+ hh->prim = DL_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);
+ if (!ret)
+ PERROR("Failed to send to socket %d\n", p_m_mISDNport->b_socket[p_m_b_index]);
+#else
+ frm->prim = DL_DATA | REQUEST;
+ frm->addr = p_m_mISDNport->b_addr[p_m_b_index] | FLG_MSG_DOWN;
+ frm->dinfo = 0;
frm->len = ISDN_LOAD;
- mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+frm->len, TIMEOUT_1SEC);
- p_m_load += frm->len;
+ memset(buf+mISDN_HEADER_LEN, (options.law=='a')?0x2a:0xff, ISDN_LOAD);
+ mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+ISDN_LOAD, TIMEOUT_1SEC);
+#endif
+ p_m_load += ISDN_LOAD;
}
/* drop if load would exceed ISDN_MAXLOAD
/* make and send frame */
#ifdef SOCKET_MISDN
- frm->prim = DL_DATA_REQ;
- frm->id = 0;
+ hh->prim = DL_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);
if (!ret)
- PERROR("Failed to send to socket %d\n", handle);
+ PERROR("Failed to send to socket %d\n", p_m_mISDNport->b_socket[p_m_b_index]);
#else
frm->prim = DL_DATA | REQUEST;
frm->addr = p_m_mISDNport->b_addr[p_m_b_index] | FLG_MSG_DOWN;
projects / lcr.git / blobdiff