Version 0.1.9 from FTP

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

3 files changed, 232 insertions, 5 deletions

diff --git a/apps/app_image.c b/apps/app_image.c
new file mode 100755
index 000000000..cc677ff5c
--- /dev/null
+++ b/apps/app_image.c
@@ -0,0 +1,89 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * App to transmit an image
+ * 
+ * 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 <asterisk/file.h>
+#include <asterisk/logger.h>
+#include <asterisk/channel.h>
+#include <asterisk/pbx.h>
+#include <asterisk/module.h>
+#include <asterisk/translate.h>
+#include <asterisk/image.h>
+#include <string.h>
+#include <stdlib.h>
+#include <pthread.h>
+
+static char *tdesc = "Image Transmission Application";
+
+static char *app = "SendImage";
+
+static char *synopsis = "Send an image file";
+
+static char *descrip = 
+"  SendImage(filename): Sends an image on a channel. If the channel\n"
+"does not support  image transport, and there exists  a  step  with\n"
+"priority n + 101, then  execution  will  continue  at  that  step.\n"
+"Otherwise,  execution  will continue at  the  next priority level.\n"
+"SendImage only  returns  0 if  the  image was sent correctly or if\n"
+"the channel does not support image transport, and -1 otherwise.\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int sendimage_exec(struct ast_channel *chan, void *data)
+{
+	int res = 0;
+	struct localuser *u;
+	if (!data || !strlen((char *)data)) {
+		ast_log(LOG_WARNING, "SendImage requires an argument (filename)\n");
+		return -1;
+	}
+	LOCAL_USER_ADD(u);
+	if (!ast_supports_images(chan)) {
+		/* Does not support transport */
+		if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid))
+			chan->priority += 100;
+		return 0;
+	}
+	res = ast_send_image(chan, data);
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, sendimage_exec, synopsis, descrip);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}
diff --git a/apps/app_system.c b/apps/app_system.c
index bb10543e2..a4369125f 100755
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -31,10 +31,11 @@ static char *app = "System";
 static char *synopsis = "Execute a system command";
 
 static char *descrip =
-"  System(command): Executes a command by using system().  Returns -1 on failure to execute\n"
-"  the specified command.  If the command itself executes but is in error, and if there exists\n"
-"  a priority n + 101, where 'n' is the priority of the current instance, then the channel will\n"
-"  will be setup to continue at that priority level.  Otherwise, System returns 0.\n";
+"  System(command): Executes a command  by  using  system(). Returns -1 on\n"
+"failure to execute the specified command. If  the command itself executes\n"
+"but is in error, and if there exists a priority n + 101, where 'n' is the\n"
+"priority of the current instance, then  the  channel  will  be  setup  to\n"
+"continue at that priority level.  Otherwise, System returns 0.\n";
 
 STANDARD_LOCAL_USER;
 
@@ -58,7 +59,7 @@ static int skel_exec(struct ast_channel *chan, void *data)
 		ast_log(LOG_WARNING, "Unable to execute '%s'\n", data);
 		res = -1;
 	} else {
-		if (res && ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101)) 
+		if (res && ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid)) 
 			chan->priority+=100;
 		res = 0;
 	}
diff --git a/apps/app_url.c b/apps/app_url.c
new file mode 100755
index 000000000..542c490a7
--- /dev/null
+++ b/apps/app_url.c
@@ -0,0 +1,137 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * App to transmit a URL
+ * 
+ * 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 <asterisk/file.h>
+#include <asterisk/logger.h>
+#include <asterisk/channel.h>
+#include <asterisk/pbx.h>
+#include <asterisk/module.h>
+#include <asterisk/translate.h>
+#include <asterisk/image.h>
+#include <string.h>
+#include <stdlib.h>
+#include <pthread.h>
+
+static char *tdesc = "Send URL Applications";
+
+static char *app = "SendURL";
+
+static char *synopsis = "Send a URL";
+
+static char *descrip = 
+"  SendURL(URL[|option]): Requests client go to URL.  If the client\n"
+"does not support html transport, and  there  exists  a  step  with\n"
+"priority  n + 101,  then  execution  will  continue  at that step.\n"
+"Otherwise, execution will continue at  the  next  priority  level.\n"
+"SendURL only returns 0  if  the  URL  was  sent  correctly  or  if\n"
+"the channel  does  not  support HTML transport,  and -1 otherwise.\n"
+"If the option 'wait' is  specified,  execution  will  wait  for an\n"
+"acknowledgement that  the  URL  has  been loaded before continuing\n"
+"and will return -1 if the peer is unable to load the URL\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int sendurl_exec(struct ast_channel *chan, void *data)
+{
+	int res = 0;
+	struct localuser *u;
+	char tmp[256];
+	char *options;
+	int option_wait=0;
+	struct ast_frame *f;
+	if (!data || !strlen((char *)data)) {
+		ast_log(LOG_WARNING, "SendURL requires an argument (URL)\n");
+		return -1;
+	}
+	strncpy(tmp, (char *)data, sizeof(tmp));
+	strtok(tmp, "|");
+	options = strtok(NULL, "|");
+	if (options && !strcasecmp(options, "wait"))
+		option_wait = 1;
+	LOCAL_USER_ADD(u);
+	if (!ast_channel_supports_html(chan)) {
+		/* Does not support transport */
+		if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid))
+			chan->priority += 100;
+		LOCAL_USER_REMOVE(u);
+		return 0;
+	}
+	res = ast_channel_sendurl(chan, tmp);
+	if (res > -1) {
+		if (option_wait) {
+			for(;;) {
+				/* Wait for an event */
+				res = ast_waitfor(chan, -1);
+				if (res < 0) 
+					break;
+				f = ast_read(chan);
+				if (!f) {
+					res = -1;
+					break;
+				}
+				if (f->frametype == AST_FRAME_HTML) {
+					switch(f->subclass) {
+					case AST_HTML_LDCOMPLETE:
+						res = 0;
+						ast_frfree(f);
+						goto out;
+						break;
+					case AST_HTML_NOSUPPORT:
+						/* Does not support transport */
+						if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid))
+							chan->priority += 100;
+						res = 0;
+						goto out;
+						break;
+					default:
+						ast_log(LOG_WARNING, "Don't know what to do with HTML subclass %d\n", f->subclass);
+					};
+				}
+				ast_frfree(f);
+			}
+		}
+	}
+out:	
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, sendurl_exec, synopsis, descrip);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}