Don't free config object until we destroy the context.

[radsecproxy.git] / lib / radsec.c

diff --git a/lib/radsec.c b/lib/radsec.c
index 40d14fc..afb871e 100644 (file)
--- a/lib/radsec.c
+++ b/lib/radsec.c
@@ -16,8 +16,9 @@
 #include <event2/util.h>
 #include <radsec/radsec.h>
 #include <radsec/radsec-impl.h>
-#if defined RS_ENABLE_TLS
+#if defined (RS_ENABLE_TLS)
 #include <regex.h>
+#include "debug.h"
 #include "rsp_list.h"
 #include "../radsecproxy.h"
 #endif
@@ -26,70 +27,67 @@
 int
 rs_context_create(struct rs_context **ctx, const char *dict)
 {
+  int err = RSE_OK;
   struct rs_context *h;
+  char *buf1 = NULL, *buf2 = NULL;
+  char *dir, *fn;
+
+  assert (dict);
 
   if (ctx)
     *ctx = NULL;
   h = (struct rs_context *) malloc (sizeof(struct rs_context));
-  if (h)
+  if (!h)
+    return RSE_NOMEM;
+
+  /* Initialize freeradius dictionary.  */
+  buf1 = malloc (strlen (dict) + 1);
+  buf2 = malloc (strlen (dict) + 1);
+  if (!buf1 || !buf2)
     {
-      char *buf1 = NULL, *buf2 = NULL;
-      char *dir, *fn;
+      err = RSE_NOMEM;
+      goto err_out;
+    }
+  strcpy (buf1, dict);
+  dir = dirname (buf1);
+  strcpy (buf2, dict);
+  fn = basename (buf2);
+  if (dict_init (dir, fn) < 0)
+    {
+      err = RSE_FR;
+      goto err_out;
+    }
+  free (buf1);
+  free (buf2);
 
-      buf1 = malloc (strlen (dict) + 1);
-      buf2 = malloc (strlen (dict) + 1);
-      if (!buf1 || !buf2)
-       {
-         free (h);
-         if (buf1)
-           free (buf1);
-         if (buf2)
-           free (buf2);
-         return RSE_NOMEM;
-       }
-      strcpy (buf1, dict);
-      dir = dirname (buf1);
-      strcpy (buf2, dict);
-      fn = basename (buf2);
-      if (dict_init (dir, fn) < 0)
-       {
-         free (h);
-         return RSE_SOME_ERROR;
-       }
-      free (buf1);
-      free (buf2);
-#if defined RS_ENABLE_TLS
-      ssl_init ();
+#if defined (RS_ENABLE_TLS)
+  ssl_init ();
 #endif
 #if defined (DEBUG)
-      fr_log_fp = stderr;
-      fr_debug_flag = 1;
+  fr_log_fp = stderr;
+  fr_debug_flag = 1;
 #endif
-      debug_init ("libradsec");        /* radsecproxy compat, FIXME: remove */
+  debug_init ("libradsec");    /* radsecproxy compat, FIXME: remove */
 
-      memset (h, 0, sizeof(struct rs_context));
-      fr_randinit (&h->fr_randctx, 0);
-      fr_rand_seed (NULL, 0);
+  memset (h, 0, sizeof(struct rs_context));
+  fr_randinit (&h->fr_randctx, 0);
+  fr_rand_seed (NULL, 0);
 
-      if (ctx)
-       *ctx = h;
-    }
-  return h ? RSE_OK : RSE_NOMEM;
-}
+  if (ctx)
+    *ctx = h;
 
-void rs_context_destroy(struct rs_context *ctx)
-{
-  free (ctx);
-}
+  return RSE_OK;
 
-int rs_context_set_alloc_scheme(struct rs_context *ctx,
-                               struct rs_alloc_scheme *scheme)
-{
-  return rs_err_ctx_push_fl (ctx, RSE_NOSYS, __FILE__, __LINE__,
-                            "%s: NYI", __func__);
+ err_out:
+  if (buf1)
+    free (buf1);
+  if (buf2)
+    free (buf2);
+  if (h)
+    free (h);
+  return err;
 }
 
-
 struct rs_peer *
 _rs_peer_create (struct rs_context *ctx, struct rs_peer **rootp)
 {
@@ -99,66 +97,61 @@ _rs_peer_create (struct rs_context *ctx, struct rs_peer **rootp)
   if (p)
     {
       memset (p, 0, sizeof(struct rs_peer));
-      p->fd = -1;
       if (*rootp)
-       (*rootp)->next = p;
+       {
+         p->next = (*rootp)->next;
+         (*rootp)->next = p;
+       }
       else
        *rootp = p;
     }
   return p;
 }
 
-int
-rs_server_create (struct rs_connection *conn, struct rs_peer **server)
+static void
+_rs_peer_destroy (struct rs_peer *p)
 {
-  struct rs_peer *srv;
-
-  srv = _rs_peer_create (conn->ctx, &conn->peers);
-  if (srv)
+  assert (p);
+  assert (p->conn);
+  assert (p->conn->ctx);
+  /* NOTE: The peer object doesn't own its connection (conn).  */
+  if (p->addr)
     {
-      srv->conn = conn;
-      srv->timeout = 1;
-      srv->tries = 3;
+      evutil_freeaddrinfo (p->addr);
+      p->addr = NULL;
     }
-  else
-    return rs_err_conn_push_fl (conn, RSE_NOMEM, __FILE__, __LINE__, NULL);
-  if (*server)
-    *server = srv;
-  return RSE_OK;
+  if (p->secret)
+    rs_free (p->conn->ctx, p->secret);
+  rs_free (p->conn->ctx, p);
 }
 
-int
-rs_server_set_address (struct rs_peer *server, const char *hostname,
-                      const char *service)
+void rs_context_destroy(struct rs_context *ctx)
 {
-  struct rs_error *err;
+  struct rs_realm *r = NULL;
+  struct rs_peer *p = NULL;
 
-  err = _rs_resolv (&server->addr, server->conn->type, hostname, service);
-  if (err)
-    return _rs_err_conn_push_err (server->conn, err);
-  return RSE_OK;
-}
+  for (r = ctx->realms; r; )
+    {
+      struct rs_realm *tmp = r;
+      for (p = r->peers; p; )
+       {
+         struct rs_peer *tmp = p;
+         p = p->next;
+         _rs_peer_destroy (tmp);
+       }
+      r = r->next;
+      rs_free (ctx, tmp);
+    }
 
-void
-rs_server_set_timeout (struct rs_peer *server, int timeout)
-{
-  server->timeout = timeout;
-}
-void
-rs_server_set_tries (struct rs_peer *server, int tries)
-{
-  server->tries = tries;
+  if (ctx->cfg)
+    cfg_free (ctx->cfg);
+  ctx->cfg = NULL;
+
+  rs_free (ctx, ctx);
 }
 
-int
-rs_server_set_secret (struct rs_peer *server, const char *secret)
+int rs_context_set_alloc_scheme(struct rs_context *ctx,
+                               struct rs_alloc_scheme *scheme)
 {
-  if (server->secret)
-    free (server->secret);
-  server->secret = (char *) malloc (strlen(secret) + 1);
-  if (!server->secret)
-    return rs_err_conn_push (server->conn, RSE_NOMEM, NULL);
-  strcpy (server->secret, secret);
-  return RSE_OK;
+  return rs_err_ctx_push_fl (ctx, RSE_NOSYS, __FILE__, __LINE__, NULL);
 }
-