Commit Graph

24552 Commits

Author SHA1 Message Date
Renato Botelho
f060bd2a8a Merge pull request #1369 from phil-davis/patch-4 2014-12-07 13:40:41 -02:00
Phil Davis
9241d942b9 Typo CIDR in UPnP GUI page
As reported by johnpoz https://forum.pfsense.org/index.php?topic=84964.0
2014-12-07 19:10:59 +05:45
Chris Buechler
fa10244f3f Disable RC4 ciphers in lighttpd 2014-12-05 15:05:47 -06:00
Renato Botelho
56c6993c26 Call filter_configure_sync() is a better fix for #4066, as pointed by Ermal 2014-12-05 17:04:07 -02:00
Renato Botelho
6d744cc842 Fix #4066:
Make sure pf is configured before other services are restarted when WAN
IP changes. The way it was before, 'pass out' rules with route-to still
have old IP set as 'from' and some Dynamic DNS ended up not being
updated.
2014-12-05 16:20:34 -02:00
Renato Botelho
8da00522ea Add RELENG_2_2 to gitsync 2014-12-05 11:05:46 -02:00
Renato Botelho
75f65f9cb9 Merge pull request #1367 from phil-davis/patch-2 2014-12-05 11:05:08 -02:00
Phil Davis
95d045fcd7 Set text and color of Gateways Widget Status
getstats.php calls functions.inc.php get_stats(), which calls get_gatewaystats().
get_gatewaystats() now returns the text for each field and an optional color separated by "/" - "text/color" e.g. "Online/#90EE90"
Parse the the new format, separating out text and color.
If color is specified, then also set it with jQuery to css.
2014-12-05 17:54:30 +05:45
Phil Davis
beb7d9e332 Explicitly pass gateway status and color
This code was passing a whole load of html to attempt to set various properties of the Gateways Widget Status column so that it would display the new status (Online, Offline...) and in the appropriate color.
Now that I am using class=listr, the css fro listr already specifies white. Setting bgcolor in HTML does not override that.
Pass both the status text and color as ordinary text, separated by "/". The consumer of this output can do their thing with jQuery to set the color as well as text of the element.
2014-12-05 17:43:48 +05:45
Phil Davis
6404148cf3 Use proper listr class for Gateways Widget Status
The Gateways Widget Status was not using the listr class, and so it was missing the borders for the right and bottom of its box.
Use the listr class.
Then use javascript to explicitly set the background-color to match the status, overriding the white that is specified in listr.
2014-12-05 17:36:49 +05:45
Renato Botelho
d57c55ca3b Merge pull request #1366 from phil-davis/patch-1 2014-12-05 07:00:37 -02:00
Phil Davis
5eeee40fb8 Fix gateway widget status update
Redmine #4077
2014-12-05 13:40:52 +05:45
Chris Buechler
393dac91c7 dyn.dns.he.net uses a self-signed cert, disable verification for it. 2014-12-04 23:38:34 -06:00
Chris Buechler
d69414feef Don't try to launch 3gstats unless it's on a valid device. 2014-12-04 23:19:45 -06:00
Chris Buechler
a0b470eefd Proper CA certificates are in place to validate SSL in these cases where it previously couldn't be, remove disabling of verification. 2014-12-04 23:11:55 -06:00
Chris Buechler
8742f79973 Merge pull request #1365 from jean-m-cyr/master 2014-12-04 20:57:13 -06:00
Chris Buechler
b3460e3dcc The time has come - bump to 2.2-RC 2014-12-04 17:20:53 -06:00
Chris Buechler
1d57a7f7c1 After discussion with Ermal, remove this to force consumers to send things
properly. I fixed the scenario in Unbound where it was sending IPs to
these functions rather than an interface, so this has no functional diff.
2014-12-04 15:58:21 -06:00
Chris Buechler
a623defdee replace spaces with tabs 2014-12-04 12:18:09 -06:00
Jean Cyr
ad62d077a3 Don't include link-locals as unbound interface candidates
Unbound does not presently support link-local interfaces.
2014-12-04 13:07:22 -05:00
Renato Botelho
9fc7e40dbe Merge pull request #1364 from phil-davis/patch-4 2014-12-04 08:39:52 -02:00
Phil Davis
f0eef2ef62 Provide friendly descr in error message in Interfaces Assign
I was doing drastic things testing some stuff, swapping WAN and OPT1 interfaces in Interfaces->Assign. I accidentally pressed Save when I had the same real device selected for both. Thankfully there was input validation! But I noticed that the error message reported just the names WAN and OPT1, but actual I had them named as different things. So the names in the error message did not match the names (friendly descriptions) in the table of interfaces.
This change makes it display both like FRIENDLY_DESC (FRIENDLY_NAME) so there is less room for confusion.
2014-12-04 16:16:05 +05:45
Renato Botelho
99a8036453 Merge pull request #1363 from phil-davis/patch-3 2014-12-04 08:01:10 -02:00
Renato Botelho
2966bc42ce Merge pull request #1362 from phil-davis/patch-2 2014-12-04 08:00:59 -02:00
Ermal LUÇI
c02c81de6a Proper fix was put on f658bac
Revert "Can't skip this if booting, ends up breaking config. Ticket #4071"

