[Asterisk-cvs] asterisk Makefile, 1.147, 1.148 asterisk.c, 1.146, 1.147 asterisk.h, 1.14, 1.15 loader.c, 1.37, 1.38 utils.c, 1.36, 1.37

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv17189

Modified Files:
	Makefile asterisk.c asterisk.h loader.c utils.c 
Log Message:


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- Makefile	1 Apr 2005 21:18:39 -0000	1.147
+++ Makefile	6 Apr 2005 21:12:32 -0000	1.148
@@ -265,7 +265,7 @@
 	cdr.o tdd.o acl.o rtp.o manager.o asterisk.o ast_expr.o \
 	dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
 	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
-	utils.o config_old.o plc.o jitterbuf.o
+	utils.o config_old.o plc.o jitterbuf.o dnsmgr.o
 ifeq (${OSARCH},Darwin)
 OBJS+=poll.o dlfcn.o
 ASTLINK=-Wl,-dynamic

Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- asterisk.c	4 Apr 2005 03:28:38 -0000	1.146
+++ asterisk.c	6 Apr 2005 21:12:32 -0000	1.147
@@ -1960,6 +1960,10 @@
 		printf(term_quit());
 		exit(1);
 	}
+	if (dnsmgr_init()) {
+		printf(term_quit());
+		exit(1);
+	}
 #if 0
 	/* This should no longer be necessary */
 	/* sync cust config and reload some internals in case a custom config handler binded to them */

Index: asterisk.h
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- asterisk.h	31 Dec 2004 00:04:41 -0000	1.14
+++ asterisk.h	6 Apr 2005 21:12:32 -0000	1.15
@@ -52,5 +52,8 @@
 extern int astdb_init(void);
 /* Provided by channel.c */
 extern void ast_channels_init(void);
+/* Provided by dnsmgr.c */
+extern int dnsmgr_init(void);
+extern void dnsmgr_reload(void);
 
 #endif

Index: loader.c
===================================================================
RCS file: /usr/cvsroot/asterisk/loader.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- loader.c	25 Jan 2005 06:10:19 -0000	1.37
+++ loader.c	6 Apr 2005 21:12:32 -0000	1.38
@@ -215,6 +215,10 @@
 		ast_rtp_reload();
 		reloaded = 2;
 	}
+	if (!name || !strcasecmp(name, "dnsmgr")) {
+		dnsmgr_reload();
+		reloaded = 2;
+	}
 	time(&ast_lastreloadtime);
 
 	ast_mutex_lock(&modlock);

Index: utils.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- utils.c	17 Mar 2005 23:12:15 -0000	1.36
+++ utils.c	6 Apr 2005 21:12:32 -0000	1.37
@@ -150,8 +150,8 @@
 
 #endif
 
-/* Recursive thread safe version of gethostbyname that replaces the 
-   standard gethostbyname (which is not recursive)
+/* Re-entrant (thread safe) version of gethostbyname that replaces the 
+   standard gethostbyname (which is not thread safe)
 */
 struct hostent *ast_gethostbyname(const char *host, struct ast_hostent *hp)
 {
@@ -457,4 +457,4 @@
 		return NULL;
 	}
 }
-#endif
+#endif /* LINUX */