From patchwork Tue Jun 30 10:38:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Palsson X-Patchwork-Id: 1319739 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=etactica.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=y0jQwFV3; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=eTactica.onmicrosoft.com header.i=@eTactica.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-eTactica-onmicrosoft-com header.b=X9f5Tq2c; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49x1CK5J03z9s6w for ; Tue, 30 Jun 2020 20:42:37 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=84MUoMRg9hj1DkztLZ0ei557Lk4tvl4gerq5POTx+Yo=; b=y0jQwFV3KPMe8ayVkYh1I5kvf yTbl5MlG4uezUm0ls72w2ujMbqYr9VZ++eLHY6SAkypi00nAElBf9krFGjk5qYGfftiQ496CjYltJ SjUojhklyvHLymovuZBmREPwVtiFwl2cvi1NWur2BncBfJ75VSq06U4HKTOO/4WUojvt3i+ZRRUFA H3hOJQ5fFldkMONvDqQ0sDpCco/derE68hl7AuoRnMYl5dKoUfj4L0DPTaPNtCd8ZjLW006Gy9YV1 6JSJ+0Xz/arHsTxwFiIT80Qiuoxxa2TZkV9NO5tQiga6rShaLKe+C3nc+jYUj3JeKvkaOPqS77Grq /abcCF5+A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqDfX-0007eT-4W; Tue, 30 Jun 2020 10:39:15 +0000 Received: from mail-am6eur05on2122.outbound.protection.outlook.com ([40.107.22.122] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqDfT-0007dS-RG for openwrt-devel@lists.openwrt.org; Tue, 30 Jun 2020 10:39:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ciDS3PjuFuLIP/xCd37np7iNw4Io2fWf+LlOGmLvsJcT20psH28+7ZU36QtEx3hv41FtltOa3XwRqx31P6Hy40os4wkqLCf4aaBVvdtZLwSGVtm0DL8ZUgjMyfE2NXOgAiYJI4HWTr2cC0KzIkyXEgXAMYhtNBA6vqxw2/2n11lXLEUJjcK0xCnGRncXhn5alLuAzpqltsMzw3gW5UM7NGhDHq9ECeC3rMNRb4GlYICP6BediidYK1ReSJzTZsXVjBwkVqHAsVFAMLWzFL9Bef7tFpdeKIYLkOuU4XK3xpkKrxuVJ49ahuBabW1qg7okg5fPqm64xAdq21aSKJBmBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uA7TF4s3NosXj14MG3IC9Ah70mIBX/TRcSnGv7C/if4=; b=TIJaPZm6DLW+YFa5P9FoBZiUhfpX6mu3fvTchlcMrgRWUrltNGt7WXq5OyNBOsSg5c8NY0ssdq7BzMVsHriBGCDXd0SJFQX/rREEldiJCLW+yZjSMcWbam/sE9ONkfVH8AEsk+xEXaf8ST7Er7ib9RAF2WlzDbigeBLorv3uNv03AOg02Lplp0gnnftSlevd0MujUSCPWdx1lvwVpfz9n5466lgkGDCfN5D0HRti1eDGfBz8VmZdlXEr0QOWScAQ8+A8dR1pIRp3v2t460ax5He/ZEaUTJ5oCGl2fDJLIwLfS1L7iN5k3XrqZpZ2h+b+FCzw3XPXv5AYPGRvx1aV5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=etactica.com; dmarc=pass action=none header.from=etactica.com; dkim=pass header.d=etactica.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eTactica.onmicrosoft.com; s=selector2-eTactica-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uA7TF4s3NosXj14MG3IC9Ah70mIBX/TRcSnGv7C/if4=; b=X9f5Tq2cyupl3eWkflP0zFt9RqdSuixS4r8uCdrl/H2kXAX0bpn+f69y+ByjivEgOwSVkPypYcSHoFbYPMSc0bJN12t27qB4AZKSAEl5/T8zGL8w9Izzn5s/ex1EpLgzl9Rh8Jx2aQC+HRWoWA85KqdJXlbNTNyaEZ4PvmdqCZA= Authentication-Results: lists.openwrt.org; dkim=none (message not signed) header.d=none;lists.openwrt.org; dmarc=none action=none header.from=etactica.com; Received: from VI1PR07MB4462.eurprd07.prod.outlook.com (20.177.54.81) by VI1PR07MB6367.eurprd07.prod.outlook.com (10.186.162.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.15; Tue, 30 Jun 2020 10:39:08 +0000 Received: from VI1PR07MB4462.eurprd07.prod.outlook.com ([fe80::a9c1:52f2:43a2:f058]) by VI1PR07MB4462.eurprd07.prod.outlook.com ([fe80::a9c1:52f2:43a2:f058%3]) with mapi id 15.20.3153.018; Tue, 30 Jun 2020 10:39:08 +0000 From: Karl Palsson To: openwrt-devel@lists.openwrt.org Subject: [PATCH libubox 1/4] lua/uloop: fd_add() better args checking Date: Tue, 30 Jun 2020 10:38:41 +0000 Message-Id: <20200630103844.16633-2-karlp@etactica.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630103844.16633-1-karlp@etactica.com> References: <20200630103844.16633-1-karlp@etactica.com> X-ClientProxiedBy: LNXP265CA0080.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::20) To VI1PR07MB4462.eurprd07.prod.outlook.com (2603:10a6:803:69::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from strem.lan (213.181.112.179) by LNXP265CA0080.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.27 via Frontend Transport; Tue, 30 Jun 2020 10:39:07 +0000 X-Mailer: git-send-email 2.21.3 X-Originating-IP: [213.181.112.179] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e8ef18e7-d8fa-4ffb-ca0c-08d81ce1d17d X-MS-TrafficTypeDiagnostic: VI1PR07MB6367: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2331; X-Forefront-PRVS: 0450A714CB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vdriXgcPZaYtaYuEDjOm4xkkWX1vk8N/MtLertrvogkaBWC2A/tce2wAC/xaxRD3+0H+x0YakZLl98AEa2cjrRbA3IAVCNaOkFgUsG6ItQLZ78ofxSgfh1Lqk6q5s75Fx3/NNwnnITjLKfutAHp5QoJTQM7UPCxNnNtKMYUtNZhP5A9/uq9B+oM/v/xkPJWqiKEqi2zGXYQnaK8snd//kr5QavdqadwpmHIhQz8HgiE0dKVS/pUvQ3ZobCdiVETd3k/iaOZ4kUU3UeiFWPKsS4swZxVg7jw//35hnq4O3ROSeEa/JHSboE8/HaaXhAp9BaM5gh3B0KgGnyPTdlFEMOBh49RUCX+geSF4C0eyP0HKA5lZ/P8RPRnIjIsfV6t0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR07MB4462.eurprd07.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(376002)(396003)(39830400003)(346002)(366004)(136003)(1076003)(52116002)(6512007)(66476007)(316002)(66946007)(66556008)(6666004)(2906002)(86362001)(36756003)(5660300002)(8886007)(508600001)(6506007)(2616005)(956004)(83380400001)(8676002)(26005)(8936002)(4326008)(186003)(6486002)(16526019)(107886003)(6916009)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: tCEcdxRIa3mGgOAJTUilg8pLjwSQBWJV7u3oXTUs+JDffxgKh/uZeyC19qHMc0RqJ57s4bmiRybSTgOeTCBBIIhY4DEMYfKwb/0pzGY+XDjO5VH+MahCDEzORu07X9vRNC6ylbnButeSASAQTKF3AtXBJJAv/TwrPzfzIp965liIcXImIr7Sc9ESddIEE7BFPXVL/e5uxYnO0kC0oNEe8prvoxHc3YUX7m7X/CBbk4BgzsJRP85hOUSU8Z7YuXEw7IJzHTPaTJELxpKyLL6+zQVK/IQWhOn7T6u2BDhhuI6F+bPcWPX+Mth58aTV+MVW29Cqns53i7wI4Wgr1tyKMBYVM57nCR4IwFvW+P5eOwJv4RyUOz41L9DJcdPFBozICFsgEYMXHzfVtaPF/OAV3orutbNXZSk+TEMTG1ufy4xKb1c+lxzzF7OtgeJH9JPiaODS5XbymEQzTK6M1A9VYW1GOH5/nqTGHj0fblp/Kco= X-OriginatorOrg: etactica.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8ef18e7-d8fa-4ffb-ca0c-08d81ce1d17d X-MS-Exchange-CrossTenant-AuthSource: VI1PR07MB4462.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2020 10:39:08.3005 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e3621586-558f-4e21-92a9-26df2c484dae X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ZYXlFUKTjlSLEzScmGK+FpmYWjhE+Co1QI1MOsxn42WASJ0iApj4yTAInIQjzoMsRrGloiWVJlx+NtqLDmaKQw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB6367 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [40.107.22.122 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.22.122 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Karl Palsson Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Actually check for flags being valid, instead of simply ignoring the call if flags was zero. Use standard lua checks for the function argument, so you can get a normal "argument #2 was invalid, expected function, got xxx" instead of the vague, "invalid arg list" Signed-off-by: Karl Palsson --- lua/uloop.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/lua/uloop.c b/lua/uloop.c index 1b0389f..fcbe274 100644 --- a/lua/uloop.c +++ b/lua/uloop.c @@ -232,17 +232,14 @@ static int ul_ufd_add(lua_State *L) int ref; int fd_ref; - if (lua_isnumber(L, -1)) { - flags = lua_tointeger(L, -1); - lua_pop(L, 1); - } - - if (!lua_isfunction(L, -1)) { - lua_pushstring(L, "invalid arg list"); + flags = luaL_checkinteger(L, -1); + if (!flags) { + lua_pushstring(L, "flags cannot be zero"); lua_error(L); - - return 0; } + lua_pop(L, 1); + + luaL_checktype(L, -1, LUA_TFUNCTION); fd = get_sock_fd(L, -2); @@ -261,8 +258,7 @@ static int ul_ufd_add(lua_State *L) ufd->fd.fd = fd; ufd->fd_r = fd_ref; ufd->fd.cb = ul_ufd_cb; - if (flags) - uloop_fd_add(&ufd->fd, flags); + uloop_fd_add(&ufd->fd, flags); return 1; } From patchwork Tue Jun 30 10:38:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Palsson X-Patchwork-Id: 1319741 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=etactica.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=AmIF0HuS; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=eTactica.onmicrosoft.com header.i=@eTactica.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-eTactica-onmicrosoft-com header.b=QQM4F1XV; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49x1CR0FnSz9sDX for ; Tue, 30 Jun 2020 20:42:43 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rPmHG30i4BST4NxgYKvRmU66wU933Qw8Abyf6odwMNI=; b=AmIF0HuSjJvtUi8G0HaPywjLU Zc6apATgkXjlvwjulT1Mi1gBL+GPGLhFwBQLhhTR7HyE/Mkq0USGa+Zmdt1sGjRYIgtlFCFywbSa6 3qUDuFm7AHS7dNxJrVCAwkqJvXaZSwToJij0U+pqPsXkmp2CH73tSS4xVirMBb6ij5f7CuZHHVB6x g8vTuFBbzgIp8pmgVF9uX1b3IUFO8fs9mSa4M0d25xFvBU4iuckd70y3yz4FlDm+RTJyF/Akd4tYG mUA+a+rPdrJsvhM+XSmz4wJEG0/Nu0X+oiUdVMFEiKJeVFurbKJ/IFZN7pRbX46i5WHUeWROjZAQw UzzHCL7BA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqDfZ-0007ew-Lm; Tue, 30 Jun 2020 10:39:17 +0000 Received: from mail-am6eur05on2122.outbound.protection.outlook.com ([40.107.22.122] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqDfU-0007dS-RQ for openwrt-devel@lists.openwrt.org; Tue, 30 Jun 2020 10:39:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K+lHdgAYW/uZ2EcXsziOH0HXStkRZBR/1Jlib3Qe3gE0URns7ZdCIDbnC7/f9dMiwktJHReZ8FKH2JIjKBWBlqyTL4vWgGfySfP96Duz0OJT0J6Ho2355EvycyEzrGOA2YLaOit3h5Dwus0gwPZl+PcqGk4Nsy2WKQ1KzXylfSb1u8hxK6u2EJlxiIogbEqV7Rgz7svzSKEKiIk3+fRND8w9QBGxlXBnMZEaGasXXzJGlDHVyRaCmZC/pzX69pN8UF6c5ZAhDFqX0BqtGh8EQB7dRe6Ir3lrsnIlF/LD81Xyp7bhC7bYavlkJCceHgOze83ZiNw9g8Sey19p1/ayJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zOZybj3iEc7iimIMbGvMTltTbIMKBBa+D6NQRmbkzik=; b=L/nxKA8RGm6yugxuLhyaeW3hV0VzzJysOfdB4Vp/eBsqem59lz6L3B4FveVCDnauwcpdHPgkSQcOtN2dOnIQ+Ofdapr//c0/FEWXcw4JUKg9qkK1oLzg0ZaLvyFFyBfW82WIfrQTX5hmqgT11WmWqtIek3hQe+2TLHFwQJTZMXeJfi9C+sBcHxig7rrZqwyKIw8H3LDd90RJtfh/Qztnt+3I/KWT9yOkw+eMqCCFRlTCuRZo/mEk9kiE3mieWImuDo/NCkP4HoDtGGnKNEpK1QIwDJXKz0NLPXbGwg4+GPXk2PCDJ9I5MVODH7zfTGj0nkpbpBLJn+LXtTgdkRs0OA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=etactica.com; dmarc=pass action=none header.from=etactica.com; dkim=pass header.d=etactica.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eTactica.onmicrosoft.com; s=selector2-eTactica-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zOZybj3iEc7iimIMbGvMTltTbIMKBBa+D6NQRmbkzik=; b=QQM4F1XV/XJcWKb9IIwQgg8B2OXIr1fqW/R6HzFSiQs7Y3/SlXxshmluJeBGdER9x02dmHToXMKUPJkC2/9vpfLPzmgLnM2lAN6hyLgwMi2WAtljHbzdM7s3Q1Eo1I0V1HgKH/utdivOAMxvu2LIMNliwUTaA5kWBrtplu19Xrk= Authentication-Results: lists.openwrt.org; dkim=none (message not signed) header.d=none;lists.openwrt.org; dmarc=none action=none header.from=etactica.com; Received: from VI1PR07MB4462.eurprd07.prod.outlook.com (20.177.54.81) by VI1PR07MB6367.eurprd07.prod.outlook.com (10.186.162.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.15; Tue, 30 Jun 2020 10:39:12 +0000 Received: from VI1PR07MB4462.eurprd07.prod.outlook.com ([fe80::a9c1:52f2:43a2:f058]) by VI1PR07MB4462.eurprd07.prod.outlook.com ([fe80::a9c1:52f2:43a2:f058%3]) with mapi id 15.20.3153.018; Tue, 30 Jun 2020 10:39:12 +0000 From: Karl Palsson To: openwrt-devel@lists.openwrt.org Subject: [PATCH libubox 2/4] lua/uloop: make get_sock_fd capable of absolute addresses Date: Tue, 30 Jun 2020 10:38:42 +0000 Message-Id: <20200630103844.16633-3-karlp@etactica.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630103844.16633-1-karlp@etactica.com> References: <20200630103844.16633-1-karlp@etactica.com> X-ClientProxiedBy: LNXP265CA0080.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::20) To VI1PR07MB4462.eurprd07.prod.outlook.com (2603:10a6:803:69::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from strem.lan (213.181.112.179) by LNXP265CA0080.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.27 via Frontend Transport; Tue, 30 Jun 2020 10:39:11 +0000 X-Mailer: git-send-email 2.21.3 X-Originating-IP: [213.181.112.179] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59612a1a-b319-4641-6549-08d81ce1d3bc X-MS-TrafficTypeDiagnostic: VI1PR07MB6367: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-Forefront-PRVS: 0450A714CB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JI0KWRyfBMPB5nWvScN6PkLEyD7z/0AlioLwzmIIp/UKfQ0gOV9fukcUGAOrs2BsmLQ4QH/X1BUCRB1Xl6zdDFylJeWx1Q4L5PFISZwlkQF5uRRI/GPl3uKH3Ouamr68LmcF3R9S75nIO5ID/WJlc9QXOata0UfwOP5ZuJYMtoGop2DEx30X9/g92/10ogaioo2mmT/hawxNyOUXyt0wiIbHDn/bpNWU249XjDWuyThjuvblTKJ2L53zaEh6ubk/Oz9Aj3rbFlqhwsPr0CwiXUWDuNmjuV2Z9BkJKxsBOY7Bn/ZRVCkUVKxuen3TZ5Qy6GpuJFYQBPVO/jUb11gYqQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR07MB4462.eurprd07.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(376002)(396003)(39830400003)(346002)(366004)(136003)(1076003)(52116002)(6512007)(66476007)(316002)(66946007)(66556008)(6666004)(2906002)(86362001)(4744005)(36756003)(5660300002)(8886007)(508600001)(6506007)(2616005)(956004)(83380400001)(8676002)(26005)(8936002)(4326008)(186003)(6486002)(16526019)(107886003)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 21kWbUUHqmzy6gJqlkxDWI/AU0f478bCiW2bpAjiQ498SHPuq2DwnQD9qpQWTtPAzLfV37T1IskPyLDpIaFPkPJ774NBOXFBDvfLwu+XlSPgrkrtGEjhBdw1L+9+X7qFtkrZ7oh9jZAgySpwxCtNaFviuuP+LFXU1IpMKciN3ALRFNpxBVrILcL1+AQhmcz2ruqoggJjbf2d/n/nAdGuAgXu7G1FQ9D5DUvGtDQ9mlDYLa7S358mDPJ56PDgUOo9w495j5Y/qux1EECZvepLPnVidjcXAnEbA7y+Btz5arAyMM1ld9HFG0gTy3IfBlhK03spH4Qi0Zr8n++bMZMfpGZDVaZnk6sgjgqmwPauA8qOGyJoy3qFSLhWR5UQze8a+uCLiBimx7ryRrhhZE/nEUkNqorinLHjLtFacrcAzURcKDXCGJkG62cunMUVM6dn/Nf1VWwS9eJzb67FPquaBEJ1LoqubAIjEWqwbr4knWE= X-OriginatorOrg: etactica.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59612a1a-b319-4641-6549-08d81ce1d3bc X-MS-Exchange-CrossTenant-AuthSource: VI1PR07MB4462.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2020 10:39:12.0422 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e3621586-558f-4e21-92a9-26df2c484dae X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5lsJJOdyEFxgufdJDjVzNkWUdad78C6PVprY6EGpivIWI+3hKgNeOd2/c+Cxur85gQ+laXEhsThv8UZp3HDimA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB6367 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [40.107.22.122 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.22.122 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Karl Palsson Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The original code required the use of relative addresses into the lua stack. It should accept either. Signed-off-by: Karl Palsson --- lua/uloop.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/uloop.c b/lua/uloop.c index fcbe274..394970d 100644 --- a/lua/uloop.c +++ b/lua/uloop.c @@ -188,7 +188,8 @@ static int get_sock_fd(lua_State* L, int idx) { lua_getfield(L, idx, "getfd"); if(lua_isnil(L, -1)) return luaL_error(L, "socket type missing 'getfd' method"); - lua_pushvalue(L, idx - 1); + /* if we have absolute, no need to adjust for getfield() call */ + lua_pushvalue(L, idx > 0 ? idx: idx - 1); lua_call(L, 1, 1); fd = lua_tointeger(L, -1); lua_pop(L, 1); From patchwork Tue Jun 30 10:38:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Palsson X-Patchwork-Id: 1319740 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=etactica.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=SfkPie66; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=eTactica.onmicrosoft.com header.i=@eTactica.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-eTactica-onmicrosoft-com header.b=Oy91zPcD; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49x1CN5RV4z9sDX for ; Tue, 30 Jun 2020 20:42:40 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hvtno1oI/Yte1HFNBjkKh63z6bt/Sx92bfYWaHS3cqo=; b=SfkPie66KOEPnm8pwYTwpnc+N 1B+p+NaTaf0QCVjB2BwjeDgZgBfsuKa+QSt2ZYHcpGekK8JOdA51aD4ClPeaByVjwAHP9mPWjcp5v a6+GXjcejWK2UEh2AN0VMRpdf7CQmEbcOdKxbYYTvGqSOlZt9U4EC978h/5fdAUlEvmi8H2NODUdR rmhgmKT2BQr9NcltB3VAlpRJPpGU66iqS2pozmCAifkCPbKJgllp4WtS78HsMbvjedhLfLqcGUqIR sHk/qkZ7GMzEl059Gj7bbluOJG45txzQzh20I4xxQp5VgMg1nzMJYFogtg37GrQeaUDiM4p5OE3CU uGoiFZ3Lw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqDfb-0007fJ-5A; Tue, 30 Jun 2020 10:39:19 +0000 Received: from mail-am6eur05on2103.outbound.protection.outlook.com ([40.107.22.103] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqDfX-0007eL-LK for openwrt-devel@lists.openwrt.org; Tue, 30 Jun 2020 10:39:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gn6bp5klQSCTjYKFiLmV3IfKeb9LzU4Z0l32KACNMFJ1ben9alwD1JIS4let1Z8WM6aQbUPxL8NyYqDxZ5kEJJMcf3F6V1ndCFJB5I6D8OyOoZzaYPPbQlsZJyDU5XC8+H6DBQnVPAAkyQAxQMNP3dbfx1nRp49WzCrl+cdP6ppyrYOl1b4RCEsvt1u1O5F+iTpnxvk1JucOMp91JK6Qg0L2NghJfb0hBSk989ZYkLPooFd3EMHRrev4E0c/yMhd6HjaymV2mkui5vADh2QCi51ck6tyBiPNZOR9BSfDmQ2lFKkP5RA51yZXPuHd6/05LBj0uSjO/JVdIBtj7U+UQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SS6/rQaMoEWzWkSUn6MuzBe78JE2KlCTmbjr7LRwa7U=; b=TaGUqOAo+B6JFLpG8INeF4VIr7dycTECsFSxeA3V3/h/eG4O2316uJTUdETbfouZJs+bBdc8kw4GukPeFp8t9eYPYSalbdomiEGG1bR7xKweNEQAeiCiPaHbb7uILou87YAqB3jayTUG/m6UfTspF4+gZ/GjoUIHMEoHU5m4XupJHPBFmakZvr/fsaaQJ48pMaww120BDKEtDA4uT5e4xkzFxDIyCqvDbH0WCUaAmJTxsBhChB8oBGDAZIehmi5xSHxXq5E5AWx9eSlTehqMlMVjVAQre7dQsBcLTQ7Xc+YohOku8m5cOT8qv88Anm5qqwRgsFxxZsxV5E+4UcU8kQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=etactica.com; dmarc=pass action=none header.from=etactica.com; dkim=pass header.d=etactica.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eTactica.onmicrosoft.com; s=selector2-eTactica-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SS6/rQaMoEWzWkSUn6MuzBe78JE2KlCTmbjr7LRwa7U=; b=Oy91zPcDe7ONE/xFD9OtjlPsIosWbtoQ+dJfR3zlCxtyOgyCM2RvldylJQ79gpyAhlFT4FcoBMx43sTR4jmUK1AdmVs5q8dpXj9v++1pnEaj7SVbAZD8hUF5GQJd3Fx0T7YM84TRHh5x6nmgi453shLX/3SA+qy2pbAQ7tsgdWs= Authentication-Results: lists.openwrt.org; dkim=none (message not signed) header.d=none;lists.openwrt.org; dmarc=none action=none header.from=etactica.com; Received: from VI1PR07MB4462.eurprd07.prod.outlook.com (20.177.54.81) by VI1PR07MB6367.eurprd07.prod.outlook.com (10.186.162.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.15; Tue, 30 Jun 2020 10:39:13 +0000 Received: from VI1PR07MB4462.eurprd07.prod.outlook.com ([fe80::a9c1:52f2:43a2:f058]) by VI1PR07MB4462.eurprd07.prod.outlook.com ([fe80::a9c1:52f2:43a2:f058%3]) with mapi id 15.20.3153.018; Tue, 30 Jun 2020 10:39:13 +0000 From: Karl Palsson To: openwrt-devel@lists.openwrt.org Subject: [PATCH libubox 3/4] lua/uloop: fd_add: use absolute indices for arguments Date: Tue, 30 Jun 2020 10:38:43 +0000 Message-Id: <20200630103844.16633-4-karlp@etactica.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630103844.16633-1-karlp@etactica.com> References: <20200630103844.16633-1-karlp@etactica.com> X-ClientProxiedBy: LNXP265CA0080.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::20) To VI1PR07MB4462.eurprd07.prod.outlook.com (2603:10a6:803:69::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from strem.lan (213.181.112.179) by LNXP265CA0080.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.27 via Frontend Transport; Tue, 30 Jun 2020 10:39:13 +0000 X-Mailer: git-send-email 2.21.3 X-Originating-IP: [213.181.112.179] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e8ac06a0-fc26-481f-f851-08d81ce1d4a2 X-MS-TrafficTypeDiagnostic: VI1PR07MB6367: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-Forefront-PRVS: 0450A714CB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eWbrHwKVNwpmYqPPhqqG21xlqejLsQOfKb93U6Qc7/Png7KEre8H26S5kf6p6z/uVTQXLJpG7U9QlnXm7M2fH9swMM+AMcAzOT1j25z/kPK+YJfOGPHwWWbtXO4rNBUwvMW5ErZ/e1OiSD4Tb23Fok7rEesZIxHRI6AVsRTzjOcaaJ8olvltm755G3VroZhAunRadQZnurED5YBxLEUdVm6RHsS0eHbCuCK8xo6nu+33X5x1yflNJKRGYPeabLezhh9v15WKiI8FtCe94Jm0T4tGK5klEyJgPGNWvjYXso9MhU9+FR/64Ruie7j6iAqE5irc5JizagbsVME29j3tKg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR07MB4462.eurprd07.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(376002)(396003)(39830400003)(346002)(366004)(136003)(1076003)(52116002)(6512007)(66476007)(316002)(66946007)(66556008)(6666004)(2906002)(86362001)(36756003)(5660300002)(8886007)(508600001)(6506007)(2616005)(956004)(83380400001)(8676002)(26005)(8936002)(4326008)(186003)(6486002)(16526019)(107886003)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: EW/wrepLrTy+rD47DBFUtMXoBRgIDJ5rEJg7fgVtkG5otvkRo/mbtPSBliLnSQXSK24uvqAYN9Ou67j/9NBh1wpvXOv5BKWB7OuZmxPKuU5y6ut3aDndtwzRmF2aSEFIsY313MGt9VBpVokdn+L5l6yptxiQJvDwg9Yj8vNUBp8QzsPEYhDltuSE9qV2TpzMbX4VqOZ2k49+wRbVZ/VEazJP6G1rjt4WiuzdJjFob+7WHVfzViHcvqiqxYfOQPlaVor73PhG9FWR6vabUv6sYKuhpFhe9XZGahSICqIWc9JMComK+bCf0+UWnE6swUQtrCckcD0Rtt8sMFZFal7Et5t+GpwsocPfFlp10De788/Z5kyq+tDuwcDQaAtq/aZFkvOectHI9LMjXBIjiyNLE8QTlp1VomChPXc31CvfKSk/zmwECrMRNvdeIJFX1AiYOIpU1d81MR3lI/sCNCEZ47e+vGDFOhD8QupHnjgSGMA= X-OriginatorOrg: etactica.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8ac06a0-fc26-481f-f851-08d81ce1d4a2 X-MS-Exchange-CrossTenant-AuthSource: VI1PR07MB4462.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2020 10:39:13.5593 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e3621586-558f-4e21-92a9-26df2c484dae X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yv/ABvFQJrSC7J6oFhJXadDs4mr8Km6XhW2sWnIeX3nP36UGKNNYDLoW0QK0hWMVNRSUb/SUa53ESiCglPH9DA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB6367 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [40.107.22.103 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.22.103 listed in wl.mailspike.net] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Karl Palsson Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Instead of having to adjust the index repeatedly as the stack is manipulated, use absolute addressing for the function arguments, so they stay the same throughout the call. Zero functional change, just subjectively easier to follow variables. Signed-off-by: Karl Palsson --- lua/uloop.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lua/uloop.c b/lua/uloop.c index 394970d..ee82104 100644 --- a/lua/uloop.c +++ b/lua/uloop.c @@ -233,24 +233,23 @@ static int ul_ufd_add(lua_State *L) int ref; int fd_ref; - flags = luaL_checkinteger(L, -1); + flags = luaL_checkinteger(L, 3); if (!flags) { lua_pushstring(L, "flags cannot be zero"); lua_error(L); } - lua_pop(L, 1); - luaL_checktype(L, -1, LUA_TFUNCTION); + luaL_checktype(L, 2, LUA_TFUNCTION); - fd = get_sock_fd(L, -2); + fd = get_sock_fd(L, 1); lua_getglobal(L, "__uloop_cb"); - lua_pushvalue(L, -2); + lua_pushvalue(L, 2); ref = luaL_ref(L, -2); lua_pop(L, 1); lua_getglobal(L, "__uloop_fds"); - lua_pushvalue(L, -3); + lua_pushvalue(L, 1); fd_ref = luaL_ref(L, -2); lua_pop(L, 1); From patchwork Tue Jun 30 10:38:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Palsson X-Patchwork-Id: 1319742 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=etactica.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=wm/RDxVX; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=eTactica.onmicrosoft.com header.i=@eTactica.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-eTactica-onmicrosoft-com header.b=R6UTv0gI; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49x1CS0hQGz9sRN for ; Tue, 30 Jun 2020 20:42:43 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=q4GqKBJdh12wl6v03YUH8JP0DCsqHYMLDFaquLCQje4=; b=wm/RDxVXnuJBtf7ZPufTAee58 3RZpWwki3y3pCrj1BDC8/1Nu4e9csxpIRlCf3olmlVPhPlY5qiAVmO3D6+sZhBWbmdl/Bja26/y3u tze08Edypukkpby3WnCahdtT+PQLvEZy+3CHURajQbrNXepE2JIBiy3kH2WJc9DoA7Wr9nvy4tDBS wJzklSTrQxNL23tPbKEL6BMFz196HaZlxVAT/TwDyl+AHR/r5m9MgWXXmU/HyOHaYkJKIMCxghq88 Khh6i64RxMIsCsfF9kXpCJw2WZ4GyO1FzdOdH6+GhYpAQ1i2JwDUOmJhuMiHGu3kxYh1q9g722y2T u0KAokUpw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqDff-0007gM-0l; Tue, 30 Jun 2020 10:39:23 +0000 Received: from mail-am6eur05on2103.outbound.protection.outlook.com ([40.107.22.103] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqDfZ-0007eL-DV for openwrt-devel@lists.openwrt.org; Tue, 30 Jun 2020 10:39:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XAyIB60TjCRefwhdF5aTcRk4X53VGzB2SNikIhto005/V8Y+LhzixWG3ca5ElCE892/x2dw2fpQ7J7nFmnv0JgZEGhtNkCVvNiTxj4uYK/q0sr52vxzQf5i+gERo05eLoc6x0qpetJUsmi+ZilrbhL24ij+tox7r6gJMztSp/++8Vtzpvp1Sy28R1Q4jgF3K6TLW1Pdx0isne+SkgQ0cQEWjm/A0Vi/RaYqhgodfb633sfV1MCDBcWob0PjNWiBgR3ev1Pi+ktmMmG9hnnC9cxI54yHHjIIgLVHKzAOjErBPqHX8PMhVgrs6H2bM8bih/qzJFJZMzmCvLfIcAcujtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=peKjc/J+ZRdMw+X8t5ycawTIRW2r9lty2t5weTSIE8w=; b=khxuP9r8zQEQ3Y3oxy19xUdDkrgmOel9wnRrT9t0ga1S6RpT85I+dW53jngQLyzrrg2+JcmZLvQybL/BPOsQraZP2tQrGoE4h+TdHeG3Yey/rESGLFlvm6fM3A25ieiJQYoHWG6F0AYiQCLdpz/fz/RwjoGTcrww18ciG1JfVGk7qklyBCeqT4XUl4S0TmUApjowXJAPoH1OjzQc/lTeej6630owtmxvQK9oIhNdtOFH0AZtYCTsM3IQSJXAbERgeSIGkgg22GamtfrGz4n4GG2E+pX7NUaQOvH6caWBoK0yXntOuRfZQN3Ih4xNIRhQLOKv0ZVtO1TRa9s1nvjiJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=etactica.com; dmarc=pass action=none header.from=etactica.com; dkim=pass header.d=etactica.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eTactica.onmicrosoft.com; s=selector2-eTactica-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=peKjc/J+ZRdMw+X8t5ycawTIRW2r9lty2t5weTSIE8w=; b=R6UTv0gINiGJBRskblBJroGfEcO+b+hLE9qLosf8JOFZnAasrfIJwAmmh3j/6TgYbLwhrpA12Ew+eJTdEYjm6h8S5Mrm/j+r70kYm5X1gnp8Zg+veqXGq6TClhKwDrMlnX+PN1WhTLnVuMFu70kiR6igGRR7X5/DNZn51m+wSRA= Authentication-Results: lists.openwrt.org; dkim=none (message not signed) header.d=none;lists.openwrt.org; dmarc=none action=none header.from=etactica.com; Received: from VI1PR07MB4462.eurprd07.prod.outlook.com (20.177.54.81) by VI1PR07MB6367.eurprd07.prod.outlook.com (10.186.162.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.15; Tue, 30 Jun 2020 10:39:15 +0000 Received: from VI1PR07MB4462.eurprd07.prod.outlook.com ([fe80::a9c1:52f2:43a2:f058]) by VI1PR07MB4462.eurprd07.prod.outlook.com ([fe80::a9c1:52f2:43a2:f058%3]) with mapi id 15.20.3153.018; Tue, 30 Jun 2020 10:39:15 +0000 From: Karl Palsson To: openwrt-devel@lists.openwrt.org Subject: [PATCH libubox 4/4] examples/lua: attempt to highlight some traps Date: Tue, 30 Jun 2020 10:38:44 +0000 Message-Id: <20200630103844.16633-5-karlp@etactica.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630103844.16633-1-karlp@etactica.com> References: <20200630103844.16633-1-karlp@etactica.com> X-ClientProxiedBy: LNXP265CA0080.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::20) To VI1PR07MB4462.eurprd07.prod.outlook.com (2603:10a6:803:69::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from strem.lan (213.181.112.179) by LNXP265CA0080.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.27 via Frontend Transport; Tue, 30 Jun 2020 10:39:14 +0000 X-Mailer: git-send-email 2.21.3 X-Originating-IP: [213.181.112.179] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 489d7cba-ff3e-4785-8005-08d81ce1d574 X-MS-TrafficTypeDiagnostic: VI1PR07MB6367: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:203; X-Forefront-PRVS: 0450A714CB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9xPFByNuS/X+I0gBjQrrj7XUTGHbGTzS/Xx9RpkOuqgJ7A2woY9maeMXQwFR82KTwwtHcVQZIRt9n2ZU09OvLD5EjaSc51bnkPzsn1x/oertempVpP+cKHeLU53SsPIsRn/InGX3RKJkCJy5Xot9Z00Uz+d+m8XzA2gtm+AeA6m8xzY3Bi498sY2GKwXT5XO63b+xdOEqI14YZO2daFknTEYvUv3pnZJ1FDvFBca3AAmzJMrwYiQapBS+g53oqIoBzIqIPiV209mcwe+CaZutuUFO8L/UaxJOdSlNaB0Pwe0BSmI1uIehJbjNF52gTDSmatCM4eg+6uQk2f/NXB76A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR07MB4462.eurprd07.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(376002)(396003)(39830400003)(346002)(366004)(136003)(1076003)(52116002)(6512007)(66476007)(316002)(66946007)(66556008)(6666004)(2906002)(86362001)(36756003)(5660300002)(8886007)(508600001)(6506007)(2616005)(956004)(83380400001)(8676002)(26005)(8936002)(4326008)(186003)(6486002)(16526019)(107886003)(6916009); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 7aXJrZUlvy8fddqQt3XINVQ1qi44n4FQ0wPFp9rRcqwa1hPh6NguFkj2S30wsJUf8FKiKPNHnN+CfgcD4fhb6z+5ouejqnVlDD+D5zti8tFtsq33WAHbhPar4byTLEWPDMCZlaCV1SqxVq2avJJiWTkKQow5lNvHCRc1jrGSJni04cdgVHjwSN/lz438L11Hu8I15+uNRqaEX+ISxmyN2yskLMTaRp7BCvZY4fQg+PnID9O/aH9aGR6RAaqM0Hg131WFPTl2i/XCRrzEOBMzLVHRb4Uwi/iXr4PhQytOw3TQXy3QHWwIQSrQgkSSKi99nQghHYbL0BbbxrQeTTIG//UzDV/5QtyZTYqleaPsPnAu/e+6jnoRL02TQMTCp6b2Ou51qHvS6Z0UlUre/spFMMkXe8FsnnQMFsuYmoUSxdh6C4PcfZ0IuEZxbNs1sv2cCApt2kgDXBss3DcFmattwcrxLBpoCCZ3dUrJMmbfuwU= X-OriginatorOrg: etactica.com X-MS-Exchange-CrossTenant-Network-Message-Id: 489d7cba-ff3e-4785-8005-08d81ce1d574 X-MS-Exchange-CrossTenant-AuthSource: VI1PR07MB4462.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2020 10:39:14.9215 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e3621586-558f-4e21-92a9-26df2c484dae X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: k0X7iUG9vEWEkm6Iu6tFT+HoTV+QTRPMCQvu8CQZv6XKxWJ7wi6+XvTSFwq4goulgOjGw7wwwuoUJhGoGLjraw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB6367 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [40.107.22.103 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.22.103 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Karl Palsson Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Ran into some issues with my fd event being garbage collected. As I never wanted to call :delete, I had seen no reason to keep the returned object, as my callback and upvalues were still valid. Signed-off-by: Karl Palsson --- examples/uloop-example.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/examples/uloop-example.lua b/examples/uloop-example.lua index 9b0684e..511b9ea 100755 --- a/examples/uloop-example.lua +++ b/examples/uloop-example.lua @@ -9,7 +9,7 @@ local udp = socket.udp() udp:settimeout(0) udp:setsockname('*', 8080) --- timer example 1 +-- timer example 1 (will run repeatedly) local timer function t() print("1000 ms timer run"); @@ -18,10 +18,10 @@ end timer = uloop.timer(t) timer:set(1000) --- timer example 2 +-- timer example 2 (will run once) uloop.timer(function() print("2000 ms timer run"); end, 2000) --- timer example 3 +-- timer example 3 (will never run) uloop.timer(function() print("3000 ms timer run"); end, 3000):cancel() -- process @@ -46,6 +46,8 @@ uloop.timer( end, 2000 ) +-- Keep udp_ev reference, events will be gc'd, even if the callback is still referenced +-- .delete will manually untrack. udp_ev = uloop.fd_add(udp, function(ufd, events) local words, msg_or_ip, port_or_nil = ufd:receivefrom() print('Recv UDP packet from '..msg_or_ip..':'..port_or_nil..' : '..words)