Commit Graph

7439 Commits

Author SHA1 Message Date
Michael Tremer
7bb66417fa Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2014-03-02 22:38:09 +01:00
Michael Tremer
1c3044d72c firewall: Resurrect port forwardings with different external ports. 2014-03-02 22:35:27 +01:00
Michael Tremer
292cad90f7 firewall: Telnet uses TCP 2014-03-02 20:48:58 +01:00
Michael Tremer
0e53d8a991 firewall: Make OpenVPN access also possible when INPUT policy is REJECT. 2014-03-02 20:40:00 +01:00
Michael Tremer
6e87f0aa53 firewall: Allow accessing port forwardings from internal networks. 2014-03-02 20:37:44 +01:00
Arne Fitzenreiter
cbc492f516 apache2: update to 2.2.26. 2014-03-02 19:44:26 +01:00
Arne Fitzenreiter
239f8188e2 rootfile updates. 2014-03-02 19:39:42 +01:00
Michael Tremer
8f4f4634df firewall: rules.pl: Refactored entire script. 2014-03-02 18:23:28 +01:00
Michael Tremer
b05ec50ac9 firewall: rules.pl: Cleanup time constraints generation. 2014-03-01 20:20:56 +01:00
Michael Tremer
6178953be5 firewall: rules.pl: Cleanup rule generation.
Various perl coding errors that have been suppressed by "no warnings uninitialized"
have been fixed and lots of helper variables have been introduced to make
it much more clearer what the code is actually doing.
2014-03-01 19:54:14 +01:00
Michael Tremer
a2b3eba9f5 general-functions.pl: Fix wrong perl syntax. 2014-03-01 18:23:52 +01:00
Michael Tremer
1f9e7b53b7 firewall: rules.pl: Remove $command and introduce $IPTABLES. 2014-03-01 18:19:09 +01:00
Michael Tremer
8531b94ae0 firewall: rules.pl: Remove command line args parsing and rest from old debugging mode. 2014-03-01 18:07:39 +01:00
Michael Tremer
68d1eb1017 firewall: rules.pl: Introduce a more slink debugging mode. 2014-03-01 18:04:40 +01:00
Michael Tremer
97ab0569bd firewall: rules.pl: Fix some coding style. 2014-03-01 17:54:22 +01:00
Michael Tremer
b57edbd8ec firewall: rules.pl: Remove totally bloated debug mode. 2014-03-01 17:49:22 +01:00
Michael Tremer
13585cc922 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2014-03-01 16:59:32 +01:00
Michael Tremer
5c3de120aa openvpnctrl: Allow ICMP error messages to pass the transfer net. 2014-03-01 16:51:03 +01:00
Michael Tremer
a0a5c14f85 firewall: Make sure that only packets that go through the tunnel are passing OVPNBLOCK. 2014-03-01 16:44:05 +01:00
Michael Tremer
2513ae737d firewall: Allow access to the entire GREEN/BLUE/ORANGE subnets.
This includes the firewall itself as well.
2014-03-01 16:04:01 +01:00
Arne Fitzenreiter
d0ff84a675 red: change mac address of nas0 device.
Traverse Technology has reported that ppp over atm-bridge is not working
because there is a bogus mac address at the virtual nas0 device.
2014-03-01 16:01:11 +01:00
Michael Tremer
bb3834231e firewall: Sort order in which chains are initialized.
This has been some real trouble because multiple rules could
not be properly inserted into the rule chains in the kernel
because the chains did not exist, yet.
2014-03-01 15:02:42 +01:00
Michael Tremer
60fb533157 firewall: rules.pl: Don't reload custom firewall rules here. 2014-03-01 15:01:58 +01:00
Michael Tremer
1db04adbef Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2014-03-01 14:19:26 +01:00
Arne Fitzenreiter
c6f96750ba ffmpeg: prevent executable stack. 2014-02-28 16:09:45 +01:00
Arne Fitzenreiter
26685b0742 libmad: prevent executable stack. 2014-02-28 16:09:04 +01:00
Arne Fitzenreiter
82a4a102f3 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next 2014-02-28 07:04:45 +01:00
Arne Fitzenreiter
6887597c04 kernel: enable rts5139 driver. 2014-02-28 07:02:14 +01:00
Michael Tremer
3e5e8a4a88 firewall: Fix firewall policy table if only RED, GREEN + BLUE are present. 2014-02-27 20:53:25 +01:00
Alexander Marx
800077a689 Firewall: Skip rules on boot when red has no ip 2014-02-27 19:42:47 +01:00
Michael Tremer
5a7491ffd6 QoS: Actually accept subnets everywhere. 2014-02-27 19:39:18 +01:00
Alexander Marx
5eee5a607e QOS: IP-Addresses can now be simple IP-Address or IP-Address and subnet 2014-02-27 19:12:06 +01:00
Michael Tremer
b18dba57de Merge remote-tracking branch 'alfh/feature_graph_constant_color' into next 2014-02-27 13:37:53 +01:00
Michael Tremer
015e243b0d Merge remote-tracking branch 'alfh/bugfix_openbox_center' into next 2014-02-27 13:36:38 +01:00
Michael Tremer
df6b9ebfbc openvpn: Provide a basic set of configuration settings.
These are the defaults as in the CGI script, but when you don't
set up the roadwarrior server, the configuration file remains
empty and the openvpnctrl binary will end itself because it cannot
read a proper configuration.
2014-02-27 13:32:13 +01:00
Michael Tremer
c9cd26f200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2014-02-27 13:14:02 +01:00
Arne Fitzenreiter
906d293b05 flash-images: work around a pandaboard uboot bug.
uboot does not find the kernel if it was copied to late to the
fat partition.
2014-02-27 12:46:14 +01:00
Arne Fitzenreiter
b3aa7a1231 ntp: wait only if wpa_supplicant is running. 2014-02-27 08:22:11 +01:00
Michael Tremer
55a5bcae74 firewall: Call firewallctrl with full path. 2014-02-26 20:03:32 +01:00
Michael Tremer
a8d1d049c6 Revert "Firewall: Fix errormessages on rulecreation when red has no IP"
This reverts commit f942937c29.

