Version 0.1.2 from FTP

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@191 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 20 insertions, 9 deletions

diff --git a/channels/chan_modem.c b/channels/chan_modem.c
index 7c6fedbf2..bf4a89c60 100755
--- a/channels/chan_modem.c
+++ b/channels/chan_modem.c
@@ -419,7 +419,6 @@ struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state)
 		snprintf(tmp->name, sizeof(tmp->name), "Modem[%s]/%s", i->mc->name, i->dev + 5);
 		tmp->type = type;
 		tmp->fd = i->fd;
-		/* XXX Switching formats silently causes kernel panics XXX */
 		tmp->format = i->mc->formats;
 		tmp->state = state;
 		if (state == AST_STATE_RING)
@@ -433,7 +432,7 @@ struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state)
 		tmp->pvt->write = modem_write;
 		strncpy(tmp->context, i->context, sizeof(tmp->context));
 		if (strlen(i->cid))
-			strncpy(tmp->callerid, i->cid, sizeof(tmp->callerid));
+			tmp->callerid = strdup(i->cid);
 		i->owner = tmp;
 		pthread_mutex_lock(&usecnt_lock);
 		usecnt++;
@@ -443,6 +442,7 @@ struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state)
 			if (ast_pbx_start(tmp)) {
 				ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
 				ast_hangup(tmp);
+				tmp = NULL;
 			}
 		}
 	} else
@@ -454,6 +454,12 @@ static void modem_mini_packet(struct ast_modem_pvt *i)
 {
 	struct ast_frame *fr;
 	fr = i->mc->read(i);
+	if (fr->frametype == AST_FRAME_CONTROL) {
+		if (fr->subclass == AST_CONTROL_RING) {
+			ast_modem_new(i, AST_STATE_RING);
+			restart_monitor();
+		}
+	}
 }
 
 static void *do_monitor(void *data)
@@ -701,10 +707,10 @@ int load_module()
 				ast_verbose(VERBOSE_PREFIX_2 "Loading modem driver %s", driver);
 				
 			if (ast_load_resource(driver)) {
-				ast_log(LOG_ERROR, "Failed to laod driver %s\n", driver);
+				ast_log(LOG_ERROR, "Failed to load driver %s\n", driver);
 				ast_destroy(cfg);
-				unload_module();
 				pthread_mutex_unlock(&iflock);
+				unload_module();
 				return -1;
 			}
 		} else if (!strcasecmp(v->name, "mode")) {
@@ -742,8 +748,6 @@ int load_module()
 	return 0;
 }
 
-
-
 int unload_module()
 {
 	struct ast_modem_pvt *p, *pl;
diff --git a/channels/chan_modem_aopen.c b/channels/chan_modem_aopen.c
index ae2b7e41a..f344cb149 100755
--- a/channels/chan_modem_aopen.c
+++ b/channels/chan_modem_aopen.c
@@ -194,9 +194,13 @@ static struct ast_frame *aopen_handle_escape(struct ast_modem_pvt *p, char esc)
 		ast_log(LOG_DEBUG, "Escaped character '%c'\n", esc);
 	
 	switch(esc) {
+	case 'R': /* Pseudo ring */
+		p->fr.frametype = AST_FRAME_CONTROL;
+		p->fr.subclass = AST_CONTROL_RING;
+		return &p->fr;
 	case 'X': /* Pseudo connect */
 		p->fr.frametype = AST_FRAME_CONTROL;
-		p->fr.subclass = AST_CONTROL_ANSWER;
+		p->fr.subclass = AST_CONTROL_RING;
 		if (p->owner)
 			p->owner->state = AST_STATE_UP;
 		if (aopen_startrec(p))
@@ -255,11 +259,14 @@ static struct ast_frame *aopen_read(struct ast_modem_pvt *p)
 				/* If we're in immediate mode, reply now */
 				if (p->mode == MODEM_MODE_IMMEDIATE)
 					return aopen_handle_escape(p, 'X');
-			}
+			} else
 			if (!strcasecmp(result, "BUSY")) {
 				/* Same as a busy signal */
 				return aopen_handle_escape(p, 'b');
-			}
+			} else
+			if (!strcasecmp(result, "RING")) {
+				return aopen_handle_escape(p, 'R');
+			} else
 			if (!strcasecmp(result, "NO DIALTONE")) {
 				/* There's no dialtone, so the line isn't working */
 				ast_log(LOG_WARNING, "Device '%s' lacking dialtone\n", p->dev);