diff -uNr asterisk-orig/apps/Makefile asterisk/apps/Makefile --- asterisk-orig/apps/Makefile 2004-04-21 06:05:14.000000000 +1000 +++ asterisk/apps/Makefile 2004-04-25 10:00:25.000000000 +1000 @@ -26,7 +26,7 @@ app_enumlookup.so app_transfer.so app_setcidnum.so app_cdr.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_nbscat.so app_sendtext.so app_exec.so app_txtcidname.so ifneq (${OSARCH},Darwin) APPS+=app_intercom.so diff -uNr asterisk-orig/apps/app_txtcidname.c asterisk/apps/app_txtcidname.c --- asterisk-orig/apps/app_txtcidname.c 1970-01-01 10:00:00.000000000 +1000 +++ asterisk/apps/app_txtcidname.c 2004-04-25 10:01:51.000000000 +1000 @@ -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 + * + * This program is free software, distributed under the terms of + * the GNU General Public License + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + + +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 -uNr asterisk-orig/enum.c asterisk/enum.c --- asterisk-orig/enum.c 2004-03-03 14:12:59.000000000 +1100 +++ asterisk/enum.c 2004-04-25 09:53:45.000000000 +1000 @@ -38,6 +38,11 @@ #define T_NAPTR 35 #endif +#ifdef __APPLE__ +#undef T_TXT +#define T_TXT 16 +#endif + #define TOPLEV "e164.arpa." static struct enum_search { @@ -225,9 +230,31 @@ 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; @@ -300,6 +327,65 @@ 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; Binary files asterisk-orig/enum.o and asterisk/enum.o differ diff -uNr asterisk-orig/include/asterisk/enum.h asterisk/include/asterisk/enum.h --- asterisk-orig/include/asterisk/enum.h 2003-05-01 14:29:25.000000000 +1000 +++ asterisk/include/asterisk/enum.h 2004-04-25 09:50:06.000000000 +1000 @@ -16,6 +16,7 @@ #include /* 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);