X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=mISDN.cpp;h=50746ecfb99331124fc4061a7487bd5494dbf6a5;hp=3e7751eae14aeabde5acb89a338eb77cc6503354;hb=34598a346419f0e661526e6208dade4aff570008;hpb=b0bd74e35e935aa976b68c594def4e8d2c22ef95

diff --git a/mISDN.cpp b/mISDN.cpp
index 3e7751e..50746ec 100644
--- a/mISDN.cpp
+++ b/mISDN.cpp
@@ -12,11 +12,9 @@
 #include "main.h"
 #include "myisdn.h"
 
-extern "C" {
-#define MISDN_OLD_AF_COMPATIBILITY 1
-#include <compat_af_isdn.h>
-}
-#include <q931.h>
+#include <mISDN/mISDNcompat.h>
+int __af_isdn = MISDN_AF_ISDN;
+#include <mISDN/q931.h>
 
 #undef offsetof
 #ifdef __compiler_offsetof
@@ -56,12 +54,10 @@ int mISDN_initialize(void)
 {
 	char filename[256];
 
-	init_af_isdn();
-
 	/* try to open raw socket to check kernel */
 	mISDNsocket = socket(PF_ISDN, SOCK_RAW, ISDN_P_BASE);
 	if (mISDNsocket < 0) {
-		fprintf(stderr, "Cannot open mISDN due to '%s'. (Does your Kernel support socket based mISDN?)\n", strerror(errno));
+		fprintf(stderr, "Cannot open mISDN due to '%s'. (Does your Kernel support socket based mISDN? Protocol family is %d.)\n", strerror(errno), PF_ISDN);
 		return(-1);
 	}
 
@@ -82,7 +78,7 @@ int mISDN_initialize(void)
 
 	if (pipe(upqueue_pipe) < 0)
 		FATAL("Failed to open pipe\n");
-	memset(&upqueue_fd, 0, sizeof(upqueue_fd.fd));
+	memset(&upqueue_fd, 0, sizeof(upqueue_fd));
 	upqueue_fd.fd = upqueue_pipe[0];
 	register_fd(&upqueue_fd, LCR_FD_READ, mISDN_upqueue, NULL, 0);
 
@@ -660,7 +656,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
 			case B_STATE_IDLE:
 			if (p_m_remote_ref) {
 				/* export bchannel */
-				message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type);
+				message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type, 0);
 				chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
 				add_trace("type", NULL, "assign");
 				add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
@@ -708,7 +704,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
 			/* in case, the bchannel is exported right after seize_bchannel */
 			/* export bchannel */
 			/* p_m_remote_id is set, when this event happens. */
-			message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type);
+			message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type, 0);
 			chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
 			add_trace("type", NULL, "assign");
 			add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
@@ -763,7 +759,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
 
 			case B_STATE_REMOTE:
 			/* bchannel is exported, so we re-import */
-			message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0);
+			message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0, 0);
 			chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
 			add_trace("type", NULL, "remove");
 			add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
@@ -814,7 +810,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
 				 * OR bchannel is not used anymore
 				 * OR bchannel has been exported to an obsolete ref,
 				 * so reimport, to later export to new remote */
-				message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0);
+				message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0, 0);
 				chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
 				add_trace("type", NULL, "remove");
 				add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
@@ -850,7 +846,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
 
 			case B_STATE_REMOTE:
 			/* bchannel is exported, so we re-import */
-			message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0);
+			message_bchannel_to_remote(mISDNport->b_remote_id[i], 0, BCHANNEL_REMOVE, portid, 0,0,0,0,0,0, 0);
 			chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
 			add_trace("type", NULL, "remove");
 			add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
@@ -881,7 +877,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
 			if (b_port) {
 				/* bchannel is now deactivate, but is requied by Port class, so we reactivate / export */
 				if (p_m_remote_ref) {
-					message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type);
+					message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type, 0);
 					chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
 					add_trace("type", NULL, "assign");
 					add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
