From nobody Fri May 05 21:47:23 2023 X-Original-To: dev-commits-ports-all@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 4QCkmq4tZfz49qvp; Fri, 5 May 2023 21:47:23 +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 4QCkmq4P8wz3hg0; Fri, 5 May 2023 21:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683323243; 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=YkDRIZqPr7y8ACt0/Ut2SWRb+iPH16sr8oLyDq8KwIM=; b=MYb8Tb46lXylFtUNDtezGAXCUANBfRZJkNTEovVorXOnMVmCRKVXv6CuOE/fSAXk1pOz5t 2NsFBYr94FvE4Nu6fELODRWy3etLCgc6KdYw1v9lGtkf1GoN6rYJ6KxicM51fFlEM77yAS S11SVcHEa0f0tS99hNzKdiR25gzuRDRDFski+65rhAToepfLrsiwDfoJ4eE+GboviXw4CP Tf1ytyUVisy5voLpKxEySmz6e7+5bVpeTVjDIClbmMy03QnDS2Sof/2A6VaJnAM4y4stmh UbYS+gUsZQGEBfivI/UuoioHDCkHrXYFw8Z+7mnT9h81ewWvF0v3EKdXYDh3zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683323243; 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=YkDRIZqPr7y8ACt0/Ut2SWRb+iPH16sr8oLyDq8KwIM=; b=u3kVDedrPUlASVJWdkyUBlwKPpS2EA3ucFH2xtih+Nth1CTZ7g0HA9v14BjYkS4jXemesP rqBDdZj9Gbt74vyZhQ4bifJ8XA7S2IHJXSxQhMrqT/rdLplRCvL9SL0hDtaKt+P0jb8MP6 21dLk6phwrf0cjHMuKOZ7JZe76kvcgECwxEZtSBEV4E1jDi10LjGx5HqU/Qi1z/otLqswN UpH13ykCu3MWYDQQVzmH0mdz9RQuZyKyVIAOQnBZbAqCer7jVtMrVNnVdW9deQqJBUPAAj 54ybD+X1y4xfSSDWbHIIdCYA+YYOj1nGp7i/tzb6F5QNwS6/V7wLQldGOcnYNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683323243; a=rsa-sha256; cv=none; b=qPDYJVuZH4IB6blZ4OADC2g8lzRQ9GxjvHDtqzOcbZUbLLF8t5hr24tA+b+bBoSY4kTF3X hrC3VM6WgY0IjCF6KR6TuIKHLvbS/5YUfl8f8XY8Hu3cssnsl23gGFYP2OJOeshtqr2qol dNEGm7iODAZF6a7nnsu+ubT+CUgND7yIZptdlE/qq+iwZzhuwkFb01zKoRRdBwQvyqF88n MmiD8lUCSPrvnB/A0WvI8xJfFAhcpOBW2/C5NuZBMgfP17Pp94zZEbO+7dW4ThnqT0TdCn S2s7k6T87BW8S/4D3jswEGL0GaMYZTgObKf9Tuq4ppxltRf1PtPqP3IwvEWLdw== 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 4QCkmq3LZkz19FY; Fri, 5 May 2023 21:47:23 +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 345LlNxI038467; Fri, 5 May 2023 21:47:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 345LlNao038466; Fri, 5 May 2023 21:47:23 GMT (envelope-from git) Date: Fri, 5 May 2023 21:47:23 GMT Message-Id: <202305052147.345LlNao038466@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: 174076e946ae - main - net/mpd5: undo regression for specific PPPoE peers List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 174076e946ae413c0f8903891a450eb821274ca2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=174076e946ae413c0f8903891a450eb821274ca2 commit 174076e946ae413c0f8903891a450eb821274ca2 Author: Eugene Grosbein AuthorDate: 2023-05-05 21:38:48 +0000 Commit: Eugene Grosbein CommitDate: 2023-05-05 21:46:57 +0000 net/mpd5: undo regression for specific PPPoE peers mpd5-5.9_14 introduced regression for specific case when no mtu configured for PPPoE peer that does not advertize any MTU itself. mpd5 should default to 1492 then but revision 14 defaults to 1500. The problem may be worked around specifying 1492 for link or interface MTU until upgrade to this revision that restores compatibility. PR: 270687 --- net/mpd5/Makefile | 2 +- net/mpd5/files/patch-max-payload | 65 +++++++++++++++++++++++++++++++++------- 2 files changed, 55 insertions(+), 12 deletions(-) diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile index d63d862eb150..aa644d6113d9 100644 --- a/net/mpd5/Makefile +++ b/net/mpd5/Makefile @@ -1,6 +1,6 @@ PORTNAME= mpd DISTVERSION= 5.9 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION} PKGNAMESUFFIX= 5 diff --git a/net/mpd5/files/patch-max-payload b/net/mpd5/files/patch-max-payload index a4ffecd37a43..f4018811369f 100644 --- a/net/mpd5/files/patch-max-payload +++ b/net/mpd5/files/patch-max-payload @@ -1,30 +1,73 @@ Index: src/link.c =================================================================== --- src/link.c (revision 2481) -+++ src/link.c (revision 2483) -@@ -1549,7 +1549,7 @@ LinkSetCommand(Context ctx, int ac, const char *const ++++ src/link.c (working copy) +@@ -435,7 +435,8 @@ LinkCreate(Context ctx, int ac, const char *const av[] + + /* Initialize link configuration with defaults */ + l->conf.mru = LCP_DEFAULT_MRU; +- l->conf.mtu = LCP_DEFAULT_MRU; ++ /* Do not assume any MTU value for this moment */ ++ l->conf.mtu = 0; + l->conf.mrru = MP_DEFAULT_MRRU; + l->conf.accmap = 0x000a0000; + l->conf.max_redial = -1; +@@ -1549,9 +1562,9 @@ LinkSetCommand(Context ctx, int ac, const char *const name = ((intptr_t)arg == SET_MTU) ? "MTU" : "MRU"; if (val < LCP_MIN_MRU) Error("min %s is %d", name, LCP_MIN_MRU); - else if (l->type && (val > l->type->mru)) { + else if (l->type && (val > l->type->mtu)) { Error("max %s on type \"%s\" links is %d", - name, l->type->name, l->type->mru); +- name, l->type->name, l->type->mru); ++ name, l->type->name, l->type->mtu); } else if ((intptr_t)arg == SET_MTU) + l->conf.mtu = val; + else +Index: src/phys.c +=================================================================== +--- src/phys.c (revision 2481) ++++ src/phys.c (working copy) +@@ -483,7 +483,7 @@ PhysGetMtu(Link l, int conf) + else + return (0); + } else +- return (l->conf.mtu); ++ return (l->conf.mtu ? l->conf.mtu : LCP_DEFAULT_MRU); + } else + return (0); + } Index: src/pppoe.c =================================================================== --- src/pppoe.c (revision 2481) -+++ src/pppoe.c (revision 2483) -@@ -31,7 +31,7 @@ ++++ src/pppoe.c (working copy) +@@ -31,6 +31,7 @@ * DEFINITIONS */ --#define PPPOE_MTU 1492 /* allow room for PPPoE overhead */ -+#define PPPOE_MTU (ETHER_MAX_LEN_JUMBO - 8) ++#define PPPOE_MTU_MAX (ETHER_MAX_LEN_JUMBO - 8) + #define PPPOE_MTU 1492 /* allow room for PPPoE overhead */ #define PPPOE_MRU 1492 - #define PPPOE_CONNECT_TIMEOUT 9 -@@ -1712,6 +1712,7 @@ PppoeSetCommand(Context ctx, int ac, const char *const +@@ -181,7 +182,7 @@ static void PppoeDoClose(Link l); + const struct phystype gPppoePhysType = { + .name = "pppoe", + .descr = "PPP over Ethernet", +- .mtu = PPPOE_MTU, ++ .mtu = PPPOE_MTU_MAX, + .mru = PPPOE_MRU, + .tmpl = 1, + .init = PppoeInit, +@@ -886,7 +887,7 @@ PppoeGetMtu(Link l, int conf) + if (conf == 0) + return (l->type->mtu); + else +- return (l->conf.mtu); ++ return (l->conf.mtu ? l->conf.mtu : PPPOE_MTU); + } + + static u_short +@@ -1712,6 +1718,7 @@ PppoeSetCommand(Context ctx, int ac, const char *const unsigned i; #ifdef NGM_PPPOE_SETMAXP_COOKIE int ap; @@ -32,7 +75,7 @@ Index: src/pppoe.c #endif switch ((intptr_t)arg) { case SET_IFACE: -@@ -1732,6 +1733,20 @@ PppoeSetCommand(Context ctx, int ac, const char *const +@@ -1732,6 +1739,20 @@ PppoeSetCommand(Context ctx, int ac, const char *const } } strlcpy(pi->hook, hookname, sizeof(pi->hook)); @@ -53,7 +96,7 @@ Index: src/pppoe.c break; default: return(-1); -@@ -1762,8 +1777,18 @@ PppoeSetCommand(Context ctx, int ac, const char *const +@@ -1762,8 +1783,18 @@ PppoeSetCommand(Context ctx, int ac, const char *const if (ac != 1) return(-1); ap = atoi(av[0]);