net: annoate group type for multi point plugins

PR: https://github.com/opnsense/core/issues/1455
This commit is contained in:
Franco Fichtner
2017-03-10 09:29:10 +01:00
parent 0d99ad98bb
commit 5718055942
6 changed files with 9 additions and 6 deletions
+1 -1
View File
@@ -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
@@ -1,7 +1,7 @@
<?php
/*
* Coypright (C) 2016 Franco Fichtner <franco@opnsense.org>
* Coypright (C) 2016-2017 Franco Fichtner <franco@opnsense.org>
* 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;
+1 -1
View File
@@ -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
@@ -1,7 +1,7 @@
<?php
/*
* Coypright (C) 2016 Franco Fichtner <franco@opnsense.org>
* Coypright (C) 2016-2017 Franco Fichtner <franco@opnsense.org>
* 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;
}
}
+1 -1
View File
@@ -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
@@ -1,7 +1,7 @@
<?php
/*
* Coypright (C) 2016 Franco Fichtner <franco@opnsense.org>
* Coypright (C) 2016-2017 Franco Fichtner <franco@opnsense.org>
* 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'])) {