@@ -913,7 +909,7 @@ void bchannel_event(struct mISDNport *mISDNport, int i, int event)
 			if (b_port) {
 				/* bchannel is now imported, but is requied by Port class, so we reactivate / export */
 				if (p_m_remote_ref) {
-					message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type);
+					message_bchannel_to_remote(p_m_remote_id, p_m_remote_ref, BCHANNEL_ASSIGN, portid, p_m_tx_gain, p_m_rx_gain, p_m_pipeline, p_m_crypt_key, p_m_crypt_key_len, p_m_crypt_key_type, 0);
 					chan_trace_header(mISDNport, b_port, "MESSAGE_BCHANNEL (to remote application)", DIRECTION_NONE);
 					add_trace("type", NULL, "assign");
 					add_trace("channel", NULL, "%d.%d", portid>>8, portid&0xff);
@@ -1371,7 +1367,11 @@ void PmISDN::bchannel_receive(struct mISDNhead *hh, unsigned char *data, int len
 		if ((cont&(~DTMF_TONE_MASK)) == DTMF_TONE_VAL) {
 			chan_trace_header(p_m_mISDNport, this, "BCHANNEL control", DIRECTION_IN);
 			add_trace("DTMF", NULL, "%c", cont & DTMF_TONE_MASK);
+			if (!p_m_dtmf)
+				add_trace("info", NULL, "DTMF is disabled");
 			end_trace();
+			if (!p_m_dtmf)
+				return;
 			message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_DTMF);
 			message->param.dtmf = cont & DTMF_TONE_MASK;
 			PDEBUG(DEBUG_PORT, "PmISDN(%s) PH_CONTROL INDICATION  DTMF digit '%c'\n", p_name, message->param.dtmf);
@@ -1832,16 +1832,20 @@ static int mISDN_upqueue(struct lcr_fd *fd, unsigned int what, void *instance, i
 	struct mbuffer *mb;
 	struct l3_msg *l3m;
 	char byte;
+	int ret;
 
 	/* unset global semaphore */
-	read(fd->fd, &byte, 1);
 	upqueue_avail = 0;
+	// with a very small incident, upqueue_avail may be set by mISDN thread and
+	// another byte may be sent to the pipe, which causes a call to this function
+	// again with nothing in the upqueue. this is no problem.
+	ret = read(fd->fd, &byte, 1);
 
 	/* process all ports */
 	mISDNport = mISDNport_first;
 	while(mISDNport) {
 		/* handle queued up-messages (d-channel) */
-		if (!mISDNport->gsm) {
+		if (!mISDNport->isloopback) {
 			while ((mb = mdequeue(&mISDNport->upqueue))) {
 				l3m = &mb->l3;
 				switch(l3m->type) {
@@ -1917,7 +1921,7 @@ static int mISDN_upqueue(struct lcr_fd *fd, unsigned int what, void *instance, i
 						if (!mISDNport->ntmode || mISDNport->ptp)
 							mISDNport->l2link = 0;
 					}
-					if (!mISDNport->gsm && (!mISDNport->ntmode || mISDNport->ptp) && l3m->pid < 127) {
+					if (!mISDNport->isloopback && (!mISDNport->ntmode || mISDNport->ptp) && l3m->pid < 127) {
 						if (!mISDNport->l2establish.active && mISDNport->l2hold) {
 							PDEBUG(DEBUG_ISDN, "set timer and establish.\n");
 							schedule_timer(&mISDNport->l2establish, 5, 0);
@@ -1944,7 +1948,7 @@ static int l2establish_timeout(struct lcr_timer *timer, void *instance, int i)
 {
 	struct mISDNport *mISDNport = (struct mISDNport *)instance;
 
-	if (!mISDNport->gsm && mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode)) {
+	if (!mISDNport->isloopback && mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode)) {
 //		PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link portnum=%d.\n", mISDNport->portnum);
 		mISDNport->ml3->to_layer3(mISDNport->ml3, MT_L2ESTABLISH, 0, NULL);
 		schedule_timer(&mISDNport->l2establish, 5, 0); /* 5 seconds */
@@ -2060,9 +2064,13 @@ int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3
 	l3m->pid = pid;
 	mqueue_tail(&mISDNport->upqueue, mb);
 	if (!upqueue_avail) {
+		// multiple threads may cause multiple calls of this section, but this
+		// results only in multiple processing of the upqueue read.
+		// this is no problem.
 		upqueue_avail = 1;
 		char byte = 0;
-		write(upqueue_pipe[1], &byte, 1);
+		int ret;
+		ret = write(upqueue_pipe[1], &byte, 1);
 	}
 	return 0;
 }
@@ -2100,7 +2108,7 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport)
 	int force_nt = ifport->nt;
 	int l1hold = ifport->l1hold;
 	int l2hold = ifport->l2hold;
-	int gsm = ifport->gsm;
+	int loop = 0;
 	int ss5 = ifport->ss5;
 	int i, cnt;
 	int pri, bri, pots;
@@ -2109,6 +2117,25 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport)
 	struct mISDN_devinfo devinfo;
 	unsigned int protocol, prop;
 
+#if defined WITH_GSM_BS && defined WITH_GSM_MS
+	loop = ifport->gsm_ms | ifport->gsm_bs;
+#else
+#ifdef WITH_GSM_BS
+	loop = ifport->gsm_bs;
+#endif
+#ifdef WITH_GSM_MS
+	loop = ifport->gsm_ms;
+#endif
+#endif
+//printf("%s == %s\n", ifport->portname, options.loopback_int);
+	if (!strcmp(ifport->portname, options.loopback_lcr))
+		loop = 1;
+
+	if (loop) {
+		if (mISDNloop_open())
+			return NULL;
+	}
+
 	/* check port counts */
 	ret = ioctl(mISDNsocket, IMGETCOUNT, &cnt);
 	if (ret < 0) {
@@ -2123,8 +2150,8 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport)
 	if (port < 0) {
 		port = mISDN_getportbyname(mISDNsocket, cnt, ifport->portname);
 		if (port < 0) {
-			if (gsm)
-				PERROR_RUNTIME("Port name '%s' not found, did you load loopback interface for GSM?.\n", ifport->portname);
+			if (loop)
+				PERROR_RUNTIME("Port name '%s' not found, did you load loopback interface?.\n", ifport->portname);
 			else
 				PERROR_RUNTIME("Port name '%s' not found, use 'misdn_info' tool to list all existing ports.\n", ifport->portname);
 			return(NULL);
@@ -2240,15 +2267,21 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport)
 		mISDNportp = &((*mISDNportp)->next);
 	mISDNport = (struct mISDNport *)MALLOC(sizeof(struct mISDNport));
 	add_timer(&mISDNport->l2establish, l2establish_timeout, mISDNport, 0);
-	if (gsm | ss5) {
-		/* gsm/ss5 link is always active */
+	if (loop | ss5) {
+		/* loop/ss5 link is always active */
 		mISDNport->l1link = 1;
 		mISDNport->l2link = 1;
 	} else {
 		mISDNport->l1link = -1;
 		mISDNport->l2link = -1;
 	}
-	mISDNport->gsm = gsm;
+#ifdef WITH_GSM_BS
+	mISDNport->gsm_bs = ifport->gsm_bs;
+#endif
+#ifdef WITH_GSM_MS
+	mISDNport->gsm_ms = ifport->gsm_ms;
+#endif
+	mISDNport->isloopback = loop;
 	pmemuse++;
 	*mISDNportp = mISDNport;
 
@@ -2290,24 +2323,24 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport)
 	if (l2hold) // supports layer 2 hold
 	       prop |= (1 << MISDN_FLG_L2_HOLD);
 	/* open layer 3 and init upqueue */
-	if (gsm) {
+	if (loop) {
 		unsigned long on = 1;
 		struct sockaddr_mISDN addr;
 
 		if (devinfo.nrbchan < 8) {
-			PERROR_RUNTIME("GSM port %d must have at least 8 b-channels.\n", port);
-			mISDNport_close(mISDNport);
-			return(NULL);
+			printf("loop port %d has a low number of bchannels. (only %d) remember that all interfaces that requires a loopback could run out of channels\n", port, devinfo.nrbchan);
+//			mISDNport_close(mISDNport);
+//			return(NULL);
 		}
 
-		if ((mISDNport->lcr_sock = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_NT_S0)) < 0) {
-			PERROR_RUNTIME("GSM port %d failed to open socket.\n", port);
+		if ((mISDNport->lcr_sock = socket(PF_ISDN, SOCK_DGRAM, (bri) ? ISDN_P_TE_S0 : ISDN_P_TE_E1)) < 0) {
+			PERROR_RUNTIME("loop port %d failed to open socket.\n", port);
 			mISDNport_close(mISDNport);
 			return(NULL);
 		}
 		/* set nonblocking io */
 		if (ioctl(mISDNport->lcr_sock, FIONBIO, &on) < 0) {
-			PERROR_RUNTIME("GSM port %d failed to set socket into nonblocking io.\n", port);
+			PERROR_RUNTIME("loop port %d failed to set socket into nonblocking io.\n", port);
 			mISDNport_close(mISDNport);
 			return(NULL);
 		}
@@ -2317,7 +2350,7 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport)
 		addr.dev = port;
 		addr.channel = 0;
 		if (bind(mISDNport->lcr_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-			PERROR_RUNTIME("GSM port %d failed to bind socket. (errno %d)\n", port, errno);
+			PERROR_RUNTIME("loop port %d failed to bind socket. (errno %d)\n", port, errno);
 			mISDNport_close(mISDNport);
 			return(NULL);
 		}
@@ -2361,7 +2394,7 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport)
 	}
 
 	/* if ptp, pull up the link */
-	if (!mISDNport->gsm && mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode)) {
+	if (!mISDNport->isloopback && mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode)) {
 		mISDNport->ml3->to_layer3(mISDNport->ml3, MT_L2ESTABLISH, 0, NULL);
 		l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT);
 		add_trace("tei", NULL, "%d", 0);
@@ -2474,17 +2507,17 @@ void mISDNport_close(struct mISDNport *mISDNport)
 	del_timer(&mISDNport->l2establish);
 
 	/* close layer 3, if open */
-	if (!mISDNport->gsm && mISDNport->ml3) {
+	if (!mISDNport->isloopback && mISDNport->ml3) {
 		close_layer3(mISDNport->ml3);
 	}
 
 	/* close gsm socket, if open */
-	if (mISDNport->gsm && mISDNport->lcr_sock > -1) {
+	if (mISDNport->isloopback && mISDNport->lcr_sock > -1) {
 		close(mISDNport->lcr_sock);
 	}
 
 	/* purge upqueue */
-	if (!mISDNport->gsm)
+	if (!mISDNport->isloopback)
 		mqueue_purge(&mISDNport->upqueue);
 
 	/* remove from list */