From patchwork Thu Jan 15 11:42:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 429362 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A6B1F14014D for ; Thu, 15 Jan 2015 22:43:22 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 46FF1283F11; Thu, 15 Jan 2015 12:41:00 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, T_DKIM_INVALID autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 2C265280520 for ; Thu, 15 Jan 2015 12:40:53 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-wg0-f49.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 15 Jan 2015 12:40:49 +0100 (CET) Received: by mail-wg0-f49.google.com with SMTP id n12so14379760wgh.8 for ; Thu, 15 Jan 2015 03:43:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=oEoBXsj439OxbDqngCUN/BnjVQa8ycqAkzHXrljvXjY=; b=nwW3/yJ6DxFBzj9WLrOl+Mw4v+V1n+eXehQ+C8TybZ6cnPCLa8Um13X48qSgeAnXeU SMECATFgkCR97VUSE9cU4TJZbvF2dsC9Dds1a0G6BT0kDTQZGKWnbLZ5nbwHfe6jE/KE YldG9fmAS5365p0s66qv98tkPqYiKba6O/cAdKlgJax9lzVl2j8NbDep+BQDTETifmbC Uu2f+b/fm7x3/XN7hLjqaPiI4aW2S5GaQZ9cI0j7xK2PQC0YeJ9G1naK11UbLpvkpcgU lHuSPgnXVCt8IUHqoKVkhVbM3YnQubhDeH/WTxHUNgiTMipxAW6gKQc3ZQYQk2jB/aRk SwGw== X-Received: by 10.180.74.229 with SMTP id x5mr6428461wiv.1.1421322182994; Thu, 15 Jan 2015 03:43:02 -0800 (PST) Received: from linux-tdhb.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by mx.google.com with ESMTPSA id ej10sm2180856wib.1.2015.01.15.03.43.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jan 2015 03:43:02 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Felix Fietkau Date: Thu, 15 Jan 2015 12:42:51 +0100 Message-Id: <1421322172-6939-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 Cc: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH libubox 1/2] usock: add helper waiting for socket to be ready X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Rafał Miłecki --- usock.c | 30 ++++++++++++++++++++++++++++++ usock.h | 11 +++++++++++ 2 files changed, 41 insertions(+) diff --git a/usock.c b/usock.c index 04ed4ee..39909c1 100644 --- a/usock.c +++ b/usock.c @@ -117,3 +117,33 @@ int usock(int type, const char *host, const char *service) { usock_set_flags(sock, type); return sock; } + +int usock_wait_ready(int fd, int msecs) { + fd_set fds; + struct timeval tv; + int res; + + FD_ZERO(&fds); + FD_SET(fd, &fds); + + tv.tv_sec = msecs / 1000; + tv.tv_usec = (msecs % 1000) * 1000; + + res = select(fd + 1, NULL, &fds, NULL, &tv); + if (res < 0) { + return errno; + } else if (res == 0) { + return -ETIMEDOUT; + } else { + int err = 0; + socklen_t optlen = sizeof(err); + + res = getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &optlen); + if (res) + return errno; + if (err) + return err; + } + + return 0; +} diff --git a/usock.h b/usock.h index 8f30add..c97fc40 100644 --- a/usock.h +++ b/usock.h @@ -32,4 +32,15 @@ int usock(int type, const char *host, const char *service); +/** + * Wait for a socket to become ready. + * + * This may be useful for users of USOCK_NONBLOCK to wait (with a timeout) + * for a socket. + * + * @param fd file descriptor of socket + * @param msecs timeout in microseconds + */ +int usock_wait_ready(int fd, int msecs); + #endif /* USOCK_H_ */