git: 15c9b10e294e - main - net/mpd5: unbreak incoming L2TP connections
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 06 Oct 2022 07:17:05 UTC
The branch main has been updated by eugen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=15c9b10e294e33112d57f3007bcdd7f3efa47a41
commit 15c9b10e294e33112d57f3007bcdd7f3efa47a41
Author: Eugene Grosbein <eugen@FreeBSD.org>
AuthorDate: 2022-10-06 07:11:55 +0000
Commit: Eugene Grosbein <eugen@FreeBSD.org>
CommitDate: 2022-10-06 07:16:58 +0000
net/mpd5: unbreak incoming L2TP connections
The revision mpd5-5.9_10 broke incoming L2TP connections. Fix it.
PR: 266838
---
net/mpd5/Makefile | 2 +-
net/mpd5/files/patch-redial | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
index b85ddf6f2ec7..8ecb88614119 100644
--- a/net/mpd5/Makefile
+++ b/net/mpd5/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mpd
DISTVERSION= 5.9
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION}
PKGNAMESUFFIX= 5
diff --git a/net/mpd5/files/patch-redial b/net/mpd5/files/patch-redial
index b8f8c18d28c1..525e13836a56 100644
--- a/net/mpd5/files/patch-redial
+++ b/net/mpd5/files/patch-redial
@@ -146,7 +146,7 @@ Index: src/link.h
Index: src/phys.c
===================================================================
--- src/phys.c (revision 2452)
-+++ src/phys.c (revision 2454)
++++ src/phys.c (revision 2461)
@@ -590,8 +590,8 @@ PhysMsg(int type, void *arg)
UNREF(l);
return;
@@ -164,7 +164,7 @@ Index: src/phys.c
}
- (*l->type->open)(l);
+ /* Redial may result in MSG_OPEN for just opened device */
-+ if (l->state == PHYS_STATE_DOWN)
++ if (l->state == PHYS_STATE_DOWN || l->state == PHYS_STATE_CONNECTING)
+ (*l->type->open)(l);
+ else
+ Log(LG_PHYS2, ("[%s] device: OPEN event ignored",