API breakage -- rename rs_packet_create_acc_request().

[radsecproxy.git] / lib / packet.c

diff --git a/lib/packet.c b/lib/packet.c
index 154abc8..07baf5e 100644 (file)
--- a/lib/packet.c
+++ b/lib/packet.c
@@ -24,33 +24,6 @@
 #endif
 
 static int
-_packet_create (struct rs_connection *conn, struct rs_packet **pkt_out)
-{
-  struct rs_packet *p;
-  RADIUS_PACKET *rpkt;
-
-  *pkt_out = NULL;
-
-  rpkt = rad_alloc (1);
-  if (!rpkt)
-    return rs_err_conn_push (conn, RSE_NOMEM, __func__);
-  rpkt->id = conn->nextid++;
-
-  p = (struct rs_packet *) malloc (sizeof (struct rs_packet));
-  if (!p)
-    {
-      rad_free (&rpkt);
-      return rs_err_conn_push (conn, RSE_NOMEM, __func__);
-    }
-  memset (p, 0, sizeof (struct rs_packet));
-  p->conn = conn;
-  p->rpkt = rpkt;
-
-  *pkt_out = p;
-  return RSE_OK;
-}
-
-static int
 _do_send (struct rs_packet *pkt)
 {
   int err;
@@ -62,7 +35,7 @@ _do_send (struct rs_packet *pkt)
   vp = paircreate (PW_MESSAGE_AUTHENTICATOR, PW_TYPE_OCTETS);
   if (!vp)
     return rs_err_conn_push_fl (pkt->conn, RSE_NOMEM, __FILE__, __LINE__,
-                               "rad_encode: %s", fr_strerror ());
+                               "paircreate: %s", fr_strerror ());
   pairadd (&pkt->rpkt->vps, vp);
 
   if (rad_encode (pkt->rpkt, NULL, pkt->conn->active_peer->secret))
@@ -99,7 +72,9 @@ _event_cb (struct bufferevent *bev, short events, void *ctx)
   struct rs_packet *pkt = (struct rs_packet *)ctx;
   struct rs_connection *conn;
   struct rs_peer *p;
+#if defined RS_ENABLE_TLS
   unsigned long err;
+#endif
 
   assert (pkt);
   assert (pkt->conn);
@@ -137,7 +112,7 @@ _event_cb (struct bufferevent *bev, short events, void *ctx)
                                   "%d", err);
            }
        }
-#endif
+#endif /* RS_ENABLE_TLS */
       rs_err_conn_push_fl (pkt->conn, RSE_CONNERR, __FILE__, __LINE__, NULL);
       fprintf (stderr, "%s: BEV_EVENT_ERROR\n", __func__); /* DEBUG, until verified that pushed errors will actually be handled  */
     }
@@ -339,6 +314,7 @@ _init_bev (struct rs_connection *conn, struct rs_peer *peer)
        return rs_err_conn_push_fl (conn, RSE_EVENT, __FILE__, __LINE__,
                                    "bufferevent_socket_new");
       break;
+#if defined RS_ENABLE_TLS
     case RS_CONN_TYPE_TLS:
       if (rs_tls_init (conn))
        return -1;
@@ -356,9 +332,10 @@ _init_bev (struct rs_connection *conn, struct rs_peer *peer)
     case RS_CONN_TYPE_DTLS:
       return rs_err_conn_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
                                  "%s: NYI", __func__);
+#endif /* RS_ENABLE_TLS */
     default:
       return rs_err_conn_push_fl (conn, RSE_INTERNAL, __FILE__, __LINE__,
-                                 "%s: invalid connection type: %d", __func__,
+                                 "%s: unknown connection type: %d", __func__,
                                  conn->type);
     }
 
@@ -413,14 +390,41 @@ _conn_is_open_p (struct rs_connection *conn)
 
 /* Public functions.  */
 int
-rs_packet_create_acc_request (struct rs_connection *conn,
-                             struct rs_packet **pkt_out,
-                             const char *user_name, const char *user_pw)
+rs_packet_create (struct rs_connection *conn, struct rs_packet **pkt_out)
+{
+  struct rs_packet *p;
+  RADIUS_PACKET *rpkt;
+
+  *pkt_out = NULL;
+
+  rpkt = rad_alloc (1);
+  if (!rpkt)
+    return rs_err_conn_push (conn, RSE_NOMEM, __func__);
+  rpkt->id = conn->nextid++;
+
+  p = (struct rs_packet *) malloc (sizeof (struct rs_packet));
+  if (!p)
+    {
+      rad_free (&rpkt);
+      return rs_err_conn_push (conn, RSE_NOMEM, __func__);
+    }
+  memset (p, 0, sizeof (struct rs_packet));
+  p->conn = conn;
+  p->rpkt = rpkt;
+
+  *pkt_out = p;
+  return RSE_OK;
+}
+
+int
+rs_packet_create_auth_request (struct rs_connection *conn,
+                              struct rs_packet **pkt_out,
+                              const char *user_name, const char *user_pw)
 {
   struct rs_packet *pkt;
   struct rs_attr *attr;
 
-  if (_packet_create (conn, pkt_out))
+  if (rs_packet_create (conn, pkt_out))
     return -1;
   pkt = *pkt_out;
   pkt->rpkt->code = PW_AUTHENTICATION_REQUEST;
@@ -435,7 +439,6 @@ rs_packet_create_acc_request (struct rs_connection *conn,
        {
          if (rs_attr_create (conn, &attr, "User-Password", user_pw))
            return -1;
-         /* FIXME: need this too? rad_pwencode(user_pw, &pwlen, SECRET, reqauth) */
          rs_packet_add_attr (pkt, attr);
        }
     }
@@ -484,7 +487,7 @@ rs_conn_receive_packet (struct rs_connection *conn,
 
   assert (conn);
 
-  if (_packet_create (conn, pkt_out))
+  if (rs_packet_create (conn, pkt_out))
     return -1;
   pkt = *pkt_out;
   pkt->conn = conn;
@@ -540,7 +543,7 @@ rs_packet_destroy(struct rs_packet *pkt)
 {
   if (pkt)
     {
-      // TODO: free all attributes
+      // FIXME: memory leak! TODO: free all attributes
       rad_free (&pkt->rpkt);
       rs_free (pkt->conn->ctx, pkt);
     }