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

diff --git a/chan_lcr.c b/chan_lcr.c
index 20d522f..110c337 100644
--- a/chan_lcr.c
+++ b/chan_lcr.c
@@ -246,8 +246,8 @@ 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);
 }
@@ -883,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])
@@ -1669,7 +1671,7 @@ again:
 		if (*p && ast) {
 			if (ast_channel_trylock(ast)) {
 				ast_mutex_unlock(&chan_lock);
-				usleep(1000);
+				usleep(1);
 				ast_mutex_lock(&chan_lock);
 				goto again;
 			}
@@ -1977,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);
         }
 }
 
@@ -2194,7 +2196,7 @@ 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;
 
 	ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;