[svn-commits] trunk - r7380 in /trunk/apps: Makefile
app_setcallerid.c
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Wed Dec 7 10:41:28 CST 2005
Author: russell
Date: Wed Dec 7 10:41:26 2005
New Revision: 7380
URL: http://svn.digium.com/view/asterisk?rev=7380&view=rev
Log:
re-add app_setcallerid since it was not actually marked deprecated in 1.2
Added:
trunk/apps/app_setcallerid.c
Modified:
trunk/apps/Makefile
Modified: trunk/apps/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/apps/Makefile?rev=7380&r1=7379&r2=7380&view=diff
==============================================================================
--- trunk/apps/Makefile (original)
+++ trunk/apps/Makefile Wed Dec 7 10:41:26 2005
@@ -20,12 +20,12 @@
app_macro.so app_milliwatt.so app_mixmonitor.so app_mp3.so app_nbscat.so \
app_parkandannounce.so app_playback.so app_privacy.so app_queue.so \
app_random.so app_read.so app_readfile.so app_realtime.so app_record.so \
- app_sayunixtime.so app_senddtmf.so app_sendtext.so app_setcdruserfield.so \
- app_settransfercapability.so app_softhangup.so app_stack.so app_system.so \
- app_talkdetect.so app_test.so app_transfer.so app_userevent.so app_url.so \
- app_verbose.so app_voicemail.so app_waitforring.so app_waitforsilence.so \
- app_while.so app_zapateller.so
-
+ app_sayunixtime.so app_senddtmf.so app_sendtext.so app_setcallerid.so \
+ app_setcdruserfield.so app_settransfercapability.so app_softhangup.so \
+ app_stack.so app_system.so app_talkdetect.so app_test.so app_transfer.so \
+ app_userevent.so app_url.so app_verbose.so app_voicemail.so \
+ app_waitforring.so app_waitforsilence.so app_while.so app_zapateller.so
+
#
# Obsolete things...
#
Added: trunk/apps/app_setcallerid.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_setcallerid.c?rev=7380&view=auto
==============================================================================
--- trunk/apps/app_setcallerid.c (added)
+++ trunk/apps/app_setcallerid.c Wed Dec 7 10:41:26 2005
@@ -1,0 +1,178 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster at digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ *
+ * \brief App to set callerid
+ *
+ * \ingroup applications
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 7221 $")
+
+#include "asterisk/lock.h"
+#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 "asterisk/callerid.h"
+
+static char *app2 = "SetCallerPres";
+
+static char *synopsis2 = "Set CallerID Presentation";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static char *descrip2 =
+" SetCallerPres(presentation): Set Caller*ID presentation on a call.\n"
+" Valid presentations are:\n"
+"\n"
+" allowed_not_screened : Presentation Allowed, Not Screened\n"
+" allowed_passed_screen : Presentation Allowed, Passed Screen\n"
+" allowed_failed_screen : Presentation Allowed, Failed Screen\n"
+" allowed : Presentation Allowed, Network Number\n"
+" prohib_not_screened : Presentation Prohibited, Not Screened\n"
+" prohib_passed_screen : Presentation Prohibited, Passed Screen\n"
+" prohib_failed_screen : Presentation Prohibited, Failed Screen\n"
+" prohib : Presentation Prohibited, Network Number\n"
+" unavailable : Number Unavailable\n"
+"\n"
+;
+
+static int setcallerid_pres_exec(struct ast_channel *chan, void *data)
+{
+ struct localuser *u;
+ int pres = -1;
+
+ LOCAL_USER_ADD(u);
+
+ pres = ast_parse_caller_presentation(data);
+
+ if (pres < 0) {
+ ast_log(LOG_WARNING, "'%s' is not a valid presentation (see 'show application SetCallerPres')\n",
+ (char *) data);
+ LOCAL_USER_REMOVE(u);
+ return 0;
+ }
+
+ chan->cid.cid_pres = pres;
+ LOCAL_USER_REMOVE(u);
+ return 0;
+}
+
+
+
+static char *tdesc = "Set CallerID Application";
+
+static char *app = "SetCallerID";
+
+static char *synopsis = "Set CallerID";
+
+static char *descrip =
+" SetCallerID(clid[|a]): Set Caller*ID on a call to a new\n"
+"value. Sets ANI as well if a flag is used. \n";
+
+static int setcallerid_exec(struct ast_channel *chan, void *data)
+{
+ int res = 0;
+ char *tmp = NULL;
+ char name[256];
+ char num[256];
+ struct localuser *u;
+ char *opt;
+ int anitoo = 0;
+
+ if (ast_strlen_zero(data)) {
+ ast_log(LOG_WARNING, "SetCallerID requires an argument!\n");
+ return 0;
+ }
+
+ LOCAL_USER_ADD(u);
+
+ tmp = ast_strdupa(data);
+ if (!tmp) {
+ ast_log(LOG_ERROR, "Out of memory\n");
+ LOCAL_USER_REMOVE(u);
+ return -1;
+ }
+
+ opt = strchr(tmp, '|');
+ if (opt) {
+ *opt = '\0';
+ opt++;
+ if (*opt == 'a')
+ anitoo = 1;
+ }
+
+ ast_callerid_split(tmp, name, sizeof(name), num, sizeof(num));
+ ast_set_callerid(chan, num, name, anitoo ? num : NULL);
+
+ LOCAL_USER_REMOVE(u);
+
+ return res;
+}
+
+int unload_module(void)
+{
+ int res;
+
+ res = ast_unregister_application(app2);
+ res |= ast_unregister_application(app);
+
+ STANDARD_HANGUP_LOCALUSERS;
+
+ return res;
+}
+
+int load_module(void)
+{
+ int res;
+
+ res = ast_register_application(app2, setcallerid_pres_exec, synopsis2, descrip2);
+ res |= ast_register_application(app, setcallerid_exec, synopsis, descrip);
+
+ return res;
+}
+
+char *description(void)
+{
+ return tdesc;
+}
+
+int usecount(void)
+{
+ int res;
+ STANDARD_USECOUNT(res);
+ return res;
+}
+
+char *key()
+{
+ return ASTERISK_GPL_KEY;
+}
More information about the svn-commits
mailing list