From b834757ea3bcd1bba3381ff7cab216458d8f7efb Mon Sep 17 00:00:00 2001 From: Rui Paulo Date: Wed, 14 Oct 2015 04:30:17 +0000 Subject: Import wpa_supplicant/hostapd 2.5. Major changes: bunch of CVEs fixed, tab completion for wpa_cli and misc bug fixes. --- src/wps/http_server.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/wps/http_server.c') diff --git a/src/wps/http_server.c b/src/wps/http_server.c index ac088c429d606..507abe8707808 100644 --- a/src/wps/http_server.c +++ b/src/wps/http_server.c @@ -277,11 +277,9 @@ struct http_server * http_server_init(struct in_addr *addr, int port, "%s", srv->port, strerror(errno)); goto fail; } - if (listen(srv->fd, 10 /* max backlog */) < 0) - goto fail; - if (fcntl(srv->fd, F_SETFL, O_NONBLOCK) < 0) - goto fail; - if (eloop_register_sock(srv->fd, EVENT_TYPE_READ, http_server_cb, + if (listen(srv->fd, 10 /* max backlog */) < 0 || + fcntl(srv->fd, F_SETFL, O_NONBLOCK) < 0 || + eloop_register_sock(srv->fd, EVENT_TYPE_READ, http_server_cb, srv, NULL)) goto fail; -- cgit v1.2.3