Commit Graph

24696 Commits

Author SHA1 Message Date
Renato Botelho
d9feefb118 Merge pull request #1408 from ExolonDX/master 2014-12-29 11:40:31 -02:00
Colin Fleming
40930f75db Backout pull request #1391
https://forum.pfsense.org/index.php?topic=85944.0

Backout pull request #13191
2014-12-29 11:51:44 +00:00
jim-p
f9aed22c4a Merge pull request #1405 from phil-davis/unbound-shortcuts 2014-12-28 13:43:06 -05:00
Phil Davis
db88a3a261 Fix unbound shortcut links
Fixes redmine #4151
1) Make the naming in shortcuts.inc more clear - forwarder=dnsmasq
resolver=unbound
2) Make the value of $shortcuts_section correct in each dnsmasq and
unbound php code
3) Make diag_logs_resolver.php smarter, so if dnsmasq is enabled, then
show shortcuts for dnsmasq, otherwise show shortcuts for unbound.
4) Fix some references to forwarder in unbound code - should be
resolver.
2014-12-28 16:36:53 +05:45
Chris Buechler
cccee75584 clarify message here after customer feedback, it wasn't meant to imply "only a reboot will re-enable" but that's how some people have read it. 2014-12-26 16:49:18 -06:00
Renato Botelho
02e4ee541b Update /etc/ttys from new partition when upgrading nanobsd, and in this case do not call reload_ttys(). It should fix #4140 2014-12-26 13:13:04 -02:00
Renato Botelho
e68b7be076 Remove unused variable 2014-12-26 13:13:02 -02:00
Renato Botelho
d0bf02bdbd Move this check before full sync to disable dnsmasq/unbound in the first time it's sync'd 2014-12-26 12:21:33 -02:00
Renato Botelho
f29fd4d08d Add dnsmasq and unbound config sections to full sync, it fixes #4076 that is caused because boolean config fields are not disabled on secondary 2014-12-26 12:20:57 -02:00
Renato Botelho
46df4e8894 Merge pull request #1402 from phil-davis/patch-1 2014-12-26 08:19:06 -02:00
Phil Davis
5525974bd1 Display tunnel description on IPsec widget
There was not even code to attempt to display the description.
Also, when I first created a phase1 and there were no phase2 yet, the widget spat out the warning for the line:
foreach ($config['ipsec']['phase2'] as $ph2ent){ ...
So I enclosed that in a block:
if (isset($config['ipsec']['phase2'])) { ... }
Tabbing that block in makes the diff look big when there really is little change - a diff ignoring spacing will look much nicer!
2014-12-26 13:48:06 +05:45
Ermal LUÇI
82a2fd790b Correct even other areas of CP using pfSense_ipfw_getTablestats function. 2014-12-24 19:14:21 +01:00
Ermal LUÇI
b927684536 Correctly call function for retrieving stats from ipfw. Fixes #4131 2014-12-24 19:10:47 +01:00
Ermal LUÇI
35d17581b1 Fixes #4130 Check for a certain size of file to start showing data on dashboard and avoiding xml parser errors 2014-12-24 18:59:21 +01:00
Ermal LUÇI
c607f3060a Fix displaying description for IKEv1 connected tunnels 2014-12-24 18:47:52 +01:00
Ermal LUÇI
cdb68b253c Oops remove variable with same name unused! 2014-12-24 18:40:32 +01:00
Ermal LUÇI
4f23e0a4e5 Add checks for ghost phase2 and no need to check for number of phase2 here 2014-12-24 18:39:13 +01:00
Ermal LUÇI
d1e53a1e2f Correct skipping of disabled tunnels 2014-12-24 18:26:22 +01:00
Ermal LUÇI
17318511f9 Make this function readble 2014-12-24 18:21:57 +01:00
Ermal LUÇI
21b2912fc0 Correct status counter of inactive tunnels 2014-12-24 18:21:22 +01:00
Warren Baker
fad42a3da8 Remove option that has now been merged into infra-host-ttl. 2014-12-24 09:19:55 -02:00
Ermal LUÇI
f882771928 Oops do not override ipsec status array! 2014-12-23 17:21:11 +01:00
Renato Botelho
242e6ba232 Merge pull request #1401 from phil-davis/patch-1 2014-12-23 10:49:08 -02:00
Phil Davis
f244dca85a Reboot not required for password protect console menu
On my systems I can toggle and save "Password protect the console menu" back and forth and the console switches back and forth from the menu to a login prompt in real time. IMHO a reboot is no longer needed. Remove this note might save some people unnecessary reboot time.
2014-12-23 09:41:35 +05:45
Chris Buechler
6422c6f14d Merge pull request #1394 from phil-davis/patch-13 2014-12-22 17:49:13 -06:00
Chris Buechler
dc83dd4ca9 Merge pull request #1393 from phil-davis/patch-12 2014-12-22 17:45:49 -06:00
Chris Buechler
f2087b77d8 Merge pull request #1397 from phil-davis/patch-15 2014-12-22 17:41:16 -06:00
Chris Buechler
b5d827f644 Merge pull request #1400 from phil-davis/patch-17 2014-12-22 17:39:26 -06:00
Chris Buechler
07499022f1 Merge pull request #1398 from wagonza/patch-2 2014-12-22 17:32:31 -06:00
Renato Botelho
ccf30846e7 Add config upgrade code to validate changes made on c2fe67eb and d269747b. It fixes #4134 2014-12-22 15:06:41 -02:00
Renato Botelho
cfec85587c Add missing $ as spotted by Kill Bill, ticket #4132 2014-12-22 14:54:11 -02:00
Ermal LUÇI
17ad9cb8c1 Correct display of tunnel status on ikev1 with multiple phase2 2014-12-22 17:36:38 +01:00
Ermal LUÇI
483c3b5b43 Correct ipsec status page to make connect button work 2014-12-22 17:20:53 +01:00
Ermal LUÇI
7a8ea3ee7a Correct dashboard with new ipsec generation 2014-12-22 16:08:31 +01:00
Ermal LUÇI
d8cb5ff357 Create a separate connection for IKEv1 with multiple phase2 definitions. 2014-12-22 15:37:25 +01:00
Ermal LUÇI
a08db60378 Correct issue with not reloading CP properly on calling interface configure. 2014-12-22 15:33:06 +01:00
Ermal LUÇI
b2448aa0c9 Fix issue reported on https://forum.pfsense.org/index.php?topic=85737.0 2014-12-22 15:24:27 +01:00
Renato Botelho
7fd7c5a545 Fix string, we want to print variable name here and not its value. Fixes #4132 2014-12-22 10:12:40 -02:00
Ermal LUÇI
ce90c89a30 Do not apply bw limits if the setting is not enabled in CP. Though still respect radius attributes for now with this setting. Resolves #4127 2014-12-22 12:03:13 +01:00
Phil Davis
acfef9f5f7 Standardise dynamic firewall log view
to be like Firewall Log widget:
1) Display IPv6 address and port in [a🅱️:c]:123 format
2) Fix same issue with rows gradually disappearing each update, or when in reverse order, update lines not being put in the right place.
3) Update the processing of function format_log_line(row) to reflect the changed list of data items returned by handle_ajax() in filter_log.inc
2014-12-21 21:50:54 +05:45
Phil Davis
c120bd8da9 Handle firewall log widget display formats
the same way for the initial display and for updated rows done by Java Script. Now we receive the source IP and port, destination IP and port, all in separate fields so they can be put together in whatever combination for display.
IPv6 displayed addresses are shown inside "[ ]" so that any following port has the standard syntax like "[a🅱️:c:d]:123" - this makes it obvious that the last numbers are a port number, and not part of the IPv6 address.
The "title" has IP+Port - that is displayed when hovering over the box in general.
The href to diag_dns.php has hover text "Reverse Resolve with DNS" and the "?host=" sends just the IP address (without IPv6 square brackets).
The text displayed in the link is the IP address (with square brackets if an IPv6 address).
For the destination column, if there is a destinaion port, it is displayed in ordinary text ":port" after the IP address.

