X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=chan_lcr.c;h=701d8a274b51ebbf54969d41a8dbb4a87ee3722a;hp=72bca9fd87f0f2e348bcb5c142ebef891280bcc5;hb=69ad78e230664a2ebf1b70f48981f73a9b81d3f8;hpb=2732c3ce40d8e0b3875b5a0c933c98f27c8cbae9

diff --git a/chan_lcr.c b/chan_lcr.c
index 72bca9f..701d8a2 100644
--- a/chan_lcr.c
+++ b/chan_lcr.c
@@ -223,6 +223,13 @@ 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
  */
@@ -233,7 +240,9 @@ 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);
@@ -249,6 +258,7 @@ void chan_lcr_log(int type, const char *file, int line, const char *function, st
 	ast_log(type, file, line, function, "[call=%s ast=%s] %s", call_text, ast_text, buffer);
 
 	ast_mutex_unlock(&log_lock);
+	lock_debug("l");
 }
 
 /*
@@ -884,7 +894,7 @@ static void lcr_in_setup(struct chan_call *call, int message_type, union paramet
 	if (param->setup.callerinfo.name[0])
 		ast->cid.cid_name = strdup(param->setup.callerinfo.name);
 	if (param->setup.redirinfo.id[0])
-		ast->cid.cid_name = strdup(numberrize_callerinfo(param->setup.callerinfo.id, param->setup.callerinfo.ntype, options.national, options.international));
+		ast->cid.cid_rdnis = strdup(numberrize_callerinfo(param->setup.redirinfo.id, param->setup.redirinfo.ntype, options.national, options.international));
 	switch (param->setup.callerinfo.present) {
 		case INFO_PRESENT_ALLOWED:
 			ast->cid.cid_pres = AST_PRES_ALLOWED;
@@ -1664,7 +1674,9 @@ static void handle_queue()
 		p = call->queue_string;
 		ast = call->ast;
 		if (*p && ast) {
+			lock_debug("A1+");
 			ast_channel_lock(ast);
+			lock_debug("A1-");
 			while(*p) {
 				switch (*p) {
 				case 'T':
@@ -1721,6 +1733,7 @@ static void handle_queue()
 			}
 			call->queue_string[0] = '\0';
 			ast_channel_unlock(ast);
+			lock_debug("a1");
 		}
 		call = call->next;
 	}
@@ -1737,12 +1750,15 @@ 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 */
@@ -1764,7 +1780,9 @@ 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();
@@ -1782,6 +1800,7 @@ static void *chan_thread(void *arg)
 	CERROR(NULL, NULL, "Thread exit.\n");
 
 	ast_mutex_unlock(&chan_lock);
+	lock_debug("a2");
 
 	return NULL;
 }
@@ -1796,13 +1815,16 @@ 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;
 	}
 
@@ -1811,6 +1833,7 @@ 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;
 	}
 
@@ -1829,6 +1852,7 @@ 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;
@@ -1874,6 +1898,7 @@ 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;
 }
 
@@ -1885,7 +1910,9 @@ 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
@@ -1896,6 +1923,7 @@ 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;
 	}
 
@@ -1936,6 +1964,7 @@ 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; 
 }
 
@@ -1993,11 +2022,14 @@ 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;
 	}
 
@@ -2024,6 +2056,7 @@ static int lcr_digit(struct ast_channel *ast, char digit)
 	}
 
 	ast_mutex_unlock(&chan_lock);
+	lock_debug("a5");
 
 #ifdef LCR_FOR_ASTERISK
 	return 0;
@@ -2035,7 +2068,9 @@ 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;
 
@@ -2044,6 +2079,7 @@ 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;
 	}
 
@@ -2054,6 +2090,7 @@ 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);
@@ -2068,11 +2105,14 @@ 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;
 	}
 	
@@ -2101,6 +2141,7 @@ 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;
 }
 
@@ -2109,13 +2150,18 @@ static int lcr_hangup(struct ast_channel *ast)
         struct chan_call *call;
 	pthread_t tid = pthread_self();
 
-	if (!pthread_equal(tid, chan_tid))
+	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))
+		if (!pthread_equal(tid, chan_tid)) {
 			ast_mutex_unlock(&chan_lock);
+			lock_debug("h");
+		}
 		return -1;
 	}
 
@@ -2136,8 +2182,10 @@ static int lcr_hangup(struct ast_channel *ast)
 			send_release_and_import(call, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL);
 		/* remove call */
 		free_call(call);
