Thu Feb 27 07:00:01 CET 2003

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

8 files changed, 167 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index d2e48c259..7c8456205 100755
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,7 @@ datafiles: all
 			exit 1; \
 		fi; \
 	done
-	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-*; do \
+	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
 		if grep -q "^%`basename $$x`%" sounds.txt; then \
 			install $$x $(ASTVARLIBDIR)/sounds ; \
 		else \
diff --git a/apps/Makefile b/apps/Makefile
index 48e69c76a..de77cfd30 100755
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -19,7 +19,7 @@ APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_intercom.
      app_queue.so app_senddtmf.so app_parkandannounce.so app_striplsd.so \
      app_setcidname.so app_lookupcidname.so app_substring.so app_macro.so \
      app_authenticate.so app_softhangup.so app_lookupblacklist.so \
-     app_waitforring.so
+     app_waitforring.so app_privacy.so
 
 #APPS+=app_sql_postgres.so
 #APPS+=app_sql_odbc.so
diff --git a/apps/app_privacy.c b/apps/app_privacy.c
new file mode 100755
index 000000000..babb6c652
--- /dev/null
+++ b/apps/app_privacy.c
@@ -0,0 +1,149 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Block all calls without Caller*ID, require phone # to be entered
+ * 
+ * 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/lock.h>
+#include <asterisk/file.h>
+#include <asterisk/logger.h>
+#include <asterisk/options.h>
+#include <asterisk/channel.h>
+#include <asterisk/pbx.h>
+#include <asterisk/module.h>
+#include <asterisk/translate.h>
+#include <asterisk/image.h>
+#include <asterisk/callerid.h>
+#include <string.h>
+#include <stdlib.h>
+#include <pthread.h>
+
+static char *tdesc = "Require phone number to be entered, if no CallerID sent";
+
+static char *app = "PrivacyManager";
+
+static char *synopsis = "Require phone number to be entered, if no CallerID sent";
+
+static char *descrip =
+  "  PrivacyManager: If no Caller*ID is sent, PrivacyManager answers the\n"
+  "channel and asks the caller to enter their 10 digit phone number.\n"
+  "The caller is given 3 attempts.  If after 3 attempts, they do no enter\n"
+  "their 10 digit phone number, and if there exists a priority n + 101,\n"
+  "where 'n' is the priority of the current instance, then  the\n"
+  "channel  will  be  setup  to continue at that priority level.\n"
+  "Otherwise, it returns 0.  Does nothing if Caller*ID was received on the\n"
+  "channel.\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int
+privacy_exec (struct ast_channel *chan, void *data)
+{
+	int res=0;
+	int retries;
+	char phone[10];
+	char new_cid[144];
+	struct localuser *u;
+
+	LOCAL_USER_ADD (u);
+	if (chan->callerid)
+	{
+		if (option_verbose > 2)
+			ast_verbose (VERBOSE_PREFIX_3 "CallerID Present: Skipping\n");
+	}
+	else
+	{
+		/*Answer the channel if it is not already*/
+		if (chan->_state != AST_STATE_UP) {
+			res = ast_answer(chan);
+			if (res) {
+				LOCAL_USER_REMOVE(u);
+				return -1;
+			}
+		}
+		/*Just a quick sleep*/
+		sleep(1);
+		
+		/*Play unidentified call*/
+		res = ast_streamfile(chan, "privacy-unident", chan->language);
+		if (!res)
+			res = ast_waitstream(chan, "");
+
+		/*Ask for 10 digit number, give 3 attempts*/
+		for (retries = 0; retries < 3; retries++) {
+			res = ast_app_getdata(chan, "privacy-prompt", phone, sizeof(phone), 0);
+			if (res < 0)
+				break;
+
+			/*Make sure we get 10 digits*/
+			if (strlen(phone) == 10) 
+				break;
+			else {
+				res = ast_streamfile(chan, "privacy-incorrect", chan->language);
+				if (!res)
+					res = ast_waitstream(chan, "");
+			}
+		}
+		
+		/*Got a number, play sounds and send them on their way*/
+		if ((retries < 3) && !res) {
+			res = ast_streamfile(chan, "privacy-thankyou", chan->language);
+			if (!res)
+				res = ast_waitstream(chan, "");
+			snprintf (new_cid, sizeof (new_cid), "\"%s\" <%s>", "Privacy Manager", phone);
+			ast_set_callerid (chan, new_cid, 0);
+			if (option_verbose > 2)
+				ast_verbose (VERBOSE_PREFIX_3 "Changed Caller*ID to %s\n",new_cid);
+		} else {
+			/*Send the call to n+101 priority, where n is the current priority*/
+			if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid))
+				chan->priority+=100;
+		}
+	}
+
+  LOCAL_USER_REMOVE (u);
+  return 0;
+}
+
+int
+unload_module (void)
+{
+  STANDARD_HANGUP_LOCALUSERS;
+  return ast_unregister_application (app);
+}
+
+int
+load_module (void)
+{
+  return ast_register_application (app, privacy_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/sounds.txt b/sounds.txt
index bddb29df0..e4b9416c6 100755
--- a/sounds.txt
+++ b/sounds.txt
@@ -186,6 +186,14 @@
 
 %priv-instruct.gsm%Press 1 to accept this call.  Press 2 to not accept this call.  Press 3 to always accept calls from this number.  Press 4 to never accept calls from this number.  Press 5 to reject calls from this number and request that they add you to their do not call list.
 
+%privacy-unident.gsm%The party you are trying to reach does not accept unidentified calls.
+
+%privacy-prompt.gsm%Please enter your 10 digit phone number, starting with the area code.
+
+%privacy-incorrect.gsm%I'm sorry, that number is not valid.
+
+%privacy-thankyou.gsm%Thank you.
+
 %tt-allbusy.gsm%All representatives of the household are currently assisting other telemarketers.  Please hold and your call will be answered in the order it was received.
 
 ;digits directory  - File Name Sound File Script
@@ -300,3 +308,11 @@
 
 %thousand.gsm%thousand
 
+%privacy-incorrect.gsm%will_be_added_later
+
+%privacy-prompt.gsm%will_be_added_later
+
+%privacy-thankyou.gsm%will_be_added_later
+
+%privacy-unident.gsm%will_be_added_later
+
diff --git a/sounds/privacy-incorrect.gsm b/sounds/privacy-incorrect.gsm
new file mode 100755
index 000000000..e4cac90ff
--- /dev/null
+++ b/sounds/privacy-incorrect.gsm
diff --git a/sounds/privacy-prompt.gsm b/sounds/privacy-prompt.gsm
new file mode 100755
index 000000000..97f2fca61
--- /dev/null
+++ b/sounds/privacy-prompt.gsm
diff --git a/sounds/privacy-thankyou.gsm b/sounds/privacy-thankyou.gsm
new file mode 100755
index 000000000..45e7104e2
--- /dev/null
+++ b/sounds/privacy-thankyou.gsm
diff --git a/sounds/privacy-unident.gsm b/sounds/privacy-unident.gsm
new file mode 100755
index 000000000..33d838459
--- /dev/null
+++ b/sounds/privacy-unident.gsm