Changeset 511:17435072de36 in freeDiameter

Timestamp:

Aug 20, 2010, 3:18:58 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Search extensions conf files in the main configuration folder also

Location:

extensions

Files:

• app_diameap/diameap.y (modified) (1 diff)
• app_radgw/rgwx_echodrop.y (modified) (1 diff)

extensions/app_diameap/diameap.y

@@ -134 +134 @@
                         if ((fl == NULL) && (*cfile != '/')) {
                                 char * tmp = cfile;
-                                CHECK_MALLOC_DO( cfile = malloc( strlen(tmp) + strlen(DEFAULT_EXTENSIONS_PATH) + 2 ),
+                                CHECK_MALLOC_DO( cfile = malloc( strlen(tmp) + strlen(DEFAULT_CONF_PATH) + 2 ),
                                         { yyerror (&yylloc, config, "Not enough memory"); YYERROR; } );
-                                sprintf(cfile, DEFAULT_EXTENSIONS_PATH "/%s", tmp);
+                                sprintf(cfile, DEFAULT_CONF_PATH "/%s", tmp);
                                 free(tmp);
                                 fl = fopen(cfile, "r");

extensions/app_radgw/rgwx_echodrop.y

@@ -69 +69 @@
         
         rgwx_echodropin = fopen(conffile, "r");
+        if ((rgwx_echodropin == NULL) && (*conffile != '/')) { /* We received a relative path, try adding DEFAULT_CONF_PATH prefix */
+                char * fullpath;
+                CHECK_MALLOC( fullpath = malloc( strlen(conffile) + strlen(DEFAULT_CONF_PATH) + 2 ) );
+                sprintf( fullpath, DEFAULT_CONF_PATH "/%s", conffile );
+                rgwx_echodropin = fopen(fullpath, "r");
+                free(fullpath);
+        }
         if (rgwx_echodropin == NULL) {
                 ret = errno;