-		if (!pthread_equal(tid, chan_tid))
+		if (!pthread_equal(tid, chan_tid)) {
 			ast_mutex_unlock(&chan_lock);
+			lock_debug("h");
+		}
 		return 0;
 	} else {
 		/* ref is not set, due to prepare setup or release */
@@ -2152,8 +2200,10 @@ static int lcr_hangup(struct ast_channel *ast)
 			call->ast = NULL;
 		}
 	} 
-	if (!pthread_equal(tid, chan_tid))
+	if (!pthread_equal(tid, chan_tid)) {
 		ast_mutex_unlock(&chan_lock);
+		lock_debug("h");
+	}
 	return 0;
 }
 
@@ -2166,15 +2216,19 @@ 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;
 }
 
@@ -2184,24 +2238,31 @@ static struct ast_frame *lcr_read(struct ast_channel *ast)
         struct chan_call *call;
 	int len;
 
+	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;
@@ -2217,10 +2278,12 @@ 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;
 		}
 	}
@@ -2238,6 +2301,7 @@ 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;
 }
@@ -2247,12 +2311,16 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
 	union parameter newparam;
         int res = 0;
         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;
 	}
 
@@ -2268,6 +2336,9 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
 				send_message(MESSAGE_DISCONNECT, call->ref, &newparam);
 				/* change state */
 				call->state = CHAN_LCR_STATE_OUT_DISCONNECT;
+			} else {
+				CDEBUG(call, ast, "Using Asterisk 'busy' indication\n");
+				ts = ast_get_indication_tone(ast->zone, "busy");
 			}
 			break;
                 case AST_CONTROL_CONGESTION:
@@ -2280,6 +2351,9 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
 				send_message(MESSAGE_DISCONNECT, call->ref, &newparam);
 				/* change state */
 				call->state = CHAN_LCR_STATE_OUT_DISCONNECT;
+			} else {
+				CDEBUG(call, ast, "Using Asterisk 'congestion' indication\n");
+				ts = ast_get_indication_tone(ast->zone, "congestion");
 			}
 			break;
                 case AST_CONTROL_PROCEEDING:
@@ -2304,6 +2378,9 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
 				send_message(MESSAGE_ALERTING, call->ref, &newparam);
 				/* change state */
 				call->state = CHAN_LCR_STATE_IN_ALERTING;
+			} else {
+				CDEBUG(call, ast, "Using Asterisk 'ring' indication\n");
+				ts = ast_get_indication_tone(ast->zone, "ring");
 			}
 			break;
 		case AST_CONTROL_PROGRESS:
@@ -2318,6 +2395,7 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
 			break;
                 case -1:
 			CDEBUG(call, ast, "Received indicate -1.\n");
+			ast_playtones_stop(ast);
                         res = -1;
 			break;
 
@@ -2367,8 +2445,13 @@ static int lcr_indicate(struct ast_channel *ast, int cond, const void *data, siz
 			break;
         }
 
+	if (ts && ts->data[0]) {
+		ast_playtones_start(ast, 0, ts->data, 1);
+	}
+
 	/* return */
 	ast_mutex_unlock(&chan_lock);
+	lock_debug("a0");
         return res;
 }
 
@@ -2383,17 +2466,21 @@ 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;
 }
 
@@ -2405,11 +2492,14 @@ 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;
 	}
 
@@ -2417,7 +2507,8 @@ static int lcr_send_text(struct ast_channel *ast, const char *text)
 	memset(&newparam, 0, sizeof(union parameter));
 	strncpy(newparam.notifyinfo.display, text, sizeof(newparam.notifyinfo.display)-1);
 	send_message(MESSAGE_NOTIFY, call->ref, &newparam);
-	ast_mutex_lock(&chan_lock);
+	ast_mutex_unlock(&chan_lock);
+	lock_debug("at");
 	return 0;
 }
 
@@ -2442,12 +2533,15 @@ 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;
 	}
 
@@ -2515,6 +2609,7 @@ enum ast_bridge_result lcr_bridge(struct ast_channel *ast1,
 	}
 	
 	ast_mutex_unlock(&chan_lock);
+	lock_debug("ab");
 	
 	while(1) {
 		to = -1;
@@ -2557,7 +2652,9 @@ 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) {
@@ -2578,6 +2675,7 @@ 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 = {
@@ -2708,7 +2806,9 @@ 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);
@@ -2739,6 +2839,7 @@ 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;
 }
 
@@ -2909,9 +3010,12 @@ 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