1 files changed, 64 insertions, 20 deletions

diff --git a/lib/err.c b/lib/err.c
index 0c7d5a8..a0fe8a0 100644
--- a/lib/err.c
+++ b/lib/err.c
@@ -1,4 +1,4 @@
-/* Copyright 2010-2013 NORDUnet A/S. All rights reserved.
+/* Copyright 2010,2011,2013 NORDUnet A/S. All rights reserved.
    See LICENSE for licensing information. */
 
 #if defined HAVE_CONFIG_H
@@ -28,7 +28,7 @@ static const char *_errtxt[] = {
   "authentication failed",			/* 12 RSE_BADAUTH */
   "internal error",				/* 13 RSE_INTERNAL */
   "SSL error",					/* 14 RSE_SSLERR */
-  "invalid packet",				/* 15 RSE_INVALID_PKT */
+  "invalid message",				/* 15 RSE_INVALID_MSG */
   "connect timeout",				/* 16 RSE_TIMEOUT_CONN */
   "invalid argument",				/* 17 RSE_INVAL */
   "I/O timeout",				/* 18 RSE_TIMEOUT_IO */
@@ -121,6 +121,7 @@ _ctx_err_vpush_fl (struct rs_context *ctx, int code, const char *file,
     return RSE_NOMEM;
 
   /* TODO: Implement a stack.  */
+  assert (ctx);
   if (ctx->err)
     rs_err_free (ctx->err);
   ctx->err = err;
@@ -156,28 +157,43 @@ rs_err_ctx_push_fl (struct rs_context *ctx, int code, const char *file,
 }
 
 int
-err_conn_push_err (struct rs_connection *conn, struct rs_error *err)
+err_connbase_push_err (struct rs_conn_base *connbase, struct rs_error *err)
 {
-  assert (conn);
-  assert (err);
-
-  if (conn->err)
-    rs_err_free (conn->err);
-  conn->err = err;		/* FIXME: use a stack */
+  assert (connbase);
+  if (connbase->err)
+    rs_err_free (connbase->err);
+  connbase->err = err;		/* FIXME: use a stack */
 
+  assert (err);
   return err->code;
 }
 
 static int
-_conn_err_vpush_fl (struct rs_connection *conn, int code, const char *file,
-		    int line, const char *fmt, va_list args)
+_connbase_err_vpush_fl (struct rs_conn_base *connbase, int code,
+                        const char *file, int line, const char *fmt,
+                        va_list args)
 {
   struct rs_error *err = _err_vcreate (code, file, line, fmt, args);
 
   if (!err)
     return RSE_NOMEM;
 
-  return err_conn_push_err (conn, err);
+  return err_connbase_push_err (connbase, err);
+}
+
+int
+rs_err_connbase_push (struct rs_conn_base *connbase, int code,
+                      const char *fmt, ...)
+{
+  int r = 0;
+
+  assert (connbase);
+  va_list args;
+  va_start (args, fmt);
+  r = _connbase_err_vpush_fl (connbase, code, NULL, 0, fmt, args);
+  va_end (args);
+
+  return r;
 }
 
 int
@@ -185,9 +201,25 @@ rs_err_conn_push (struct rs_connection *conn, int code, const char *fmt, ...)
 {
   int r = 0;
 
+  assert (conn);
+  va_list args;
+  va_start (args, fmt);
+  r = _connbase_err_vpush_fl (TO_BASE_CONN (conn), code, NULL, 0, fmt, args);
+  va_end (args);
+
+  return r;
+}
+
+int
+rs_err_connbase_push_fl (struct rs_conn_base *connbase, int code,
+                         const char *file,
+                         int line, const char *fmt, ...)
+{
+  int r = 0;
+
   va_list args;
   va_start (args, fmt);
-  r = _conn_err_vpush_fl (conn, code, NULL, 0, fmt, args);
+  r = _connbase_err_vpush_fl (connbase, code, file, line, fmt, args);
   va_end (args);
 
   return r;
@@ -201,7 +233,7 @@ rs_err_conn_push_fl (struct rs_connection *conn, int code, const char *file,
 
   va_list args;
   va_start (args, fmt);
-  r = _conn_err_vpush_fl (conn, code, file, line, fmt, args);
+  r = _connbase_err_vpush_fl (TO_BASE_CONN (conn), code, file, line, fmt, args);
   va_end (args);
 
   return r;
@@ -221,25 +253,37 @@ rs_err_ctx_pop (struct rs_context *ctx)
 }
 
 struct rs_error *
-rs_err_conn_pop (struct rs_connection *conn)
+rs_err_connbase_pop (struct rs_conn_base *connbase)
 {
   struct rs_error *err;
 
-  if (!conn)
+  if (!connbase)
     return NULL;		/* FIXME: RSE_INVALID_CONN */
-  err = conn->err;
-  conn->err = NULL;
+  err = connbase->err;
+  connbase->err = NULL;
 
   return err;
 }
 
+struct rs_error *
+rs_err_conn_pop (struct rs_connection *conn)
+{
+  return rs_err_connbase_pop (TO_BASE_CONN (conn));
+}
+
+struct rs_error *
+rs_err_listener_pop (struct rs_listener *l)
+{
+  return rs_err_connbase_pop (TO_BASE_CONN (l));
+}
+
 int
 rs_err_conn_peek_code (struct rs_connection *conn)
 {
   if (!conn)
     return -1;			/* FIXME: RSE_INVALID_CONN */
-  if (conn->err)
-    return conn->err->code;
+  if (conn->base_.err)
+    return conn->base_.err->code;
 
   return RSE_OK;
 }