[asterisk-addons-commits] russell: trunk r263 - in /trunk: ./ asterisk-ooh323c/src/

[asterisk-addons-commits at lists.digium.com]

Author: russell
Date: Sat Jul 22 20:48:05 2006
New Revision: 263

URL: http://svn.digium.com/view/asterisk-addons?rev=263&view=rev
Log:
fix chan_ooh323 and res_config_mysql to reflect recent API changes

Modified:
    trunk/asterisk-ooh323c/src/chan_h323.c
    trunk/res_config_mysql.c

Modified: trunk/asterisk-ooh323c/src/chan_h323.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/src/chan_h323.c?rev=263&r1=262&r2=263&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/src/chan_h323.c (original)
+++ trunk/asterisk-ooh323c/src/chan_h323.c Sat Jul 22 20:48:05 2006
@@ -2887,7 +2887,6 @@
    struct sockaddr_in us;
    ooMediaInfo mediaInfo;
    int x, format=0;     
-   static char iabuf[INET_ADDRSTRLEN];
 
    if(gH323Debug)
       ast_verbose("---   configure_local_rtp\n");
@@ -2896,13 +2895,7 @@
    /* figure out our local RTP port and tell the H.323 stack about it*/
    ast_rtp_get_us(p->rtp, &us);
 
-   if(!ast_inet_ntoa(iabuf, sizeof(iabuf), us.sin_addr))
-   {
-      ast_log(LOG_ERROR, "Unable to allocate rtp_info, this is very bad.\n");
-      ast_mutex_unlock(&p->lock);
-      return 0;
-   }
-   strncpy(mediaInfo.lMediaIP, iabuf, sizeof(mediaInfo.lMediaIP)-1);
+   strncpy(mediaInfo.lMediaIP, ast_inet_ntoa(us.sin_addr), sizeof(mediaInfo.lMediaIP)-1);
    mediaInfo.lMediaPort = ntohs(us.sin_port);
    mediaInfo.lMediaCntrlPort = mediaInfo.lMediaPort +1;
    for(x=0; 0 != (format=ast_codec_pref_index(&p->prefs, x)); x++)

Modified: trunk/res_config_mysql.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/res_config_mysql.c?rev=263&r1=262&r2=263&view=diff
==============================================================================
--- trunk/res_config_mysql.c (original)
+++ trunk/res_config_mysql.c Sat Jul 22 20:48:05 2006
@@ -353,7 +353,7 @@
 	return -1;
 }
 
-static struct ast_config *config_mysql(const char *database, const char *table, const char *file, struct ast_config *cfg)
+static struct ast_config *config_mysql(const char *database, const char *table, const char *file, struct ast_config *cfg, int withcomments)
 {
 	MYSQL_RES *result;
 	MYSQL_ROW row;
@@ -402,7 +402,7 @@
 
 		while((row = mysql_fetch_row(result))) {
 			if(!strcmp(row[1], "#include")) {
-				if (!ast_config_internal_load(row[2], cfg)) {
+				if (!ast_config_internal_load(row[2], cfg, 0)) {
 					mysql_free_result(result);
 					ast_mutex_unlock(&mysql_lock);
 					return NULL;