The blank not-displayed row at the end of the table is removed - this fixes the problem with counting the rows of the table where rows would disappear at each update.
2014-12-21 17:48:35 +05:45
Phil Davis
319e126e12 Lastsawtime has moved further along
srcport, dstport and version are now explicitly passed as fields here, so lastsawtime is 3 fields further out.
2014-12-21 17:34:32 +05:45
Phil Davis
1a9b610a32 Pass src dst IP port through to firewall log
and IP version. So that the receiving code can easily have each pat of the IP addresses and ports, and display them as it wishes.
2014-12-21 17:30:40 +05:45
Warren Baker
3050152665 Prevent resolvconf(8) from stomping all over our newly generated
resolv.conf and subsequent updates.
2014-12-20 22:13:45 +02:00
Phil Davis
fe416714b9 Put line break only if IPv4 address exists
This makes a line for the IPv4 address if it is there. If the IPv4 address goes away, the whole line will disappear, leaving just the IPv6 address without an empty line above it.
2014-12-20 23:57:29 +05:45
Phil Davis
7a0c88f827 Interfaces widget remove blank line if no IPv4 address
If the interface had an IPv6 address but no IPv4 address, there was a blank line where the IPv4 address would have been. There is no need for that, and one day IPv4 will be old legacy and systems will routinely have no IPv4 addresses at all - they will all be IPv6. Might as well make that look ordinary on the display now.
The br goes in the div so we can put it in and out from the AJAX also.
2014-12-20 23:50:35 +05:45
Phil Davis
6e795218c4 Set Interfaces widget IPv6 address
Now that get_interfacestatus() is returning us the IPv6 address, and interfaces.widget.php has a div to put it in, actually update the IPv6 address on the widget.
2014-12-20 23:01:21 +05:45
Phil Davis
d7884992d2 Send IPv4 and IPv6 address in get_interfacestatus
And make them strong (bold), which is how they are displayed originally by interfaces.widget.php
This allows the AJAX that manipulates the div's in interfaces.widget.php to get the data, so it can make it update.
2014-12-20 22:57:47 +05:45
Phil Davis
2795f40b0c Interfaces widget create all div
All div for the various things need to be created here, so that later AJAX can switch the necessary things on/off and write a new IPv4 or IPv6 address into the div when an interface acquires an address.
2014-12-20 22:53:58 +05:45
Chris Buechler
5b4ed0e1db Use correct port for viewing portal page contents. Ticket #4125 2014-12-19 19:57:10 -06:00