DeforaNetworks/siproxd
DeforaNetworks/siproxd
3
0
Fork 0
Code Releases Activity

- Defined default values for config options

Browse Source
This commit is contained in:
Thomas Ries 2010-01-07 11:34:33 +00:00
parent 4d12f4eba7
commit 106cc024f6
1 changed files with 58 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/readconf.c
View File

@ -40,6 +40,9 @@ extern struct siproxd_config configuration;
/* prototypes used locally only */ /* prototypes used locally only */
static int parse_config (FILE *configfile, cfgopts_t cfgopts[], char *filter); static int parse_config (FILE *configfile, cfgopts_t cfgopts[], char *filter);
/* load default values from cfgopts_t structure */
static int load_defaults(cfgopts_t cfgopts2[]);
/* try to open (whichever is found first): /* try to open (whichever is found first):
* <name> * <name>
@ -69,6 +72,9 @@ int read_config(char *name, int search, cfgopts_t cfgopts[], char *filter) {
NULL }; NULL };
DEBUGC(DBCLASS_CONFIG,"setting default config values");
load_defaults(cfgopts);
DEBUGC(DBCLASS_CONFIG,"trying to read config file"); DEBUGC(DBCLASS_CONFIG,"trying to read config file");
/* shall I search the config file myself ? */ /* shall I search the config file myself ? */
@ -314,12 +320,57 @@ static int parse_config (FILE *configfile, cfgopts_t configoptions[],
} }
int make_default_config(void){ /* load_defaults
memset (&configuration, 0, sizeof(configuration)); *
configuration.sip_listen_port=SIP_PORT; * Loads the default values as defined in the cfgopts structure
configuration.default_expires=DEFAULT_EXPIRES; *
configuration.rtp_input_dejitter=DEFAULT_DEJITTER; * cfgopts: control array for the parser. defined keywors and types
configuration.rtp_output_dejitter=DEFAULT_DEJITTER; *
* RETURNS
* STS_SUCCESS on success
* STS_FAILURE on error
*/
static int load_defaults(cfgopts_t cfgopts2[]){
int k;
void *ptr;
/* loop through the config array */
for (k=0; cfgopts2[k].keyword != NULL; k++) {
switch (cfgopts2[k].type) {
//
// Integer4
//
case TYP_INT4:
ptr=cfgopts2[k].dest;
*(int*)ptr=cfgopts2[k].defval.int4;
break;
//
// String
// copy the pointer to a statically allocated string. If overridden
// by the config file, memory will be allocated dynamically and
// overwrites the destination pointer.
//
case TYP_STRING:
ptr=cfgopts2[k].dest;
memcpy(ptr, &cfgopts2[k].defval.string, sizeof (char *));
break;
//
// String array
//
case TYP_STRINGA:
memset(cfgopts2[k].dest, 0, sizeof (char *));
break;
default:
break;
}
} /* for k */
return STS_SUCCESS; return STS_SUCCESS;
} };