diff options
-rw-r--r-- | lib/conn.c | 6 | ||||
-rw-r--r-- | lib/include/radsec/radsec-impl.h | 6 | ||||
-rw-r--r-- | lib/send.c | 4 | ||||
-rw-r--r-- | lib/tcp.c | 6 |
4 files changed, 11 insertions, 11 deletions
@@ -207,7 +207,7 @@ _rcb (struct rs_packet *packet, void *user_data) assert (pkt); assert (pkt->conn); - pkt->flags |= rs_packet_received_flag; + pkt->flags |= RS_PACKET_RECEIVED; if (pkt->conn->bev) bufferevent_disable (pkt->conn->bev, EV_WRITE|EV_READ); else @@ -234,7 +234,7 @@ rs_conn_receive_packet (struct rs_connection *conn, conn->callbacks.received_cb = _rcb; conn->user_data = pkt; - pkt->flags &= ~rs_packet_received_flag; + pkt->flags &= ~RS_PACKET_RECEIVED; if (conn->bev) /* TCP. */ { @@ -267,7 +267,7 @@ rs_conn_receive_packet (struct rs_connection *conn, evutil_gai_strerror (err)); rs_debug (("%s: event loop done\n", __func__)); - if ((pkt->flags & rs_packet_received_flag) == 0 + if ((pkt->flags & RS_PACKET_RECEIVED) == 0 || (req_msg && packet_verify_response (pkt->conn, pkt, req_msg) != RSE_OK)) { diff --git a/lib/include/radsec/radsec-impl.h b/lib/include/radsec/radsec-impl.h index a4d97f0..6c02dcf 100644 --- a/lib/include/radsec/radsec-impl.h +++ b/lib/include/radsec/radsec-impl.h @@ -116,9 +116,9 @@ struct rs_connection { }; enum rs_packet_flags { - rs_packet_hdr_read_flag, - rs_packet_received_flag, - rs_packet_sent_flag, + RS_PACKET_HEADER_READ, + RS_PACKET_RECEIVED, + RS_PACKET_SENT, }; struct radius_packet; @@ -67,7 +67,7 @@ _wcb (void *user_data) { struct rs_packet *pkt = (struct rs_packet *) user_data; assert (pkt); - pkt->flags |= rs_packet_sent_flag; + pkt->flags |= RS_PACKET_SENT; if (pkt->conn->bev) bufferevent_disable (pkt->conn->bev, EV_WRITE|EV_READ); else @@ -127,7 +127,7 @@ rs_packet_send (struct rs_packet *pkt, void *user_data) conn->callbacks.sent_cb = NULL; conn->user_data = NULL; - if ((pkt->flags & rs_packet_sent_flag) == 0) + if ((pkt->flags & RS_PACKET_SENT) == 0) { assert (rs_err_conn_peek_code (conn)); return rs_err_conn_peek_code (conn); @@ -34,7 +34,7 @@ _read_header (struct rs_packet *pkt) n = bufferevent_read (pkt->conn->bev, pkt->hdr, RS_HEADER_LEN); if (n == RS_HEADER_LEN) { - pkt->flags |= rs_packet_hdr_read_flag; + pkt->flags |= RS_PACKET_HEADER_READ; pkt->rpkt->length = (pkt->hdr[2] << 8) + pkt->hdr[3]; if (pkt->rpkt->length < 20 || pkt->rpkt->length > RS_MAX_PACKET_LEN) { @@ -89,7 +89,7 @@ _read_packet (struct rs_packet *pkt) { bufferevent_disable (pkt->conn->bev, EV_READ); rs_debug (("%s: complete packet read\n", __func__)); - pkt->flags &= ~rs_packet_hdr_read_flag; + pkt->flags &= ~RS_PACKET_HEADER_READ; memset (pkt->hdr, 0, sizeof(*pkt->hdr)); /* Checks done by rad_packet_ok: @@ -155,7 +155,7 @@ tcp_read_cb (struct bufferevent *bev, void *user_data) Room for improvement: Peek inside buffer (evbuffer_copyout()) to avoid the extra copying. */ - if ((pkt->flags & rs_packet_hdr_read_flag) == 0) + if ((pkt->flags & RS_PACKET_HEADER_READ) == 0) if (_read_header (pkt)) return; /* Error. */ _read_packet (pkt); |