Changeset 304:ad3c46016584 in freeDiameter for freeDiameter/config.c

Timestamp:

May 14, 2010, 5:26:53 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added install directives for cmake; also allow default directory to seek for extensions and configuration files

File:

• freeDiameter/config.c (modified) (4 diffs)

freeDiameter/config.c

@@ -35 +35 @@
 
 #include "fD.h"
+#include <sys/stat.h>
 
 /* Configuration management */
@@ -51 +52 @@
         
         fd_g_config->cnf_eyec = EYEC_CONFIG;
-        fd_g_config->cnf_file = DEFAULT_CONF_FILE;
         
         fd_g_config->cnf_timer_tc = 30;
@@ -145 +145 @@
         extern FILE * fddin;
         
-        TRACE_DEBUG (FULL, "Parsing configuration file: %s", fd_g_config->cnf_file);
+        /* Attempt to find the configuration file */
+        if (!fd_g_config->cnf_file)
+                fd_g_config->cnf_file = FD_DEFAULT_CONF_FILENAME;
         
         fddin = fopen(fd_g_config->cnf_file, "r");
+        if ((fddin == NULL) && (*fd_g_config->cnf_file != '/')) {
+                /* We got a relative path, attempt to add the default directory prefix */
+                char * bkp = fd_g_config->cnf_file;
+                CHECK_MALLOC( fd_g_config->cnf_file = malloc(strlen(bkp) + strlen(DEFAULT_CONF_PATH) + 2) ); /* we will not free it, but not important */
+                sprintf( fd_g_config->cnf_file, DEFAULT_CONF_PATH "/%s", bkp );
+                fddin = fopen(fd_g_config->cnf_file, "r");
+        }
         if (fddin == NULL) {
                 int ret = errno;
@@ -155 +164 @@
         
         /* call yacc parser */
+        TRACE_DEBUG (FULL, "Parsing configuration file: %s", fd_g_config->cnf_file);
         CHECK_FCT(  fddparse(fd_g_config)  );