webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 10:35:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

network: Drop any traces of ISDN

Browse Source 
This has been removed a long time ago and we should probably spend a
little bit more time on keeping the networking code tidy :)

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2022-12-01 17:22:56 +00:00
committed by Peter Müller
parent 957863f754
commit a0918657c9
21 changed files with 7 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/common/configroot
View File

@@ -85,8 +85,6 @@ var/ipfire/ipblocklist-functions.pl
var/ipfire/ipblocklist
#var/ipfire/ipblocklist/modified
#var/ipfire/ipblocklist/settings
var/ipfire/isdn
#var/ipfire/isdn/settings
var/ipfire/key
var/ipfire/lang.pl
var/ipfire/langs

5
doc/language_issues.de
View File

@@ -376,7 +376,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -424,10 +423,6 @@ WARNING: translation string unused: ipblocklist category scanner
WARNING: translation string unused: ipfire side
WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
WARNING: translation string unused: isdn
WARNING: translation string unused: isdn settings
WARNING: translation string unused: isdn1
WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version

1
doc/language_issues.es
View File

@@ -415,7 +415,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id

5
doc/language_issues.fr
View File

@@ -404,7 +404,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -454,10 +453,6 @@ WARNING: translation string unused: ipblocklist category scanner
WARNING: translation string unused: ipfire side
WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
WARNING: translation string unused: isdn
WARNING: translation string unused: isdn settings
WARNING: translation string unused: isdn1
WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version

5
doc/language_issues.it
View File

@@ -372,7 +372,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -417,10 +416,6 @@ WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
WARNING: translation string unused: isdn
WARNING: translation string unused: isdn settings
WARNING: translation string unused: isdn1
WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version

5
doc/language_issues.nl
View File

@@ -374,7 +374,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -419,10 +418,6 @@ WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
WARNING: translation string unused: isdn
WARNING: translation string unused: isdn settings
WARNING: translation string unused: isdn1
WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version

5
doc/language_issues.pl
View File

@@ -315,7 +315,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -359,10 +358,6 @@ WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: iptable rules
WARNING: translation string unused: isdn
WARNING: translation string unused: isdn settings
WARNING: translation string unused: isdn1
WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version

5
doc/language_issues.ru
View File

@@ -312,7 +312,6 @@ WARNING: translation string unused: host configuration
WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hours2
WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -356,10 +355,6 @@ WARNING: translation string unused: invert
WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: iptable rules
WARNING: translation string unused: isdn
WARNING: translation string unused: isdn settings
WARNING: translation string unused: isdn1
WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version

5
doc/language_issues.tr
View File

@@ -398,7 +398,6 @@ WARNING: translation string unused: host deny
WARNING: translation string unused: hostname and domain already in use
WARNING: translation string unused: hour-graph
WARNING: translation string unused: hours2
WARNING: translation string unused: ibod for dual isdn only
WARNING: translation string unused: icmp selected but no type
WARNING: translation string unused: icmp type
WARNING: translation string unused: id
@@ -443,10 +442,6 @@ WARNING: translation string unused: ip address in use
WARNING: translation string unused: ipfire side
WARNING: translation string unused: ipsec no connections
WARNING: translation string unused: iptable rules
WARNING: translation string unused: isdn
WARNING: translation string unused: isdn settings
WARNING: translation string unused: isdn1
WARNING: translation string unused: isdn2
WARNING: translation string unused: javascript menu error1
WARNING: translation string unused: javascript menu error2
WARNING: translation string unused: kernel version

14
html/cgi-bin/pppsetup.cgi
View File

