Michael Tremer
41dfa08d2a
Merge branch 'ppp-update' into beyond-next
2014-03-26 23:43:04 +01:00
Michael Tremer
5240f73d9c
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next
2014-03-26 23:42:57 +01:00
Michael Tremer
93b36c3e22
ppp: Update to 2.4.6.
2014-03-26 23:42:05 +01:00
Michael Tremer
7add463e51
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2014-03-26 23:35:18 +01:00
Michael Tremer
36d809efb6
media.cgi: Fix typo 'writen'.
2014-03-26 23:34:58 +01:00
Arne Fitzenreiter
513c321ebe
wlanap.cgi: fix missing line from wlan info.
2014-03-26 08:35:00 +01:00
Arne Fitzenreiter
6a79396ce6
hostapd: change setting of the regdomain.
...
the regdomain is only updated if it was really changed but after boot
the system believe it is "00" World but it is not correctly set at
some cards. So we set a region and set it back to "00" before the
real region was set.
2014-03-25 19:11:03 +01:00
Arne Fitzenreiter
91eb94ee2f
wlanap: fix typo.
2014-03-25 13:15:43 +01:00
Arne Fitzenreiter
57c209d558
wlanap.cgi: fix detection of not useable channels.
2014-03-25 13:03:56 +01:00
Arne Fitzenreiter
5c8167f576
iwlwifi: use noibss flags only on radar detection channels.
2014-03-25 12:59:37 +01:00
Arne Fitzenreiter
f763ff3224
kernel: update to 3.10.34.
2014-03-24 13:28:29 +01:00
Arne Fitzenreiter
af433268e0
graphs.pl: fix links position in chrome for android.
2014-03-23 17:39:47 +01:00
Michael Tremer
4c7bfb1f27
Merge remote-tracking branch 'stevee/squid-zph-qos' into beyond-next
2014-03-21 14:48:22 +01:00
Michael Tremer
6bd4bcdaa1
squid: Update to 3.4.4.
2014-03-21 13:46:03 +01:00
Michael Tremer
51cf3f8be5
firewall: rules.pl: Honour time constraints for NAT rules as well.
2014-03-21 13:39:03 +01:00
Michael Tremer
f98bb538e5
firewall: rules.pl: Catch invalid configurations.
2014-03-21 13:33:08 +01:00
Michael Tremer
c0ce920610
firewall: rules.pl: Allow REDIRECT rules.
2014-03-21 13:28:00 +01:00
Alexander Marx
896eb2d693
Firewall: Allow DNAT with target firewall
2014-03-21 12:55:34 +01:00
Alexander Marx
c71499d8d9
Firewall: Rename defaultNetworks to netsettings
2014-03-21 12:51:18 +01:00
Alexander Marx
fd169d0adc
Firewall: DNAT - Show right DNAT interface in ruletable
...
Now:
When using a hostgroup as source there are all corresponding DNAT
interfaces shown in ruletable depending on the entries in the group.
When in DNAT area "-automatic" is selected, the DNAT interfaces are
shown as IP-Addresses, else they are shown as "ORANGE","GREEN","BLUE"...
BUGFIX: When there is a MAC address used in a sourcegroup, the rules could not be set. Now MAC addresses get allways the public interface as DNAT
2014-03-21 12:51:09 +01:00
Alexander Marx
4e54e3c6f5
Firewall: Move some functions from rules.pl to firewall-lib.pl
2014-03-21 12:51:04 +01:00
Michael Tremer
d7a14d01e1
firewall: rules.pl: Fix rules with other NAT port.
2014-03-21 12:40:55 +01:00
Michael Tremer
fc84e6ec23
Merge remote-tracking branch 'alfh/feature_vnstat_1.11' into beyond-next
2014-03-20 23:16:38 +01:00
Michael Tremer
296a73a532
Merge remote-tracking branch 'alfh/feature_firewalllogcountry' into beyond-next
...
Conflicts:
langs/de/cgi-bin/de.pl
2014-03-20 23:15:49 +01:00
Michael Tremer
dd29d563a6
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next
...
Conflicts:
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.nl
doc/language_issues.pl
doc/language_issues.ru
doc/language_issues.tr
doc/language_missings
2014-03-20 23:14:13 +01:00
Michael Tremer
0d0df35ca2
Update translations.
2014-03-20 23:07:26 +01:00
Alexander Marx
95cda25924
Firewall: DNAT - always show right red address in dropdown.
...
Edited language String in DNAT area: external ip address is now Firewall
Interface
2014-03-20 23:06:50 +01:00
Arne Fitzenreiter
cec275c9df
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
2014-03-19 19:07:27 +01:00
Arne Fitzenreiter
b3c0c61132
hostapd: enable CONFIG_ACS for dfs channels.
2014-03-19 19:03:22 +01:00
Arne Fitzenreiter
0f0d6a5a7d
hostapd: change channellist and status for dfs channels.
2014-03-19 19:00:47 +01:00
Arne Fitzenreiter
dea9e7193c
core76: add wpa_supplicant to update.
2014-03-19 09:05:37 +01:00
Arne Fitzenreiter
ece72ab98f
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
2014-03-19 07:23:40 +01:00
Arne Fitzenreiter
f89678de2f
hostapd: update to 2.1.
2014-03-19 07:22:49 +01:00
Michael Tremer
b0d9fad3f9
firewall: rules.pl: Add support for auto selection of NAT addresses.
2014-03-18 23:49:23 +01:00
Alexander Marx
cc77ac2364
Firewall: select right value in DNAT Dropdown
2014-03-18 18:03:52 +01:00
Alexander Marx
1aa5439cf1
Firewall: extend DNAT dropdown with auto,BLUE,ORANGE,GREEN
2014-03-18 18:03:42 +01:00
Michael Tremer
bb0618287b
openssh: Update to 6.6p1.
2014-03-18 18:03:14 +01:00
Michael Tremer
df1f687b28
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2014-03-18 18:00:42 +01:00
Arne Fitzenreiter
be0d1005fd
core76: add tzdata to update.
2014-03-18 07:28:13 +01:00
Arne Fitzenreiter
4f92fd2aeb
tzdata: fix rootfile.
2014-03-18 07:20:41 +01:00
Arne Fitzenreiter
fff24766e3
initskripts: add pcengines apu support to leds.
2014-03-18 00:25:08 +01:00
Arne Fitzenreiter
607c9d3ae0
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
2014-03-18 00:22:24 +01:00
Arne Fitzenreiter
e583643a25
kernel: add pcengines apu led support.
2014-03-18 00:21:38 +01:00
Michael Tremer
5561ea4a71
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2014-03-17 22:04:48 +01:00
Michael Tremer
4ebd3831fa
Merge remote-tracking branch 'alfh/feature_firewalllog_centergraph' into next
2014-03-17 22:04:44 +01:00
Michael Tremer
da7a2208d3
firewall: rules.pl: Code cleanup.
2014-03-17 18:03:00 +01:00
Michael Tremer
5cf8c8c123
firewall: Fix DNAT rules between internal zones.
2014-03-17 17:39:47 +01:00
Michael Tremer
c2a1af7545
firewall: rules.pl: Sanitise source and destination IP addresses.
...
Those variables are now empty if source or destination are
unspecified.
2014-03-17 16:24:23 +01:00
Michael Tremer
2a07aa9d9c
dialctrl: Remove defunct script.
2014-03-17 14:17:44 +01:00
Alexander Marx
a72ae687c6
Firewall: Bugfix: Remark in hostgroups and servicegroups was not changeable
...
Another Bugfix: Layout of hostgroups was broken when more than 1 vpn
connection is defined. There where dropdownboxes for every vpn
connection instead of only one
2014-03-17 14:09:17 +01:00