This completely destroys external access rules and is therefore
reverted.
2014-02-26 20:02:24 +01:00
Alf Høgemark
e06986e853 qos and process graphs: avoid random colors
For the graphs for qos classes, and for process
count and memory usage, the colors change on
each page reload, since the colors are currently
totally random.

This change uses defined color indexes, 15 different
ones, that should be enough for qos at least, and is
enough for processes on my setup. This makes
the colors consistent between page loads, so it makes
it easier to monitor changes.

Perhaps one should define 30 different colors meant
to be used for graphing, then one could avoid random
colors also for the sensor graphs, and make it less
likely to get color collision for the process graphs
as well. Defining 30 such colors is not part of this
change.
2014-02-26 18:48:05 +01:00
Alf Høgemark
480f354d89 ipfire theme: Use div align for center
Revert change to make openbox produce validating html,
when center alignment for box is wanted.

I have not been able to find css solution for
properly aligning the div horisontally.
2014-02-26 18:37:57 +01:00
Arne Fitzenreiter
329e9c465a kernel: enable cgroups and fix some accounting settings. 2014-02-26 18:06:49 +01:00
Arne Fitzenreiter
ce81f1eb3e kernel: enable pci modules in arm multiarch kernel. 2014-02-26 18:00:44 +01:00
Arne Fitzenreiter
adce3f96fc Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2014-02-26 17:59:53 +01:00
Michael Tremer
69776cc42f apache: Update cipher suite that is used for the web user interface.
Taken from here with exception of RC4.
  https://wiki.mozilla.org/Security/Server_Side_TLS#Apache
2014-02-26 15:01:29 +01:00
Arne Fitzenreiter
78f10eafe0 strongswan: no padlock on arm. 2014-02-26 09:37:12 +01:00
Alf Høgemark
c101827318 firewalllogs*.dat: Reduce amount of code to set row bgcolor
Replace 10 if statements with duplicated code for print
and setting background color by using a variable and
one if statement.
2014-02-25 22:03:40 +01:00
Michael Tremer
25bd6edaaf Merge remote-tracking branch 'alfh/feature_html_validating' into next 2014-02-25 22:02:34 +01:00
Michael Tremer
f2b8668fc8 Merge remote-tracking branch 'alfh/feature_qos_description' into next 2014-02-25 22:01:34 +01:00