Changeset 947:cce5d4bace82 in freeDiameter
- Timestamp:
- Feb 13, 2013, 10:47:47 PM (11 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
include/freeDiameter/libfdcore.h
r904 r947 87 87 88 88 /* Parse the freeDiameter.conf configuration file, load the extensions */ 89 int fd_core_parseconf(c har * conffile);89 int fd_core_parseconf(const char * conffile); 90 90 91 91 /* Start the server & client threads */ … … 111 111 int cnf_eyec; /* Eye catcher: EYEC_CONFIG */ 112 112 113 c har*cnf_file; /* Configuration file to parse, default is DEFAULT_CONF_FILE */113 const char *cnf_file; /* Configuration file to parse, default is DEFAULT_CONF_FILE */ 114 114 115 115 DiamId_t cnf_diamid; /* Diameter Identity of the local peer (FQDN -- ASCII) */ … … 350 350 * ENOMEM : Memory allocation for the new object element failed.) 351 351 */ 352 int fd_peer_add ( struct peer_info * info, c har * orig_dbg, void (*cb)(struct peer_info *, void *), void * cb_data );352 int fd_peer_add ( struct peer_info * info, const char * orig_dbg, void (*cb)(struct peer_info *, void *), void * cb_data ); 353 353 354 354 /* -
libfdcore/config.c
r946 r947 230 230 { 231 231 extern FILE * fddin; 232 c har * orig = NULL;232 const char * orig = NULL; 233 233 234 234 /* Attempt to find the configuration file */ … … 238 238 fddin = fopen(fd_g_config->cnf_file, "r"); 239 239 if ((fddin == NULL) && (*fd_g_config->cnf_file != '/')) { 240 char * new_cnf = NULL; 240 241 /* We got a relative path, attempt to add the default directory prefix */ 241 242 orig = fd_g_config->cnf_file; 242 CHECK_MALLOC( fd_g_config->cnf_file = malloc(strlen(orig) + strlen(DEFAULT_CONF_PATH) + 2) ); /* we will not free it, but not important */ 243 sprintf( fd_g_config->cnf_file, DEFAULT_CONF_PATH "/%s", orig ); 243 CHECK_MALLOC( new_cnf = malloc(strlen(orig) + strlen(DEFAULT_CONF_PATH) + 2) ); /* we will not free it, but not important */ 244 sprintf( new_cnf, DEFAULT_CONF_PATH "/%s", orig ); 245 fd_g_config->cnf_file = new_cnf; 244 246 fddin = fopen(fd_g_config->cnf_file, "r"); 245 247 } 246 248 if (fddin == NULL) { 247 249 int ret = errno; 248 if (orig) { 249 fprintf(stderr, "Unable to open configuration file for reading\n" 250 "Tried the following locations:\n" 251 " - %s\n" 252 " - %s\n" 253 "Error: %s\n", orig, fd_g_config->cnf_file, strerror(ret)); 254 } else { 255 fprintf(stderr, "Unable to open '%s' for reading: %s\n", fd_g_config->cnf_file, strerror(ret)); 256 } 250 TRACE_DEBUG_ERROR("Unable to open configuration file for reading; tried the following locations: %s%s%s; Error: %s\n", 251 orig ?: "", orig? " and " : "", fd_g_config->cnf_file, strerror(ret)); 257 252 return ret; 258 253 } -
libfdcore/core.c
r908 r947 226 226 227 227 /* Parse the freeDiameter.conf configuration file, load the extensions */ 228 int fd_core_parseconf(c har * conffile)228 int fd_core_parseconf(const char * conffile) 229 229 { 230 230 TRACE_ENTRY("%p", conffile); -
libfdcore/peers.c
r908 r947 91 91 92 92 /* Add a new peer entry */ 93 int fd_peer_add ( struct peer_info * info, c har * orig_dbg, void (*cb)(struct peer_info *, void *), void * cb_data )93 int fd_peer_add ( struct peer_info * info, const char * orig_dbg, void (*cb)(struct peer_info *, void *), void * cb_data ) 94 94 { 95 95 struct fd_peer *p = NULL;
Note: See TracChangeset
for help on using the changeset viewer.