Change default configuration to do RadSec rather than UDP.

[radsecproxy.git] / lib / conf.c

diff --git a/lib/conf.c b/lib/conf.c
index c235ffe..14bc3ef 100644 (file)
--- a/lib/conf.c
+++ b/lib/conf.c
@@ -1,4 +1,5 @@
-/* See the file COPYING for licensing information.  */
+/* Copyright 2010, 2011 NORDUnet A/S. All rights reserved.
+   See the file COPYING for licensing information.  */
 
 #if defined HAVE_CONFIG_H
 #include <config.h>
@@ -8,11 +9,15 @@
 #include <string.h>
 #include <radsec/radsec.h>
 #include <radsec/radsec-impl.h>
+#include "peer.h"
+#include "debug.h"
 
 #if 0
-  # example of client config
+  # client config options
   config NAME {
       type = "UDP"|"TCP"|"TLS"|"DTLS"
+      timeout = INT
+      retries = INT
       cacertfile = STRING
       #cacertpath = STRING
       certfile = STRING
@@ -21,8 +26,6 @@
           hostname = STRING
          service = STRING
          secret = STRING
-         timeout = INT         /* optional */
-         tries = INT           /* optional */
       }
   }
 #endif
@@ -30,19 +33,24 @@
 int
 rs_context_read_config(struct rs_context *ctx, const char *config_file)
 {
-#warning "Missing some error handling in rs_context_config_read()"
+  /* FIXME: Missing some error handling in rs_context_read_config().  */
+
+  cfg_t *cfg, *cfg_config, *cfg_server;
+  int i, j;
+  const char *s;
+
   cfg_opt_t server_opts[] =
     {
       CFG_STR ("hostname", NULL, CFGF_NONE),
-      CFG_STR ("service", "radius", CFGF_NONE),
-      CFG_STR ("secret", NULL, CFGF_NONE),
-      CFG_INT ("timeout", 3, CFGF_NONE),
-      CFG_INT ("tries", 1, CFGF_NONE),
+      CFG_STR ("service", "2083", CFGF_NONE),
+      CFG_STR ("secret", "radsec", CFGF_NONE),
       CFG_END ()
     };
   cfg_opt_t config_opts[] =
     {
       CFG_STR ("type", "UDP", CFGF_NONE),
+      CFG_INT ("timeout", 2, CFGF_NONE), /* FIXME: Remove?  */
+      CFG_INT ("retries", 2, CFGF_NONE), /* FIXME: Remove?  */
       CFG_STR ("cacertfile", NULL, CFGF_NONE),
       /*CFG_STR ("cacertpath", NULL, CFGF_NONE),*/
       CFG_STR ("certfile", NULL, CFGF_NONE),
@@ -55,8 +63,6 @@ rs_context_read_config(struct rs_context *ctx, const char *config_file)
       CFG_SEC ("config", config_opts, CFGF_TITLE | CFGF_MULTI),
       CFG_END ()
     };
-  cfg_t *cfg, *cfg_config, *cfg_server;
-  int i, j;
 
   cfg = cfg_init (opts, CFGF_NONE);
   if (cfg_parse (cfg, config_file) == CFG_PARSE_ERROR)
@@ -71,11 +77,18 @@ rs_context_read_config(struct rs_context *ctx, const char *config_file)
        return rs_err_ctx_push_fl (ctx, RSE_NOMEM, __FILE__, __LINE__, NULL);
       memset (r, 0, sizeof(*r));
       if (ctx->realms)
-       ctx->realms->next = r;
+       {
+         r->next = ctx->realms->next;
+         ctx->realms->next = r;
+       }
       else
-       ctx->realms = r;
+         ctx->realms = r;
       cfg_config = cfg_getnsec (cfg, "config", i);
-      r->name = strdup (cfg_title (cfg_config));
+      s = cfg_title (cfg_config);
+      if (s == NULL)
+       return rs_err_ctx_push_fl (ctx, RSE_CONFIG, __FILE__, __LINE__,
+                                  "missing config name");
+      r->name = strdup (s);
 
       typestr = cfg_getstr (cfg_config, "type");
       if (!strcmp (typestr, "UDP"))
@@ -88,7 +101,9 @@ rs_context_read_config(struct rs_context *ctx, const char *config_file)
        r->type = RS_CONN_TYPE_DTLS;
       else
        return rs_err_ctx_push_fl (ctx, RSE_CONFIG, __FILE__, __LINE__,
-                                  "%s: invalid connection type", typestr);
+                                  "invalid connection type: %s", typestr);
+      r->timeout = cfg_getint (cfg_config, "timeout");
+      r->retries = cfg_getint (cfg_config, "retries");
 
       r->cacertfile = cfg_getstr (cfg_config, "cacertfile");
       /*r->cacertpath = cfg_getstr (cfg_config, "cacertpath");*/
@@ -98,25 +113,27 @@ rs_context_read_config(struct rs_context *ctx, const char *config_file)
       /* Add peers, one per server stanza.  */
       for (j = 0; j < cfg_size (cfg_config, "server"); j++)
        {
-         struct rs_peer *p = _rs_peer_create (ctx, &r->peers);
+         struct rs_peer *p = peer_create (ctx, &r->peers);
          if (!p)
            return rs_err_ctx_push_fl (ctx, RSE_NOMEM, __FILE__, __LINE__,
                                       NULL);
          p->realm = r;
 
          cfg_server = cfg_getnsec (cfg_config, "server", j);
-         _rs_resolv (&p->addr, r->type, cfg_getstr (cfg_server, "hostname"),
-                     cfg_getstr (cfg_server, "service"));
-         p->secret = strdup (cfg_getstr (cfg_server, "secret"));
-         p->timeout = cfg_getint (cfg_server, "timeout");
-         p->tries = cfg_getint (cfg_server, "tries");
+         rs_resolv (&p->addr, r->type, cfg_getstr (cfg_server, "hostname"),
+                    cfg_getstr (cfg_server, "service"));
+         p->secret = cfg_getstr (cfg_server, "secret");
        }
     }
+
+  /* Save config object in context, for freeing in
+     rs_context_destroy().  */
+  ctx->cfg =  cfg;
   return RSE_OK;
 }
 
-struct rs_realm
-*rs_conf_find_realm(struct rs_context *ctx, const char *name)
+struct rs_realm *
+rs_conf_find_realm(struct rs_context *ctx, const char *name)
 {
   struct rs_realm *r;