From nobody Thu Oct 20 20:24:18 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MtfFt4ylBz4gTsZ; Thu, 20 Oct 2022 20:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MtfFt42tfz3MvK; Thu, 20 Oct 2022 20:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666297458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tab6qtszUgGDednkH1d+3/WYieQZim4Um96wqCH3Xwk=; b=G1PvfxXtjrY1NX3AMm1XPWp4Ivp5yi6nk7xROAjQsIMVJDq1RecOltNj1pj3vB4TJMn2Zz lk5FrhKrS/pz64q4PIaLZ2VYhd8EvOd3vImWyqHyw/586gf4FIqTF3ZMa+QoRmSy6c+BXR 0fN6JatmUBiXUvf2wCehGRxcCUR2KkTiY7niWz7NR5u5LvXQpgfOvvZjUOh786ZdQ4znCT a//f3rK/IeQEQqFky6iWjiQN4meyKpfikYa+Jh1vwkco0WElFT6VYyCh87FEqeplXzwGxZ grPYfXe6g7JqJwo+CjXcyFOnqOKEAJSTL/RVkb9/9MhfhmVB6Z9wpHq1Roko6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MtfFt35Tcz1033; Thu, 20 Oct 2022 20:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29KKOIpa089425; Thu, 20 Oct 2022 20:24:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29KKOIWM089424; Thu, 20 Oct 2022 20:24:18 GMT (envelope-from git) Date: Thu, 20 Oct 2022 20:24:18 GMT Message-Id: <202210202024.29KKOIWM089424@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: c9665e214f72 - main - net/ng_mikrotik_eoip: Fix build after recent changes in main. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9665e214f726d9a6e62af00d81b94567ebe2572 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666297458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tab6qtszUgGDednkH1d+3/WYieQZim4Um96wqCH3Xwk=; b=HhYUFQfU4i4va/SvllIwd/C/RiZlBQPYXCYc5bweiXSkD3XJmzQupTVFeYV63S+YXrKiis LareIBMBaZNhnoDKyjxc5itm0BUfLzkvhA6A7uFqBxcI6ML8OfNAGG3b1McGnWD2SuhmDa Jfd1KlwhUb01IVL6Lj+CN26XMcFYW3A+Bk6d7YNwl+fBm8FvWQcazWCAaq2a5dgKvoiOSk RadYFEVh83LbIwdQnRpYdkFh16C0iCtC3uaPMj4GQu9iPIGY/dTC3qZs1gEeM7Bs2v7Jpn 1UtqrFCym1NmImUZV/u1tlRt9uDTCfy71260K6uaawKl9ll60bODvBH4DWySYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666297458; a=rsa-sha256; cv=none; b=Ne7fmsT/ekDwzXm78xcLkhiA7MAZJ+OnxZBCEHLGkrDuQXlVtP54W+QSgTmhuFDH6JI0t2 4CDI/b0QHmyyYDJPLw4TD/yiRDaIcxGkkCB7fRGlqWaAATHVM3AjKCAQBEGkecZu7TXlF7 LraSOnbHCHel9gdWlZFsoNkpjNnMX45k2FxsEocw1DHr++4ce0i5rvpIMeyP1WGmw0KHhB qq38DGkQ/ZMRJOdgcmhsiI5xQhPT/OijFIGE5QgKkZqjNkzfLv8sjjwb40SMuQ9JkGna5t WnPLUfSULZ07ciV864UTbNVbT3dYUAREP4oEdJNrLKlmOnxH1nPlROJ+VI00zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=c9665e214f726d9a6e62af00d81b94567ebe2572 commit c9665e214f726d9a6e62af00d81b94567ebe2572 Author: John Baldwin AuthorDate: 2022-10-20 20:22:02 +0000 Commit: John Baldwin CommitDate: 2022-10-20 20:22:02 +0000 net/ng_mikrotik_eoip: Fix build after recent changes in main. src commit 6d5f002ed1187547b0b40f8b46a3db38bf89c6dc changed the API of NG_NODE_FOREACH_HOOK to remove a mostly unused parameter. Use a structure as the callback argument to save the returned hook. PR: 266392 Differential Revision: https://reviews.freebsd.org/D36545 --- .../files/patch-ng__mikrotik__eoip.c | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/net/ng_mikrotik_eoip/files/patch-ng__mikrotik__eoip.c b/net/ng_mikrotik_eoip/files/patch-ng__mikrotik__eoip.c new file mode 100644 index 000000000000..4649334fe687 --- /dev/null +++ b/net/ng_mikrotik_eoip/files/patch-ng__mikrotik__eoip.c @@ -0,0 +1,60 @@ +--- ng_mikrotik_eoip.c.orig 2022-09-13 07:45:40 UTC ++++ ng_mikrotik_eoip.c +@@ -193,26 +193,54 @@ static ng_fn_eachhook check_id; + #ifndef NO_LINEAR_HOOK_LOOKUP + static ng_fn_eachhook check_id; + ++#if __FreeBSD_version >= 1400057 ++struct check_id_data { ++ hook_p result; ++ uint16_t id; ++}; ++#endif ++ + static int +-check_id(hook_p hook, void *id) ++check_id(hook_p hook, void *arg) + { + struct tunnel_info *info = NG_HOOK_PRIVATE(hook); ++#if __FreeBSD_version >= 1400057 ++ struct check_id_data *data = arg; ++#endif ++ uint16_t id; + +- if (info != NULL && info->id == (uint16_t)(*((unsigned int *)id))) ++#if __FreeBSD_version >= 1400057 ++ id = data->id; ++#else ++ id = *((unsigned int *)id; ++#endif ++ if (info != NULL && info->id == id) { ++#if __FreeBSD_version >= 1400057 ++ data->result = hook; ++#endif + return 0; +- else ++ } else + return 1; + } + + static hook_p + find_hook(node_p node, uint16_t id) + { ++#if __FreeBSD_version >= 1400057 ++ struct check_id_data data; ++ ++ data.result = NULL; ++ data.id = id; ++ NG_NODE_FOREACH_HOOK(node, check_id, &data); ++ return data.result; ++#else + hook_p result = NULL; + unsigned int val = id; + + NG_NODE_FOREACH_HOOK(node, check_id, (void*)&val, result); + + return result; ++#endif + } + #endif /* NO_LINEAR_HOOK_LOOKUP */ +