Changeset 304:ad3c46016584 in freeDiameter for extensions/app_radgw/rgw_conf.y

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:

• extensions/app_radgw/rgw_conf.y (modified) (5 diffs)

extensions/app_radgw/rgw_conf.y

@@ -53 +53 @@
 #include "rgw_conf.tab.h"       /* bison is not smart enough to define the YYLTYPE before including this code, so... */
 
-#include <sys/stat.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
@@ -97 +96 @@
         else
                 fd_log_debug("%s:%d.%d : %s\n", conffile, ploc->first_line, ploc->first_column, s);
-}
-
-/* This function checks a string value is a valid filename */
-static int is_valid_file( char * candidate ) 
-{
-        int ret;
-        struct stat buffer;
-        
-        ret = stat(candidate, &buffer);
-        if (ret != 0) {
-                fd_log_debug("Error on file '%s': %s.\n", candidate, strerror(errno));
-                return 0;
-        }
-
-        /* Ok this candidate is valid */
-        return 1;
 }
 
@@ -161 +144 @@
 %token <ss>     IP
 
-%type <string>  FILENAME
+%type <string>  FINDFILEEXT
 
 /* simple tokens */
@@ -197 +180 @@
                                 
 /* -------------------------------------- */
-FILENAME:               QSTRING
-                        {
-                                /* Verify this is a valid file */
-                                if (!is_valid_file($1)) {
-                                        yyerror (&yylloc, conffile, "Error on file name, aborting...");
-                                        YYERROR;
-                                }
-                                $$ = $1;
+FINDFILEEXT:            QSTRING
+                        {
+                                char * fname = $1;
+                                FILE * fd;
+                                
+                                /* First, check if the file exists */
+                                fd = fopen(fname, "r");
+                                if ((fd == NULL) && (*fname != '/')) {
+                                        char * bkp = fname;
+                                        CHECK_MALLOC_DO( fname = malloc( strlen(bkp) + strlen(DEFAULT_EXTENSIONS_PATH) + 2 ),
+                                                { yyerror (&yylloc, conffile, "Not enough memory"); YYERROR; } );
+                                        sprintf(fname, DEFAULT_EXTENSIONS_PATH "/%s", bkp);
+                                        free(bkp);
+                                        fd = fopen(fname, "r");
+                                }
+                                if (fd == NULL) {
+                                        int ret = errno;
+                                        TRACE_DEBUG(INFO, "Unable to open file %s for reading: %s\n", fname, strerror(ret));
+                                        yyerror (&yylloc, conffile, "Error adding plugin"); 
+                                        YYERROR;
+                                }
+                                fclose(fd);
+                                
+                                $$ = fname;
                         }
                         ;
@@ -214 +213 @@
                                 free(plgconffile); plgconffile = NULL;
                         }
-                        PLG_PREFIX '=' FILENAME plg_attributes ';'
+                        PLG_PREFIX '=' FINDFILEEXT plg_attributes ';'
                         {
                                 /* Add this extension in the list */