Changeset 538 for trunk/src/ocatsetup.c

Timestamp:

01/24/10 19:55:24 (2 years ago)

Author:

eagle

Message:

• options are parsed sequentially (-f and -I first)
• config file is always read from SYSCONFDIR (usually /etc or /usr/local/etc)
• changed Makefile.am to not install header files

File:

• trunk/src/ocatsetup.c (modified) (2 diffs)

trunk/src/ocatsetup.c

@@ -57 +57 @@
    //ADDR4_PREFIX, ADDR4_MASK
    {0}, 0,
-   NULL, 1,
+   // config_file, config_read, config_failed
+   NULL, 0, 0,
 #ifdef __CYGWIN__
    1,
@@ -148 +149 @@
 void post_init_setup(void)
 {
+   size_t l;
    setup_.ocat_addr4 = NDESC(prefix4);
    setup_.ocat_addr4_mask = NDESC(addr4_mask);
    setup_.ocat_dest_port = NDESC(vdest_port);
    setup_.ocat_ctrl_port = NDESC(ctrl_port);
+
+   l = strlen(SYSCONFDIR) + strlen(NDESC(config_file)) + 2;
+   if ((setup_.config_file = malloc(l)) != NULL)
+      snprintf(setup_.config_file, l, "%s/%s", SYSCONFDIR, NDESC(config_file));
+   else
+      log_msg(LOG_WARNING, "could not get memory for config file string: \"%s\"", strerror(errno));
 
    if (!setup_.socks_dst->sin_port)