This reverts commit effb3a3cfe.
2014-12-04 10:19:00 +01:00
Ermal LUÇI
f658bac744 Properly unset booting flags to allow dynamic ipsec tunnels to work correctly 2014-12-04 10:18:44 +01:00
Phil Davis
62a407dad5 Put -4 in the right place in ntpq clockver command #4074
I had pasted it in here between "-c" and "clockvar", that was not good.
That's all I have for #4074 (I hope)
2014-12-04 13:50:11 +05:45
Phil Davis
c2914fc984 Use IPv4 for ntpq if IPv6 not allowed in widget #4074
Similar code here. Shame it was not in a subroutine called from both places, but not about to re-engineer that now:)
2014-12-04 13:44:20 +05:45
Chris Buechler
e26effd340 change the ordering of dhcpd_configure and unbound_configure here, claims on forum it fixes issue I can't seem to replicate. 2014-12-04 00:23:44 -06:00
Chris Buechler
888dd4949a Merge pull request #1361 from phil-davis/patch-2 2014-12-04 00:12:17 -06:00
Phil Davis
e4a496ae8f Use IPv4 for ntpq if IPv6 not allowed
Forum: https://forum.pfsense.org/index.php?topic=84890.0
2014-12-04 11:26:45 +05:45
Chris Buechler
679c54fcee Merge pull request #1360 from jean-m-cyr/master 2014-12-03 23:07:18 -06:00
Jean Cyr
f302a333af Link local interfaces don't have subnet.. don't create access-control statement
Selecting link local interface for unbound causes invalid access-control
statement in unbound config since link local address doesn't have
subnet.
2014-12-03 22:23:34 -05:00
Chris Buechler
effb3a3cfe Can't skip this if booting, ends up breaking config. Ticket #4071 2014-12-03 20:43:03 -06:00
Chris Buechler
e78509cc09 fix IPv6 static routes, is_ipaddrv6 returns true for strings including a
CIDR mask, which then ended up broken.
2014-12-03 12:42:05 -06:00
Chris Buechler
3064001823 Change our default resolv-retry back to OpenVPN's default. Changing this
didn't help the ticket where it was intended to help, which was later
fixed differently. This change in defaults is problematic in a lot of
scenarios, go back to the way things were before. Ticket #3894
2014-12-03 11:05:16 -06:00
Renato Botelho
576af57027 Merge pull request #1359 from phil-davis/patch-1 2014-12-03 10:57:48 -02:00
Phil Davis
efa2869209 Display installed pkg version even if pkg server not available
Forum: https://forum.pfsense.org/index.php?topic=84820.0
It seems reasonable to me to display the currently installed package version numbers, along with text like "Latest: N/A". and the Version box being red-filled when someone goes to System->Packages and displays the installed packages but the package server is not reachable for some reason.
This code does it.
What do you think?
2014-12-03 17:27:58 +05:45
Chris Buechler
a94b1edc7f Merge pull request #1348 from phil-davis/patch-4 2014-12-02 21:35:54 -06:00
Chris Buechler
c042bc3b10 Merge pull request #1357 from DasTestament/patch-1 2014-12-02 21:28:32 -06:00
Chris Buechler
d12e3d3c46 reload Unbound here, fixes some instances of PD-assigned v6 IPs missing from unbound.conf 2014-12-02 20:50:19 -06:00
Chris Buechler
a0e9e17d2d If get_interface_ip(v6) is passed an IP, return the IP.
Properly set up interface binding for v6 link local IPs. Ticket #4021

except had to comment out the fix for now because of #4062 to avoid config breakage.
2014-12-02 20:15:04 -06:00
jim-p
0b0d83cbf0 Use clog -f /var/log/filter.log to view firewall log entries, so they are displayed in the new format. 2014-12-02 12:46:14 -05:00
Chris Buechler
690b557cbf wait 10 minutes before retrying on soft failures to avoid us getting DoSed
if something is wrong there (like someone's system can't validate the
cert)
2014-12-02 11:14:03 -06:00
Chris Buechler
a82b458fcc don't include cert.pem in the obsoletedfiles list. 2014-12-02 11:08:08 -06:00
Ermal LUÇI
3377dc9da6 Preserve exit code lost from s/exit/return/ 2014-12-02 12:59:54 +01:00
Ermal LUÇI
110967a4ba Try to not make useless entries in the config file for very rare used configuration values. Makes config file readble and with less size 2014-12-02 12:35:36 +01:00
Ermal LUÇI
7f06001481 Cleanup whitespace. 2014-12-02 12:24:28 +01:00
Ermal LUÇI
52550ca5e3 Remove exit from as much as possible backend code 2014-12-02 12:01:15 +01:00
Ermal LUÇI
9ea554ee5c Remove exit from as much as possible backend code 2014-12-02 11:33:21 +01:00