Version 0.1.1 from FTP

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

5 files changed, 852 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 5604e7628..1ac473afc 100755
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # 
 # Top level Makefile
 #
-# Copyright (C) 1999, Adtran Inc. and Linux Support Services, LLC
+# Copyright (C) 1999, Mark Spencer
 #
 # Mark Spencer <markster@linux-support.net>
 #
@@ -18,11 +18,11 @@ MODULES_DIR=/usr/lib/asterisk/modules
 
 DEBUG=-g #-pg
 INCLUDE=-Iinclude -I../include
-CFLAGS=-Wall -Werror -O6 $(DEBUG) $(INCLUDE) -D_REENTRANT
+CFLAGS=-pipe -Wall -Werror -Wmissing-prototypes -Wmissing-declarations -O6 $(DEBUG) $(INCLUDE) -D_REENTRANT
 CFLAGS+=$(shell if $(CC) -march=i686 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=i686"; fi)
 SUBDIRS=channels pbx apps codecs formats
-LIBS=-ldl -lpthread #-lefence
-OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o translate.o file.o say.o pbx.o asterisk.o
+LIBS=-ldl -lpthread -lreadline # -lefence
+OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o translate.o file.o say.o pbx.o cli.o asterisk.o
 CC=gcc
 INSTALL=install
 
diff --git a/channels/chan_modem.c b/channels/chan_modem.c
new file mode 100755
index 000000000..7c6fedbf2
--- /dev/null
+++ b/channels/chan_modem.c
@@ -0,0 +1,813 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * A/Open ITU-56/2 Voice Modem Driver (Rockwell, IS-101, and others)
+ * 
+ * Copyright (C) 1999, Mark Spencer
+ *
+ * Mark Spencer <markster@linux-support.net>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#include <stdio.h>
+#include <pthread.h>
+#include <string.h>
+#include <asterisk/channel.h>
+#include <asterisk/channel_pvt.h>
+#include <asterisk/config.h>
+#include <asterisk/logger.h>
+#include <asterisk/module.h>
+#include <asterisk/pbx.h>
+#include <asterisk/options.h>
+#include <asterisk/vmodem.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <arpa/inet.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/termios.h>
+#include <sys/signal.h>
+#include <ctype.h>
+
+/* Up to 10 seconds for an echo to arrive */
+#define ECHO_TIMEOUT 10
+
+static char *desc = "Generic Voice Modem Driver";
+static char *tdesc = "Generic Voice Modem Channel Driver";
+static char *type = "Modem";
+static char *config = "modem.conf";
+static char dialtype = 'T';
+static int gmode = MODEM_MODE_IMMEDIATE;
+
+/* Default modem type */
+static char mtype[80] = "autodetect";
+/* Default context for incoming calls */
+static char context[AST_MAX_EXTENSION]= "default";
+
+/* Initialization String */
+static char initstr[AST_MAX_INIT_STR] = "ATE1Q0";
+
+static int usecnt =0;
+
+static int baudrate = 115200;
+
+static int stripmsd = 0;
+
+static pthread_mutex_t usecnt_lock = PTHREAD_MUTEX_INITIALIZER;
+
+/* Protect the interface list (of ast_modem_pvt's) */
+static pthread_mutex_t iflock = PTHREAD_MUTEX_INITIALIZER;
+
+/* Protect the monitoring thread, so only one process can kill or start it, and not
+   when it's doing something critical. */
+static pthread_mutex_t monlock = PTHREAD_MUTEX_INITIALIZER;
+
+/* This is the thread for the monitor which checks for input on the channels
+   which are not currently in use.  */
+static pthread_t monitor_thread = -1;
+
+static int restart_monitor(void);
+
+/* The private structures of the Phone Jack channels are linked for
+   selecting outgoing channels */
+   
+static struct ast_modem_pvt  *iflist = NULL;
+
+static int modem_digit(struct ast_channel *ast, char digit)
+{
+	struct ast_modem_pvt *p;
+	p = ast->pvt->pvt;
+	if (p->mc->dialdigit)
+		return p->mc->dialdigit(p, digit);
+	else ast_log(LOG_DEBUG, "Channel %s lacks digit dialing\n");
+	return 0;
+}
+
+static struct ast_modem_driver *drivers = NULL;
+
+static struct ast_frame *modem_read(struct ast_channel *);
+
+static struct ast_modem_driver *find_capability(char *ident)
+{
+	struct ast_modem_driver *mc;
+	int x;
+	mc = drivers;
+	while(mc) {
+		for (x=0;mc->idents[x];x++) {
+			if (!strcmp(ident, mc->idents[x])) 
+				break;
+		}
+		if (mc->idents[x])
+			break;
+		mc = mc->next;
+	}
+	if (mc) {
+		if (mc->incusecnt)
+			mc->incusecnt();
+	}
+	return mc;
+}
+
+static struct ast_modem_driver *find_driver(char *drv)
+{
+	struct ast_modem_driver *mc;
+	mc = drivers;
+	while(mc) {
+		if (!strcasecmp(mc->name, drv))	
+			break;
+		mc = mc->next;
+	}
+	if (mc) {
+		if (mc->incusecnt)
+			mc->incusecnt();
+	}
+	return mc;
+}
+
+int ast_register_modem_driver(struct ast_modem_driver *mc)
+{
+	mc->next = drivers;
+	drivers = mc;
+	return 0;
+}
+
+int ast_unregister_modem_driver(struct ast_modem_driver *mc)
+{
+	struct ast_modem_driver *last = NULL, *cur;
+	cur = drivers;
+	while(cur) {
+		if (cur == mc) {
+			if (last)
+				last->next = mc->next;
+			else
+				drivers = mc->next;
+			return 0;
+		}
+		cur = cur->next;
+	}
+	return -1;
+}
+
+static int modem_call(struct ast_channel *ast, char *idest, int timeout)
+{
+	struct ast_modem_pvt *p;
+	int ms = timeout;
+	char rdest[80], *where;
+	strncpy(rdest, idest, sizeof(rdest));
+	strtok(rdest, ":");
+	where = strtok(NULL, ":");
+	if (!where) {
+		ast_log(LOG_WARNING, "Destination %s requres a real destination (device:destination)\n", idest);
+		return -1;
+	}
+	p = ast->pvt->pvt;
+	if ((ast->state != AST_STATE_DOWN) && (ast->state != AST_STATE_RESERVED)) {
+		ast_log(LOG_WARNING, "modem_call called on %s, neither down nor reserved\n", ast->name);
+		return -1;
+	}
+	if (!strcasecmp(where, "handset")) {
+		if (p->mc->setdev)
+			if (p->mc->setdev(p, MODEM_DEV_HANDSET))
+				return -1;
+		/* Should be immediately up */
+		ast->state = AST_STATE_UP;
+	} else {
+		if (p->mc->setdev)
+			if (p->mc->setdev(p, MODEM_DEV_TELCO_SPK))
+				return -1;
+		if (p->mc->dial)
+			p->mc->dial(p, where + p->stripmsd);
+		ast->state = AST_STATE_DIALING;
+		while((ast->state != AST_STATE_UP) && (ms > 0)) {
+			ms = ast_waitfor(ast, ms);
+			/* Just read packets and watch what happens */
+			if (ms > 0) {
+				if (!modem_read(ast))
+					return -1;
+			}
+		}
+		if (ms < 0)	
+			return -1;
+	}
+	return 0;
+}
+
+int ast_modem_send(struct ast_modem_pvt *p, char *cmd, int len)
+{
+	int res;
+	if (!len) {
+		fprintf(p->f, "%s\r\n", cmd);
+		res = ast_modem_expect(p, cmd, ECHO_TIMEOUT);
+		if (res) {
+			ast_log(LOG_WARNING, "Unexpected reply %s\n", p->response);
+			return -1;
+		}
+		return 0;
+	} else {
+		if (fwrite(cmd, 1, len, p->f) < len)
+			return -1;
+		return 0;
+	}
+}
+
+int ast_modem_read_response(struct ast_modem_pvt *p, int timeout)
+{
+	int res = -1;
+	timeout *= 1000;
+	strncpy(p->response, "(No Response)", sizeof(p->response));
+	do {
+		res = ast_waitfor_n_fd(&p->fd, 1, &timeout);
+		if (res < 0) {
+			return -1;
+		}
+		/* Read a response */
+		fgets(p->response, sizeof(p->response), p->f);
+		return 0;
+	} while(timeout > 0);
+	return -1;
+}
+
+int ast_modem_expect(struct ast_modem_pvt *p, char *result, int timeout)
+{
+	int res = -1;
+	timeout *= 1000;
+	strncpy(p->response, "(No Response)", sizeof(p->response));
+	do {
+		res = ast_waitfor_n_fd(&p->fd, 1, &timeout);
+		if (res < 0) {
+			return -1;
+		}
+		/* Read a response */
+		fgets(p->response, sizeof(p->response), p->f);
+#if 0
+		fprintf(stderr, "Modem said: %s", p->response);
+#endif
+		if (!strncasecmp(p->response, result, strlen(result))) 
+			return 0;
+	} while(timeout > 0);
+	return -1;
+}
+
+void ast_modem_trim(char *s)
+{
+	int x;
+	x = strlen(s) - 1;
+	while(x >= 0) {
+		if ((s[x] != '\r') && (s[x] != '\n') && (s[x] != ' '))
+			break;
+		s[x] = '\0';
+		x--;
+	}
+}
+
+static int modem_setup(struct ast_modem_pvt *p, int baudrate)
+{
+	/* Make sure there's a modem there and that it's in a reasonable 
+	   mode.  Set the baud rate, etc.  */
+	char identity[256];
+	char *ident = NULL;
+	if (option_debug)
+		ast_log(LOG_DEBUG, "Setting up modem %s\n", p->dev);
+	if (ast_modem_send(p, "\r\n", 2)) {
+		ast_log(LOG_WARNING, "Failed to send enter?\n");
+		return -1;
+	}
+	/* Read any outstanding stuff */
+	while(!ast_modem_read_response(p, 0));
+	if (ast_modem_send(p, "ATZ", 0)) {
+		ast_log(LOG_WARNING, "Modem not responding on %s\n", p->dev);
+		return -1;
+	}
+	if (ast_modem_expect(p, "OK", ECHO_TIMEOUT)) {
+		ast_log(LOG_WARNING, "Modem reset failed: %s\n", p->response);
+		return -1;
+	}
+	if (ast_modem_send(p, p->initstr, 0)) {
+		ast_log(LOG_WARNING, "Modem not responding on %s\n", p->dev);
+		return -1;
+	}
+	if (ast_modem_expect(p, "OK", ECHO_TIMEOUT)) {
+		ast_log(LOG_WARNING, "Modem initialization failed: %s\n", p->response);
+		return -1;
+	}
+	if (ast_modem_send(p, "ATI3", 0)) {
+		ast_log(LOG_WARNING, "Modem not responding on %s\n", p->dev);
+		return -1;
+	}
+	if (ast_modem_read_response(p, ECHO_TIMEOUT)) {
+		ast_log(LOG_WARNING, "Modem did not provide identification\n");
+		return -1;
+	}
+	strncpy(identity, p->response, sizeof(identity));
+	ast_modem_trim(identity);
+	if (ast_modem_expect(p, "OK", ECHO_TIMEOUT)) {
+		ast_log(LOG_WARNING, "Modem did not provide identification\n");
+		return -1;
+	}
+	if (!strcasecmp(mtype, "autodetect")) {
+		p->mc = find_capability(identity);
+		if (!p->mc) {
+			ast_log(LOG_WARNING, "Unable to autodetect modem.  You'll need to specify a driver in modem.conf.  Please report modem identification (%s) and which driver works to markster@linux-support.net.\n", identity); 
+			return -1;
+		}
+	} else {
+		p->mc = find_driver(mtype);
+		if (!p->mc) {
+			ast_log(LOG_WARNING, "No driver for modem type '%s'\n", mtype);
+			return -1;
+		}
+	}
+	if (p->mc->init) {
+		if (p->mc->init(p)) {
+			ast_log(LOG_WARNING, "Modem Initialization Failed on '%s', driver %s.\n", p->dev, p->mc->name);
+			p->mc->decusecnt();
+			return -1;
+		}
+	}			
+	if (option_verbose > 2) {
+		ast_verbose(VERBOSE_PREFIX_3 "Configured modem %s with driver %s (%s)\n", p->dev, p->mc->name, p->mc->identify ? (ident = p->mc->identify(p)) : "No identification");
+	}
+	if (ident)
+		free(ident);
+	return 0;
+}
+
+static int modem_hangup(struct ast_channel *ast)
+{
+	struct ast_modem_pvt *p;
+	ast_log(LOG_DEBUG, "modem_hangup(%s)\n", ast->name);
+	p = ast->pvt->pvt;
+	/* Hang up */
+	if (p->mc->hangup)
+		p->mc->hangup(p);
+	/* Re-initialize */
+	if (p->mc->init)
+		p->mc->init(p);
+	ast->state = AST_STATE_DOWN;
+	memset(p->cid, 0, sizeof(p->cid));
+	((struct ast_modem_pvt *)(ast->pvt->pvt))->owner = NULL;
+	pthread_mutex_lock(&usecnt_lock);
+	usecnt--;
+	if (usecnt < 0) 
+		ast_log(LOG_WARNING, "Usecnt < 0???\n");
+	pthread_mutex_unlock(&usecnt_lock);
+	ast_update_use_count();
+	if (option_verbose > 2) 
+		ast_verbose( VERBOSE_PREFIX_3 "Hungup '%s'\n", ast->name);
+	ast->pvt->pvt = NULL;
+	ast->state = AST_STATE_DOWN;
+	restart_monitor();
+	return 0;
+}
+
+static int modem_answer(struct ast_channel *ast)
+{
+	struct ast_modem_pvt *p;
+	int res=0;
+	ast_log(LOG_DEBUG, "modem_hangup(%s)\n", ast->name);
+	p = ast->pvt->pvt;
+	if (p->mc->answer) {
+		res = p->mc->answer(p);
+	}
+	if (!res) {
+		ast->rings = 0;
+		ast->state = AST_STATE_UP;
+	}
+	return res;
+}
+
+static char modem_2digit(char c)
+{
+	if (c == 12)
+		return '#';
+	else if (c == 11)
+		return '*';
+	else if ((c < 10) && (c >= 0))
+		return '0' + c - 1;
+	else
+		return '?';
+}
+
+static struct ast_frame *modem_read(struct ast_channel *ast)
+{
+	struct ast_modem_pvt *p = ast->pvt->pvt;
+	struct ast_frame *fr=NULL;
+	if (p->mc->read)
+		fr = p->mc->read(p);
+	return fr;
+}
+
+static int modem_write(struct ast_channel *ast, struct ast_frame *frame)
+{
+	int res=0;
+	struct ast_modem_pvt *p = ast->pvt->pvt;
+	if (p->mc->write)
+		res = p->mc->write(p, frame);
+	return 0;
+}
+
+struct ast_channel *ast_modem_new(struct ast_modem_pvt *i, int state)
+{
+	struct ast_channel *tmp;
+	tmp = ast_channel_alloc();
+	if (tmp) {
+		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)
+			tmp->rings = 1;
+		tmp->pvt->pvt = i;
+		tmp->pvt->send_digit = modem_digit;
+		tmp->pvt->call = modem_call;
+		tmp->pvt->hangup = modem_hangup;
+		tmp->pvt->answer = modem_answer;
+		tmp->pvt->read = modem_read;
+		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));
+		i->owner = tmp;
+		pthread_mutex_lock(&usecnt_lock);
+		usecnt++;
+		pthread_mutex_unlock(&usecnt_lock);
+		ast_update_use_count();
+		if (state != AST_STATE_DOWN) {
+			if (ast_pbx_start(tmp)) {
+				ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
+				ast_hangup(tmp);
+			}
+		}
+	} else
+		ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
+	return tmp;
+}
+
+static void modem_mini_packet(struct ast_modem_pvt *i)
+{
+	struct ast_frame *fr;
+	fr = i->mc->read(i);
+}
+
+static void *do_monitor(void *data)
+{
+	fd_set rfds, efds;
+	int n, res;
+	struct ast_modem_pvt *i;
+	/* This thread monitors all the frame relay interfaces which are not yet in use
+	   (and thus do not have a separate thread) indefinitely */
+	/* From here on out, we die whenever asked */
+#if 0
+	if (pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL)) {
+		ast_log(LOG_WARNING, "Unable to set cancel type to asynchronous\n");
+		return NULL;
+	}
+#endif
+	for(;;) {
+		/* Don't let anybody kill us right away.  Nobody should lock the interface list
+		   and wait for the monitor list, but the other way around is okay. */
+		if (pthread_mutex_lock(&monlock)) {
+			ast_log(LOG_ERROR, "Unable to grab monitor lock\n");
+			return NULL;
+		}
+		/* Lock the interface list */
+		if (pthread_mutex_lock(&iflock)) {
+			ast_log(LOG_ERROR, "Unable to grab interface lock\n");
+			pthread_mutex_unlock(&monlock);
+			return NULL;
+		}
+		/* Build the stuff we're going to select on, that is the socket of every
+		   ast_modem_pvt that does not have an associated owner channel */
+		n = -1;
+		FD_ZERO(&rfds);
+		FD_ZERO(&efds);
+		i = iflist;
+		while(i) {
+			if (FD_ISSET(i->fd, &rfds)) 
+				ast_log(LOG_WARNING, "Descriptor %d appears twice (%s)?\n", i->fd, i->dev);
+			if (!i->owner) {
+				/* This needs to be watched, as it lacks an owner */
+				FD_SET(i->fd, &rfds);
+				FD_SET(i->fd, &efds);
+				if (i->fd > n)
+					n = i->fd;
+			}
+			
+			i = i->next;
+		}
+		/* Okay, now that we know what to do, release the interface lock */
+		pthread_mutex_unlock(&iflock);
+		
+		/* And from now on, we're okay to be killed, so release the monitor lock as well */
+		pthread_mutex_unlock(&monlock);
+#if 0
+		ast_log(LOG_DEBUG, "In monitor, n=%d, pid=%d\n", n, getpid());
+#endif
+		/* Wait indefinitely for something to happen */
+		pthread_testcancel();
+		res = select(n + 1, &rfds, NULL, &efds, NULL);
+		pthread_testcancel();
+		/* Okay, select has finished.  Let's see what happened.  */
+		if (res < 1) {
+			ast_log(LOG_WARNING, "select return %d: %s\n", res, strerror(errno));
+			continue;
+		}
+		/* Alright, lock the interface list again, and let's look and see what has
+		   happened */
+		if (pthread_mutex_lock(&iflock)) {
+			ast_log(LOG_WARNING, "Unable to lock the interface list\n");
+			continue;
+		}
+		i = iflist;
+		while(i) {
+			if (FD_ISSET(i->fd, &rfds) || FD_ISSET(i->fd, &efds)) {
+				if (i->owner) {
+					ast_log(LOG_WARNING, "Whoa....  I'm owned but found (%d, %s)...\n", i->fd, i->dev);
+					i = i->next;
+					continue;
+				}
+				modem_mini_packet(i);
+			}
+			i=i->next;
+		}
+		pthread_mutex_unlock(&iflock);
+	}
+	/* Never reached */
+	return NULL;
+	
+}
+
+static int restart_monitor()
+{
+	/* If we're supposed to be stopped -- stay stopped */
+	if (monitor_thread == -2)
+		return 0;
+	if (pthread_mutex_lock(&monlock)) {
+		ast_log(LOG_WARNING, "Unable to lock monitor\n");
+		return -1;
+	}
+	if (monitor_thread == pthread_self()) {
+		pthread_mutex_unlock(&monlock);
+		ast_log(LOG_WARNING, "Cannot kill myself\n");
+		return -1;
+	}
+	if (monitor_thread != -1) {
+		pthread_cancel(monitor_thread);
+		/* Nudge it a little, as it's probably stuck in select */
+		pthread_kill(monitor_thread, SIGURG);
+		pthread_join(monitor_thread, NULL);
+	}
+	/* Start a new monitor */
+	if (pthread_create(&monitor_thread, NULL, do_monitor, NULL) < 0) {
+		pthread_mutex_unlock(&monlock);
+		ast_log(LOG_ERROR, "Unable to start monitor thread.\n");
+		return -1;
+	}
+	pthread_mutex_unlock(&monlock);
+	return 0;
+}
+
+static struct ast_modem_pvt *mkif(char *iface)
+{
+	/* Make a ast_modem_pvt structure for this interface */
+	struct ast_modem_pvt *tmp;
+#if 0
+	int flags;	
+#endif
+	
+	tmp = malloc(sizeof(struct ast_modem_pvt));
+	if (tmp) {
+		tmp->fd = open(iface, O_RDWR | O_NONBLOCK);
+		if (tmp->fd < 0) {
+			ast_log(LOG_WARNING, "Unable to open '%s'\n", iface);
+			free(tmp);
+			return NULL;
+		}
+		tmp->f = fdopen(tmp->fd, "w+");
+		/* Disable buffering */
+		setvbuf(tmp->f, NULL, _IONBF,0);
+		if (tmp->f < 0) {
+			ast_log(LOG_WARNING, "Unable to fdopen '%s'\n", iface);
+			free(tmp);
+			return NULL;
+		}
+#if 0
+		flags = fcntl(tmp->fd, F_GETFL);
+		fcntl(tmp->fd, F_SETFL, flags | O_NONBLOCK);
+#endif
+		tmp->owner = NULL;
+		tmp->ministate = 0;
+		tmp->stripmsd = stripmsd;
+		tmp->dialtype = dialtype;
+		tmp->mode = gmode;
+		memset(tmp->cid, 0, sizeof(tmp->cid));
+		strncpy(tmp->dev, iface, sizeof(tmp->dev));
+		strncpy(tmp->context, context, sizeof(tmp->context));
+		strncpy(tmp->initstr, initstr, sizeof(tmp->initstr));
+		tmp->next = NULL;
+		tmp->obuflen = 0;
+		
+		if (modem_setup(tmp, baudrate) < 0) {
+			ast_log(LOG_WARNING, "Unable to configure modem '%s'\n", iface);
+			free(tmp);
+			return NULL;
+		}
+	}
+	return tmp;
+}
+
+static struct ast_channel *modem_request(char *type, int format, void *data)
+{
+	int oldformat;
+	struct ast_modem_pvt *p;
+	struct ast_channel *tmp = NULL;
+	char dev[80];
+	strncpy(dev, (char *)data, sizeof(dev));
+	strtok(dev, ":");
+	oldformat = format;
+	/* Search for an unowned channel */
+	if (pthread_mutex_lock(&iflock)) {
+		ast_log(LOG_ERROR, "Unable to lock interface list???\n");
+		return NULL;
+	}
+	p = iflist;
+	while(p) {
+		if (!strcmp(dev, p->dev + 5)) {
+			if (p->mc->formats & format) {
+				if (!p->owner) {
+					tmp = ast_modem_new(p, AST_STATE_DOWN);
+					restart_monitor();
+					break;
+				} else
+					ast_log(LOG_WARNING, "Device '%s' is busy\n", p->dev);
+			} else 
+				ast_log(LOG_WARNING, "Asked for a format %d line on %s\n", format, p->dev);
+			break;
+		}
+		p = p->next;
+	}
+	if (!p) 
+		ast_log(LOG_WARNING, "Requested device '%s' does not exist\n", p->dev);
+	
+	pthread_mutex_unlock(&iflock);
+	return tmp;
+}
+
+int load_module()
+{
+	struct ast_config *cfg;
+	struct ast_variable *v;
+	struct ast_modem_pvt *tmp;
+	char driver[80];
+	cfg = ast_load(config);
+
+	/* We *must* have a config file otherwise stop immediately */
+	if (!cfg) {
+		ast_log(LOG_ERROR, "Unable to load config %s\n", config);
+		return -1;
+	}
+	if (pthread_mutex_lock(&iflock)) {
+		/* It's a little silly to lock it, but we mind as well just to be sure */
+		ast_log(LOG_ERROR, "Unable to lock interface list???\n");
+		return -1;
+	}
+	v = ast_variable_browse(cfg, "interfaces");
+	while(v) {
+		/* Create the interface list */
+		if (!strcasecmp(v->name, "device")) {
+				tmp = mkif(v->value);
+				if (tmp) {
+					tmp->next = iflist;
+					iflist = tmp;
+					
+				} else {
+					ast_log(LOG_ERROR, "Unable to register channel '%s'\n", v->value);
+					ast_destroy(cfg);
+					pthread_mutex_unlock(&iflock);
+					unload_module();
+					pthread_mutex_unlock(&iflock);
+					return -1;
+				}
+		} else if (!strcasecmp(v->name, "driver")) {
+			snprintf(driver, sizeof(driver), "chan_modem_%s.so", v->value);
+			if (option_verbose > 1) 
+				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_destroy(cfg);
+				unload_module();
+				pthread_mutex_unlock(&iflock);
+				return -1;
+			}
+		} else if (!strcasecmp(v->name, "mode")) {
+			if (!strncasecmp(v->value, "ri", 2)) 
+				gmode = MODEM_MODE_WAIT_RING;
+			else if (!strncasecmp(v->value, "im", 2))
+				gmode = MODEM_MODE_IMMEDIATE;
+			else if (!strncasecmp(v->value, "an", 2))
+				gmode = MODEM_MODE_WAIT_ANSWER;
+			else
+				ast_log(LOG_WARNING, "Unknown mode: %s\n", v->value);
+		} else if (!strcasecmp(v->name, "stripmsd")) {
+			stripmsd = atoi(v->value);
+		} else if (!strcasecmp(v->name, "type")) {
+			strncpy(mtype, v->value, sizeof(mtype));
+		} else if (!strcasecmp(v->name, "initstr")) {
+			strncpy(initstr, v->value, sizeof(initstr));
+		} else if (!strcasecmp(v->name, "dialtype")) {
+			dialtype = toupper(v->value[0]);
+		} else if (!strcasecmp(v->name, "context")) {
+			strncpy(context, v->value, sizeof(context));
+		}
+		v = v->next;
+	}
+	pthread_mutex_unlock(&iflock);
+	if (ast_channel_register(type, tdesc, /* XXX Don't know our types -- maybe we should register more than one XXX */ AST_FORMAT_SLINEAR, modem_request)) {
+		ast_log(LOG_ERROR, "Unable to register channel class %s\n", type);
+		ast_destroy(cfg);
+		unload_module();
+		return -1;
+	}
+	ast_destroy(cfg);
+	/* And start the monitor for the first time */
+	restart_monitor();
+	return 0;
+}
+
+
+
+int unload_module()
+{
+	struct ast_modem_pvt *p, *pl;
+	/* First, take us out of the channel loop */
+	ast_channel_unregister(type);
+	if (!pthread_mutex_lock(&iflock)) {
+		/* Hangup all interfaces if they have an owner */
+		p = iflist;
+		while(p) {
+			if (p->owner)
+				ast_softhangup(p->owner);
+			p = p->next;
+		}
+		iflist = NULL;
+		pthread_mutex_unlock(&iflock);
+	} else {
+		ast_log(LOG_WARNING, "Unable to lock the monitor\n");
+		return -1;
+	}
+	if (!pthread_mutex_lock(&monlock)) {
+		if (monitor_thread > -1) {
+			pthread_cancel(monitor_thread);
+			pthread_join(monitor_thread, NULL);
+		}
+		monitor_thread = -2;
+		pthread_mutex_unlock(&monlock);
+	} else {
+		ast_log(LOG_WARNING, "Unable to lock the monitor\n");
+		return -1;
+	}
+
+	if (!pthread_mutex_lock(&iflock)) {
+		/* Destroy all the interfaces and free their memory */
+		p = iflist;
+		while(p) {
+			/* Close the socket, assuming it's real */
+			if (p->fd > -1)
+				close(p->fd);
+			pl = p;
+			p = p->next;
+			/* Free associated memory */
+			free(pl);
+		}
+		iflist = NULL;
+		pthread_mutex_unlock(&iflock);
+	} else {
+		ast_log(LOG_WARNING, "Unable to lock the monitor\n");
+		return -1;
+	}
+		
+	return 0;
+}
+
+int usecount(void)
+{
+	int res;
+	pthread_mutex_lock(&usecnt_lock);
+	res = usecnt;
+	pthread_mutex_unlock(&usecnt_lock);
+	return res;
+}
+
+char *description()
+{
+	return desc;
+}
+
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index a5d9c9121..425eb2e30 100755
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -3,7 +3,7 @@
  *
  * General Asterisk channel definitions.
  * 
