From patchwork Tue Jul 9 11:08:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Glembotzki X-Patchwork-Id: 1958327 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=qDG8wWz0; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=ng+2ic0I; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::237; helo=mail-lj1-x237.google.com; envelope-from=swupdate+bncbdy5juxlviebbsnxws2amgqe7vhvb2q@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x237.google.com (mail-lj1-x237.google.com [IPv6:2a00:1450:4864:20::237]) (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 4WJJLj2Ltlz1yV0 for ; Tue, 9 Jul 2024 21:15:25 +1000 (AEST) Received: by mail-lj1-x237.google.com with SMTP id 38308e7fff4ca-2ee87069f27sf49062221fa.2 for ; Tue, 09 Jul 2024 04:15:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720523723; cv=pass; d=google.com; s=arc-20160816; b=VnL7N1/TWwiQThoERH5Yl5kPVfAWPjseCGJias2gYzSjc8zrGKWxw4BUY1bDMaQd+J YPoO3Gf9op435aXIOhommM0t35rb6sy27gmMGi22aIzTdo21ztvPHTR8n5QXYzJN1Zb6 aWYFa2t+ZpsHAUVHaofv+4G/3I3WMADvBh2IO69eKEJAipcppJspAuLsc1LuPFY7cVPd J/Ry+gD1QWbwxHPcbTjxU+lmXz/G9jjL+PAerDgK0U7VDd2P/c8pufutYweMxXBw89Cz 89Y9QhbnJWOLM3pdbj7xFuk7x8I6eDqr4ebMcFm0mIW3LERCPvsDFuu0vNjchVbZyU1Y 5WDg== ARC-Message-Signature: i=2; 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=e/ZuZzE8ygpj1KM59wsCB6YIvlHBVkHGmM5jGmHHJDI=; fh=9q1aZmrmrevCsZ3DiA56tSwE4VRv+rpt7DTTVncBJBs=; b=h66CR4xV6TonVvAmgk40FSXfv50Aq1YkwmWnZqrdeRh5vAusKqNRh9fMaGH5pyLf1I wjR5wGzMk87ToirWFWuOE/jAC66U/zCBd+nQddoq5dHjLsV3ogeO5ifLscvp8cduBa6z Vb3Egp63PQFHvDxQMSc/3+QmjUJ8ui2vA6RArfFgyfssh2DbEXbzUp6pbAogHw7AYEw3 rOFo0yMlIVBZVRqlVgBm/QxAYudqNrwX9wCpdZE3bkjyM1lhuVI0eD+1mencqMZ6/qbM sKR/Ywu/YWGM9HV+q5CI8G4TpU45Ip4BxT7z4cnFhBSw1uSd0WrCe/FPICIOXfdo9sB4 nAnA==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MkWtVbHx; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::632 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720523723; x=1721128523; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=e/ZuZzE8ygpj1KM59wsCB6YIvlHBVkHGmM5jGmHHJDI=; b=qDG8wWz0EUm9kebf673M3E7XrHiCHnXqdhkOhb5VqeC8tg3T0Hcl7ZSRCkLHyN7BrK zgM15A08J7sC5/XAhVvnsqt4dsfuF3tzjsAakugDgXTUv4jIg25gu+Xar6W1eS3xp/JD 3KLZhOnIg/9qvHy/raeIGLLBuIqtYk/CXudAOXq8NtI//JglXBZ/M2MFGEtopnVzPkg4 y7FSu5w48qi0QIyWvMmU/IYDHL73zyg+yhD8byAZ872vErxuYpcOxivZh1Jq4uoYT/Ei Jb7drdGjdK+vO0WqsyojSqgTc8/vhPiLBR2/JNa/P5gYMIcM4m6x3XHITfBkxYVeibks EaIA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720523723; x=1721128523; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=e/ZuZzE8ygpj1KM59wsCB6YIvlHBVkHGmM5jGmHHJDI=; b=ng+2ic0IheEWi4QO/kEPBCgPoKUedLC35Luyf8DrSi6coZ9On0zMMraWivmXb1g0dE 0ScYsiNZSJM2hiCfiLeABguH2Bahk4C8b/jPrySarCR0/429IPFJq6HTZ3jBjfqCYt+q +vZEObRtBhrzg+iV9rx7WiDv4lEts3dhPMoziJwRHrvZ00rdHXswUo4KHR/bXMO8nzB5 KyFV41zDyhFOj/4fftsTqCr1FKkE1QlXCR1Kc0x8emR45ZDmFOvvCJXEgNBH/2FxIdDX COQgQ0lUNwi/SVdYyYHziP5qAsQG0wsmbpL/VGy2XqfOv8QiHh419tqejc06qmKZcuZT Yi+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720523723; x=1721128523; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=e/ZuZzE8ygpj1KM59wsCB6YIvlHBVkHGmM5jGmHHJDI=; b=t6P9opAUxJ8SeH0M2O18tm9vRlqkiSLwa3Hqaxq7lu3sZVKj1CS2h+9i6fYYzAMfKI Wll6xU1eNIN27afKD70cs7a4Yck8iG7GMkIbruh8b2qiQ/Y4F4GNw+S5XEV6zEJCZvW5 m6NqBX7D0B3ae9e42442ti1Q5fuJTfO6va3fnDOlaasD1YLU73tnN9U1OaVV/JDd4BQy 9YdSqnRu5RJ0OCP5Fyau0GOlK6l7vClVpGiMjboIXTgjy+AtLa6zuTtuxy/OZkI01KhV 9ZFrrZGfYl52CPHrBdWwWgAz2YbJaURwWkqXMwAJr9l/EP9DmaIOSSAgeVcsDHuVAq6P +HSg== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUgOSjJ5YTQzCNf3TPyd2D6fzT9OawZtJFQTHsnmSz8GfZxkhv76jGm/Y2kdiWyg7vaKNVY4WX2PRwklZHaDD7So2fzPR2GRLYgXCXK+w== X-Gm-Message-State: AOJu0Yx02a4ADox3uxNESrLAr0sa49U9iB2BvBXWJAXdfEn1kmSPigcR szbmdl9jSZvg83i68Ia0stAalK6QX8XjP1LadqgF7rZpyHW86dqw X-Google-Smtp-Source: AGHT+IGbW4kKDhvIytWPfHb/Rc2H8OqqfX+FsPokXoxiIialhczcwDmYqUt1uAjmy5Agb9Eid2aHQQ== X-Received: by 2002:a2e:82d0:0:b0:2ee:493b:a4ee with SMTP id 38308e7fff4ca-2eeb30fcb53mr14619421fa.24.1720523722336; Tue, 09 Jul 2024 04:15:22 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:651c:107a:b0:2ee:8477:7703 with SMTP id 38308e7fff4ca-2ee8cd9d7a0ls24524221fa.1.-pod-prod-02-eu; Tue, 09 Jul 2024 04:15:19 -0700 (PDT) X-Received: by 2002:a2e:7311:0:b0:2ec:5364:c791 with SMTP id 38308e7fff4ca-2eeb30dbe06mr15517671fa.17.1720523719423; Tue, 09 Jul 2024 04:15:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720523719; cv=none; d=google.com; s=arc-20160816; b=g1TkE9TENQUiKoksfL1UvDSRcYuTxV3tZOX/t0NEJbi1GTIpXfr2W/5ydaunhuu7Lh l4w4dWwF3zhWFkjA3PxUOCfFRMxv0pbcPLMM2wqAs7EtRsFWT5Zpt59Phpl8wYlKujyz e0YlXlXzUkwy5hND2/GKa/WxDotUWg3fNpiOHtvsNdBlYlVxciO3YHdY8GDj+w1LzAEH mHN/oy2Qsly6yMlPmLLV9fBBqT2FB0jztTs/PmLFtzTIeVTBMe2VXO79GWtASVOKGIxC nOTk0AcUt+Etzwl+2WFoSGqxRf2k67gn0Z+0wq+tDUkDsXFrs6UhECjtj0/lQQLtNgX+ JRNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=pN7wbSdre8mc5H2QetiMWOP8+y1w0RJnPWEgTEeiwiQ=; fh=zydHuzCQWrku2OPQyZfraJZFcOpEXLQ/YBcu3QNiBd0=; b=JmlFiRMHSUacEE+r92F9q0f828qYI/oSSitSM66/orCMpUYG1sI0Ab/KmjLLANYIPe yauXyMznGi4ZnqaYu44dZgBxm07Wms4viXVGw2UskhGzpYzHxdXMmLHJRx5inNUQxmwk OdnQ3WoNxnMTlOus7LBKD3WERr2OCcJUWDwqnOE0ZtULaleGa9b/eu3OOxyImdt0AIAc H8Mz+iOjkCX3w/UkV8ReskjfewBAlCCB62JdQbIIqdhcyifLV2x6HhpmzEL2K9W+rpit XedQSTAqdZbcXR4e5Gwgsp0bzzQG9eBUsVtGN58TChu8WWglVixcuMVEjVSVTt1ZTQle wPiw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MkWtVbHx; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::632 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com. [2a00:1450:4864:20::632]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-2eeb34a5aecsi324381fa.3.2024.07.09.04.15.19 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Jul 2024 04:15:19 -0700 (PDT) Received-SPF: pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::632 as permitted sender) client-ip=2a00:1450:4864:20::632; Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a6265d3ba8fso448475466b.0 for ; Tue, 09 Jul 2024 04:15:19 -0700 (PDT) X-Received: by 2002:a17:907:3f12:b0:a72:7736:9e03 with SMTP id a640c23a62f3a-a780b881c7cmr189578366b.52.1720523718455; Tue, 09 Jul 2024 04:15:18 -0700 (PDT) Received: from PC-2635.irisgmbh.local (dslb-002-203-138-100.002.203.pools.vodafone-ip.de. [2.203.138.100]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6bc8adsm70739166b.14.2024.07.09.04.15.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 04:15:17 -0700 (PDT) From: Michael Glembotzki To: swupdate@googlegroups.com Cc: Michael Glembotzki Subject: [swupdate] [V3][PATCH 09/21] mongoose: Replace deprecated mg_http_match_uri() with mg_match() Date: Tue, 9 Jul 2024 13:08:45 +0200 Message-ID: <20240709111440.8215-10-Michael.Glembotzki@iris-sensing.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240709111440.8215-1-Michael.Glembotzki@iris-sensing.com> References: <20240709111440.8215-1-Michael.Glembotzki@iris-sensing.com> MIME-Version: 1.0 X-Original-Sender: m.glembo@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MkWtVbHx; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::632 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com 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: , mongoose rev-id: a025577b30be2fe0a90358702b41b7d8e5afe69f Signed-off-by: Michael Glembotzki --- mongoose/mongoose_interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mongoose/mongoose_interface.c b/mongoose/mongoose_interface.c index b3ebc62f..ba2e8d35 100644 --- a/mongoose/mongoose_interface.c +++ b/mongoose/mongoose_interface.c @@ -692,7 +692,7 @@ static void ev_handler(struct mg_connection *nc, int ev, void *ev_data) mg_http_send_digest_auth_request(nc, global_auth_domain); else if (mg_http_get_header(hm, "Sec-WebSocket-Key") != NULL) websocket_handler(nc, ev_data); - else if (mg_http_match_uri(hm, "/restart")) + else if (mg_match(hm->uri, mg_str("/restart"), NULL)) restart_handler(nc, ev_data); else mg_http_serve_dir(nc, ev_data, &s_http_server_opts); @@ -700,7 +700,7 @@ static void ev_handler(struct mg_connection *nc, int ev, void *ev_data) struct mg_http_message hm; int hlen = mg_http_parse((char *) nc->recv.buf, nc->recv.len, &hm); if (hlen > 0) { - if (mg_http_match_uri(&hm, "/upload")) { + if (mg_match(hm.uri, mg_str("/upload"), NULL)) { if (!mg_http_is_authorized(&hm, global_auth_domain, global_auth_file)) { if (nc->pfn != NULL) mg_http_send_digest_auth_request(nc, global_auth_domain);