Seth Mos
0d4bedeb83
Merge pull request #82 from bcyrill/patch-7
...
Remove [] of literal IPv6 addresses
2012-04-11 13:41:04 -07:00
bcyrill
72cd706b8d
Remove [] of literal IPv6 addresses
2012-04-11 23:12:34 +03:00
smos
21b586aa12
Also validate IPv6 literals.
2012-04-11 21:21:14 +02:00
Scott Ullrich
bf7f1e5ff8
Merge pull request #80 from bcyrill/patch-4
...
Removed flawed HTML.
2012-04-11 09:37:56 -07:00
bcyrill
2afb2c3758
Removed flawed HTML.
2012-04-11 19:34:49 +03:00
jim-p
e6138bf2b3
Remove duplicated function
2012-04-11 12:02:49 -04:00
jim-p
f898c1a982
Add alias support to static routes (needs some testing) Ticket #2239
...
Conflicts:
etc/inc/filter.inc
etc/inc/util.inc
usr/local/www/system_routes_edit.php
2012-04-11 11:58:21 -04:00
jim-p
fdcf104ce4
When renaming a user, make sure to remove the previous user or it gets left in /etc/passwd.
2012-04-11 10:46:41 -04:00
smos
2fe06a3228
Remove this faulty piece of gateway code, it overwrites the existing entries that return_gateways_array() returns.
...
It doesn't take any address families into account either.
2012-04-09 16:45:02 +02:00
smos
6e5d84ba22
Restore this piece of logic, otherwise the firewall rules break.
2012-04-09 14:14:12 +02:00
smos
c616b3c73e
Correct the variable names for the duplicate stf check
2012-04-08 20:55:27 +02:00
smos
4e83a8f2fd
Remove this piece of code, it loads even on interfaces not configured for track. Really needs asynchronous javascript.
2012-04-08 20:41:41 +02:00
smos
319c2bfda8
Also use the prefix calculation function here.
2012-04-08 20:37:44 +02:00
smos
8b198c649f
Prevent duplicate 6rd or 6to4 interfaces, these conflict and both use the stf0 adapter. Only 1 can be active.
...
Move piece of code into function, we need it more places, tighten rules for proto 41 traffic.
Attempt to micro optimize the select box for large amounts of choices. Chrome likes this approach better.
2012-04-08 20:36:19 +02:00
Scott Ullrich
e7a9f730ee
Merge pull request #79 from bcyrill/patch-3
...
Merge array and keep unchanged values.
2012-04-08 11:13:42 -07:00
bcyrill
adc3353eb6
Merge array and keep unchanged values.
2012-04-08 21:07:07 +03:00
Erik Fonnesbeck
26b8990538
Move some constants in gitsync closer to the top of the source code and add some new ones of potential interest to those reconfiguring gitsync. Also modify messages to indicate that Git URLs are also allowed.
2012-04-07 16:20:58 -06:00
Erik Fonnesbeck
0b4ae4b5ca
Check for this function before calling it to avoid an error when hitting that line for pages that don't include the js file for it.
2012-04-07 15:55:12 -06:00
smos
93cd15be68
Correct typo in the filter rule
2012-04-07 20:25:10 +02:00
smos
5411c08460
Add automatic firewall rules that allow traffic destined for a downstream delegated prefix.
...
The downstream router is the one to decide what to do with it. This can still be overridden by user rules, just like outbound traffic.
2012-04-07 19:20:26 +02:00
smos
d48ed103b0
Change the command to reflect the new, just added dhcpleases6 binary for triggering route injection.
2012-04-07 17:37:05 +02:00
smos
8d923616a4
it needs to point to a existing file otherwise it will not launch.
2012-04-07 15:18:00 +02:00
smos
acbb62fd97
Add the -h parameter which is required for dhcpleases, might need to be removed later.
2012-04-07 13:13:37 +02:00
Darren Embry
ee965a5c7b
fix for Bug #2231 --- Dashboard: Traffic Graph: Unable to save settings
2012-04-06 19:45:25 -04:00
Darren Embry
556e760dc0
fix indentation.
2012-04-06 17:43:26 -04:00
Darren Embry
1ed88e0660
fix a syntax error
2012-04-06 16:56:10 -04:00
smos
092462dc10
Add a dhcpleases monitor to the DHCPv6 server which will trigger automatic creation of routes into the routing table so that prefix delegation will just work.
...
Redmine ticket #2347
2012-04-06 20:08:09 +02:00
Darren Embry
0416d9a0eb
fix for #2289 : Logic error in firewall rule interface selection for drop-down menu case
2012-04-06 14:15:16 -04:00
Scott Ullrich
48cb641a81
Merge pull request #78 from Whizkidzz/master
...
Added "interface_selection" to enable interface selection in tinydns
2012-04-06 10:16:06 -07:00
Scott Ullrich
d33e772fa0
Merge pull request #76 from bcyrill/patch-2
...
Fixed Bug #2348
2012-04-06 10:09:56 -07:00
bcyrill
adb29e55fa
Fixed Bug #2348
2012-04-06 20:00:38 +03:00
Darren Embry
f3d912154e
Bug #2329 : checkbox js problem on diag_logs_settings.php
2012-04-06 11:04:03 -04:00
Darren Embry
c8610dc99e
aggh javascript lines terminated by \n instead of semicolon
2012-04-06 10:58:12 -04:00
Darren Embry
3df59babdb
don't delete port aliases used by load balancer
2012-04-06 10:45:32 -04:00
Ermal Luçi
3f3ab84641
Merge pull request #75 from bcyrill/patch-1
...
Replace is_function with function_exists
2012-04-06 07:41:28 -07:00
whizkidzz
85a46fbdcd
Added interface_selection to choose a interface in tinydns failover selection
...
Changed the $text so that no "option value" is preselected when adding a newrow with addrowto function.
2012-04-06 16:21:07 +02:00
whizkidzz
44c7059177
Added rowsize[] for use in row_helper_dynamic.js
2012-04-06 16:17:07 +02:00
bcyrill
91b2f62348
Replace is_function with function_exists
2012-04-06 17:14:11 +03:00
whizkidzz
177a823e52
Added empty option line so not to write to config.xml if not filled in
2012-04-06 16:13:50 +02:00
whizkidzz
de69fab34c
Added interface_selection for use in tinydns
...
Corrected the use of objectsize so that if its "undefined" the correct "rowsize[]" is used
which if used outside the for loop was also "undefined"
2012-04-06 16:01:17 +02:00
smos
eab2db683c
Make sure that we use the right interface for 6rd
2012-04-06 11:28:15 +02:00
smos
df52abf1d2
Unbreak rc.filter_synchronize, add )
2012-04-06 11:27:48 +02:00
Darren Embry
c2feff64bc
restore default dropdown values of 24/64 bits
...
now that feature #2320 behavor is a bit different regarding change of
existing set value when switching between ipv4 and ipv6
2012-04-05 19:10:13 -04:00
Darren Embry
b771e46942
change behavior a bit on #bits dropdown
...
this is prepwork for restoring 24/64 bit defaults in vpn_ipsec_phase2
2012-04-05 19:09:19 -04:00
Darren Embry
6255beda29
add feature #2320 to vpn_ipsec_phase2.php.
...
note: had to disable existing behavior that modified the value of the
behavior.
existing behavior that disables/enables the dropdowns is still active.
2012-04-05 18:17:38 -04:00
Darren Embry
0f907a68b7
bug fix for #2320 : on firewall_virtual_ip_edit.php it jumps to a length of 1 on a valid ipv4
2012-04-05 18:17:37 -04:00
Darren Embry
f57a578d1c
work around a redeclaration error.
...
i'm going to start a discussion about making sure all require() calls
become require_once() calls but until then i have to fix this.
2012-04-05 18:17:36 -04:00
Ermal
f99aa333fe
Unbreak interface.inc after manual merge
2012-04-05 21:11:44 +00:00
Ermal
4459f03d4a
Remove slipped line
2012-04-05 21:07:39 +00:00
Darren Embry
87744d53c8
missed a spot for feature #2320 toggle subnet mask
2012-04-05 17:08:56 -04:00