net/mpd5: import latest fix for "set iface mtu X override" from upstream

freebsd · Oct 4, 2018 · 7d765cc · 7d765cc
1 parent b97bb73
commit 7d765cc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpd
 DISTVERSION=	5.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION}
 PKGNAMESUFFIX=	5

diff --git a/net/mpd5/files/patch-mtu-override b/net/mpd5/files/patch-mtu-override
@@ -105,3 +105,17 @@ Index: src/iface.c
    snprintf(tcpmsscfg.inHook, sizeof(tcpmsscfg.inHook), "in");
    snprintf(tcpmsscfg.outHook, sizeof(tcpmsscfg.outHook), "out");
    if (NgSendMsg(gLinksCsock, path, NGM_TCPMSS_COOKIE, NGM_TCPMSS_CONFIG,
+Index: src/bund.c
+===================================================================
+--- src/bund.c	(revision 2253)
++++ src/bund.c	(revision 2254)
+@@ -328,7 +328,8 @@ BundJoin(Link l)
+
+     /* Configure this link */
+     b->pppConfig.links[l->bundleIndex].enableLink = 1;
+-    b->pppConfig.links[l->bundleIndex].mru = lcp->peer_mru;
++    b->pppConfig.links[l->bundleIndex].mru = b->iface.mtu_override ?
++	b->iface.mtu_override : lcp->peer_mru;
+     b->pppConfig.links[l->bundleIndex].enableACFComp = lcp->peer_acfcomp;
+     b->pppConfig.links[l->bundleIndex].enableProtoComp = lcp->peer_protocomp;
+     b->pppConfig.links[l->bundleIndex].bandwidth =