Michael Tremer
f4819f1f76
Merge remote-tracking branch 'amarx/ipsec' into next
2012-11-28 22:12:50 +01:00
Stefan Schantl
4cdf8b927a
ovpnmain.cgi: Some cosmetic changes on the Net-to-Net section.
...
* Fix colspan of column.
* Check of mtu-disc and fragment or mssfix, before mtu will be performend.
2012-11-28 22:03:44 +01:00
Alexander Marx
e2429e8d34
OpenVPN ccd: created subnet checkfunction in general_functions, because ipsec needs this too!
...
This should prevent ipsec Hosts/Nets to have same ip addresses than openvpn Hosts/Nets
2012-11-28 20:24:59 +01:00
Alexander Marx
ac87f37110
OpenVPN ccd: fixed counter in static networks. Only 63 hosts are possible in /24 subnet Now IP-Range begins with ".2"
2012-11-28 20:18:14 +01:00
Alexander Marx
df9b48b753
OpenVPN ccd: added alphanumeric sort of static networks and under ROUTING, NONE is selected if no route is specified
2012-11-28 20:17:23 +01:00
Alexander Marx
f7fc17c38a
IPSEC: added checkroutine for used OpenVPN subnets/Hosts
2012-11-26 13:19:07 +01:00
Michael Tremer
3ef99ad95a
Add links to sarg reports on the proxy reports page.
2012-11-26 12:18:54 +01:00
Michael Tremer
d46bec5299
calamaris: Fix viewing reports.
...
Fixes that only the last created report could be viewed (#10259 ).
2012-11-26 10:55:32 +01:00
Alexander Marx
5068ac3822
OpenVPN ccd: try to adapt changes to latest next branch.
2012-11-26 10:31:47 +01:00
Michael Tremer
43f4c938c1
ipsec: Shut up strongswan logging.
...
Just log the basic stuff.
2012-11-24 14:22:14 +01:00
Michael Tremer
b368a2f84d
Merge remote-tracking branch 'stevee/next' into next
2012-11-23 12:58:40 +01:00
Alexander Marx
290007b3b0
openvpn ccd: Fix subnet mask validation.
2012-11-23 12:56:54 +01:00
Alexander Marx
52d08bcbd2
openvpn ccd: Minor fixes: iroute, delete route line.
...
Fixed several bugs:
1) iroute line not correctly printed in ccd file
2) route line was not deleted from server.conf when deleting a client
3) Routebox (client has access to these networks on ipfire site) did not show green,orange and blue when no static route was defined on ipfire
4) Green is no longer selected as default route in clientconfig.
Tested all Options with Windows 7 Client and Linux Mint 12
2012-11-23 12:56:47 +01:00
Stefan Schantl
1647059d74
ovpnmain.cgi: Check and only allow valid operation modes for mtu-disc.
...
In the past some unexpected things has been happened if the Path MTU Discovery not has been
configured.
2012-11-22 19:59:56 +01:00
Stefan Schantl
9e3b875694
ovpnmain.cgi: Path MTU Discovery defaults to Off on Net-to-Net connections.
2012-11-22 19:47:30 +01:00
Stefan Schantl
f2621c3190
Revert "openvpn.cgi: Respect if mtu-disc hasn't been configured yet."
...
This reverts commit a66e24bbfd
2012-11-22 19:45:44 +01:00
Stefan Schantl
b228aaf09d
ovpnmain.cgi: Path MTU Discovery defaults to Off on Net-to-Net connections.
2012-11-20 19:26:13 +01:00
Alexander Marx
e81be1e1ed
openvpn ccd: Minor fixes.
...
some bugfixes, client advanced options no more visible under net-2-net config, blue network is recognized,
Fixed the bug with wrong ip address in ccd file.
2012-11-20 17:11:08 +01:00
Stefan Schantl
a66e24bbfd
openvpn.cgi: Respect if mtu-disc hasn't been configured yet.
...
If mtu-disc has not been configured, the script anyway has write mtu-disc to the configuration files,
which has brocken them.
2012-11-19 21:07:55 +01:00
Stefan Schantl
350f298025
Merge branch 'ovpn-mtu-disc' into next
...
Conflicts:
html/cgi-bin/ovpnmain.cgi
2012-11-17 13:10:05 +01:00
Alexander Marx
8c877a82f6
OpenVPN: Add CCD configuration GUI.
2012-11-16 17:08:49 +01:00
Stefan Schantl
2ee746be04
Add support for mtu-disc to openvpn.
...
OpenVPN now have support for an automaticaly mtu path discovery.
This feature can be enabled on roadwarrior or net-to-net connections.
It can be fully configured by using the webinterface.
2012-11-14 20:46:36 +01:00
Arne Fitzenreiter
0d3e1e8c1d
Merge remote-tracking branch 'origin/next' into thirteen
2012-11-07 00:01:32 +01:00
Michael Tremer
fb874f2e7c
Update credits.cgi.
2012-11-06 11:44:45 +01:00
Arne Fitzenreiter
534fb55f9d
Merge remote-tracking branch 'origin/next' into thirteen
...
Conflicts:
make.sh
2012-11-03 17:04:23 +01:00
Arne Fitzenreiter
d095947fed
snort: updated ruleset download url for new snort.
2012-11-03 16:29:53 +01:00
Arne Fitzenreiter
e62efbb73d
hostapd: add 5ghz "n" and wpa1+2 mode.
2012-10-31 20:57:19 +01:00
Arne Fitzenreiter
ecd0ac08a5
Merge remote-tracking branch 'origin/next' into thirteen
2012-10-26 09:58:49 +02:00
Michael Tremer
d6b4566d9c
credits.cgi: Update donation link.
2012-10-23 17:19:47 +02:00
Jörn-Ingo Weigert
d9efec0d7b
updatexlrator.cgi: Fix wrong patch to delete.gif.
2012-10-20 11:04:42 +02:00
Michael Tremer
77a03efc2f
Merge remote-tracking branch 'origin/thirteen' into thirteen
2012-10-09 11:17:53 +02:00
Michael Tremer
207c9813bc
Merge branch 'strongswan-5' into thirteen
2012-10-09 00:30:33 +02:00
Michael Tremer
01b5bc9170
vpnmain.cgi: Support more ciphers and integrity algorithms.
2012-09-26 23:05:21 +02:00
Arne Fitzenreiter
5e0a1a503b
Merge remote-tracking branch 'origin/next' into thirteen
...
Conflicts:
make.sh
2012-09-23 05:02:34 -04:00
Erik Kapfer
e5d406ab9e
index.cgi: Fix HTML syntax.
...
Bug #10225 .
2012-09-20 16:13:31 +02:00
Arne Fitzenreiter
e0027e6cdc
Merge remote-tracking branch 'origin/next' into thirteen
...
Conflicts:
config/rootfiles/core/52/meta
config/rootfiles/core/53/filelists/strongswan
config/rootfiles/core/53/meta
config/rootfiles/core/54/filelists/strongswan
config/rootfiles/core/54/meta
config/rootfiles/core/55/exclude
config/rootfiles/core/55/meta
config/rootfiles/core/56/exclude
config/rootfiles/core/56/meta
config/rootfiles/core/57/exclude
config/rootfiles/core/57/filelists/strongswan
config/rootfiles/core/57/meta
config/rootfiles/core/58/exclude
config/rootfiles/core/58/filelists/strongswan
config/rootfiles/core/58/meta
config/rootfiles/core/59/exclude
config/rootfiles/core/59/filelists/strongswan
config/rootfiles/core/59/meta
config/rootfiles/core/strongswan/exclude
config/rootfiles/core/strongswan/filelists/strongswan
config/rootfiles/core/strongswan/meta
config/rootfiles/oldcore/52/meta
config/rootfiles/oldcore/53/filelists/strongswan
config/rootfiles/oldcore/53/meta
config/rootfiles/oldcore/54/filelists/strongswan
config/rootfiles/oldcore/54/meta
config/rootfiles/oldcore/55/exclude
config/rootfiles/oldcore/55/meta
config/rootfiles/oldcore/56/exclude
config/rootfiles/oldcore/56/meta
config/rootfiles/oldcore/57/exclude
config/rootfiles/oldcore/57/filelists/strongswan
config/rootfiles/oldcore/57/meta
config/rootfiles/oldcore/58/exclude
config/rootfiles/oldcore/58/filelists/strongswan
config/rootfiles/oldcore/58/meta
config/rootfiles/oldcore/59/exclude
config/rootfiles/oldcore/59/filelists/strongswan
config/rootfiles/oldcore/59/meta
lfs/dhcp
2012-09-20 07:45:00 +02:00
Erik Kapfer
1de5c9454b
openvpn: Fix fragment problem.
...
Bug #10220 .
http://forum.ipfire.org/index.php/topic,6773.0.html
2012-09-17 20:55:37 +02:00
Michael Tremer
e218d500dd
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-5
2012-09-12 16:14:31 +02:00
Michael Tremer
2b710ab3fa
QoS: Use fq_codel instead of sfq.
2012-08-30 19:17:17 +02:00
Michael Tremer
41cfd9e04b
Merge remote-tracking branch 'origin/next' into glibc-update2
2012-08-22 12:23:11 +02:00
Michael Tremer
35b5392a95
vpnmain.cgi: Fix saving ENABLED status.
...
The web interface ignores what has been set to the ENABLED
checkbox.
http://lists.ipfire.org/pipermail/development/2012-August/000047.html
2012-08-07 17:04:37 +02:00
Michael Tremer
c9e01c8cb8
connections.cgi: Show return paths (NAT endpoints).
2012-08-06 20:20:40 +02:00
Michael Tremer
5ac2ed4778
connections.cgi: Fix colour for orange firewall IP address.
2012-08-05 14:13:09 +02:00
Arne Fitzenreiter
4503e6b7ad
Merge remote-tracking branch 'ms/ccache-update' into kernel-update
2012-08-01 08:56:54 +02:00
Michael Tremer
c8a8778f89
connections.cgi: Highlight multicast (former class D) connections.
2012-07-22 17:36:13 +02:00
Michael Tremer
03435d851b
connections.cgi: Fix parsing of IPsec config file.
2012-07-22 17:35:41 +02:00
Michael Tremer
1f571dbd72
credits.cgi: Update PP information.
2012-07-22 17:34:00 +02:00
Arne Fitzenreiter
cd025baace
close core61.
2012-07-22 10:25:10 +02:00
Arne Fitzenreiter
b431bfce48
Merge remote-tracking branch 'origin/master' into kernel-update
2012-07-21 23:54:31 +02:00
Michael Tremer
41b72de4e0
Re-add donation button from credits.cgi.
...
This reverts commit 39d36c000a
2012-07-21 12:43:35 +02:00
