my $menu = \%menuhash;
%settings = ();
%ethsettings = ();
+%pppsettings = ();
@URI = ();
### Make sure this is an SSL request
### Initialize environment
&General::readhash("${swroot}/main/settings", \%settings);
&General::readhash("${swroot}/ethernet/settings", \%ethsettings);
+&General::readhash("${swroot}/ppp/settings", \%pppsettings);
$language = $settings{'LANGUAGE'};
$hostname = $settings{'HOSTNAME'};
$hostnameintitle = 0;
$menu->{'01.system'}{'subMenu'}->{'21.wlan'}{'enabled'} = 1;
}
- if ($ethsettings{'RED_TYPE'} eq "PPPOE") {
+ if ( $ethsettings{'RED_TYPE'} eq "PPPOE" && $pppsettings{'MONPORT'} ne "" ) {
$menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1;
}
}
bless $self, $class;
# Initialize the connetion to the modem.
- $self->_initialize($port, $baud);
+ my $ret = $self->_initialize($port, $baud);
+ if ($ret) {
+ return undef;
+ }
if ($self->_is_working()) {
return $self;
sub _initialize() {
my ($self, $port, $baud) = @_;
+ # Check if the character device actually exists.
+ if (! -c $port) {
+ return 1;
+ }
+
# Establish connection to the modem.
$self->{modem} = new Device::Modem(port => $port);
$self->{modem}->connect(baudrate => $baud);
+
+ return 0;
}
sub _is_working() {
CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SERIAL_8250_DETECT_IRQ is not set
CONFIG_SERIAL_8250_RSA=y
-# CONFIG_SERIAL_8250_DW is not set
+CONFIG_SERIAL_8250_DW=y
# CONFIG_SERIAL_8250_EM is not set
#
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEASPM=y
# CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
-CONFIG_PCIEASPM_POWERSAVE=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
# CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_PCIE_PME=y
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCIEAER_INJECT=m
CONFIG_PCIEASPM=y
# CONFIG_PCIEASPM_DEBUG is not set
-# CONFIG_PCIEASPM_DEFAULT is not set
-CONFIG_PCIEASPM_POWERSAVE=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
# CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_PCIE_PME=y
CONFIG_ARCH_SUPPORTS_MSI=y
#usr/include/linux/unix_diag.h
#usr/include/linux/usb
#usr/include/linux/usb/audio.h
+#usr/include/linux/usb/cdc-wdm.h
#usr/include/linux/usb/cdc.h
#usr/include/linux/usb/ch11.h
#usr/include/linux/usb/ch9.h
#usr/include/linux/unix_diag.h
#usr/include/linux/usb
#usr/include/linux/usb/audio.h
+#usr/include/linux/usb/cdc-wdm.h
#usr/include/linux/usb/cdc.h
#usr/include/linux/usb/ch11.h
#usr/include/linux/usb/ch9.h
#usr/bin/pcap-config
#usr/include/pcap
+#usr/include/pcap/bluetooth.h
#usr/include/pcap-bpf.h
#usr/include/pcap-int.h
+#usr/include/pcap/ipnet.h
#usr/include/pcap-namedb.h
#usr/include/pcap.h
#usr/include/pcap/bpf.h
#usr/include/pcap/pcap.h
#usr/include/pcap/sll.h
#usr/include/pcap/usb.h
+#usr/include/pcap/vlan.h
#usr/lib/libpcap.a
usr/lib/libpcap.so
usr/lib/libpcap.so.1
-usr/lib/libpcap.so.1.0
-usr/lib/libpcap.so.1.0.0
+usr/lib/libpcap.so.1.4.0
#usr/share/man/man1/pcap-config.1
#usr/share/man/man3/pcap.3pcap
#usr/share/man/man3/pcap_activate.3pcap
#usr/share/man/man3/pcap_findalldevs.3pcap
#usr/share/man/man3/pcap_fopen_offline.3pcap
#usr/share/man/man3/pcap_free_datalinks.3pcap
+#usr/share/man/man3/pcap_free_tstamp_types.3pcap
#usr/share/man/man3/pcap_freealldevs.3pcap
#usr/share/man/man3/pcap_freecode.3pcap
#usr/share/man/man3/pcap_get_selectable_fd.3pcap
#usr/share/man/man3/pcap_is_swapped.3pcap
#usr/share/man/man3/pcap_lib_version.3pcap
#usr/share/man/man3/pcap_list_datalinks.3pcap
+#usr/share/man/man3/pcap_list_tstamp_types.3pcap
#usr/share/man/man3/pcap_lookupdev.3pcap
#usr/share/man/man3/pcap_lookupnet.3pcap
#usr/share/man/man3/pcap_loop.3pcap
#usr/share/man/man3/pcap_set_rfmon.3pcap
#usr/share/man/man3/pcap_set_snaplen.3pcap
#usr/share/man/man3/pcap_set_timeout.3pcap
+#usr/share/man/man3/pcap_set_tstamp_type.3pcap
#usr/share/man/man3/pcap_setdirection.3pcap
#usr/share/man/man3/pcap_setfilter.3pcap
#usr/share/man/man3/pcap_setnonblock.3pcap
#usr/share/man/man3/pcap_stats.3pcap
#usr/share/man/man3/pcap_statustostr.3pcap
#usr/share/man/man3/pcap_strerror.3pcap
+#usr/share/man/man3/pcap_tstamp_type_name_to_val.3pcap
+#usr/share/man/man3/pcap_tstamp_type_val_to_name.3pcap
#usr/share/man/man5/pcap-savefile.5
#usr/share/man/man7/pcap-filter.7
#usr/share/man/man7/pcap-linktype.7
+#usr/share/man/man7/pcap-tstamp.7
etc/system-release
etc/issue
+etc/rc.d/init.d/leds
etc/rc.d/init.d/sshd
+etc/rc.d/init.d/udev
srv/web/ipfire/cgi-bin/ddns.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
srv/web/ipfire/cgi-bin/modem-status.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/traffic.cgi
srv/web/ipfire/html/themes/ipfire/include/functions.pl
usr/bin/squidGuard
+usr/sbin/firewall-policy
usr/sbin/redirect_wrapper
usr/sbin/updxlrator
usr/local/bin/setddns.pl
+var/ipfire/header.pl
var/ipfire/langs
var/ipfire/menu.d/20-status.menu
var/ipfire/menu.d/70-log.menu
--- /dev/null
+../../../common/libpcap
\ No newline at end of file
--- /dev/null
+../../../common/openssh
\ No newline at end of file
--- /dev/null
+../../../common/openssl
\ No newline at end of file
--- /dev/null
+../../../common/perl-Device-Modem
\ No newline at end of file
--- /dev/null
+../../../common/perl-Device-SerialPort
\ No newline at end of file
#
# Remove old core updates from pakfire cache to save space...
-core=78
+core=79
for (( i=1; i<=${core}; i++ ))
do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-[Temp]
-path = /tmp
-comment = Temp
-browseable = yes
+[Share1]
+path = /mnt/share1
+comment = Shared Folder
+browsable = yes
writeable = yes
-create mask = 0777
-directory mask = 0777
-guest ok = yes
-force user = samba
-[P2P]
-path = /var/ipfire/samba/p2p
-comment = P2P
-browseable = yes
-writeable = yes
-create mask = 0777
-directory mask = 0777
+create mask = 0644
+directory mask = 0755
guest ok = yes
force user = samba
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
WARNING: untranslated string: first
WARNING: untranslated string: fwhost err hostip
WARNING: untranslated string: last
-WARNING: untranslated string: monitor interface
WARNING: untranslated string: qos add subclass
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
WARNING: untranslated string: first
WARNING: untranslated string: fwhost err hostip
WARNING: untranslated string: last
-WARNING: untranslated string: monitor interface
WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
WARNING: translation string unused: removable device advice
WARNING: translation string unused: reportfile
WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
WARNING: translation string unused: restore hardware settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
WARNING: translation string unused: route subnet is invalid
WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
WARNING: translation string unused: save error
WARNING: translation string unused: source ip or net
WARNING: translation string unused: source net
WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
WARNING: translation string unused: source port overlaps
WARNING: translation string unused: squid extension methods
WARNING: translation string unused: squid extension methods invalid
< modem no connection message
< modem sim information
< modem status
+< monitor interface
< most preferred
< MTU settings
< never
< modem no connection message
< modem sim information
< modem status
+< monitor interface
< most preferred
< MTU settings
< never
< modem no connection message
< modem sim information
< modem status
+< monitor interface
< most preferred
< MTU settings
< never
< modem no connection message
< modem sim information
< modem status
+< monitor interface
< month-graph
< most preferred
< MTU settings
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2014 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
exit(0);
}
+###
+### Download tls-auth key
+###
+}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download tls-auth key'}) {
+ if ( -f "${General::swroot}/ovpn/certs/ta.key" ) {
+ print "Content-Type: application/octet-stream\r\n";
+ print "Content-Disposition: filename=ta.key\r\n\r\n";
+ print `/bin/cat ${General::swroot}/ovpn/certs/ta.key`;
+ exit(0);
+ }
+
###
### Form for generating a root certificate
###
exit(0);
}
+###
+### Display tls-auth key
+###
+} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'show tls-auth key'}) {
+
+ if (! -e "${General::swroot}/ovpn/certs/ta.key") {
+ $errormessage = $Lang::tr{'not present'};
+ } else {
+ &Header::showhttpheaders();
+ &Header::openpage($Lang::tr{'ovpn'}, 1, '');
+ &Header::openbigbox('100%', 'LEFT', '', '');
+ &Header::openbox('100%', 'LEFT', "$Lang::tr{'ta key'}:");
+ my $output = `/bin/cat ${General::swroot}/ovpn/certs/ta.key`;
+ $output = &Header::cleanhtml($output,"y");
+ print "<pre>$output</pre>\n";
+ &Header::closebox();
+ print "<div align='center'><a href='/cgi-bin/ovpnmain.cgi'>$Lang::tr{'back'}</a></div>";
+ &Header::closebigbox();
+ &Header::closepage();
+ exit(0);
+ }
+
###
### Display Certificate Revoke List
###
my $mssfixactive;
my $authactive;
my $n2nfragment;
-my $authactive;
my @n2nmtudisc = split(/ /, (grep { /^mtu-disc/ } @firen2nconf)[0]);
my @n2nproto2 = split(/ /, (grep { /^proto/ } @firen2nconf)[0]);
my @n2nproto = split(/-/, $n2nproto2[1]);
;
&Header::closebox();
}
+
+ # CA/key listing
&Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate authorities'}");
print <<END;
<table width='100%' cellspacing='1' cellpadding='0' class='tbl'>
;
my $col1="bgcolor='$color{'color22'}'";
my $col2="bgcolor='$color{'color20'}'";
+ # DH parameter line
my $col3="bgcolor='$color{'color22'}'";
+ # ta.key line
+ my $col4="bgcolor='$color{'color20'}'";
if (-f "${General::swroot}/ovpn/ca/cacert.pem") {
my $casubject = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/ca/cacert.pem`;
<tr>
<td class='base' $col1>$Lang::tr{'root certificate'}</td>
<td class='base' $col1>$casubject</td>
- <form method='post' name='frmrootcrta'><td width='3%' align='center' $col1>
+ <form method='post' name='frmrootcrta'><td width='3%' align='center' $col1>
<input type='hidden' name='ACTION' value='$Lang::tr{'show root certificate'}' />
<input type='image' name='$Lang::tr{'edit'}' src='/images/info.gif' alt='$Lang::tr{'show root certificate'}' title='$Lang::tr{'show root certificate'}' width='20' height='20' border='0' />
- </td></form>
- <form method='post' name='frmrootcrtb'><td width='3%' align='center' $col1>
+ </form>
+ <form method='post' name='frmrootcrtb'><td width='3%' align='center' $col1>
<input type='image' name='$Lang::tr{'download root certificate'}' src='/images/media-floppy.png' alt='$Lang::tr{'download root certificate'}' title='$Lang::tr{'download root certificate'}' border='0' />
<input type='hidden' name='ACTION' value='$Lang::tr{'download root certificate'}' />
- </td></form>
- <td width='4%' $col1> </td></tr>
+ </form>
+ <td width='4%' $col1> </td>
+ </tr>
END
;
} else {
<tr>
<td class='base' $col1>$Lang::tr{'root certificate'}:</td>
<td class='base' $col1>$Lang::tr{'not present'}</td>
- <td colspan='3' $col1> </td></tr>
+ <td colspan='3' $col1> </td>
+ </tr>
END
;
}
<tr>
<td class='base' $col2>$Lang::tr{'host certificate'}</td>
<td class='base' $col2>$hostsubject</td>
- <form method='post' name='frmhostcrta'><td width='3%' align='center' $col2>
+ <form method='post' name='frmhostcrta'><td width='3%' align='center' $col2>
<input type='hidden' name='ACTION' value='$Lang::tr{'show host certificate'}' />
<input type='image' name='$Lang::tr{'show host certificate'}' src='/images/info.gif' alt='$Lang::tr{'show host certificate'}' title='$Lang::tr{'show host certificate'}' width='20' height='20' border='0' />
- </td></form>
- <form method='post' name='frmhostcrtb'><td width='3%' align='center' $col2>
+ </form>
+ <form method='post' name='frmhostcrtb'><td width='3%' align='center' $col2>
<input type='image' name="$Lang::tr{'download host certificate'}" src='/images/media-floppy.png' alt="$Lang::tr{'download host certificate'}" title="$Lang::tr{'download host certificate'}" border='0' />
<input type='hidden' name='ACTION' value="$Lang::tr{'download host certificate'}" />
- </td></form>
- <td width='4%' $col2> </td></tr>
+ </td></form>
+ <td width='4%' $col2> </td>
+ </tr>
END
;
} else {
<tr>
<td width='25%' class='base' $col2>$Lang::tr{'host certificate'}:</td>
<td class='base' $col2>$Lang::tr{'not present'}</td>
- </td><td colspan='3' $col2> </td></tr>
+ </td><td colspan='3' $col2> </td>
+ </tr>
END
;
}
# Adding DH parameter to chart
if (-f "${General::swroot}/ovpn/ca/dh1024.pem") {
my $dhsubject = `/usr/bin/openssl dhparam -text -in ${General::swroot}/ovpn/ca/dh1024.pem`;
- $dhsubject =~ /PKCS#3 (.*)[\n]/;
+ $dhsubject =~ / (.*)[\n]/;
$dhsubject = $1;
<tr>
<td class='base' $col3>$Lang::tr{'dh parameter'}</td>
<td class='base' $col3>$dhsubject</td>
- <form method='post' name='frmdhparam'><td width='3%' align='center' $col3>
+ <form method='post' name='frmdhparam'><td width='3%' align='center' $col3>
<input type='hidden' name='ACTION' value='$Lang::tr{'show dh'}' />
<input type='image' name='$Lang::tr{'show dh'}' src='/images/info.gif' alt='$Lang::tr{'show dh'}' title='$Lang::tr{'show dh'}' width='20' height='20' border='0' />
- </td></form>
- <form method='post' name='frmdhparam'><td width='3%' align='center' $col3>
- <input type='image' name="$Lang::tr{'download dh parameter'}" src='/images/media-floppy.png' alt="$Lang::tr{'download dh parameter'}" title="$Lang::tr{'download dh parameter'}" border='0' />
- <input type='hidden' name='ACTION' value="$Lang::tr{'download dh parameter'}" />
- </td></form>
- <td width='4%' $col3> </td></tr>
+ </form>
+ <form method='post' name='frmdhparam'><td width='3%' align='center' $col3>
+ </form>
+ <td width='4%' $col3> </td>
+ </tr>
END
;
} else {
<tr>
<td width='25%' class='base' $col3>$Lang::tr{'dh parameter'}:</td>
<td class='base' $col3>$Lang::tr{'not present'}</td>
- </td><td colspan='3' $col3> </td></tr>
+ </td><td colspan='3' $col3> </td>
+ </tr>
+END
+ ;
+ }
+
+ # Adding ta.key to chart
+ if (-f "${General::swroot}/ovpn/certs/ta.key") {
+ my $tasubject = `/bin/cat ${General::swroot}/ovpn/certs/ta.key`;
+ $tasubject =~ /# (.*)[\n]/;
+ $tasubject = $1;
+ print <<END;
+
+ <tr>
+ <td class='base' $col4>$Lang::tr{'ta key'}</td>
+ <td class='base' $col4>$tasubject</td>
+ <form method='post' name='frmtakey'><td width='3%' align='center' $col4>
+ <input type='hidden' name='ACTION' value='$Lang::tr{'show tls-auth key'}' />
+ <input type='image' name='$Lang::tr{'edit'}' src='/images/info.gif' alt='$Lang::tr{'show tls-auth key'}' title='$Lang::tr{'show tls-auth key'}' width='20' height='20' border='0' />
+ </form>
+ <form method='post' name='frmtakey'><td width='3%' align='center' $col4>
+ <input type='image' name='$Lang::tr{'download tls-auth key'}' src='/images/media-floppy.png' alt='$Lang::tr{'download tls-auth key'}' title='$Lang::tr{'download tls-auth key'}' border='0' />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'download tls-auth key'}' />
+ </form>
+ <td width='4%' $col4> </td>
+ </tr>
+END
+ ;
+ } else {
+ # Nothing
+ print <<END;
+ <tr>
+ <td width='25%' class='base' $col4>$Lang::tr{'ta key'}:</td>
+ <td class='base' $col4>$Lang::tr{'not present'}</td>
+ <td colspan='3' $col4> </td>
+ </tr>
END
;
}
<hr size='1'>
<form method='post' enctype='multipart/form-data'>
<table width='100%' border='0'cellspacing='1' cellpadding='0'>
+ <tr>
+ <td class'base'><b>$Lang::tr{'upload ca certificate'}</b></td>
+ </tr>
<tr>
<td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td>
<td nowrap='nowrap'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' align='left'/></td>
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2014 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
}
elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
{
- if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM0|ttyACM1|ttyACM2|ttyACM3|ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3|rfcomm0|rfcomm1|isdn1|isdn2)$/) {
+ if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1|isdn1|isdn2)$/) {
$errormessage = $Lang::tr{'invalid input'};
goto ERROR; }
- if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3)$/) {
+ if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $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)$/) {
$selected{'COMPORT'}{'ttyACM1'} = '';
$selected{'COMPORT'}{'ttyACM2'} = '';
$selected{'COMPORT'}{'ttyACM3'} = '';
+$selected{'COMPORT'}{'ttyACM4'} = '';
+$selected{'COMPORT'}{'ttyACM5'} = '';
+$selected{'COMPORT'}{'ttyACM6'} = '';
+$selected{'COMPORT'}{'ttyACM7'} = '';
+$selected{'COMPORT'}{'ttyACM8'} = '';
+$selected{'COMPORT'}{'ttyACM9'} = '';
$selected{'COMPORT'}{'ttyUSB0'} = '';
$selected{'COMPORT'}{'ttyUSB1'} = '';
$selected{'COMPORT'}{'ttyUSB2'} = '';
$selected{'COMPORT'}{'ttyUSB3'} = '';
+$selected{'COMPORT'}{'ttyUSB4'} = '';
+$selected{'COMPORT'}{'ttyUSB5'} = '';
+$selected{'COMPORT'}{'ttyUSB6'} = '';
+$selected{'COMPORT'}{'ttyUSB7'} = '';
+$selected{'COMPORT'}{'ttyUSB8'} = '';
+$selected{'COMPORT'}{'ttyUSB9'} = '';
$selected{'COMPORT'}{'rfcomm0'} = '';
$selected{'COMPORT'}{'rfcomm1'} = '';
$selected{'COMPORT'}{$pppsettings{'COMPORT'}} = "selected='selected'";
$selected{'MONPORT'}{''} = '';
+$selected{'MONPORT'}{'ttyACM0'} = '';
+$selected{'MONPORT'}{'ttyACM1'} = '';
+$selected{'MONPORT'}{'ttyACM2'} = '';
+$selected{'MONPORT'}{'ttyACM3'} = '';
+$selected{'MONPORT'}{'ttyACM4'} = '';
+$selected{'MONPORT'}{'ttyACM5'} = '';
+$selected{'MONPORT'}{'ttyACM6'} = '';
+$selected{'MONPORT'}{'ttyACM7'} = '';
+$selected{'MONPORT'}{'ttyACM8'} = '';
+$selected{'MONPORT'}{'ttyACM9'} = '';
$selected{'MONPORT'}{'ttyUSB0'} = '';
$selected{'MONPORT'}{'ttyUSB1'} = '';
$selected{'MONPORT'}{'ttyUSB2'} = '';
$selected{'MONPORT'}{'ttyUSB3'} = '';
+$selected{'MONPORT'}{'ttyUSB4'} = '';
+$selected{'MONPORT'}{'ttyUSB5'} = '';
+$selected{'MONPORT'}{'ttyUSB6'} = '';
+$selected{'MONPORT'}{'ttyUSB7'} = '';
+$selected{'MONPORT'}{'ttyUSB8'} = '';
+$selected{'MONPORT'}{'ttyUSB9'} = '';
+$selected{'MONPORT'}{'rfcomm0'} = '';
+$selected{'MONPORT'}{'rfcomm1'} = '';
$selected{'MONPORT'}{$pppsettings{'MONPORT'}} = "selected='selected'";
$selected{'DTERATE'}{'9600'} = '';
<option value='ttyUSB1' $selected{'COMPORT'}{'ttyUSB1'}>ttyUSB1</option>
<option value='ttyUSB2' $selected{'COMPORT'}{'ttyUSB2'}>ttyUSB2</option>
<option value='ttyUSB3' $selected{'COMPORT'}{'ttyUSB3'}>ttyUSB3</option>
+ <option value='ttyUSB4' $selected{'COMPORT'}{'ttyUSB4'}>ttyUSB4</option>
+ <option value='ttyUSB5' $selected{'COMPORT'}{'ttyUSB5'}>ttyUSB5</option>
+ <option value='ttyUSB6' $selected{'COMPORT'}{'ttyUSB6'}>ttyUSB6</option>
+ <option value='ttyUSB7' $selected{'COMPORT'}{'ttyUSB7'}>ttyUSB7</option>
+ <option value='ttyUSB8' $selected{'COMPORT'}{'ttyUSB8'}>ttyUSB8</option>
+ <option value='ttyUSB9' $selected{'COMPORT'}{'ttyUSB9'}>ttyUSB9</option>
<option value='rfcomm0' $selected{'COMPORT'}{'rfcomm0'}>rfcomm0 (bluetooth)</option>
<option value='rfcomm1' $selected{'COMPORT'}{'rfcomm1'}>rfcomm1 (bluetooth)</option>
END
;
if ($pppsettings{'TYPE'} ne 'serial' ) {
print <<END
- <option value='ttyACM0' $selected{'COMPORT'}{'ttyACM0'}>$Lang::tr{'usb modem on acm0'}</option>
- <option value='ttyACM1' $selected{'COMPORT'}{'ttyACM1'}>$Lang::tr{'usb modem on acm1'}</option>
- <option value='ttyACM2' $selected{'COMPORT'}{'ttyACM2'}>$Lang::tr{'usb modem on acm2'}</option>
- <option value='ttyACM3' $selected{'COMPORT'}{'ttyACM3'}>$Lang::tr{'usb modem on acm3'}</option>
+ <option value='ttyACM0' $selected{'COMPORT'}{'ttyACM0'}>ttyACM0</option>
+ <option value='ttyACM1' $selected{'COMPORT'}{'ttyACM1'}>ttyACM1</option>
+ <option value='ttyACM2' $selected{'COMPORT'}{'ttyACM2'}>ttyACM2</option>
+ <option value='ttyACM3' $selected{'COMPORT'}{'ttyACM3'}>ttyACM3</option>
+ <option value='ttyACM4' $selected{'COMPORT'}{'ttyACM4'}>ttyACM4</option>
+ <option value='ttyACM5' $selected{'COMPORT'}{'ttyACM5'}>ttyACM5</option>
+ <option value='ttyACM6' $selected{'COMPORT'}{'ttyACM6'}>ttyACM6</option>
+ <option value='ttyACM7' $selected{'COMPORT'}{'ttyACM7'}>ttyACM7</option>
+ <option value='ttyACM8' $selected{'COMPORT'}{'ttyACM8'}>ttyACM8</option>
+ <option value='ttyACM9' $selected{'COMPORT'}{'ttyACM9'}>ttyACM9</option>
END
;
}
<option value="ttyUSB1" $selected{'MONPORT'}{'ttyUSB1'}>ttyUSB1</option>
<option value="ttyUSB2" $selected{'MONPORT'}{'ttyUSB2'}>ttyUSB2</option>
<option value="ttyUSB3" $selected{'MONPORT'}{'ttyUSB3'}>ttyUSB3</option>
+ <option value="ttyUSB4" $selected{'MONPORT'}{'ttyUSB4'}>ttyUSB4</option>
+ <option value="ttyUSB5" $selected{'MONPORT'}{'ttyUSB5'}>ttyUSB5</option>
+ <option value="ttyUSB6" $selected{'MONPORT'}{'ttyUSB6'}>ttyUSB6</option>
+ <option value="ttyUSB7" $selected{'MONPORT'}{'ttyUSB7'}>ttyUSB7</option>
+ <option value="ttyUSB8" $selected{'MONPORT'}{'ttyUSB8'}>ttyUSB8</option>
+ <option value="ttyUSB9" $selected{'MONPORT'}{'ttyUSB9'}>ttyUSB9</option>
+ <option value="rfcomm0" $selected{'COMPORT'}{'rfcomm0'}>rfcomm0 (bluetooth)</option>
+ <option value="rfcomm1" $selected{'COMPORT'}{'rfcomm1'}>rfcomm1 (bluetooth)</option>
+ <option value="ttyACM0" $selected{'COMPORT'}{'ttyACM0'}>ttyACM0</option>
+ <option value="ttyACM1" $selected{'COMPORT'}{'ttyACM1'}>ttyACM1</option>
+ <option value="ttyACM2" $selected{'COMPORT'}{'ttyACM2'}>ttyACM2</option>
+ <option value="ttyACM3" $selected{'COMPORT'}{'ttyACM3'}>ttyACM3</option>
+ <option value="ttyACM4" $selected{'COMPORT'}{'ttyACM4'}>ttyACM4</option>
+ <option value="ttyACM5" $selected{'COMPORT'}{'ttyACM5'}>ttyACM5</option>
+ <option value="ttyACM6" $selected{'COMPORT'}{'ttyACM6'}>ttyACM6</option>
+ <option value="ttyACM7" $selected{'COMPORT'}{'ttyACM7'}>ttyACM7</option>
+ <option value="ttyACM8" $selected{'COMPORT'}{'ttyACM8'}>ttyACM8</option>
+ <option value="ttyACM9" $selected{'COMPORT'}{'ttyACM9'}>ttyACM9</option>
</select>
</td>
</tr>
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2014 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
if ( $testdata =~ 'enough') {
print"No data for $device !<br>";
} else {
- # Falls back to textoutput if there was no % value because vnstati hang in this case
- if (!($testdata =~ 'nan%')) {
- system("/usr/bin/vnstati -c 5 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png");
- }
+ system("/usr/bin/vnstati -c 5 -s -i $device -o /srv/web/ipfire/html/graphs/vnstat-s-$device.png");
# Hour graph
system("/usr/bin/vnstati -c 5 -h -i $device -o /srv/web/ipfire/html/graphs/vnstat-h-$device.png");
# Day graph
system("/usr/bin/vnstati -c 5 -t -i $device -o /srv/web/ipfire/html/graphs/vnstat-t-$device.png");
# Generate HTML-Table with the graphs
- print "<table>";
- if ($testdata =~ 'nan%') {
- print "<tr><td><b><pre>";
- system("/usr/bin/vnstat -i $device");
- print "</pre></b></td></tr>";
- } else {
- print"<tr><td><img src=\"/graphs/vnstat-s-$device.png\"></td></tr>";
- }
print <<END
+<table>
+<tr><td><img src="/graphs/vnstat-s-$device.png"></td></tr>
<tr><td><img src="/graphs/vnstat-h-$device.png"></td></tr>
<tr><td><img src="/graphs/vnstat-d-$device.png"></td></tr>
<tr><td><img src="/graphs/vnstat-m-$device.png"></td></tr>
'ccd used' => 'Genutzte Adressen',
'cert' => 'Zertifikat',
'certificate' => 'Zertifikat',
-'certificate authorities' => 'Zertifizierungsstellen (CAs)',
+'certificate authorities' => 'Zertifizierungsstellen und -Schlüssel',
'certificate does not have a valid ca associated with it' => 'Mit dem Zertifikat ist keine gültige CA verbunden.',
'certificate file move failed' => 'Verschieben der Zertifikatsdatei fehlgeschlagen',
'cfg restart' => 'Nach dem Wiederherstellen eines Konfigurationsarchivs wird ein Neustart empfohlen.',
'connection' => 'Verbindung',
'connection closed' => 'Nicht Verbunden...',
'connection debugging' => 'Verbindungs-Debugging',
-'connection status and controlc' => 'Verbindungsstatus und -kontrolle',
+'connection status and controlc' => 'Verbindungsstatus und -Kontrolle',
'connection tracking' => 'iptables-Verbindungsverfolgung',
'connection type' => 'Verbindungstyp',
'connection type is invalid' => 'Verbindungstyp ist ungültig',
'downlink std class' => 'Downloadstandardklasse',
'download' => 'herunterladen',
'download ca certificate' => 'CA-Zertifikat herunterladen',
-'download certificate' => 'Zertifikate herunterladen',
+'download certificate' => 'Datei herunterladen',
'download dh parameter' => 'Diffie-Hellman-Parameter herunterladen',
'download host certificate' => 'Host-Zertifikat herunterladen',
'download new ruleset' => 'Neuen Regelsatz herunterladen',
'download pkcs12 file' => 'PKCS12-Datei herunterladen',
'download root certificate' => 'Root-Zertifikat herunterladen',
+'download tls-auth key' => 'tls-auth Key herunterladen',
'dpd action' => 'Aktion für Dead Peer Detection',
'dpd delay' => 'Verzögerung',
'dpd timeout' => 'Zeitüberschreitung',
'modify' => 'Ändern',
'modulation' => 'Modulation',
'monday' => 'Montag',
+'monitor interface' => 'Monitor-Schnittstelle',
'month' => 'Monat',
'month-graph' => 'Monat',
'monthly firewallhits' => 'monatliche Firewalltreffer',
'ovpn device' => 'OpenVPN-Gerät',
'ovpn dh' => 'Diffie-Hellman-Parameter-Länge',
'ovpn dh new key' => 'Neuen Diffie-Hellman Parameter erstellen',
-'ovpn dh parameters' => 'Diffie-Hellman-Parameter-Optionen',
+'ovpn dh parameters' => 'Diffie-Hellman-Parameter Optionen',
'ovpn dh upload' => 'Neuen Diffie-Hellman-Parameter hochladen',
'ovpn dl' => 'OVPN-Konfiguration downloaden',
'ovpn engines' => 'Krypto Engine',
'shares' => 'Freigaben',
'show ajax speedmeter in footer' => 'Ajax Speed Anzeige',
'show ca certificate' => 'CA Zertifikat anzeigen',
-'show certificate' => 'Zertifikat anzeigen',
+'show certificate' => 'Datei anzeigen',
'show crl' => 'Certificate Revocation List anzeigen',
'show dh' => 'Diffie-Hellman-Parameter anzeigen',
'show host certificate' => 'Host-Zertifikat anzeigen',
'time server' => 'Zeitserver',
'timeout must be a number' => 'Wartezeit muss eine Zahl sein.',
'title' => 'Titel',
+'ta key' => 'TLS-Authentifizierungsschlüssel',
'to' => 'Bis',
'to email adr' => 'An Email Adresse',
'to install an update' => 'Um ein Update zu installieren, laden Sie zuerst die folgende .tgz.gpg Datei hoch:',
'urlfilter weekly' => 'wöchentlich',
'urlfilter whitelist always allowed' => 'Erlaube angepasste Whitelist für gesperrte Clients',
'urlfilter wrong filetype' => 'Die Datei hat nicht die Erweiterung .tar.gz',
-'usb modem on acm0' => 'USB Modem an ACM0',
-'usb modem on acm1' => 'USB Modem an ACM1',
-'usb modem on acm2' => 'USB Modem an ACM2',
-'usb modem on acm3' => 'USB Modem an ACM3',
'use' => 'Einsatz',
'use a pre-shared key' => 'Verwenden Sie einen Pre-Shared Schlüssel:',
'use dov' => 'DOV (Data Over Voice) benutzen:',
'ccd used' => 'Used addresses',
'cert' => 'Certificate',
'certificate' => 'Certificate',
-'certificate authorities' => 'Certificate Authorities',
+'certificate authorities' => 'Certificate Authorities and -Keys',
'certificate does not have a valid ca associated with it' => 'Certificate does not have a valid CA associated with it.',
'certificate file move failed' => 'Certificate file move failed',
'cfg restart' => 'A reboot is suggested after restoring a configuration archive.',
'connection' => 'Connection',
'connection closed' => 'Not connected...',
'connection debugging' => 'Connection debugging',
-'connection status and controlc' => 'Connection status and control',
+'connection status and controlc' => 'Connection Status and -Control',
'connection tracking' => 'iptables Connection Tracking',
'connection type' => 'Connection Type',
'connection type is invalid' => 'Connection type is invalid.',
'downlink std class' => 'downlink standard class',
'download' => 'download',
'download ca certificate' => 'Download CA certificate',
-'download certificate' => 'Download certificate',
+'download certificate' => 'Download file',
'download dh parameter' => 'Download Diffie-Hellman parameters',
'download host certificate' => 'Download host certificate',
'download new ruleset' => 'Download new ruleset',
'download pkcs12 file' => 'Download PKCS12 file',
'download root certificate' => 'Download root certificate',
+'download tls-auth key' => 'Download tls-auth key',
'dpd action' => 'Action',
'dpd delay' => 'Delay',
'dpd timeout' => 'Timeout',
'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Generating the root and host certificates may take a long time. It can take up to several minutes on older hardware. Please be patient.',
'genkey' => 'Generate PSK',
'genre' => 'Genre',
-'global settings' => 'Global settings',
+'global settings' => 'Global Settings',
'gpl i accept these terms and conditions' => 'I accept these terms and conditions',
'gpl license agreement' => 'License Agreement',
'gpl please read carefully the general public license and accept it below' => 'Please read carefully the General Public License and accept it below',
'modify' => 'Modify',
'modulation' => 'Modulation',
'monday' => 'Monday',
+'monitor interface' => 'Monitor Interface',
'month' => 'Month',
'month-graph' => 'Month',
'monthly firewallhits' => 'monthly firewallhits',
'show ajax speedmeter in footer' => 'Show Ajax speedmeter',
'show areas' => 'show areas',
'show ca certificate' => 'Show CA certificate',
-'show certificate' => 'Show certificate',
+'show certificate' => 'Show file',
'show crl' => 'Show certificate revocation list',
'show dh' => 'Show Diffie-Hellman parameters',
'show host certificate' => 'Show host certificate',
'show lines' => 'Show lines',
'show root certificate' => 'Show root certificate',
'show share options' => 'Show shares options',
+'show tls-auth key' => 'Show tls-auth key',
'shuffle' => 'Shuffle',
'shutdown' => 'Shutdown',
'shutdown ask' => 'Shutdown?',
'system log viewer' => 'System Log Viewer',
'system logs' => 'System Logs',
'system status information' => 'System Status Information',
+'ta key' => 'TLS-Authentification-Key',
'telephone not set' => 'Telephone not set.',
'template' => 'Preset',
'template warning' => 'You have two options to set up Qos. The First, you press the save button and generate the classes and rules on your own. The second, you press the preset button and classes and rules will be set up by a template.',
'urlfilter weekly' => 'weekly',
'urlfilter whitelist always allowed' => 'Allow custom whitelist for banned clients',
'urlfilter wrong filetype' => 'File has not the extension .tar.gz',
-'usb modem on acm0' => 'USB Modem on ACM0',
-'usb modem on acm1' => 'USB Modem on ACM1',
-'usb modem on acm2' => 'USB Modem on ACM2',
-'usb modem on acm3' => 'USB Modem on ACM3',
'use' => 'Use',
'use a pre-shared key' => 'Use a pre-shared key:',
'use dov' => 'Use data over voice (DOV):',
'urlfilter weekly' => 'semanalmente',
'urlfilter whitelist always allowed' => 'Permitir lista blanca personalizada para clientes censurados',
'urlfilter wrong filetype' => 'El archivo no tiene la extension .tar.gz',
-'usb modem on acm0' => 'Modem USB en ACM0',
-'usb modem on acm1' => 'Modem USB en ACM1',
-'usb modem on acm2' => 'Modem USB en ACM2',
-'usb modem on acm3' => 'Modem USB en ACM3',
'use' => 'Usar',
'use a pre-shared key' => 'Usar llave pre-compartida',
'use dov' => 'Usar datos sobre voz (DOV)',
'urlfilter weekly' => 'hebdomadairement',
'urlfilter whitelist always allowed' => 'Autoriser une liste blanche personnalisée de clients bannis',
'urlfilter wrong filetype' => 'Le fichier n\'a pas l\'extension .tar.gz',
-'usb modem on acm0' => 'Modem USB sur ACM0',
-'usb modem on acm1' => 'Modem USB sur ACM1',
-'usb modem on acm2' => 'Modem USB sur ACM2',
-'usb modem on acm3' => 'Modem USB sur ACM3',
'use' => 'Utiliser',
'use a pre-shared key' => 'Utiliser une clé pré-partagée :',
'use dov' => 'Utilisez DOV (Data Over Voice):',
'urlfilter weekly' => 'wekelijks',
'urlfilter whitelist always allowed' => 'Toestaan gebruik van eigen witte lijst voor verboden clients',
'urlfilter wrong filetype' => 'Bestand heeft niet de extensie .tar.gz',
-'usb modem on acm0' => 'USB Modem op ACM0',
-'usb modem on acm1' => 'USB Modem op ACM1',
-'usb modem on acm2' => 'USB Modem op ACM2',
-'usb modem on acm3' => 'USB Modem op ACM3',
'use' => 'Gebruik',
'use a pre-shared key' => 'Gebruik een pre-shared sleutel:',
'use dov' => 'Gebruik data over voice (DOV):',
'urlfilter weekly' => 'co tydzień',
'urlfilter whitelist always allowed' => 'Zezwolenie na białą listę dla zablokowanych klientów',
'urlfilter wrong filetype' => 'Plik nie posiada rozszerzenia .tar.gz',
-'usb modem on acm0' => 'Modem USB na ACM0',
-'usb modem on acm1' => 'Modem USB na ACM1',
-'usb modem on acm2' => 'Modem USB na ACM2',
-'usb modem on acm3' => 'Modem USB na ACM3',
'use' => 'Użyj',
'use a pre-shared key' => 'Użyj klucza współdzielonego:',
'use dov' => 'Use data over voice (DOV):',
'urlfilter weekly' => 'Еженедельно',
'urlfilter whitelist always allowed' => 'Разрешить пользовательский белый список для забаненых клиентов',
'urlfilter wrong filetype' => 'File has not the extension .tar.gz',
-'usb modem on acm0' => 'USB Модем на ACM0',
-'usb modem on acm1' => 'USB Модем на ACM1',
-'usb modem on acm2' => 'USB Модем на ACM2',
-'usb modem on acm3' => 'USB Модем на ACM3',
'use' => 'Use',
'use a pre-shared key' => 'Use a pre-shared key:',
'use dov' => 'Use data over voice (DOV):',
'urlfilter weekly' => 'Haftalık',
'urlfilter whitelist always allowed' => 'Yasaklı istemciler için özel beyaz liste izini',
'urlfilter wrong filetype' => 'Uzantısı .tar.gz olan dosya yok',
-'usb modem on acm0' => 'ACM0 üzerindeki USB Modem',
-'usb modem on acm1' => 'ACM1 üzerindeki USB Modem',
-'usb modem on acm2' => 'ACM2 üzerindeki USB Modem',
-'usb modem on acm3' => 'ACM3 üzerindeki USB Modem',
'use' => 'Kullan',
'use a pre-shared key' => 'Ön paylaşımlı anahtar kullan:',
'use dov' => 'Ses üzerinden veri kullan (DOV):',
include Config
-VER = 1.0.0
+VER = 1.4.0
THISAPP = libpcap-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+CFLAGS += -fno-strict-aliasing
+
###############################################################################
# Top-level Rules
###############################################################################
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9ad1358c5dec48456405eac197a46d3d
+$(DL_FILE)_MD5 = 56e88a5aabdd1e04414985ac24f7e76c
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpcap-0.8.3-shared.patch
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
- cd $(DIR_APP) && make
- cd $(DIR_APP) && make shared
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
- cd $(DIR_APP) && make install-shared-so
- ln -svf libpcap.so.1.0.0 /usr/lib/libpcap.so.1.0
- ln -svf libpcap.so.1.0 /usr/lib/libpcap.so.1
- ln -svf libpcap.so.1 /usr/lib/libpcap.so
- cd $(DIR_APP) && cp -vf pcap-int.h /usr/include
@rm -rf $(DIR_APP)
@$(POSTBUILD)
include Config
-VER = 3.10.41
+VER = 3.10.43
RPI_PATCHES = linux-3.10.38-grsec-1b49b45
-GRS_PATCHES = grsecurity-2.9.1-3.10.41-ipfire1.patch.xz
+GRS_PATCHES = grsecurity-2.9.1-3.10.43-ipfire1.patch.xz
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
CFLAGS =
CXXFLAGS =
-PAK_VER = 46
+PAK_VER = 49
DEPS = ""
VERSUFIX=ipfire$(KCFG)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
$(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
-$(DL_FILE)_MD5 = 08631db3e6b4328b0315f59ef3fa7b0a
+$(DL_FILE)_MD5 = b76af402bd1848b533f0b6dab41d3220
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a7408e8bad57b4b2cb677dd5a0bfb7ff
-$(GRS_PATCHES)_MD5 = de48891a35952a3c6de5beea694f7557
+$(GRS_PATCHES)_MD5 = a77f35c2f4cd6d64a50c26ef5513540b
install : $(TARGET)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch
+ # Moschip 7830 link detection
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.y-usbnet_mcs7830_rework_link_detect.patch
+
ifeq "$(KCFG)" "-kirkwood"
# Add dreamplug,guruplug and icy 62x0 support on ARM-kirkwood
include Config
-VER = 1.0.1g
+VER = 1.0.1h
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = de62b43dfcd858e66a74bee1c834e959
+$(DL_FILE)_MD5 = 8d6d684a9430d5cc98a62a5d8fbda8cf
install : $(TARGET)
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.15" # Version number
-CORE="78" # Core Level (Filename)
-PAKFIRE_CORE="78" # Core Level (PAKFIRE)
+CORE="79" # Core Level (Filename)
+PAKFIRE_CORE="79" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
# Load ethernet settings
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
-if [ "${RED_DEV}" == "" ]; then
- RED_DEV=ppp0
-fi
+case "${RED_TYPE}" in
+ PPPOE)
+ RED_DEV="ppp0"
+ ;;
+esac
# setup_netdev_trigger LED DEVICE MODE
setup_netdev_trigger ()
# Now traverse /sys in order to "coldplug" devices that have
# already been discovered
- /bin/udevadm trigger
+ /bin/udevadm trigger --action=add
# Now wait for udevd to process the uevents we triggered
/bin/udevadm settle
replace("/harddisk/boot/grub/grub.conf", "splashimage", "#splashimage");
replace("/harddisk/boot/grub/grub.conf", "#serial", "serial");
replace("/harddisk/boot/grub/grub.conf", "#terminal", "terminal");
- replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,38400n8 panic=10 ");
+ replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,115200n8 panic=10 ");
/*inittab*/
replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:");
FILE *file, *hosts;
struct keyvalue *kv;
char hostname[STRING_SIZE];
- char domainname[STRING_SIZE] = "";
+ char domainname[STRING_SIZE] = "localdomain";
char commandstring[STRING_SIZE];
char buffer[STRING_SIZE];
--- /dev/null
+From 4e9792dc8ab29175295c79c35f9f6fbd2d453b35 Mon Sep 17 00:00:00 2001
+From: Octavian Purdila <octavian.purdila@intel.com>
+Date: Mon, 23 Dec 2013 19:06:31 +0200
+Subject: [PATCH] usbnet: mcs7830: rework link state detection
+
+Even with the quirks in commit dabdaf0c (mcs7830: Fix link state
+detection) there are still spurious link-down events for some chips
+where the false link-down events count go over a few hundreds.
+
+This patch takes a more conservative approach and only looks at
+link-down events where the link-down state is not combined with other
+states (e.g. half/full speed, pending frames in SRAM or TX status
+information valid). In all other cases we assume the link is up.
+
+Tested on MCS7830CV-DA (USB ID 9710:7830).
+
+Cc: Ondrej Zary <linux@rainbow-software.org>
+Cc: Michael Leun <lkml20120218@newton.leun.net>
+Cc: Ming Lei <ming.lei@canonical.com>
+Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/usb/mcs7830.c | 19 ++++---------------
+ 1 file changed, 4 insertions(+), 15 deletions(-)
+
+diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
+index 9237c45..8dd48b5 100644
+--- a/drivers/net/usb/mcs7830.c
++++ b/drivers/net/usb/mcs7830.c
+@@ -117,7 +117,6 @@ enum {
+ struct mcs7830_data {
+ u8 multi_filter[8];
+ u8 config;
+- u8 link_counter;
+ };
+
+ static const char driver_name[] = "MOSCHIP usb-ethernet driver";
+@@ -562,26 +561,16 @@ static void mcs7830_status(struct usbnet *dev, struct urb *urb)
+ {
+ u8 *buf = urb->transfer_buffer;
+ bool link, link_changed;
+- struct mcs7830_data *data = mcs7830_get_data(dev);
+
+ if (urb->actual_length < 16)
+ return;
+
+- link = !(buf[1] & 0x20);
++ link = !(buf[1] == 0x20);
+ link_changed = netif_carrier_ok(dev->net) != link;
+ if (link_changed) {
+- data->link_counter++;
+- /*
+- track link state 20 times to guard against erroneous
+- link state changes reported sometimes by the chip
+- */
+- if (data->link_counter > 20) {
+- data->link_counter = 0;
+- usbnet_link_change(dev, link, 0);
+- netdev_dbg(dev->net, "Link Status is: %d\n", link);
+- }
+- } else
+- data->link_counter = 0;
++ usbnet_link_change(dev, link, 0);
++ netdev_dbg(dev->net, "Link Status is: %d\n", link);
++ }
+ }
+
+ static const struct driver_info moschip_info = {
+--
+2.0.0
+