X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=chan_lcr.c;h=9c62447499615c67cd64f7e7c9450c05c9714b68;hp=6a953a20e7a0208601cb4d29c9388856b348f549;hb=13f107bc240d351b1eb1915eff140efe1b4a95bb;hpb=0c65074b5b88b2da2390078d0fab6c72f228709d

diff --git a/chan_lcr.c b/chan_lcr.c
index 6a953a2..9c62447 100644
--- a/chan_lcr.c
+++ b/chan_lcr.c
@@ -884,7 +884,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;
@@ -2247,6 +2247,7 @@ 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;
 
 	ast_mutex_lock(&chan_lock);
         call = ast->tech_pvt;
@@ -2268,6 +2269,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 +2284,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 +2311,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 +2328,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,6 +2378,10 @@ 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);
         return res;
@@ -2417,7 +2432,7 @@ 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);
 	return 0;
 }
 
@@ -2748,13 +2763,14 @@ static int lcr_config_exec(struct ast_channel *ast, void *data, char **argv)
 int load_module(void)
 {
 	u_short i;
+	char options_error[256];
 
 	for (i = 0; i < 256; i++) {
 		flip_bits[i] = (i>>7) | ((i>>5)&2) | ((i>>3)&4) | ((i>>1)&8)
 			     | (i<<7) | ((i&2)<<5) | ((i&4)<<3) | ((i&8)<<1);
 	}
 
-	if (read_options() == 0) {
+	if (read_options(options_error) == 0) {
 		CERROR(NULL, NULL, "%s", options_error);
 
 		#ifdef LCR_FOR_ASTERISK