From c358e3ec72134eca59901fa5b221b29cf7261dc5 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Wed, 16 May 2018 09:29:33 +0200
Subject: [PATCH] net/freeradius: add mikrotik vlan support (#673)

---
 net/freeradius/Makefile                              |  2 +-
 .../Freeradius/forms/dialogEditFreeRADIUSUser.xml    | 12 ++++++++++++
 .../OPNsense/Freeradius/forms/general.xml            |  6 ++++++
 .../mvc/app/models/OPNsense/Freeradius/General.xml   |  4 ++++
 .../mvc/app/models/OPNsense/Freeradius/User.xml      |  6 ++++++
 .../service/templates/OPNsense/Freeradius/users      |  6 ++++++
 6 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 45879dbbc..be91e120f 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		freeradius
-PLUGIN_VERSION=		1.6.0
+PLUGIN_VERSION=		1.7.0
 PLUGIN_COMMENT=		RADIUS Authentication, Authorization and Accounting Server
 PLUGIN_DEPENDS=		freeradius3
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSUser.xml b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSUser.xml
index 497842678..d80c6f88c 100644
--- a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSUser.xml
+++ b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSUser.xml
@@ -91,6 +91,18 @@
         <type>text</type>
         <help>Set the maximum download bandwith for ChilliSpot attribute. The value is treated as kbits/s.</help>
     </field>
+    <field>
+        <id>user.mikrotik_vlan_id_number</id>
+        <label>Mikrotik VLAN ID</label>
+        <type>text</type>
+        <help>Set the Mikrotik VLAN ID attribute. Mikrotik uses own attributes for VLAN assignment.</help>
+    </field>
+    <field>
+        <id>user.mikrotik_vlan_id_type</id>
+        <label>Mikrotik VLAN Type</label>
+        <type>text</type>
+        <help>Set the Mikrotik VLAN type attribute. For general use a value of 0 is fine.</help>
+    </field>
     <field>
         <id>user.sessionlimit_max_session_limit</id>
         <label>Max Daily Session</label>
diff --git a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/general.xml b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/general.xml
index d39801687..8e8997baa 100644
--- a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/general.xml
+++ b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/general.xml
@@ -29,6 +29,12 @@
         <type>checkbox</type>
         <help>This enables the ChilliSpot attributes assignment via users tab.</help>
     </field>
+    <field>
+        <id>general.mikrotik</id>
+        <label>Enable Mikrotik attributes</label>
+        <type>checkbox</type>
+        <help>This enables the Mikrotik attributes assignment via users tab.</help>
+    </field>
     <field>
         <id>general.sessionlimit</id>
         <label>Enable Daily Session Limit</label>
diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/General.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/General.xml
index 0440296f9..c245906d0 100644
--- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/General.xml
+++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/General.xml
@@ -23,6 +23,10 @@
             <default>0</default>
             <Required>N</Required>
         </chillispot>
+        <mikrotik type="BooleanField">
+            <default>0</default>
+            <Required>N</Required>
+        </mikrotik>
         <sessionlimit type="BooleanField">
             <default>0</default>
             <Required>N</Required>
diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
index 3951c3ab6..6dd93601b 100644
--- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
+++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
@@ -58,6 +58,12 @@
                 <chillispot_bw_max_down type="IntegerField">
                     <Required>N</Required>
                 </chillispot_bw_max_down>
+                <mikrotik_vlan_id_number type="IntegerField">
+                    <Required>N</Required>
+                </mikrotik_vlan_id_number>
+                <mikrotik_vlan_id_type type="IntegerField">
+                    <Required>N</Required>
+                </mikrotik_vlan_id_type>
                 <sessionlimit_max_session_limit type="IntegerField">
                     <Required>N</Required>
                 </sessionlimit_max_session_limit>
diff --git a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users
index 2e9272f1d..cc7881d9b 100644
--- a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users
+++ b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users
@@ -41,6 +41,12 @@
 {%       endif %}
 {%       if user_list.chillispot_bw_max_down is defined %}
        ChilliSpot-Bandwidth-Max-Down = {{ user_list.chillispot_bw_max_down }},
+{%       endif %}
+{%       if user_list.mikrotik_vlan_id_number is defined %}
+       Mikrotik-Wireless-VLANID = {{ user_list.mikrotik_vlan_id_number }},
+{%       endif %}
+{%       if user_list.mikrotik_vlan_id_type is defined %}
+       Mikrotik-Wireless-VLANID-Type = {{ user_list.mikrotik_vlan_id_type }},
 {%       endif %}
        Framed-Protocol = PPP