From 57180559423be0b1d5d988e9dcef81ce7a4b488b Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 10 Mar 2017 09:29:10 +0100 Subject: [PATCH] net: annoate group type for multi point plugins PR: https://github.com/opnsense/core/issues/1455 --- net/l2tp/Makefile | 2 +- net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc | 3 ++- net/pppoe/Makefile | 2 +- net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc | 3 ++- net/pptp/Makefile | 2 +- net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc | 3 ++- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/net/l2tp/Makefile b/net/l2tp/Makefile index ec0941f84..ab279f603 100644 --- a/net/l2tp/Makefile +++ b/net/l2tp/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= l2tp -PLUGIN_VERSION= 1.6 +PLUGIN_VERSION= 1.7 PLUGIN_DEPENDS= clog mpd5 PLUGIN_COMMENT= L2TP server based on MPD5 PLUGIN_MAINTAINER= franco@opnsense.org diff --git a/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc b/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc index cd6e80c88..79c662f82 100644 --- a/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc +++ b/net/l2tp/src/etc/inc/plugins.inc.d/if_l2tp.inc @@ -1,7 +1,7 @@ + * Coypright (C) 2016-2017 Franco Fichtner * Copyright (C) 2008 Shrew Soft Inc * Copyright (C) 2008 Ermal Luçi * Copyright (C) 2004 Scott Ullrich @@ -267,6 +267,7 @@ function if_l2tp_interfaces() $oic['networks'] = array(); $oic['if'] = 'l2tp'; $oic['descr'] = 'L2TP'; + $oic['type'] = 'group'; $mask = !empty($config['l2tp']['l2tp_subnet']) ? $config['l2tp']['l2tp_subnet'] : 32; $oic['networks'][] = array("network" => gen_subnet($config['l2tp']['remoteip'], $mask), "mask" => $mask); $interfaces['l2tp'] = $oic; diff --git a/net/pppoe/Makefile b/net/pppoe/Makefile index 1d240a9a4..493f612f0 100644 --- a/net/pppoe/Makefile +++ b/net/pppoe/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= pppoe -PLUGIN_VERSION= 1.6 +PLUGIN_VERSION= 1.7 PLUGIN_DEPENDS= clog mpd5 PLUGIN_COMMENT= PPPoE server based on MPD5 PLUGIN_MAINTAINER= franco@opnsense.org diff --git a/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc b/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc index 2b3ce92e8..fda27074d 100644 --- a/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc +++ b/net/pppoe/src/etc/inc/plugins.inc.d/if_pppoe.inc @@ -1,7 +1,7 @@ + * Coypright (C) 2016-2017 Franco Fichtner * Copyright (C) 2008 Shrew Soft Inc * Copyright (C) 2008 Ermal Luçi * Copyright (C) 2004 Scott Ullrich @@ -319,6 +319,7 @@ function if_pppoe_interfaces() $pppoeifs['virtual'] = true; $pppoeifs['if'] = 'pppoe'; $pppoeifs['descr'] = 'pppoe'; + $pppoeifs['type'] = 'group'; $interfaces['pppoe'] = $pppoeifs; } } diff --git a/net/pptp/Makefile b/net/pptp/Makefile index e75827b59..838cbdf59 100644 --- a/net/pptp/Makefile +++ b/net/pptp/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= pptp -PLUGIN_VERSION= 1.6 +PLUGIN_VERSION= 1.7 PLUGIN_DEPENDS= clog mpd5 PLUGIN_COMMENT= PPTP server based on MPD5 PLUGIN_MAINTAINER= franco@opnsense.org diff --git a/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc b/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc index e027b62c0..b503785dd 100644 --- a/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc +++ b/net/pptp/src/etc/inc/plugins.inc.d/if_pptp.inc @@ -1,7 +1,7 @@ + * Coypright (C) 2016-2017 Franco Fichtner * Copyright (C) 2008 Shrew Soft Inc * Copyright (C) 2008 Ermal Luçi * Copyright (C) 2004 Scott Ullrich @@ -279,6 +279,7 @@ function if_pptp_interfaces() $oic['networks'] = array(); $oic['virtual'] = true; $oic['if'] = 'pptp'; + $oic['type'] = 'group'; $oic['descr'] = 'pptp'; $mask = !empty($config['pptpd']['pptp_subnet']) ? $config['pptpd']['pptp_subnet'] : 32; if (isset($config['pptpd']['n_pptp_units']) && is_numeric($config['pptpd']['n_pptp_units'])) {