#include <netinet/in.h>
#include <netdb.h>
#include <sys/socket.h>
-#include <mISDNif.h>
+#include <mISDN/mISDNif.h>
-#define AF_COMPATIBILITY_FUNC 1
-#define MISDN_OLD_AF_COMPATIBILITY 1
-#include <compat_af_isdn.h>
+#include <mISDN/mISDNcompat.h>
+int __af_isdn = MISDN_AF_ISDN;
+#include <mISDN/q931.h>
#define HAVE_ATTRIBUTE_always_inline 1
#define HAVE_ARPA_INET_H 1
#define HAVE_TIMERSUB 1
+#include <asterisk/autoconfig.h>
#include <asterisk/compiler.h>
#include <asterisk/frame.h>
#include "bchannel.h"
#include "chan_lcr.h"
#include "callerid.h"
+#include "options.h"
#ifndef ISDN_PID_L4_B_USER
BSTATE_DEACTIVATING,
};
+static void bchannel_send_queue(struct bchannel *bchannel);
int bchannel_initialize(void)
{
- init_af_isdn();
-
return 0;
}
/*
* create stack
*/
-int bchannel_create(struct bchannel *bchannel, int mode)
+int bchannel_create(struct bchannel *bchannel, int mode, int queue)
{
int ret;
struct sockaddr_mISDN addr;
}
/* open socket */
- bchannel->b_mode = mode;
+ bchannel->b_mode = (mode & 3);
switch(bchannel->b_mode) {
case 0:
CDEBUG(bchannel->call, NULL, "Open DSP audio\n");
bchannel->b_sock = -1;
return 0;
}
+
+ /* queue */
+ if (bchannel->b_mode == 1 && queue) {
+ bchannel->nodsp_queue_out = 0;
+ bchannel->nodsp_queue_in = queue * 8;
+ if (bchannel->nodsp_queue_in > QUEUE_BUFFER_MAX-1)
+ bchannel->nodsp_queue_in = QUEUE_BUFFER_MAX-1;
+ bchannel->nodsp_queue = bchannel->nodsp_queue_in; /* store initial load */
+ memset(&bchannel->nodsp_queue_buffer, (options.law=='a')?0x2a:0xff, QUEUE_BUFFER_SIZE);
+ bchannel->queue_sent = 0;
+ } else
+ bchannel->nodsp_queue = 0;
+
return 1;
}
struct mISDNhead *frm = (struct mISDNhead *)buff;
int ret;
int i;
+ int space, in;
if (bchannel->b_state != BSTATE_ACTIVE)
return;
if (len > 1024 || len < 1)
return;
- switch(bchannel->b_mode) {
- case 0:
- for (i = 0; i < len; i++)
- *p++ = flip_bits[*data++];
- frm->prim = DL_DATA_REQ;
- break;
- case 1:
- for (i = 0; i < len; i++)
- *p++ = flip_bits[*data++];
- frm->prim = PH_DATA_REQ;
- break;
- case 2:
- memcpy(p, data, len);
- frm->prim = DL_DATA_REQ;
- break;
- case 3:
- memcpy(p, data, len);
- frm->prim = PH_DATA_REQ;
- break;
+ if (data) {
+ switch(bchannel->b_mode) {
+ case 0:
+ for (i = 0; i < len; i++)
+ *p++ = flip_bits[*data++];
+ frm->prim = DL_DATA_REQ;
+ break;
+ case 1:
+ for (i = 0; i < len; i++)
+ *p++ = flip_bits[*data++];
+ frm->prim = PH_DATA_REQ;
+ break;
+ case 2:
+ memcpy(p, data, len);
+ frm->prim = DL_DATA_REQ;
+ break;
+ case 3:
+ memcpy(p, data, len);
+ frm->prim = PH_DATA_REQ;
+ break;
+ }
+ } else
+ memset(p, flip_bits[(options.law=='a')?0x2a:0xff], len);
+ frm->id = 0;
+#ifdef SEAMLESS_TEST
+ unsigned char test_tone[8] = {0x2a, 0x24, 0xb4, 0x24, 0x2a, 0x25, 0xb5, 0x25};
+ p = buff + MISDN_HEADER_LEN;
+ for (i = 0; i < len; i++)
+ *p++ = test_tone[(bchannel->test + i) & 7];
+ bchannel->test = (bchannel->test + len) & 7;
+#endif
+ if (bchannel->nodsp_queue) {
+ space = (bchannel->nodsp_queue_out - bchannel->nodsp_queue_in - 1) & (QUEUE_BUFFER_SIZE - 1);
+ if (len > space) {
+ CERROR(bchannel->call, NULL, "Queue buffer overflow, space is %d, len is %d.\n", space, len);
+ return;
+ }
+ p = buff + MISDN_HEADER_LEN;
+ in = bchannel->nodsp_queue_in;
+ for (i = 0; i < len; i++) {
+ bchannel->nodsp_queue_buffer[in] = *p++;
+ in = (in + 1) & (QUEUE_BUFFER_SIZE - 1);
+ }
+ bchannel->nodsp_queue_in = in;
+ if (bchannel->queue_sent == 0) /* if there is no pending data */
+ bchannel_send_queue(bchannel);
+ return;
}
+ ret = sendto(bchannel->b_sock, buff, MISDN_HEADER_LEN+len, 0, NULL, 0);
+ if (ret < 0)
+ CERROR(bchannel->call, NULL, "Failed to send to socket %d\n", bchannel->b_sock);
+}
+
+
+/*
+ * in case of a send queue, we send from that queue rather directly
+ */
+static void bchannel_send_queue(struct bchannel *bchannel)
+{
+ unsigned char buff[1024 + MISDN_HEADER_LEN], *p = buff + MISDN_HEADER_LEN;
+ struct mISDNhead *frm = (struct mISDNhead *)buff;
+ int ret;
+ int i;
+ int len, out;
+
+ len = (bchannel->nodsp_queue_in - bchannel->nodsp_queue_out) & (QUEUE_BUFFER_SIZE - 1);
+ if (len == 0)
+ return; /* mISDN driver received all load */
+#if 0
+ printf("%4d:(%s|%s)\n", bchannel->nodsp_queue_out,
+ "----------------------------------------------------------------"+64-len/(8192/64),
+ " "+len/(8192/64));
+#endif
+ if (len > 1024)
+ len = 1024;
+ frm->prim = PH_DATA_REQ;
frm->id = 0;
+ out = bchannel->nodsp_queue_out;
+ for (i = 0; i < len; i++) {
+ *p++ = bchannel->nodsp_queue_buffer[out];
+ out = (out + 1) & (QUEUE_BUFFER_SIZE - 1);
+ }
+ bchannel->nodsp_queue_out = out;
ret = sendto(bchannel->b_sock, buff, MISDN_HEADER_LEN+len, 0, NULL, 0);
if (ret < 0)
CERROR(bchannel->call, NULL, "Failed to send to socket %d\n", bchannel->b_sock);
+ else
+ bchannel->queue_sent = 1;
}
ret = recv(bchannel->b_sock, buffer, sizeof(buffer), 0);
if (ret >= (int)MISDN_HEADER_LEN) {
switch(hh->prim) {
- /* we don't care about confirms, we use rx data to sync tx */
+ /* after a confim, we can send more from queue */
case PH_DATA_CNF:
+ if (bchannel->nodsp_queue) {
+ bchannel->queue_sent = 0;
+ bchannel_send_queue(bchannel);
+ }
break;
/* we receive audio data, we respond to it AND we send tones */
projects / lcr.git / blobdiff