Cosmetic changes.

[radsecproxy.git] / lib / packet.c

diff --git a/lib/packet.c b/lib/packet.c
index 90782f7..9874dee 100644 (file)
--- a/lib/packet.c
+++ b/lib/packet.c
@@ -46,9 +46,11 @@ _do_send (struct rs_packet *pkt)
   assert (pkt->rpkt);
   assert (!pkt->original);
 
+  /* Add Message-Authenticator, RFC 2869.  */
+  /* FIXME: Make Message-Authenticator optional?  */
   vp = paircreate (PW_MESSAGE_AUTHENTICATOR, PW_TYPE_OCTETS);
   if (!vp)
-    return rs_err_conn_push_fl (pkt->conn, RSE_NOMEM, __FILE__, __LINE__,
+    return rs_err_conn_push_fl (pkt->conn, RSE_FR, __FILE__, __LINE__,
                                "paircreate: %s", fr_strerror ());
   pairadd (&pkt->rpkt->vps, vp);
 
@@ -132,7 +134,7 @@ _event_cb (struct bufferevent *bev, short events, void *ctx)
     {
       rs_debug (("%s: %p times out on %s\n", __func__, p,
                 (events & BEV_EVENT_READING) ? "read" : "write"));
-      rs_err_conn_push_fl (pkt->conn, RSE_IOTIMEOUT, __FILE__, __LINE__, NULL);
+      rs_err_conn_push_fl (pkt->conn, RSE_TIMEOUT_IO, __FILE__, __LINE__, NULL);
     }
   else if (events & BEV_EVENT_ERROR)
     {
@@ -328,9 +330,9 @@ _read_packet (struct rs_packet *pkt)
    Inform upper layer about successful reception of valid RADIUS
    message by invoking conn->callbacks.recevied_cb(), if !NULL.  */
 static void
-_read_cb (struct bufferevent *bev, void *ctx)
+_read_cb (struct bufferevent *bev, void *user_data)
 {
-  struct rs_packet *pkt = (struct rs_packet *) ctx;
+  struct rs_packet *pkt = (struct rs_packet *) user_data;
 
   assert (pkt);
   assert (pkt->conn);
@@ -401,14 +403,16 @@ _init_socket (struct rs_connection *conn, struct rs_peer *p)
   conn->fd = socket (p->addr->ai_family, p->addr->ai_socktype,
                     p->addr->ai_protocol);
   if (conn->fd < 0)
-    return rs_err_conn_push_fl (conn, RSE_SOME_ERROR, __FILE__, __LINE__,
-                               strerror (errno));
+    return rs_err_conn_push_fl (conn, RSE_SOCKERR, __FILE__, __LINE__,
+                               "socket: %d (%s)",
+                               errno, strerror (errno));
   if (evutil_make_socket_nonblocking (conn->fd) < 0)
     {
       evutil_closesocket (conn->fd);
       conn->fd = -1;
-      return rs_err_conn_push_fl (conn, RSE_SOME_ERROR, __FILE__, __LINE__,
-                                 strerror (errno));
+      return rs_err_conn_push_fl (conn, RSE_SOCKERR, __FILE__, __LINE__,
+                                 "evutil_make_socket_nonblocking: %d (%s)",
+                                 errno, strerror (errno));
     }
   return RSE_OK;
 }
@@ -439,7 +443,7 @@ _conn_timeout_cb (int fd, short event, void *data)
       rs_debug (("%s: connection timeout on %p (fd %d) connecting to %p\n",
                 __func__, conn, conn->fd, conn->active_peer));
       conn->is_connecting = 0;
-      rs_err_conn_push_fl (conn, RSE_IOTIMEOUT, __FILE__, __LINE__, NULL);
+      rs_err_conn_push_fl (conn, RSE_TIMEOUT_IO, __FILE__, __LINE__, NULL);
       _loopbreak (conn);
     }
 }
@@ -452,7 +456,7 @@ _set_timeout (struct rs_connection *conn)
     conn->tev = evtimer_new (conn->evb, _conn_timeout_cb, conn);
   if (!conn->tev)
     return rs_err_conn_push_fl (conn, RSE_EVENT, __FILE__, __LINE__,
-                               "event_new");
+                               "evtimer_new");
   tv.tv_sec = conn->realm->timeout;
   tv.tv_usec = 0;
   evtimer_add (conn->tev, &tv);
@@ -496,8 +500,7 @@ _init_bev (struct rs_connection *conn, struct rs_peer *peer)
       break;
 
     case RS_CONN_TYPE_DTLS:
-      return rs_err_conn_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__,
-                                 "%s: NYI", __func__);
+      return rs_err_conn_push_fl (conn, RSE_NOSYS, __FILE__, __LINE__, NULL);
 #endif /* RS_ENABLE_TLS */
 
     default:
@@ -601,9 +604,9 @@ rs_packet_create (struct rs_connection *conn, struct rs_packet **pkt_out)
 }
 
 int
-rs_packet_create_auth_request (struct rs_connection *conn,
-                              struct rs_packet **pkt_out,
-                              const char *user_name, const char *user_pw)
+rs_packet_create_authn_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;
@@ -762,21 +765,21 @@ rs_conn_receive_packet (struct rs_connection *conn,
 }
 
 void
-rs_packet_add_attr(struct rs_packet *pkt, struct rs_attr *attr)
+rs_packet_add_attr (struct rs_packet *pkt, struct rs_attr *attr)
 {
   pairadd (&pkt->rpkt->vps, attr->vp);
   attr->pkt = pkt;
 }
 
 struct radius_packet *
-rs_packet_frpkt(struct rs_packet *pkt)
+rs_packet_frpkt (struct rs_packet *pkt)
 {
   assert (pkt);
   return pkt->rpkt;
 }
 
 void
-rs_packet_destroy(struct rs_packet *pkt)
+rs_packet_destroy (struct rs_packet *pkt)
 {
   if (pkt)
     {