@@ -32,7 +32,6 @@ require "${General::swroot}/header.pl";
our %pppsettings=();
my %temppppsettings=();
our %modemsettings=();
our %isdnsettings=();
our %netsettings=();
my %selected=();
my %checked=();
@@ -63,7 +62,7 @@ if ($pppsettings{'ACTION'} ne '' &&
&General::readhash("${General::swroot}/ppp/settings", \%pppsettings);}
elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'})
{
unless ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn|pppoe|pptp|vdsl|pppoeatm|pptpatm)$/) {
unless ($pppsettings{'TYPE'} =~ /^(modem|serial|pppoe|pptp|vdsl|pppoeatm|pptpatm)$/) {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
my $type = $pppsettings{'TYPE'};
@@ -72,10 +71,10 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'})
}
elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
{
if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1|isdn1|isdn2)$/) {
if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) {
if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) {
@@ -93,7 +92,7 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
$errormessage = $Lang::tr{'profile name not given'};
$pppsettings{'PROFILENAME'} = '';
goto ERROR; }
if ($pppsettings{'TYPE'} =~ /^(modem|isdn)$/) {
if ($pppsettings{'TYPE'} =~ /^(modem)$/) {
if ($pppsettings{'TELEPHONE'} eq '') {
$errormessage = $Lang::tr{'telephone not set'};
goto ERROR; }
@@ -739,7 +738,6 @@ print <<END
</tr>
END
;
if ($pppsettings{'TYPE'} ne 'isdn') {
print <<END
<tr>
<td colspan='4' width='100%'><input type='radio' name='RECONNECTION' value='persistent' $checked{'RECONNECTION'}{'persistent'}>$Lang::tr{'persistent'}</td>
@@ -755,10 +753,6 @@ END
print <<END
</select></td>
</tr>
END
;
}
print <<END
<tr>
<td colspan='3' width='75%'>$Lang::tr{'dod for dns'}</td>
<td width='25%'><input type='checkbox' name='DIALONDEMANDDNS' $checked{'DIALONDEMANDDNS'}{'on'} /></td>

5
langs/de/cgi-bin/de.pl
View File

@@ -1366,7 +1366,6 @@
'hour-graph' => 'Stunde',
'hours' => 'Stunden',
'hours2' => 'Stunden',
'ibod for dual isdn only' => 'iBOD kann nur bei ISDN-Kanalbündelung genutzt werden.',
'icmp selected but no type' => 'ICMP wurde zwar als Protokoll gewählt, es wurde aber kein ICMP-Typ angegeben.',
'icmp type' => 'ICMP-Typ',
'id' => 'ID',
@@ -1579,10 +1578,6 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'iptables',
'isdn' => 'ISDN',
'isdn settings' => 'Zusätzliche ISDN-Einstellungen:',
'isdn1' => 'Einfaches ISDN',
'isdn2' => 'ISDN-Kanalbündelung',
'itlb multihit' => 'iTLB MultiHit',
'january' => 'Januar',
'javascript menu error1' => 'Wenn die Drop-down-Menus nicht funktionieren, deaktivieren Sie Javascript auf der',

5
langs/en/cgi-bin/en.pl
View File

@@ -1411,7 +1411,6 @@
'hour-graph' => 'Hour',
'hours' => 'Hours',
'hours2' => 'Hours',
'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.',
'icmp type' => 'ICMP Type',
'id' => 'ID',
@@ -1628,10 +1627,6 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'iptables',
'isdn' => 'ISDN',
'isdn settings' => 'Additional ISDN settings:',
'isdn1' => 'Single ISDN',
'isdn2' => 'Dual ISDN',
'itlb multihit' => 'iTLB MultiHit',
'january' => 'January',
'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the',

1
langs/es/cgi-bin/es.pl
View File

@@ -1420,7 +1420,6 @@
'hour-graph' => 'Hora',
'hours' => 'horas',
'hours2' => 'Horas',
'ibod for dual isdn only' => 'iBPD sólo puede usarse con ISDN dual',
'icmp selected but no type' => 'ICMP seleccionado como protocolo, pero no se ha seleccionado tipo de ICMP.',
'icmp type' => 'Tipo de ICMP',
'id' => 'ID',

5
langs/fr/cgi-bin/fr.pl
View File

@@ -1411,7 +1411,6 @@
'hour-graph' => 'Heure',
'hours' => 'heure(s)',
'hours2' => 'Heures',
'ibod for dual isdn only' => 'iBOD peut seulement être utilisé avec un double ISDN.',
'icmp selected but no type' => 'ICMP est le protocole sélectionné, mais il n\'y a aucun type ICMP spécifié.',
'icmp type' => 'Type ICMP',
'id' => 'ID',
@@ -1631,10 +1630,6 @@
'iptmangles' => 'Table IP Mangle ',
'iptnats' => 'Traduction d\'adresses réseaux table IP ',
'ipts' => 'Tables IP ',
'isdn' => 'RNIS',
'isdn settings' => 'Réglages RNIS supplémentaires :',
'isdn1' => 'RNIS unique',
'isdn2' => 'RNIS double',
'itlb multihit' => 'ITLB - erreur vérification machine',
'january' => 'Janvier',
'javascript menu error1' => 'Si les menus déroulants ne fonctionnent pas, désactivez le Javascript sur la',

5
langs/it/cgi-bin/it.pl
View File

@@ -1204,7 +1204,6 @@
'hour-graph' => 'Ora',
'hours' => 'Ore',
'hours2' => 'Ore',
'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.',
'icmp type' => 'ICMP Type',
'id' => 'ID',
@@ -1339,10 +1338,6 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'iptables',
'isdn' => 'ISDN',
'isdn settings' => 'Additional ISDN settings:',
'isdn1' => 'Single ISDN',
'isdn2' => 'Dual ISDN',
'january' => 'Gennaio',
'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the',
'javascript menu error2' => 'page.',

5
langs/nl/cgi-bin/nl.pl
View File

@@ -1200,7 +1200,6 @@
'hour-graph' => 'Uur',
'hours' => 'uren',
'hours2' => 'Uren',
'ibod for dual isdn only' => 'iBOD kan alleen gebruikt worden met Dual ISDN.',
'icmp selected but no type' => 'ICMP als protocol geselecteerd, maar er is geen ICMP type gespecificeerd.',
'icmp type' => 'ICMP Type',
'id' => 'ID',
@@ -1333,10 +1332,6 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Adrestranslatie',
'ipts' => 'iptables',
'isdn' => 'ISDN',
'isdn settings' => 'Extra ISDN instellingen:',
'isdn1' => 'Single ISDN',
'isdn2' => 'Dual ISDN',
'january' => 'Januari',
'javascript menu error1' => 'Als de menu\'s niet werken, schakel dan javascript uit op de',
'javascript menu error2' => 'pagina.',

5
langs/pl/cgi-bin/pl.pl
View File

@@ -912,7 +912,6 @@
'hour-graph' => 'Godzina',
'hours' => 'Godziny',
'hours2' => 'Godziny',
'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
'icmp selected but no type' => 'Wybrano protokół ICMP, ale nie określono typu ICMP.',
'icmp type' => 'Typ ICMP',
'id' => 'ID',
@@ -1038,10 +1037,6 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'iptables',
'isdn' => 'ISDN',
'isdn settings' => 'Dodatkowe ustawienia ISDN:',
'isdn1' => 'Pojedynczy ISDN',
'isdn2' => 'Podwójny ISDN',
'january' => 'Styczeń',
'javascript menu error1' => 'Jeżeli rozwijane menu nie działają poprawnie wyłącz javascript na',
'javascript menu error2' => 'stronie.',

5
langs/ru/cgi-bin/ru.pl
View File

@@ -906,7 +906,6 @@
'hour' => 'Час',
'hours' => 'Часы',
'hours2' => 'Часы',
'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.',
'icmp type' => 'ICMP Type',
'id' => 'ID',
@@ -1031,10 +1030,6 @@
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Address Translation',
'ipts' => 'iptables',
'isdn' => 'ISDN',
'isdn settings' => 'Additional ISDN settings:',
'isdn1' => 'Single ISDN',
'isdn2' => 'Dual ISDN',
'january' => 'Январь',
'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the',
'javascript menu error2' => 'page.',

5
langs/tr/cgi-bin/tr.pl
View File

@@ -1317,7 +1317,6 @@
'hour-graph' => 'saat',
'hours' => 'saat',
'hours2' => 'saat',
'ibod for dual isdn only' => 'iBOD yalnızca çift ISDN ile kullanılabilir.',
'icmp selected but no type' => 'ICMP kuralı için seçildi ancak ICMP türü belirtildi.',
'icmp type' => 'ICMP Türü',
'id' => 'Kimlik Numarası (ID)',
@@ -1457,10 +1456,6 @@
'iptmangles' => 'IPTablo sıkıştırmaları',
'iptnats' => 'IPTablo ağ adres çevrimi',
'ipts' => 'IPTablolar',
'isdn' => 'ISDN',
'isdn settings' => 'Ek ISDN ayarları:',
'isdn1' => 'Tek ISDN',
'isdn2' => 'Çift ISDN',
'january' => 'Ocak',
'javascript menu error1' => 'Eğer aşağı açılır listeler çalışmıyorsa javascript seçeneğini devre dışı bırakın',
'javascript menu error2' => 'sayfa.',

4
lfs/configroot
View File

@@ -51,7 +51,7 @@ $(TARGET) :
# Create all directories
for i in addon-lang auth backup ca captive certs connscheduler crls ddns dhcp dhcpc dns dnsforward \
ethernet extrahd/bin fwlogs fwhosts firewall ipblocklist isdn key langs logging mac main \
ethernet extrahd/bin fwlogs fwhosts firewall ipblocklist key langs logging mac main \
menu.d modem optionsfw \
ovpn patches pakfire portfw ppp private proxy/advanced/cre \
proxy/calamaris/bin qos/bin red remote sensors suricata time \
@@ -66,7 +66,7 @@ $(TARGET) :
dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/locationblock firewall/input firewall/outgoing \
fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/modified \
ipblocklist/settings isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
ipblocklist/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \
ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
qos/tosconfig suricata/settings vpn/config vpn/settings vpn/ipsec.conf \

5
src/ppp/ip-up
View File

@@ -24,11 +24,6 @@
eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
if [ "$TYPE" = "isdn" ]; then
DNS1="${MS_DNS1}"
DNS2="${MS_DNS2}"
fi
# Write DNS servers to configuration
echo "${DNS1}" > /var/run/dns1
echo "${DNS2}" > /var/run/dns2