X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=chan_lcr.c;h=110c3372a80a2bdb9a3a0a5fcc76e7820ed09a8d;hp=59687339a7c29ae51ac4d05c39d6f899436264b7;hb=a71c27047b4ff3c216cc176ba1e6fc80f55b9032;hpb=ec4c180567d94ada2940ca106b45e5876d6bbf3a

diff --git a/chan_lcr.c b/chan_lcr.c
index 5968733..110c337 100644
--- a/chan_lcr.c
+++ b/chan_lcr.c
@@ -223,13 +223,6 @@ struct admin_list {
 
 static struct ast_channel_tech lcr_tech;
 
-void lock_debug(char *text)
-{
-	pthread_t tid = pthread_self();
-//	printf("%s|%03x\n", text, ((tid>>6) | (tid>>3) | tid) & 0xfff); fflush(stdout);
-	printf(" %s(%x) ", text, (int)tid); fflush(stdout);
-}
-
 /*
  * logging
  */
@@ -240,9 +233,7 @@ void chan_lcr_log(int type, const char *file, int line, const char *function, st
 	char ast_text[128] = "NULL";
 	va_list args;
 
-	lock_debug("L+");
 	ast_mutex_lock(&log_lock);
-	lock_debug("L-");
 
 	va_start(args,fmt);
 	vsnprintf(buffer,sizeof(buffer)-1,fmt,args);
@@ -255,11 +246,10 @@ void chan_lcr_log(int type, const char *file, int line, const char *function, st
 		strncpy(ast_text, ast->name, sizeof(ast_text)-1);
 	ast_text[sizeof(ast_text)-1] = '\0';
 
-printf("\n[call=%s ast=%s] %s\n", call_text, ast_text, buffer);
 //	ast_log(type, file, line, function, "[call=%s ast=%s] %s", call_text, ast_text, buffer);
+	printf("[call=%s ast=%s] %s", call_text, ast_text, buffer);
 
 	ast_mutex_unlock(&log_lock);
-	lock_debug("l");
 }
 
 /*
@@ -623,7 +613,7 @@ static void send_setup_to_lcr(struct chan_call *call)
 {
 	union parameter newparam;
 	struct ast_channel *ast = call->ast;
-	const char *tmp;
+//	const char *tmp;
 
 	if (!call->ast || !call->ref)
 		return;
@@ -676,9 +666,10 @@ static void send_setup_to_lcr(struct chan_call *call)
 		default:
 		newparam.setup.callerinfo.ntype = INFO_NTYPE_UNKNOWN;
 	}
-	tmp = pbx_builtin_getvar_helper(ast, "LCR_TRANSFERCAPABILITY");
-	if (tmp && *tmp)
-		ast->transfercapability = atoi(tmp);
+#warning DISABLED DUE TO DOUBLE LOCKING PROBLEM
+//	tmp = pbx_builtin_getvar_helper(ast, "LCR_TRANSFERCAPABILITY");
+//	if (tmp && *tmp)
+//		ast->transfercapability = atoi(tmp);
 	newparam.setup.capainfo.bearer_capa = ast->transfercapability;
 	newparam.setup.capainfo.bearer_mode = INFO_BMODE_CIRCUIT;
 	if (call->hdlc)
@@ -892,6 +883,8 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet
 		strncpy(ast->context, param->setup.callerinfo.interface, AST_MAX_CONTEXT-1);
 	if (param->setup.callerinfo.id[0])
 		ast->cid.cid_num = strdup(param->setup.callerinfo.id);
+	if (param->setup.callerinfo.id2[0])
+		ast->cid.cid_ani = strdup(param->setup.callerinfo.id2);
 	if (param->setup.callerinfo.name[0])
 		ast->cid.cid_name = strdup(param->setup.callerinfo.name);
 	if (param->setup.redirinfo.id[0])
@@ -1265,7 +1258,6 @@ int receive_message(int message_type, unsigned int ref, union parameter *param)
 	if (message_type == MESSAGE_BCHANNEL) {
 		switch(param->bchannel.type) {
 			case BCHANNEL_ASSIGN:
-lock_debug("rx1");
 			CDEBUG(NULL, NULL, "Received BCHANNEL_ASSIGN message. (handle=%08lx) for ref %d\n", param->bchannel.handle, ref);
 			if ((bchannel = find_bchannel_handle(param->bchannel.handle))) {
 				CERROR(NULL, NULL, "bchannel handle %x already assigned.\n", (int)param->bchannel.handle);
@@ -1530,23 +1522,16 @@ static int handle_socket(struct lcr_fd *fd, unsigned int what, void *instance, i
 	struct admin_list *admin;
 	struct admin_message msg;
 
-	lock_debug("handle+");
 	if ((what & LCR_FD_READ)) {
 		/* read from socket */
-		lock_debug("handle1");
 		len = read(lcr_sock, &msg, sizeof(msg));
-		lock_debug("handle2");
 		if (len == 0) {
 			CERROR(NULL, NULL, "Socket closed.\n");
 			error:
 			CERROR(NULL, NULL, "Handling of socket failed - closing for some seconds.\n");
-			lock_debug("handle3");
 			close_socket();
-			lock_debug("handle4");
 			release_all_calls();
-			lock_debug("handle5");
 			schedule_timer(&socket_retry, SOCKET_RETRY_TIMER, 0);
-			lock_debug("handle-");
 			return 0;
 		}
 		if (len > 0) {
@@ -1558,9 +1543,7 @@ static int handle_socket(struct lcr_fd *fd, unsigned int what, void *instance, i
 				CERROR(NULL, NULL, "Socket received illegal message %d.\n", msg.message);
 				goto error;
 			}
-			lock_debug("handleX");
 			receive_message(msg.u.msg.type, msg.u.msg.ref, &msg.u.msg.param);
-			lock_debug("handleY");
 		} else {
 			CERROR(NULL, NULL, "Socket failed (errno %d).\n", errno);
 			goto error;
@@ -1571,13 +1554,10 @@ static int handle_socket(struct lcr_fd *fd, unsigned int what, void *instance, i
 		/* write to socket */
 		if (!admin_first) {
 			socket_fd.when &= ~LCR_FD_WRITE;
-			lock_debug("handle-");
 			return 0;
 		}
-		lock_debug("handle6");
 		admin = admin_first;
 		len = write(lcr_sock, &admin->msg, sizeof(msg));
-		lock_debug("handle7");
 		if (len == 0) {
 			CERROR(NULL, NULL, "Socket closed.\n");
 			goto error;
@@ -1588,7 +1568,6 @@ static int handle_socket(struct lcr_fd *fd, unsigned int what, void *instance, i
 				goto error;
 			}
 			/* free head */
-			lock_debug("handle8");
 			admin_first = admin->next;
 			free(admin);
 			global_change = 1;
@@ -1598,7 +1577,6 @@ static int handle_socket(struct lcr_fd *fd, unsigned int what, void *instance, i
 		}
 	}
 
-	lock_debug("handle-");
 	return 0;
 }
 
@@ -1671,11 +1649,9 @@ static int wake_event(struct lcr_fd *fd, unsigned int what, void *instance, int
 {
 	char byte;
 
-	lock_debug("wake+");
 	read(wake_pipe[0], &byte, 1);
 
 	wake_global = 0;
-	lock_debug("wake-");
 
 	return 0;
 }
@@ -1687,18 +1663,18 @@ static void handle_queue()
 	struct ast_frame fr;
 	char *p;
 
+again:
 	call = call_first;
 	while(call) {
 		p = call->queue_string;
 		ast = call->ast;
 		if (*p && ast) {
-			lock_debug("A1+");
-			while (ast_channel_trylock(ast)) {
-				lock_debug("<trylock failed>");
-				usleep(1000);
-				lock_debug("A1++");
+			if (ast_channel_trylock(ast)) {
+				ast_mutex_unlock(&chan_lock);
+				usleep(1);
+				ast_mutex_lock(&chan_lock);
+				goto again;
 			}
-			lock_debug("A1-");
 			while(*p) {
 				switch (*p) {
 				case 'T':
@@ -1755,7 +1731,6 @@ static void handle_queue()
 			}
 			call->queue_string[0] = '\0';
 			ast_channel_unlock(ast);
-			lock_debug("a1");
 		}
 		call = call->next;
 	}
@@ -1772,15 +1747,12 @@ static int handle_retry(struct lcr_timer *timer, void *instance, int index)
 
 void lock_chan(void)
 {
-	lock_debug("C+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("C-");
 }
 
 void unlock_chan(void)
 {
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("c");
 }
 
 /* chan_lcr thread */
@@ -1802,9 +1774,7 @@ static void *chan_thread(void *arg)
 	/* open socket the first time */
 	handle_retry(NULL, NULL, 0);
 
-	lock_debug("A2+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("A2-");
 
 	while(!quit) {
 		handle_queue();
@@ -1822,7 +1792,6 @@ static void *chan_thread(void *arg)
 	CERROR(NULL, NULL, "Thread exit.\n");
 
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("a2");
 
 	return NULL;
 }
@@ -1837,16 +1806,13 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c
 	struct ast_channel *ast;
         struct chan_call *call;
 
-	lock_debug("A3+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("A3-");
 	CDEBUG(NULL, NULL, "Received request from Asterisk. (data=%s)\n", (char *)data);
 
 	/* if socket is closed */
 	if (lcr_sock < 0) {
 		CERROR(NULL, NULL, "Rejecting call from Asterisk, because LCR not running.\n");
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("a3");
 		return NULL;
 	}
 
@@ -1855,7 +1821,6 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c
 	if (!call) {
 		/* failed to create instance */
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("a3");
 		return NULL;
 	}
 
@@ -1874,7 +1839,6 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c
 		free_call(call);
 		/* failed to create instance */
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("a3");
 		return NULL;
 	}
 	ast->tech = &lcr_tech;
@@ -1920,7 +1884,6 @@ struct ast_channel *lcr_request(const char *type, int format, void *data, int *c
 	apply_opt(call, (char *)opt);
 
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("a3");
 	return ast;
 }
 
@@ -1932,9 +1895,7 @@ static int lcr_call(struct ast_channel *ast, char *dest, int timeout)
 	union parameter newparam;
         struct chan_call *call;
 
-	lock_debug("A4+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("A4-");
         call = ast->tech_pvt;
         
         #ifdef LCR_FOR_CALLWEAVER
@@ -1945,7 +1906,6 @@ static int lcr_call(struct ast_channel *ast, char *dest, int timeout)
 	if (!call) {
 		CERROR(NULL, ast, "Received call from Asterisk, but call instance does not exist.\n");
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("a4");
 		return -1;
 	}
 
@@ -1986,7 +1946,6 @@ static int lcr_call(struct ast_channel *ast, char *dest, int timeout)
 			sizeof(call->cid_rdnis)-1);
 
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("a4");
 	return 0; 
 }
 
@@ -2020,8 +1979,8 @@ static void send_digit_to_chan(struct ast_channel * ast, char digit )
                 ast_playtones_start(ast,0,dtmf_tones[15], 0);
         else {
                 /* not handled */
-//                ast_log(LOG_DEBUG, "Unable to handle DTMF tone "
-//			"'%c' for '%s'\n", digit, ast->name);
+		CDEBUG(NULL, ast, "Unable to handle DTMF tone "
+			"'%c' for '%s'\n", digit, ast->name);
         }
 }
 
@@ -2044,14 +2003,11 @@ static int lcr_digit(struct ast_channel *ast, char digit)
 	if (digit > 126 || digit < 32)
 		return 0;
 
-	lock_debug("A5+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("A5-");
         call = ast->tech_pvt;
 	if (!call) {
 		CERROR(NULL, ast, "Received digit from Asterisk, but no call instance exists.\n");
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("a5");
 		return -1;
 	}
 
@@ -2078,7 +2034,6 @@ static int lcr_digit(struct ast_channel *ast, char digit)
 	}
 
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("a5");
 
 #ifdef LCR_FOR_ASTERISK
 	return 0;
@@ -2090,9 +2045,7 @@ static int lcr_digit_end(struct ast_channel *ast, char digit, unsigned int durat
         struct chan_call *call;
 #endif
 
-	lock_debug("A6+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("A6-");
 
         call = ast->tech_pvt;
 
@@ -2101,7 +2054,6 @@ static int lcr_digit_end(struct ast_channel *ast, char digit, unsigned int durat
 		       "Received digit from Asterisk, "
 		       "but no call instance exists.\n");
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("a6");
 		return -1;
 	}
 
@@ -2112,7 +2064,6 @@ static int lcr_digit_end(struct ast_channel *ast, char digit, unsigned int durat
 	}
 
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("a6");
 
 	if (inband_dtmf) {
 		CDEBUG(call, ast, "-> sending '%c' inband.\n", digit);
@@ -2127,14 +2078,11 @@ static int lcr_answer(struct ast_channel *ast)
 	union parameter newparam;
         struct chan_call *call;
 
-	lock_debug("A7+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("A7-");
         call = ast->tech_pvt;
 	if (!call) {
 		CERROR(NULL, ast, "Received answer from Asterisk, but no call instance exists.\n");
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("a7");
 		return -1;
 	}
 	
@@ -2163,7 +2111,6 @@ static int lcr_answer(struct ast_channel *ast)
 //	send_message(MESSAGE_ENABLEKEYPAD, call->ref, &newparam);
 	
    	ast_mutex_unlock(&chan_lock);
-	lock_debug("a7");
         return 0;
 }
 
@@ -2173,16 +2120,13 @@ static int lcr_hangup(struct ast_channel *ast)
 	pthread_t tid = pthread_self();
 
 	if (!pthread_equal(tid, chan_tid)) {
-		lock_debug("H+");
 		ast_mutex_lock(&chan_lock);
-		lock_debug("H-");
 	}
         call = ast->tech_pvt;
 	if (!call) {
 		CERROR(NULL, ast, "Received hangup from Asterisk, but no call instance exists.\n");
 		if (!pthread_equal(tid, chan_tid)) {
 			ast_mutex_unlock(&chan_lock);
-			lock_debug("h");
 		}
 		return -1;
 	}
@@ -2206,7 +2150,6 @@ static int lcr_hangup(struct ast_channel *ast)
 		free_call(call);
 		if (!pthread_equal(tid, chan_tid)) {
 			ast_mutex_unlock(&chan_lock);
-			lock_debug("h");
 		}
 		return 0;
 	} else {
@@ -2224,7 +2167,6 @@ static int lcr_hangup(struct ast_channel *ast)
 	} 
 	if (!pthread_equal(tid, chan_tid)) {
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("h");
 	}
 	return 0;
 }
@@ -2238,19 +2180,15 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *f)
 	if (!(f->subclass & ast->nativeformats))
 		CDEBUG(NULL, ast, "Unexpected format.\n");
 	
-	lock_debug("A8+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("A8-");
         call = ast->tech_pvt;
 	if (!call) {
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("a8");
 		return -1;
 	}
 	if (call->bchannel && f->samples)
 		bchannel_transmit(call->bchannel, *((unsigned char **)&(f->data)), f->samples);
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("a8");
 	return 0;
 }
 
@@ -2258,33 +2196,26 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *f)
 static struct ast_frame *lcr_read(struct ast_channel *ast)
 {
         struct chan_call *call;
-	int len;
+	int len = 0;
 
-	lock_debug("A9+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("A9-");
         call = ast->tech_pvt;
 	if (!call) {
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("a9");
 		return NULL;
 	}
 	if (call->pipe[0] > -1) {
 		if (call->rebuffer && !call->hdlc) {
 			/* Make sure we have a complete 20ms (160byte) frame */
-			lock_debug("*1");
 			len=read(call->pipe[0],call->read_buff + call->framepos, 160 - call->framepos);
 			if (len > 0) {
 				call->framepos += len;
 			}
 		} else {
-			lock_debug("*2");
 			len = read(call->pipe[0], call->read_buff, sizeof(call->read_buff));
 		}
-		lock_debug("*3");
 		if (len < 0 && errno == EAGAIN) {
 			ast_mutex_unlock(&chan_lock);
-			lock_debug("a9");
 
 			#ifdef LCR_FOR_ASTERISK
 			return &ast_null_frame;
@@ -2300,12 +2231,10 @@ static struct ast_frame *lcr_read(struct ast_channel *ast)
 			call->pipe[0] = -1;
 			global_change = 1;
 			ast_mutex_unlock(&chan_lock);
-			lock_debug("a9");
 			return NULL;
 		} else if (call->rebuffer && call->framepos < 160) {
 			/* Not a complete frame, so we send a null-frame */
 			ast_mutex_unlock(&chan_lock);
-			lock_debug("a9");
 			return &ast_null_frame;
 		}
 	}
@@ -2323,7 +2252,6 @@ static struct ast_frame *lcr_read(struct ast_channel *ast)
 	call->read_fr.delivery = ast_tv(0,0);
 	*((unsigned char **)&(call->read_fr.data)) = call->read_buff;
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("a9");
 
 	return &call->read_fr;
 }
@@ -2335,14 +2263,11 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
         struct chan_call *call;
 	const struct tone_zone_sound *ts = NULL;
 
-	lock_debug("A0+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("A0-");
         call = ast->tech_pvt;
 	if (!call) {
 		CERROR(NULL, ast, "Received indicate from Asterisk, but no call instance exists.\n");
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("a0");
 		return -1;
 	}
 
@@ -2473,7 +2398,6 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
 
 	/* return */
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("a0");
         return res;
 }
 
@@ -2488,21 +2412,17 @@ static int lcr_fixup(struct ast_channel *oldast, struct ast_channel *ast)
 		return -1;
 	}
 
-	lock_debug("Af+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("Af-");
 	call = ast->tech_pvt;
 	if (!call) {
 		CERROR(NULL, ast, "Received fixup from Asterisk, but no call instance exists.\n");
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("af");
 		return -1;
 	}
 
 	CDEBUG(call, ast, "Received fixup from Asterisk.\n");
 	call->ast = ast;
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("af");
 	return 0;
 }
 
@@ -2514,14 +2434,11 @@ static int lcr_send_text(struct ast_channel *ast, const char *text)
         struct chan_call *call;
 	union parameter newparam;
 
-	lock_debug("At+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("At-");
 	call = ast->tech_pvt;
 	if (!call) {
 		CERROR(NULL, ast, "Received send_text from Asterisk, but no call instance exists.\n");
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("at");
 		return -1;
 	}
 
@@ -2530,7 +2447,6 @@ static int lcr_send_text(struct ast_channel *ast, const char *text)
 	strncpy(newparam.notifyinfo.display, text, sizeof(newparam.notifyinfo.display)-1);
 	send_message(MESSAGE_NOTIFY, call->ref, &newparam);
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("at");
 	return 0;
 }
 
@@ -2555,15 +2471,12 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
 	carr[1] = ast2;
 
 	/* join via dsp (if the channels are currently open) */
-	lock_debug("Ab+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("Ab-");
 	call1 = ast1->tech_pvt;
 	call2 = ast2->tech_pvt;
 	if (!call1 || !call2) {
 		CDEBUG(NULL, NULL, "Bridge, but we don't have two call instances, exitting.\n");
 		ast_mutex_unlock(&chan_lock);
-		lock_debug("ab");
 		return AST_BRIDGE_COMPLETE;
 	}
 
@@ -2631,7 +2544,6 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
 	}
 	
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("ab");
 	
 	while(1) {
 		to = -1;
@@ -2674,9 +2586,7 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
 	CDEBUG(NULL, NULL, "Releasing bridge.\n");
 
 	/* split channels */
-	lock_debug("Ab+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("Ab-");
 	call1 = ast1->tech_pvt;
 	call2 = ast2->tech_pvt;
 	if (call1 && call1->bridge_id) {
@@ -2697,7 +2607,6 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
 	call2->bridge_call = NULL;
 
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("ab");
 	return AST_BRIDGE_COMPLETE;
 }
 static struct ast_channel_tech lcr_tech = {
@@ -2828,9 +2737,7 @@ static int lcr_config_exec(struct ast_channel *ast, void *data, char **argv)
 {
 	struct chan_call *call;
 
-	lock_debug("Ae+");
 	ast_mutex_lock(&chan_lock);
-	lock_debug("Ae-");
 
 	#ifdef LCR_FOR_ASTERISK
 	CDEBUG(NULL, ast, "Received lcr_config (data=%s)\n", (char *)data);
@@ -2861,7 +2768,6 @@ static int lcr_config_exec(struct ast_channel *ast, void *data, char **argv)
 		CERROR(NULL, ast, "lcr_config app not called by chan_lcr channel.\n");
 
 	ast_mutex_unlock(&chan_lock);
-	lock_debug("ae");
 	return 0;
 }
 
@@ -3032,12 +2938,9 @@ int usecount(void)
 hae
 {
 	int res;
-	lock_debug("U+");
 	ast_mutex_lock(&usecnt_lock);
-	lock_debug("U-");
 	res = usecnt;
 	ast_mutex_unlock(&usecnt_lock);
-	lock_debug("u");
 	return res;
 }
 #endif