From patchwork Thu Nov 30 12:36:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 1870098 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=tDga0p8b; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::f3c; helo=mail-qv1-xf3c.google.com; envelope-from=swupdate+bncbdd6bwv65qpbb24dukvqmgqetblzi7q@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-qv1-xf3c.google.com (mail-qv1-xf3c.google.com [IPv6:2607:f8b0:4864:20::f3c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SgwgR3H9xz23mq for ; Thu, 30 Nov 2023 23:37:06 +1100 (AEDT) Received: by mail-qv1-xf3c.google.com with SMTP id 6a1803df08f44-67a1c96a5f2sf12976426d6.1 for ; Thu, 30 Nov 2023 04:37:06 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1701347820; cv=pass; d=google.com; s=arc-20160816; b=pb72jI5H1/LBHXjCwZWKXRHfOLNF9Dovg9d40IsEOTlogPWPshwZxvluZ3xGWK+mkn LVuVnkzYHp40IfDVF4lU72OnsfFJrFjtQbEYxV8UzclzKHBjjr+2yln69nmRUJDEN1qy dcbGPF9H6KMWsSioShws5YY2kGwvC393nqveVV3bvZpZ6mTHjbWC4JwcNGeFHcV8EZzx gEjBAwkpa9zCPqMmiiwtO4QCW5ZWb6MXQhzpORaZbhLnarAoi2+P5v1AwIma+k+DBnca DxYyU8JOqEN+F8TUwiE0gqlLWEa5GtI5l3d2Y/Qz0iNckbVFYGucBXtVv+zVHNfMFRrq ih/w== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:content-id :content-language:accept-language:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature; bh=GtKMr1c0Ksc4SQdR+KtPPuM3jIKZFvz2e9zXVz8NokI=; fh=/Sq10j8qVg0lhG4kkzFw9VeKictZ+FTMYdyRSQaH4EI=; b=uvmtAtm/Tgj4jwu/jTpTL9Tka6W042zIFZPu/Thg28k4HcGa0qSS0G/T8sQY1STq55 ank5+GPQvlKrn6v5L2SMBdq90VJyKBEnDKS95HgKBlqllfvVCMExeuC8VBhyhiQmeRCA KQMw769HOyu0WSmHOeQXq5884CxYVQ12TshMmLyqsE8dR8BfPiEMEbVbziyAxFlCKa6p lM8B8OdCFT9WK7hffcDCtVgwuRGfGU7t6ZhNRpbn5E3DB65KmGz/R0UjWNkp38ylSpO8 J2H99YMYzzAIoFCUtLuS6w5YPYrLxZQkEVCcnHIhajtxCsKFNoM9KMwiu0F0oiG5qJZh w/Pg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=EIGvr78b; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f400:7e1a::60e as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1701347820; x=1701952620; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-id:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=GtKMr1c0Ksc4SQdR+KtPPuM3jIKZFvz2e9zXVz8NokI=; b=tDga0p8bNzuIyFPVed7GBvO0/Tkoo43l+/UGluCQyB3pqpWzg849nX62EWBHmrCaC2 UL/EFJwKwlpWH2lBnY0IJMVcMgRL6UZ8wLDtziWpap5ClziUTKsQj/NUNQS8mjrziBu1 kPs16EkOxqxgRcBMr59NauXJmjYF2DBQ/U/NLx5H0mWic+R3vS0QYVsTsRmWwzw2+KYz MjFk7nCeF6jgZXWqJ+rfyuEkMiaU4/MCmetzBpxI8F6i25JQxUB/xb75qGvP0HqWBeGH yDo5z03EEPgLHUDJ/32f3BgqVTJqXY7CEGzwWF8+m8p7Ong+qahKuqSznTwqsDvZ9/Po jGFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701347820; x=1701952620; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-id:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GtKMr1c0Ksc4SQdR+KtPPuM3jIKZFvz2e9zXVz8NokI=; b=Q3XZa1JbLh4snwq6RhP+j08fb0AI7OqsLrfx+BhHcQimaOD59uC8KCdoc/fF1bFjtL 01IpdwkWc4yJGtxqmtIspfNlvfCfViwo+PrC3E7rCrgWJy3egmdAiH+0RVh6Ev20096a w9nndTe/nzlHWQimhPZuTax6m+oY+NwukC9n9jGzkIchIPRvlLX9Juzp7Bgj7exOjMWf Ng2x8zbhUXC2EzPy9ZvKXZjsBOHgwhJerdw78sGgx5NUCJAaiKkgE4+4eHt/r9mDQsTV 4eiX2B1EWfWNV+gR6/1KS8PzNt1salaWSKehEePLoN1yf/+DrnQ90KmBQodAw8eGB6rQ Hzkw== X-Gm-Message-State: AOJu0YyBeg8JwDIbq/PiIKaxD+Z8EuxPqNskjiJq+iAE9yBrTXiCOtL3 JgQc59tgBP/pvfylrS4ju0s= X-Google-Smtp-Source: AGHT+IEIoq3hOh8e9ug0x4/vET0S6s5yofHYHAeKuIPv+ZZKJ1W59+jkOGYGrxBcZaElA1b07PyLYg== X-Received: by 2002:a05:6214:d8e:b0:67a:3b18:1b1e with SMTP id e14-20020a0562140d8e00b0067a3b181b1emr17353545qve.54.1701347819972; Thu, 30 Nov 2023 04:36:59 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:ad4:4f10:0:b0:67a:3538:42f0 with SMTP id fb16-20020ad44f10000000b0067a353842f0ls1120057qvb.0.-pod-prod-05-us; Thu, 30 Nov 2023 04:36:59 -0800 (PST) X-Received: by 2002:a05:6122:98a:b0:4b2:9169:437f with SMTP id g10-20020a056122098a00b004b29169437fmr4457393vkd.16.1701347818880; Thu, 30 Nov 2023 04:36:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1701347818; cv=pass; d=google.com; s=arc-20160816; b=lmLeWl9RZTe6zAxtkpV6Dfme3t1Qsso8MxJI2q7zlhTdLcGT93VGrwyl0WulRFZFkm fXi5JQ/2A0KHPot9Y/sGH+g1bMx/ngaRbStEOpCXoQyGAQjL5EkCCCxHnE2BwixcNfpt m7LLZQvq3G26IDqFcfwa1CkXcAyJGmTIUb4Y6tkl50m5OOnPGbr44zEdpDQ7teWJRxHU bZgKrDdEcLhWhHAlEsVB8D19SCuSFluLKWXD61UZkk1v4XyY71oXUHVHYm5Xh98QCsw0 FYA4C/AF3Zwc3QkkRJcYiH1EgzpaFtYD4YZBaDFR0T3KBhTteyVrbLkQSynYZ/1Zi/1/ nLcQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-id:content-language :accept-language:message-id:date:thread-index:thread-topic:subject :cc:to:from:dkim-signature; bh=BRkSPpmzIo94SmtQac9ZCBNRCgSNBbnBij9oWwQijEY=; fh=/Sq10j8qVg0lhG4kkzFw9VeKictZ+FTMYdyRSQaH4EI=; b=F3GtkqT4fa07UUReGskBkQGx2jkPa085el7spEqoRREWfuxZXPbXZ1uoE9aVfVOjix 5VRJBmorGA92x0UmRgzyeTSbIZElMdEeqh3oquW3y93SuS/pvagACMKeQvO8qploBdZv 2c7AK3Cw0YFMIZJyWzo0cJS/EZyHwoDcEEqKfTUYtrQgDkeb5/0aIrmrlyzzjtOgHYL/ l7Og1W5UROaZ1iCgWYAbSu1MiEYCgvhZ5j74AIcJCpC5yezAPldIUCNvXSwu+JB8bj9N B99VvydDElAO3/lp3tImNWMCbdOxdsmVcODKMHTmVUneFaF8m+qSrrBCZ5yjRNlLX188 zBgg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=EIGvr78b; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f400:7e1a::60e as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2060e.outbound.protection.outlook.com. [2a01:111:f400:7e1a::60e]) by gmr-mx.google.com with ESMTPS id br25-20020ab03e99000000b007c4705fb21bsi125392uab.2.2023.11.30.04.36.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2023 04:36:58 -0800 (PST) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f400:7e1a::60e as permitted sender) client-ip=2a01:111:f400:7e1a::60e; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cFcQ7u2FNlhK/hNGRrYORzHIQy0e0JRHTgw4KlbEsMcW7cOBU8O0ZAgR6KhY/VWDRC50rtMpzXiNdzh3NIGZwwxCGI+6HlMJdKwcWVVtwyVTTja7V2G3uPjqfErjGRbWdUsekor0P96pePiUyzPnplw78Hpdn2yMqfSjNPEH1d6NqO9N9TQyq+yILDWF3MdgjeDv6hTxggqgdgl6b9XvmshayRMDHY5xd1lSYeSr7mYj0q0Q5Ns5GhhzTgYNw7czXrTZXYXcfhbWVEBH7zBZ6UmW7pZgmY5twQX95O/QlguLVhHlyyfogPYNIFdilDUevb8uIWNh8d+bWpb7hA4r3A== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BRkSPpmzIo94SmtQac9ZCBNRCgSNBbnBij9oWwQijEY=; b=MXz4X49C1jjNHS1ekzJkN3Ki7effo97QWyGdK+7ppTplBl+tSIe+6nsk2yvLotizWzWg8au6tr7alD8lLnyaFTvhIOpjl3yiX5SMrMMFk+2hMER2wNnVc6n3Pa8I6wvCUitCXOBnhfUShWzvEsB4sB2lF+CepjEOhy7ILsnyw13lwMKGdpYHKz+AgdE676cbAqExegHWu144nybTL8UvL6xFiOorWaX9suZ6qcm+y6NlBgBamoRQud6y2bu8m4MscGoR8R30UDUdpJNL/nUJdBCRSqcnLNjmTNf58EiKfxtmGISb9miqNMrZPu7tPcLbyZ9gze7KnbEMEwZIOv2Fug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:333::17) by GV1PR10MB6539.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:83::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.24; Thu, 30 Nov 2023 12:36:55 +0000 Received: from DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM ([fe80::4883:a6f3:3843:93af]) by DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM ([fe80::4883:a6f3:3843:93af%7]) with mapi id 15.20.7046.024; Thu, 30 Nov 2023 12:36:55 +0000 X-Patchwork-Original-From: "'Storm, Christian' via swupdate" From: "Storm, Christian" To: swupdate CC: "Colpan, Enes" Subject: [swupdate] [PATCH] suricatta/wfx: Fix proxy handling Thread-Topic: [PATCH] suricatta/wfx: Fix proxy handling Thread-Index: AQHaI4nnen4re2ln1Uydkxl1QMsj4w== Date: Thu, 30 Nov 2023 12:36:55 +0000 Message-ID: <41AE80A0-68B2-4A6B-A280-269A0E49DD7B@siemens.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DB9PR10MB5404:EE_|GV1PR10MB6539:EE_ x-ms-office365-filtering-correlation-id: 1529c76e-1ad6-4f58-a022-08dbf1a1099b x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3gjJD3AguTo5iEHHYOh4ces6dF0qxGWV+AWx01PX3/bOg6aX2jDba7CKJD+o2SoD7BD86MmCGKPfCBAKcD55fK/NQJStlLFcd91S+gItnjqeQmQv9pEop2qPqd8uS1rDbdxvutVbG/iiiWJbTX0JgCfWke8y0cm7u4jMPTkcyeFP5lKJjv/+gCupGL4LXG10Jzx/AXTNevcXDk07Rg6CPg3KKC1166Rw7SsWpHf1L6hJDPsC4XJ0NTmhFCBPrtfiudsnPXOzMLkgDQR1tzd8Rvq1Xpur4PogMEtMV7nJp5tLXQKqXMnq4F/htkaKHyeFTLN52vKZ9SZeu4Zmh5Kg9xssp+3K9eZK9CyBMh6hTyNA8h5i96WN0OV4ztt14LycRqr6GAMhi8ocvNLBNzWhd0uLz4QdtqcclHhEH4EH5V+hInMxfUzsSmMsNfoO7K6QfJzoWfxr/FHIM4kiJKrdR7bwSYf3jIAxMyKJTL0+EIr9DY1hnKxOvUo/qnWBGTQ75jwb76vgkUCJXgGhNZ1DWW+O4Ptn2D1NUK/EzJ1V1G3O8aI/zXP1q+h2N1MxoDYv59WenV7O3V1JUFS2l9SsmZ9Xr1fF872KGewO7ZOvRNI2KkWS/n00zl0aoYy7Ge3MEt/Y8QrD8+RaQf2GcKWc+Q== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(396003)(376002)(366004)(346002)(136003)(230922051799003)(186009)(1800799012)(451199024)(64100799003)(122000001)(26005)(83380400001)(82960400001)(107886003)(2616005)(38070700009)(38100700002)(6512007)(6506007)(71200400001)(478600001)(6486002)(91956017)(4326008)(8936002)(8676002)(6916009)(66556008)(66476007)(66446008)(64756008)(316002)(66946007)(76116006)(36756003)(86362001)(5660300002)(41300700001)(33656002)(2906002)(45980500001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: k/mSvQiYqVVujc4tYFhdEjC/vs79n7j0M+JVHiQ66uDOI3MivhCJAg+b941IcVWo0ysVfMc2072hXOZSE1D0uzPu2jFPYcj15hcBch6wulV67mDS+0Ch32zmqZWifBuNXs1Ea1If0f6mJ8+xuSnAzXzY/VnSeZE4tQV8RNLQ55l0KGK67scnOm5qCpj5oqOk2SrTEY4lNb1uOX1vuBf/r5mKA/Pn9w+x0zXSjvkB6KWwCiy0DC0FA5qpjwYJpogi9WWPg3FYu4LgUSippb+Gt+gEaN5Z810KVkgeDikUVjx5ZJtc/km3E+jvk3kDAsVDvkqQvh4Q7z22Fls7goGW9ErUZdt8Mb2n7kgkoCdmJL3JNNr78sJ0gj++ZgvYUCXO8YaX3BIwhSxEVrX2xqaMiAMXR2SXhvxdZys8nt7XwOlXw8n5eI/vGiFcW9S/mGK8fpyCDFeAvRPcGPJ6wa7kGwGBSb5AYtqOFDcqtyeWcdxmsCZFHYytce62s9iqIUPND5500EYW56P8pMwAC4HMr/pxddZrUrqJOzLS9mCR6SEOJEK7irXAJfc+Buztm4G88ppcbRvSC7rritdeY79Ql0RWl3bk+vmrY1eqGJHJ8SS9sIHUVf4EPze2xXtWmIYtYofLGSU5M8JLPoOMg2zCywz7dvyV1U6QnbGQ3fC586PzBUZEPdznXL3lSjkgblS20OZVX7ul7Lx2f4Ckej1vCXBMliZS/EgdQ1Pmt8AA6E0MsXu75akRmPdcxpLZ4GBTyAHr/hwiBX+FmYoAxNaY/LuLu04payDHmnahwQlJe4FqhbpMRTyAKykrC1ku4zY+2eCPlWvAjtoh1R7kwaY1ltMya5XGvZfObRLQIEzcyUQZR1Ln3P86JqXyLWLlnUre/3hdMeKIZcYrQiA4+YtnaT135KfT5DMXziz9+Y5NFAs8r1JUnR1SykDmrbc1fMcI7prMqgB3dR5J7RT8pz9YM63mqfBjLdEnHRvnLiI0+DoRUh9JnHT6uqSiZ6JrRArlN959Ju9XlGb1SMFGb9MCjvO88qCKzCH0nt8E1BmKY05PUDJSZlIBj5j9jivaB7Pd/nG9yqFxjg81PMNrXtrbOOzkjiLBQgKVmiSDhUUUHiNJzyU1TZ8vM8RKgDF9WXyvKrEFk8PiNsK+RdLUoudHbQsTUY7D6DO/SoPokQQim9ifH4De+R+lfGuvrMndT7QCksUHZPsz4o4WCZE0gkhJ+eNiE/GZvOm1ULa/3ZZjCYp68uv3ynpb3G0YMRPLtvIpqYxTofOkYeTmBJutw6pmsoNUFQ+c49xkWifnxwkI2tb7qklVpBqM6Prv0rH57fEpNUA4lKezspp4CDvOjJs9kToSO4hYsLvjKer2aWGBcyXrV+hkMz75ZocCUV7EL43XW1nghlmaYHxk+S2X8Hl3vd3TR92fbStb4ftq9nuiH6kDIInBC+BChsReyfx+g4jtkRfp2eg9h5RcJUgIi0A+y6I67vCUtJguvnMenSITGNEeWF1SmXpvL2TGf54IJlcGmu6QGa1npMoGur1eVKJ+9Zq7eEFMxi3Rvq86P5h/bAMJQI/ZFtg6guOfQI8lfv6M6a0s/FQVoM5D/hWzvWSjTQ== Content-ID: <9F3CE49BD7FD3C4FB2B7DA4F8C59ED61@EURPRD10.PROD.OUTLOOK.COM> MIME-Version: 1.0 X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB5404.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 1529c76e-1ad6-4f58-a022-08dbf1a1099b X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Nov 2023 12:36:55.5829 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: kjpNHW/UNJzgww1Kvru7nxQykDLEn6ECG9a5k3T0dM7h+CvIP2ztqAu2q9nmUT/JFVXnNwKw69v8dC9f4Oy3z7vHAxShQ9hAgrLpGwHEtdw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR10MB6539 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=EIGvr78b; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of christian.storm@siemens.com designates 2a01:111:f400:7e1a::60e as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: "Storm, Christian" Reply-To: "Storm, Christian" Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , wfx's proxy handling works with an explicitly given proxy. It didn't for fallback to proxy environment variables. Hence, introduce USE_PROXY_ENV as already used in hawkBit. While at it, sanity-check whether the environment variables to fall back to are actually existing. Reported-by: Enes Colpan Signed-off-by: Christian Storm --- suricatta/server_lua.c | 23 ++++++++++++++++++++--- suricatta/server_wfx.lua | 18 +++++++++++++++++- suricatta/suricatta.lua | 6 ++++++ 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/suricatta/server_lua.c b/suricatta/server_lua.c index 62bc35be..efeb092b 100644 --- a/suricatta/server_lua.c +++ b/suricatta/server_lua.c @@ -526,7 +526,11 @@ static void channel_push_options(lua_State *L, channel_data_t *channel_data) push_to_table(L, "sslkey", channel_data->sslkey); push_to_table(L, "sslcert", channel_data->sslcert); push_to_table(L, "ciphers", channel_data->ciphers); - push_to_table(L, "proxy", channel_data->proxy); + if (channel_data->proxy && channel_data->proxy == USE_PROXY_ENV) { + push_to_table(L, "proxy", ""); + } else { + push_to_table(L, "proxy", channel_data->proxy); + } push_to_table(L, "info", channel_data->info); push_to_table(L, "auth_token", channel_data->auth_token); push_to_table(L, "content_type", channel_data->content_type); @@ -568,7 +572,6 @@ static void channel_set_options(lua_State *L, channel_data_t *channel_data) get_from_table(L, "sslkey", channel_data->sslkey, COPY_DEST); get_from_table(L, "sslcert", channel_data->sslcert, COPY_DEST); get_from_table(L, "ciphers", channel_data->ciphers, COPY_DEST); - get_from_table(L, "proxy", channel_data->proxy, COPY_DEST); get_from_table(L, "info", channel_data->info, COPY_DEST); get_from_table(L, "auth_token", channel_data->auth_token, COPY_DEST); get_from_table(L, "content_type", channel_data->content_type, COPY_DEST); @@ -589,6 +592,14 @@ static void channel_set_options(lua_State *L, channel_data_t *channel_data) channel_data->max_download_speed = (unsigned int)ustrtoull(max_download_speed, NULL, 10); free(max_download_speed); } + lua_getfield(L, -1, "proxy"); + if (lua_isstring(L, -1)) { + channel_data->proxy = strnlen(lua_tostring(L, -1), 1) > 0 + ? strdup(lua_tostring(L, -1)) : USE_PROXY_ENV; + } else { + channel_data->proxy = NULL; + } + lua_pop(L, 1); } @@ -613,7 +624,9 @@ static void channel_free_options(channel_data_t *channel_data) free(channel_data->sslkey); free(channel_data->sslcert); free(channel_data->ciphers); - free(channel_data->proxy); + if (channel_data->proxy && channel_data->proxy != USE_PROXY_ENV) { + free(channel_data->proxy); + } free(channel_data->info); } @@ -1620,6 +1633,10 @@ static int suricatta_lua_module(lua_State *L) channel_push_options(L, &channel_data_defaults); lua_settable(L, -3); + lua_pushstring(L, "USE_PROXY_ENV"); + lua_pushstring(L, ""); + lua_settable(L, -3); + lua_pushstring(L, "content"); lua_newtable(L); push_to_table(L, "RAW", CHANNEL_PARSE_RAW); diff --git a/suricatta/server_wfx.lua b/suricatta/server_wfx.lua index 3fd61b57..2bd7478d 100644 --- a/suricatta/server_wfx.lua +++ b/suricatta/server_wfx.lua @@ -2020,7 +2020,23 @@ function M.suricatta_funcs.server_start(defaults, argv, fconfig) elseif opt == "i" then configuration.id = tostring(arg) elseif opt == "y" then - configuration.proxy = tostring(arg) + if not arg then + io.stderr:write("ERROR: proxy parameter is not a valid string.\n") + return suricatta.status.EINIT + end + configuration.proxy = tostring(arg):gsub('["\']', '') + if #configuration.proxy == 0 then + configuration.proxy = suricatta.channel.USE_PROXY_ENV + if + not os.getenv("http_proxy") + and not os.getenv("https_proxy") + and not os.getenv("HTTPS_PROXY") + and not os.getenv("ALL_PROXY") + then + io.stderr:write("ERROR: Should use proxy but no proxy environment variables nor proxy URL set.\n") + return suricatta.status.EINIT + end + end elseif opt == "p" then configuration.polldelay = tonumber(arg) or configuration.polldelay elseif opt == "r" then diff --git a/suricatta/suricatta.lua b/suricatta/suricatta.lua index 23a964c0..6a4fa131 100644 --- a/suricatta/suricatta.lua +++ b/suricatta/suricatta.lua @@ -196,6 +196,12 @@ suricatta.server.register = function(function_p, purpose) end --- @class suricatta.channel suricatta.channel = { + + -- Lua-alike of proxy environment variable usage marker as in `include/channel_curl.h`. + -- An empty `proxy` string means to use proxy environment variables. + -- @type string + USE_PROXY_ENV = "", + --- @enum suricatta.channel.content --- Content type passed over the channel as in `include/channel_curl.h`. content = {