- * Copyright (C) 1999, Adtran Inc. and Linux Support Services, LLC
+ * Copyright (C) 1999, Mark Spencer
  *
  * Mark Spencer <markster@linux-support.net>
  *
@@ -23,7 +23,7 @@
 extern "C" {
 #endif
 
-
+#include <pthread.h>
 
 #define AST_CHANNEL_NAME 80
 #define AST_CHANNEL_MAX_STACK 32
@@ -34,7 +34,10 @@ extern "C" {
 struct ast_channel {
 	char name[AST_CHANNEL_NAME];		/* ASCII Description of channel name */
 	pthread_t blocker;					/* If anyone is blocking, this is them */
+	pthread_mutex_t lock;				/* Lock, can be used to lock a channel for some operations */
 	char *blockproc;					/* Procedure causing blocking */
+	char *appl;							/* Current application */
+	char *data;							/* Data passed to current application */
 	int blocking;						/* Whether or not we're blocking */
 	struct sched_context *sched;		/* Schedule context */
 	int streamid;					/* For streaming playback, the schedule ID */
@@ -129,6 +132,9 @@ struct ast_frame *ast_read(struct ast_channel *chan);
 /* Write a frame to a channel */
 int ast_write(struct ast_channel *chan, struct ast_frame *frame);
 
+/* Browse the channels currently in use */
+struct ast_channel *ast_channel_walk(struct ast_channel *prev);
+
 /* Wait for a digit.  Returns <0 on error, 0 on no entry, and the digit on success. */
 char ast_waitfordigit(struct ast_channel *c, int ms);
 
diff --git a/loader.c b/loader.c
index af52f657e..d6a549b4b 100755
--- a/loader.c
+++ b/loader.c
@@ -3,7 +3,7 @@
  *
  * Module Loader
  * 
- * Copyright (C) 1999, Adtran Inc. and Linux Support Services, LLC
+ * Copyright (C) 1999, Mark Spencer
  *
  * Mark Spencer <markster@linux-support.net>
  *
@@ -91,9 +91,22 @@ int ast_load_resource(char *resource_name)
 	static char fn[256];
 	int errors=0;
 	int res;
-	struct module *m = malloc(sizeof(struct module));
+	struct module *m;
+	if (pthread_mutex_lock(&modlock))
+		ast_log(LOG_WARNING, "Failed to lock\n");
+	m = module_list;
+	while(m) {
+		if (!strcasecmp(m->resource, resource_name)) {
+			ast_log(LOG_WARNING, "Module '%s' already exists\n", resource_name);
+			pthread_mutex_unlock(&modlock);
+			return -1;
+		}
+		m = m->next;
+	}
+	m = malloc(sizeof(struct module));	
 	if (!m) {
 		ast_log(LOG_WARNING, "Out of memory\n");
+		pthread_mutex_unlock(&modlock);
 		return -1;
 	}
 	strncpy(m->resource, resource_name, sizeof(m->resource));
@@ -106,6 +119,7 @@ int ast_load_resource(char *resource_name)
 	if (!m->lib) {
 		ast_log(LOG_WARNING, "%s\n", dlerror());
 		free(m);
+		pthread_mutex_unlock(&modlock);
 		return -1;
 	}
 	m->load_module = dlsym(m->lib, "load_module");
@@ -132,25 +146,23 @@ int ast_load_resource(char *resource_name)
 		ast_log(LOG_WARNING, "%d error(s) loading module %s, aborted\n", errors, fn);
 		dlclose(m->lib);
 		free(m);
+		pthread_mutex_unlock(&modlock);
 		return -1;
 	}
 	if (option_verbose) 
 		ast_verbose( " => (%s)\n", m->description());
+	pthread_mutex_unlock(&modlock);
 	if ((res = m->load_module())) {
 		ast_log(LOG_WARNING, "%s: load_module failed, returning %d\n", m->resource, fn, res);
-		free(m);
+		ast_unload_resource(resource_name, 0);
 		return -1;
 	}
-	if (pthread_mutex_lock(&modlock))
-		ast_log(LOG_WARNING, "Failed to lock\n");
 	m->next = module_list;
 	module_list = m;
-	pthread_mutex_unlock(&modlock);
-	ast_update_use_count();
 	return 0;
 }	
 
-int ast_resource_exists(char *resource)
+static int ast_resource_exists(char *resource)
 {
 	struct module *m;
 	if (pthread_mutex_lock(&modlock))
diff --git a/logger.c b/logger.c
index b67c88f08..179ab66f3 100755
--- a/logger.c
+++ b/logger.c
@@ -3,7 +3,7 @@
  * 
  * Mark Spencer <markster@marko.net>
  *
- * Copyright(C) 1999, Adtran, Inc.
+ * Copyright(C)1999, Mark Spencer
  * 
  * Distributed under the terms of the GNU General Public License (GPL) Version 2
  *
@@ -29,6 +29,7 @@
 #define MAX_MSG_QUEUE 200
 
 static pthread_mutex_t msglist_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t loglock = PTHREAD_MUTEX_INITIALIZER;
 
 static struct msglist {
 	char *msg;
@@ -75,7 +76,7 @@ extern void ast_log(int level, char *file, int line, char *function, char *fmt,
 
 	va_list ap;
 	va_start(ap, fmt);
-
+	pthread_mutex_lock(&loglock);
 	if (level == 1 /* Event */) {
 		time(&t);
 		tm = localtime(&t);
@@ -92,12 +93,13 @@ extern void ast_log(int level, char *file, int line, char *function, char *fmt,
 		vfprintf(stdout, fmt, ap);
 		fflush(stdout);
 	}
+	pthread_mutex_unlock(&loglock);
 	va_end(ap);
 }
 
 extern void ast_verbose(char *fmt, ...)
 {
-	static char stuff[256];
+	static char stuff[4096];
 	static int pos = 0, opos;
 	static int replacelast = 0, complete;
 	struct msglist *m;
@@ -139,6 +141,7 @@ extern void ast_verbose(char *fmt, ...)
 			}
 		}
 	}
+	pthread_mutex_lock(&loglock);
 	if (verboser) {
 		v = verboser;
 		while(v) {
@@ -152,7 +155,7 @@ extern void ast_verbose(char *fmt, ...)
 		replacelast = 1;
 	else 
 		replacelast = pos = 0;
-	
+	pthread_mutex_unlock(&loglock);
 	va_end(ap);
 	pthread_mutex_unlock(&msglist_lock);
 }