WPS: Clean up http_client_tx_ready()
authorJouni Malinen <j@w1.fi>
Sat, 29 Aug 2015 10:34:39 +0000 (13:34 +0300)
committerJouni Malinen <j@w1.fi>
Sat, 29 Aug 2015 10:42:32 +0000 (13:42 +0300)
Calculate the send() buffer length only once to make this a bit more
readable.

Signed-off-by: Jouni Malinen <j@w1.fi>
src/wps/http_client.c

index 0290013..9d25245 100644 (file)
@@ -85,15 +85,16 @@ static void http_client_tx_ready(int sock, void *eloop_ctx, void *sock_ctx)
 {
        struct http_client *c = eloop_ctx;
        int res;
+       size_t send_len;
 
+       send_len = wpabuf_len(c->req) - c->req_pos;
        wpa_printf(MSG_DEBUG, "HTTP: Send client request to %s:%d (%lu of %lu "
                   "bytes remaining)",
                   inet_ntoa(c->dst.sin_addr), ntohs(c->dst.sin_port),
                   (unsigned long) wpabuf_len(c->req),
-                  (unsigned long) wpabuf_len(c->req) - c->req_pos);
+                  (unsigned long) send_len);
 
-       res = send(c->sd, wpabuf_head_u8(c->req) + c->req_pos,
-                  wpabuf_len(c->req) - c->req_pos, 0);
+       res = send(c->sd, wpabuf_head_u8(c->req) + c->req_pos, send_len, 0);
        if (res < 0) {
                wpa_printf(MSG_DEBUG, "HTTP: Failed to send buffer: %s",
                           strerror(errno));
@@ -102,12 +103,11 @@ static void http_client_tx_ready(int sock, void *eloop_ctx, void *sock_ctx)
                return;
        }
 
-       if ((size_t) res < wpabuf_len(c->req) - c->req_pos) {
+       if ((size_t) res < send_len) {
                wpa_printf(MSG_DEBUG, "HTTP: Sent %d of %lu bytes; %lu bytes "
                           "remaining",
                           res, (unsigned long) wpabuf_len(c->req),
-                          (unsigned long) wpabuf_len(c->req) - c->req_pos -
-                          res);
+                          (unsigned long) send_len - res);
                c->req_pos += res;
                return;
        }