/CHANGELOG |
---|
12,6 → 12,8 |
CHANGES |
- Explode the "Filter-Id" RADIUS attribute into ALCASAR vendor attributes (they can now be set independently and with a good user/group priority). |
- Add "Alcasar-Expire-After" RADIUS attribute instead of replace "Max-All-Session". |
- Rename "ChilliSpot-*" RADIUS attributes to "CoovaChilli-*". |
BUGS |
- alcasar.sh : Fix exiting on wrong hardware architecture |
/alcasar.sh |
---|
936,6 → 936,10 |
# Add ALCASAR dictionary |
cp $DIR_CONF/radius/dictionary.alcasar /usr/share/freeradius/dictionary.alcasar |
echo -e '\n$INCLUDE dictionary.alcasar' >> /usr/share/freeradius/dictionary |
# Add CoovaChilli dictionary |
cp /usr/share/doc/coova-chilli/dictionary.coovachilli /usr/share/freeradius/dictionary.coovachilli |
echo -e '\n$INCLUDE dictionary.coovachilli' >> /usr/share/freeradius/dictionary |
# Set "client.conf" to describe radius clients (coova on 127.0.0.1) |
[ -e /etc/raddb/clients.conf.default ] || cp -f /etc/raddb/clients.conf /etc/raddb/clients.conf.default |
cat << EOF > /etc/raddb/clients.conf |
/conf/freeradius-web/sql.attrmap |
---|
51,9 → 51,4 |
replyitem Reply-Message Reply-Message |
replyItem Dialup-Lock-Msg Reply-Message |
replyItem User-Password User-Password |
replyItem ChilliSpot-Max-Input-Octets ChilliSpot-Max-Input-Octets |
replyItem ChilliSpot-max-Output-Octets ChilliSpot-Max-Output-Octets |
replyItem ChilliSpot-Max-Total-Octets ChilliSpot-Max-Total-Octets |
replyItem ChilliSpot-Bandwidth-Max-Up ChilliSpot-Bandwidth-Max-Up |
replyItem ChilliSpot-Bandwidth-Max-Down ChilliSpot-Bandwidth-Max-Down |
replyItem WISPr-Redirection-URL WISPr-Redirection-URL |
/conf/freeradius-web/user_edit.attrs |
---|
15,12 → 15,12 |
Max-Monthly-Session <a href="help/session_timeout_help.html" target=st_help onclick=window.open("help/session_timeout_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Session Timeout Help Page"><font color="blue">Durée limite mensuelle</font></a><BR>(en secondes) |
Simultaneous-Use <a href="help/simultaneous_use_help.html" target=su_help onclick=window.open("help/simultaneous_use_help.html","su_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="Simultaneous Use Help Page"><font color="blue">Nombre de sessions simultanées</font></a> |
Login-Time <a href="help/login_time_help.html" target=lt_help onclick=window.open("help/login_time_help.html","lt_help","width=600,height=370,toolbar=no,scrollbars=no,resizable=yes") title="Login-Time Help Page"><font color="blue">Période hebdomadaire</font></a> |
ChilliSpot-Max-Input-Octets <a href="help/chillispot_max_input_octets_help.html" target=st_help onclick=window.open("help/chillispot_max_input_octets_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="ChilliSpot Max Input Octets Help Page"><font color="blue">Nombre d'octets max. en émission</font></a><BR>(en octets) |
ChilliSpot-Max-Output-Octets <a href="help/chillispot_max_output_octets_help.html" target=st_help onclick=window.open("help/chillispot_max_output_octets_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="ChilliSpot Max Output Octets Help Page"><font color="blue">Nombre d'octets max. en réception</font></a><BR>(en octets) |
ChilliSpot-Max-Total-Octets <a href="help/chillispot_max_total_octets_help.html" target=st_help onclick=window.open("help/chillispot_max_total_octets_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="ChilliSpot Max Total Octets Help Page"><font color="blue">Nombre d'octets max. total transmit</font></a><BR>(en octets) |
ChilliSpot-Bandwidth-Max-Up <a href="help/chillispot_bandwidth_max_up_help.html" target=st_help onclick=window.open("help/chillispot_bandwidth_max_up_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="ChilliSpot Bandwidth Max Up Help Page"><font color="blue">Bande passante montante max.</font></a><BR>(en kbits/seconde) |
ChilliSpot-Bandwidth-Max-Down <a href="help/chillispot_bandwidth_max_down_help.html" target=st_help onclick=window.open("help/chillispot_bandwidth_max_down_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="ChilliSpot Bandwidth Max Down Help Page"><font color="blue">Bande passante descendante max.</font></a><BR>(en kbits/seconde) |
WISPr-Redirection-URL <a href="help/wispr_redirection_url_help.html" target=st_help onclick=window.open("help/wispr_redirection_url_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="ChilliSpot Bandwidth Max Down Help Page"><font color="blue">URL de redirection</font></a><BR> |
CoovaChilli-Max-Input-Octets <a href="help/coovachilli_max_input_octets_help.html" target=st_help onclick=window.open("help/coovachilli_max_input_octets_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="CoovaChilli Max Input Octets Help Page"><font color="blue">Nombre d'octets max. en émission</font></a><BR>(en octets) |
CoovaChilli-Max-Output-Octets <a href="help/coovachilli_max_output_octets_help.html" target=st_help onclick=window.open("help/coovachilli_max_output_octets_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="CoovaChilli Max Output Octets Help Page"><font color="blue">Nombre d'octets max. en réception</font></a><BR>(en octets) |
CoovaChilli-Max-Total-Octets <a href="help/coovachilli_max_total_octets_help.html" target=st_help onclick=window.open("help/coovachilli_max_total_octets_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="CoovaChilli Max Total Octets Help Page"><font color="blue">Nombre d'octets max. total transmit</font></a><BR>(en octets) |
CoovaChilli-Bandwidth-Max-Up <a href="help/coovachilli_bandwidth_max_up_help.html" target=st_help onclick=window.open("help/coovachilli_bandwidth_max_up_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="CoovaChilli Bandwidth Max Up Help Page"><font color="blue">Bande passante montante max.</font></a><BR>(en kbits/seconde) |
CoovaChilli-Bandwidth-Max-Down <a href="help/coovachilli_bandwidth_max_down_help.html" target=st_help onclick=window.open("help/coovachilli_bandwidth_max_down_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="CoovaChilli Bandwidth Max Down Help Page"><font color="blue">Bande passante descendante max.</font></a><BR>(en kbits/seconde) |
WISPr-Redirection-URL <a href="help/wispr_redirection_url_help.html" target=st_help onclick=window.open("help/wispr_redirection_url_help.html","st_help","width=600,height=250,toolbar=no,scrollbars=no,resizable=yes") title="CoovaChilli Bandwidth Max Down Help Page"><font color="blue">URL de redirection</font></a><BR> |
# |
##Auth-Type <a href="help/auth_type_help.html" target=su_help onclick=window.open("help/auth_type_help.html","su_help","width=560,height=230,toolbar=no,scrollbars=no,resizable=yes") title="Auth-Type Help Page"><font color="blue">Auth-Type</font></a> |
#Framed-Protocol <a href="help/framed_protocol_help.html" target=fpr_help onclick=window.open("help/framed_protocol_help.htlml","fpr_help","width=560,height=230,toolbar=no,scrollbars=no,resizable=yes") title="Framed-Protocol Help PPage"><font color="blue">Protocol</font></a> |
/web/acc/manager/htdocs/find.php |
---|
16,11 → 16,11 |
$selected['Max-Monthly-Session'] = ''; |
$selected['Simultaneous-Use'] = ''; |
$selected['Login-Time'] = ''; |
$selected['ChilliSpot-Max-Input-Octets'] = ''; |
$selected['ChilliSpot-Max-Total-Octets'] = ''; |
$selected['ChilliSpot-Bandwidth-Max-Up'] = ''; |
$selected['ChilliSpot-Bandwidth-Max-Down'] = ''; |
$selected['ChilliSpot-Max-Output-Octets'] = ''; |
$selected['CoovaChilli-Max-Input-Octets'] = ''; |
$selected['CoovaChilli-Max-Total-Octets'] = ''; |
$selected['CoovaChilli-Bandwidth-Max-Up'] = ''; |
$selected['CoovaChilli-Bandwidth-Max-Down'] = ''; |
$selected['CoovaChilli-Max-Output-Octets'] = ''; |
$selected['WISPr-Redirection-URL'] = ''; |
} |
if (isset($search_IN)) $selected[$search_IN] = 'selected'; |
175,23 → 175,23 |
$desc=$l_expiration; |
echo "<option $selected[$key] value=\"$key\">$desc\n"; |
break; |
case 'ChilliSpot-Max-Input-Octets' : |
case 'CoovaChilli-Max-Input-Octets' : |
$desc=$l_max_input_octets; |
echo "<option $selected[$key] value=\"$key\">$desc\n"; |
break; |
case 'ChilliSpot-Max-Output-Octets' : |
case 'CoovaChilli-Max-Output-Octets' : |
$desc=$l_max_output_octets; |
echo "<option $selected[$key] value=\"$key\">$desc\n"; |
break; |
case 'ChilliSpot-Max-Total-Octets' : |
case 'CoovaChilli-Max-Total-Octets' : |
$desc=$l_max_total_octets; |
echo "<option $selected[$key] value=\"$key\">$desc\n"; |
break; |
case 'ChilliSpot-Bandwidth-Max-Up' : |
case 'CoovaChilli-Bandwidth-Max-Up' : |
$desc=$l_max_bandwidth_up; |
echo "<option $selected[$key] value=\"$key\">$desc\n"; |
break; |
case 'ChilliSpot-Bandwidth-Max-Down' : |
case 'CoovaChilli-Bandwidth-Max-Down' : |
$desc=$l_max_bandwidth_down; |
echo "<option $selected[$key] value=\"$key\">$desc\n"; |
break; |
/web/acc/manager/htdocs/group_new.php |
---|
220,29 → 220,29 |
$help_link = "help/expiration_help.html"; |
$desc = $l_expiration; |
break; |
case 'ChilliSpot-Max-Input-Octets' : |
case 'CoovaChilli-Max-Input-Octets' : |
$advanced = true; |
$help_link = "help/chillispot_max_input_octets_help.html"; |
$help_link = "help/coovachilli_max_input_octets_help.html"; |
$desc = $l_max_input_octets; |
break; |
case 'ChilliSpot-Max-Output-Octets' : |
case 'CoovaChilli-Max-Output-Octets' : |
$advanced = true; |
$help_link = "help/chillispot_max_output_octets_help.html"; |
$help_link = "help/coovachilli_max_output_octets_help.html"; |
$desc = $l_max_output_octets; |
break; |
case 'ChilliSpot-Max-Total-Octets' : |
case 'CoovaChilli-Max-Total-Octets' : |
$advanced = true; |
$help_link = "help/chillispot_max_total_octets_help.html"; |
$help_link = "help/coovachilli_max_total_octets_help.html"; |
$desc = $l_max_total_octets; |
break; |
case 'ChilliSpot-Bandwidth-Max-Up' : |
case 'CoovaChilli-Bandwidth-Max-Up' : |
$advanced = true; |
$help_link = "help/chillispot_bandwidth_max_up_help.html"; |
$help_link = "help/coovachilli_bandwidth_max_up_help.html"; |
$desc = $l_max_bandwidth_up; |
break; |
case 'ChilliSpot-Bandwidth-Max-Down' : |
case 'CoovaChilli-Bandwidth-Max-Down' : |
$advanced = true; |
$help_link = "help/chillispot_bandwidth_max_down_help.html"; |
$help_link = "help/coovachilli_bandwidth_max_down_help.html"; |
$desc = $l_max_bandwidth_down; |
break; |
case 'WISPr-Redirection-URL' : |
296,11 → 296,11 |
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\":=\">:="; |
break; |
case 'Session-Timeout' : |
case 'ChilliSpot-Max-Input-Octets' : |
case 'ChilliSpot-Max-Output-Octets' : |
case 'ChilliSpot-Max-Total-Octets' : |
case 'ChilliSpot-Bandwidth-Max-Up' : |
case 'ChilliSpot-Bandwidth-Max-Down' : |
case 'CoovaChilli-Max-Input-Octets' : |
case 'CoovaChilli-Max-Output-Octets' : |
case 'CoovaChilli-Max-Total-Octets' : |
case 'CoovaChilli-Bandwidth-Max-Up' : |
case 'CoovaChilli-Bandwidth-Max-Down' : |
case 'WISPr-Redirection-URL' : |
case 'Alcasar-Filter' : |
case 'Alcasar-Protocols-Filter' : |
350,11 → 350,11 |
echo "<input type=\"hidden\" name=\"$oper_name\" value=\":=\">"; |
break; |
case 'Session-Timeout' : |
case 'ChilliSpot-Max-Input-Octets' : |
case 'ChilliSpot-Max-Output-Octets' : |
case 'ChilliSpot-Max-Total-Octets' : |
case 'ChilliSpot-Bandwidth-Max-Up' : |
case 'ChilliSpot-Bandwidth-Max-Down' : |
case 'CoovaChilli-Max-Input-Octets' : |
case 'CoovaChilli-Max-Output-Octets' : |
case 'CoovaChilli-Max-Total-Octets' : |
case 'CoovaChilli-Bandwidth-Max-Up' : |
case 'CoovaChilli-Bandwidth-Max-Down' : |
case 'WISPr-Redirection-URL' : |
echo "<input type=\"hidden\" name=\"$oper_name\" value=\"=\">"; |
break; |
/web/acc/manager/htdocs/user_edit.php |
---|
259,19 → 259,19 |
case 'Max-Monthly-Session' : |
$grp_maxmonth = $val; |
break; |
case 'ChilliSpot-Max-Input-Octets' : |
case 'CoovaChilli-Max-Input-Octets' : |
$grp_maxio = $val; |
break; |
case 'ChilliSpot-Max-Output-Octets' : |
case 'CoovaChilli-Max-Output-Octets' : |
$grp_maxoo = $val; |
break; |
case 'ChilliSpot-Max-Total-Octets' : |
case 'CoovaChilli-Max-Total-Octets' : |
$grp_maxto = $val; |
break; |
case 'ChilliSpot-Bandwidth-Max-Up' : |
case 'CoovaChilli-Bandwidth-Max-Up' : |
$grp_bwup = $val; |
break; |
case 'ChilliSpot-Bandwidth-Max-Down' : |
case 'CoovaChilli-Bandwidth-Max-Down' : |
$grp_bwdown = $val; |
break; |
case 'WISPr-Redirection-URL' : |
465,29 → 465,29 |
$help_link = "help/expiration_help.html"; |
$desc = $l_expiration; |
break; |
case 'ChilliSpot-Max-Input-Octets' : |
case 'CoovaChilli-Max-Input-Octets' : |
$advanced = true; |
$help_link = "help/chillispot_max_input_octets_help.html"; |
$help_link = "help/coovachilli_max_input_octets_help.html"; |
$desc = $l_max_input_octets; |
break; |
case 'ChilliSpot-Max-Output-Octets' : |
case 'CoovaChilli-Max-Output-Octets' : |
$advanced = true; |
$help_link = "help/chillispot_max_output_octets_help.html"; |
$help_link = "help/coovachilli_max_output_octets_help.html"; |
$desc = $l_max_output_octets; |
break; |
case 'ChilliSpot-Max-Total-Octets' : |
case 'CoovaChilli-Max-Total-Octets' : |
$advanced = true; |
$help_link = "help/chillispot_max_total_octets_help.html"; |
$help_link = "help/coovachilli_max_total_octets_help.html"; |
$desc = $l_max_total_octets; |
break; |
case 'ChilliSpot-Bandwidth-Max-Up' : |
case 'CoovaChilli-Bandwidth-Max-Up' : |
$advanced = true; |
$help_link = "help/chillispot_bandwidth_max_up_help.html"; |
$help_link = "help/coovachilli_bandwidth_max_up_help.html"; |
$desc = $l_max_bandwidth_up; |
break; |
case 'ChilliSpot-Bandwidth-Max-Down' : |
case 'CoovaChilli-Bandwidth-Max-Down' : |
$advanced = true; |
$help_link = "help/chillispot_bandwidth_max_down_help.html"; |
$help_link = "help/coovachilli_bandwidth_max_down_help.html"; |
$desc = $l_max_bandwidth_down; |
break; |
case 'WISPr-Redirection-URL' : |
542,11 → 542,11 |
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\":=\">:=</option></select></td>"; |
break; |
case 'Session-Timeout' : |
case 'ChilliSpot-Max-Input-Octets' : |
case 'ChilliSpot-Max-Output-Octets' : |
case 'ChilliSpot-Max-Total-Octets' : |
case 'ChilliSpot-Bandwidth-Max-Up' : |
case 'ChilliSpot-Bandwidth-Max-Down' : |
case 'CoovaChilli-Max-Input-Octets' : |
case 'CoovaChilli-Max-Output-Octets' : |
case 'CoovaChilli-Max-Total-Octets' : |
case 'CoovaChilli-Bandwidth-Max-Up' : |
case 'CoovaChilli-Bandwidth-Max-Down' : |
case 'WISPr-Redirection-URL' : |
case 'Alcasar-Filter' : |
case 'Alcasar-Protocols-Filter' : |
593,11 → 593,11 |
echo "<input type=\"hidden\" name=\"$oper_name\" value=\":=\">"; |
break; |
case 'Session-Timeout' : |
case 'ChilliSpot-Max-Input-Octets' : |
case 'ChilliSpot-Max-Output-Octets' : |
case 'ChilliSpot-Max-Total-Octets' : |
case 'ChilliSpot-Bandwidth-Max-Up' : |
case 'ChilliSpot-Bandwidth-Max-Down' : |
case 'CoovaChilli-Max-Input-Octets' : |
case 'CoovaChilli-Max-Output-Octets' : |
case 'CoovaChilli-Max-Total-Octets' : |
case 'CoovaChilli-Bandwidth-Max-Up' : |
case 'CoovaChilli-Bandwidth-Max-Down' : |
case 'WISPr-Redirection-URL' : |
case 'Alcasar-Filter' : |
case 'Alcasar-Protocols-Filter' : |
654,19 → 654,19 |
case 'Max-Monthly-Session' : |
echo "$grp_maxmonth"; |
break; |
case 'ChilliSpot-Max-Input-Octets' : |
case 'CoovaChilli-Max-Input-Octets' : |
echo "$grp_maxio"; |
break; |
case 'ChilliSpot-Max-Output-Octets' : |
case 'CoovaChilli-Max-Output-Octets' : |
echo "$grp_maxoo"; |
break; |
case 'ChilliSpot-Max-Total-Octets' : |
case 'CoovaChilli-Max-Total-Octets' : |
echo "$grp_maxto"; |
break; |
case 'ChilliSpot-Bandwidth-Max-Up' : |
case 'CoovaChilli-Bandwidth-Max-Up' : |
echo "$grp_bwup"; |
break; |
case 'ChilliSpot-Bandwidth-Max-Down' : |
case 'CoovaChilli-Bandwidth-Max-Down' : |
echo "$grp_bwdown"; |
break; |
case 'WISPr-Redirection-URL' : |
/web/acc/manager/htdocs/user_new.php |
---|
295,29 → 295,29 |
$help_link = "help/expiration_help.html"; |
$desc = $l_expiration; |
break; |
case 'ChilliSpot-Max-Input-Octets' : |
case 'CoovaChilli-Max-Input-Octets' : |
$advanced = true; |
$help_link = "help/chillispot_max_input_octets_help.html"; |
$help_link = "help/coovachilli_max_input_octets_help.html"; |
$desc = $l_max_input_octets; |
break; |
case 'ChilliSpot-Max-Output-Octets' : |
case 'CoovaChilli-Max-Output-Octets' : |
$advanced = true; |
$help_link = "help/chillispot_max_output_octets_help.html"; |
$help_link = "help/coovachilli_max_output_octets_help.html"; |
$desc = $l_max_output_octets; |
break; |
case 'ChilliSpot-Max-Total-Octets' : |
case 'CoovaChilli-Max-Total-Octets' : |
$advanced = true; |
$help_link = "help/chillispot_max_total_octets_help.html"; |
$help_link = "help/coovachilli_max_total_octets_help.html"; |
$desc = $l_max_total_octets; |
break; |
case 'ChilliSpot-Bandwidth-Max-Up' : |
case 'CoovaChilli-Bandwidth-Max-Up' : |
$advanced = true; |
$help_link = "help/chillispot_bandwidth_max_up_help.html"; |
$help_link = "help/coovachilli_bandwidth_max_up_help.html"; |
$desc = $l_max_bandwidth_up; |
break; |
case 'ChilliSpot-Bandwidth-Max-Down' : |
case 'CoovaChilli-Bandwidth-Max-Down' : |
$advanced = true; |
$help_link = "help/chillispot_bandwidth_max_down_help.html"; |
$help_link = "help/coovachilli_bandwidth_max_down_help.html"; |
$desc = $l_max_bandwidth_down; |
break; |
case 'WISPr-Redirection-URL' : |
371,11 → 371,11 |
echo "<td><select name=\"$oper_name\"><option $selected[$op_eq] value=\":=\">:=</option></select></td>"; |
break; |
case 'Session-Timeout' : |
case 'ChilliSpot-Max-Input-Octets' : |
case 'ChilliSpot-Max-Output-Octets' : |
case 'ChilliSpot-Max-Total-Octets' : |
case 'ChilliSpot-Bandwidth-Max-Up' : |
case 'ChilliSpot-Bandwidth-Max-Down' : |
case 'CoovaChilli-Max-Input-Octets' : |
case 'CoovaChilli-Max-Output-Octets' : |
case 'CoovaChilli-Max-Total-Octets' : |
case 'CoovaChilli-Bandwidth-Max-Up' : |
case 'CoovaChilli-Bandwidth-Max-Down' : |
case 'WISPr-Redirection-URL' : |
case 'Alcasar-Filter' : |
case 'Alcasar-Protocols-Filter' : |
422,11 → 422,11 |
echo "<input type=\"hidden\" name=\"$oper_name\" value=\":=\">"; |
break; |
case 'Session-Timeout' : |
case 'ChilliSpot-Max-Input-Octets' : |
case 'ChilliSpot-Max-Output-Octets' : |
case 'ChilliSpot-Max-Total-Octets' : |
case 'ChilliSpot-Bandwidth-Max-Up' : |
case 'ChilliSpot-Bandwidth-Max-Down' : |
case 'CoovaChilli-Max-Input-Octets' : |
case 'CoovaChilli-Max-Output-Octets' : |
case 'CoovaChilli-Max-Total-Octets' : |
case 'CoovaChilli-Bandwidth-Max-Up' : |
case 'CoovaChilli-Bandwidth-Max-Down' : |
case 'WISPr-Redirection-URL' : |
case 'Alcasar-Filter' : |
case 'Alcasar-Protocols-Filter' : |