diff --git a/apps/Makefile b/apps/Makefile
index 3316a22e651778348931882aff40c45e2b62ad07..f7aca4639d5c1332c0ea660f68ec9490e633b9d3 100755
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -27,7 +27,7 @@ APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_mp3.so\
app_hasnewvoicemail.so app_sayunixtime.so app_cut.so app_read.so \
app_setcdruserfield.so app_random.so app_ices.so app_eval.so \
app_nbscat.so app_sendtext.so app_exec.so app_sms.so \
- app_groupcount.so
+ app_groupcount.so app_txtcidname.so
ifneq (${OSARCH},Darwin)
ifneq (${OSARCH},FreeBSD)
diff --git a/apps/app_txtcidname.c b/apps/app_txtcidname.c
new file mode 100755
index 0000000000000000000000000000000000000000..afb5109b7a6271ecca4e00f5e99356e809d57920
--- /dev/null
+++ b/apps/app_txtcidname.c
@@ -0,0 +1,149 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Time of day - Report the time of day
+ *
+ * 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/channel.h>
+#include <asterisk/pbx.h>
+#include <asterisk/options.h>
+#include <asterisk/config.h>
+#include <asterisk/module.h>
+#include <asterisk/enum.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include <pthread.h>
+
+
+static char *tdesc = "TXTCIDName";
+
+static char *app = "TXTCIDName";
+
+static char *synopsis = "Lookup caller name from TXT record";
+
+static char *descrip =
+" TXTLookup(CallerID): Looks up an Caller Name via DNS and sets\n"
+"the variable 'TXTCIDNAME'. TXTCIDName will either be blank\n"
+"or return the value found in the TXT record in DNS.\n" ;
+
+#define ENUM_CONFIG "enum.conf"
+
+static char h323driver[80];
+#define H323DRIVERDEFAULT "H323"
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int txtcidname_exec(struct ast_channel *chan, void *data)
+{
+ int res=0;
+ char tech[80];
+ char txt[256];
+ char dest[80];
+
+ txt[0] = 0;
+ struct localuser *u;
+ if (!data || !strlen(data)) {
+ ast_log(LOG_WARNING, "TXTCIDName requires an argument (extension)\n");
+ res = 1;
+ }
+ LOCAL_USER_ADD(u);
+ if (!res) {
+ res = ast_get_txt(chan, data, dest, sizeof(dest), tech, sizeof(tech), txt, sizeof(txt));
+ }
+ LOCAL_USER_REMOVE(u);
+ /* Parse it out */
+ if (res > 0) {
+ if(strlen(txt) > 0)
+ {
+ pbx_builtin_setvar_helper(chan, "TXTCIDNAME", txt);
+#if 0
+ printf("TXTCIDNAME got '%s'\n", txt);
+#endif
+ }
+ }
+ if (!res) {
+ /* Look for a "busy" place */
+ if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid))
+ chan->priority += 100;
+ } else if (res > 0)
+ res = 0;
+ return res;
+}
+
+static int load_config(void)
+{
+ struct ast_config *cfg;
+ char *s;
+
+ cfg = ast_load(ENUM_CONFIG);
+ if (cfg) {
+ if (!(s=ast_variable_retrieve(cfg, "general", "h323driver"))) {
+ strcpy(h323driver, H323DRIVERDEFAULT);
+ } else {
+ strcpy(h323driver, s);
+ }
+ ast_destroy(cfg);
+ return 0;
+ }
+ ast_log(LOG_NOTICE, "No ENUM Config file, using defaults\n");
+ return 0;
+}
+
+
+int unload_module(void)
+{
+ STANDARD_HANGUP_LOCALUSERS;
+ return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+ int res;
+ res = ast_register_application(app, txtcidname_exec, synopsis, descrip);
+ if (res)
+ return(res);
+ if ((res=load_config())) {
+ return(res);
+ }
+ return(0);
+}
+
+int reload(void)
+{
+ return(load_config());
+}
+
+
+char *description(void)
+{
+ return tdesc;
+}
+
+int usecount(void)
+{
+ int res;
+ STANDARD_USECOUNT(res);
+ return res;
+}
+
+char *key()
+{
+ return ASTERISK_GPL_KEY;
+}
+
diff --git a/enum.c b/enum.c
index a0fa980831e6bd1b3f3d05aaac1fca15f004e2b8..a4ffe3fa357b8d35b746cf3b564a95240de46937 100755
--- a/enum.c
+++ b/enum.c
@@ -39,6 +39,11 @@
#define T_NAPTR 35
#endif
+#ifdef __APPLE__
+#undef T_TXT
+#define T_TXT 16
+#endif
+
#define TOPLEV "e164.arpa."
static struct enum_search {
@@ -226,9 +231,31 @@ struct enum_context {
int dstlen;
char *tech;
int techlen;
+ char *txt;
+ int txtlen;
char *naptrinput;
};
+static int txt_callback(void *context, u_char *answer, int len, u_char *fullanswer)
+{
+ struct enum_context *c = (struct enum_context *)context;
+#if 0
+ printf("ENUMTXT Called\n");
+#endif
+
+ if(answer != NULL)
+ {
+ c->txtlen = strlen(answer) - 2;
+ strncpy(c->txt, answer, 255);
+ c->txt[c->txtlen] = 0;
+ return 1;
+ } else {
+ c->txt = NULL;
+ c->txtlen = 0;
+ return 0;
+ }
+}
+
static int enum_callback(void *context, u_char *answer, int len, u_char *fullanswer)
{
struct enum_context *c = (struct enum_context *)context;
@@ -301,6 +328,65 @@ int ast_get_enum(struct ast_channel *chan, const char *number, char *dst, int ds
return ret;
}
+int ast_get_txt(struct ast_channel *chan, const char *number, char *dst, int dstlen, char *tech, int techlen, char *txt, int txtlen)
+{
+ struct enum_context context;
+ char tmp[259 + 80];
+ char naptrinput[80] = "+";
+ int pos = strlen(number) - 1;
+ int newpos = 0;
+ int ret = -1;
+ struct enum_search *s = NULL;
+ int version = -1;
+
+ strncat(naptrinput, number, sizeof(naptrinput) - 2);
+
+ context.naptrinput = naptrinput;
+ context.dst = dst;
+ context.dstlen = dstlen;
+ context.tech = tech;
+ context.techlen = techlen;
+ context.txt = txt;
+ context.txtlen = txtlen;
+
+ if (pos > 128)
+ pos = 128;
+ while(pos >= 0) {
+ tmp[newpos++] = number[pos--];
+ tmp[newpos++] = '.';
+ }
+
+ if (chan && ast_autoservice_start(chan) < 0)
+ return -1;
+
+ for(;;) {
+ ast_mutex_lock(&enumlock);
+ if (version != enumver) {
+ /* Ooh, a reload... */
+ s = toplevs;
+ version = enumver;
+ } else {
+ s = s->next;
+ }
+ if (s) {
+ strcpy(tmp + newpos, s->toplev);
+ }
+ ast_mutex_unlock(&enumlock);
+ if (!s)
+ break;
+ ret = ast_search_dns(&context, tmp, C_IN, T_TXT, txt_callback);
+ if (ret > 0)
+ break;
+ }
+ if (ret < 0) {
+ ast_log(LOG_DEBUG, "No such number found: %s (%s)\n", tmp, strerror(errno));
+ ret = 0;
+ }
+ if (chan)
+ ret |= ast_autoservice_stop(chan);
+ return ret;
+}
+
static struct enum_search *enum_newtoplev(char *s)
{
struct enum_search *tmp;
diff --git a/include/asterisk/enum.h b/include/asterisk/enum.h
index 684276860c1e7398a2d63ce0ce678d623596f526..9d45b3a934598351a48065c2d4de75d94329eba2 100755
--- a/include/asterisk/enum.h
+++ b/include/asterisk/enum.h
@@ -16,6 +16,7 @@
#include <asterisk/channel.h>
/* Lookup entry in ENUM Returns 1 if found, 0 if not found, -1 on hangup */
extern int ast_get_enum(struct ast_channel *chan, const char *number, char *location, int maxloc, char *technology, int maxtech);
+extern int ast_get_txt(struct ast_channel *chan, const char *number, char *location, int maxloc, char *technology, int maxtech, char *txt, int maxtxt);
extern int ast_enum_init(void);
extern int ast_enum_reload(void);