Commit Graph

19761 Commits

Author SHA1 Message Date
jim-p
4856df9b7f Add forgotten "ipv6 remote network", clean up a couple bits, make sure local network box is hidden for shared key servers. 2012-08-09 14:40:54 -04:00
jim-p
d5d1554278 Activate "base" exchange mode also supported by racoon. 2012-08-08 12:54:47 -04:00
jim-p
6e2cbc5823 Sync pbi tools 2012-08-08 08:14:20 -04:00
jim-p
3dc3b15b28 Catch another error here 2012-08-07 18:18:52 -04:00
jim-p
4178d033a2 Make sure we don't have any extra whitespace here. 2012-08-07 18:15:31 -04:00
Ermal Luçi
9f310a6384 Merge pull request #208 from phildd/master
Change rcfileprefix to a constant
2012-08-07 03:50:26 -07:00
phildd
e9d66ed41e Change rcfileprefix to a constant 2012-08-07 16:12:09 +05:45
phildd
c59667116d Change rcfileprefix to a constant 2012-08-07 16:10:11 +05:45
phildd
dd9e0bdb55 Change rcfileprefix to a constant 2012-08-07 16:08:17 +05:45
Ermal Luçi
b0c5dd87fd Merge pull request #207 from phildd/master
firmware_update_misc log file name out of date
2012-08-07 01:03:34 -07:00
phildd
2e009ccba6 firmware_update_misc log file name out of date
The name was changed to /conf/firmware_update_misc_log.txt in etc/rc.firmware quite a while ago. It needs fixing here in diag_nanobsd.php also.
2012-08-07 09:46:02 +05:45
Jim P
a25ec99eff Merge pull request #205 from phil-davis/master
Minor text typo in DynDNS log message
2012-08-06 05:04:01 -07:00
Phil Davis
1bf52c67a6 Minor text typo in DynDNS log message
I noticed the "Inital" typo in my syslog, so thought I might as well scan through the DynDNS messages and fix it up.
2012-08-06 15:29:39 +05:45
Ermal Luçi
1f2db61295 Merge pull request #204 from phil-davis/master
pkg_mgr_install - only mount rw when needed
Probably more comment should be put in the code.
2012-08-03 08:05:50 -07:00
Phil Davis
06aa745e29 pkg_mgr_install - only mount rw when needed
When entering pkg_mgr_install the filesystem was being mounted rw and a backup made of the config, even if the case was "showlog" or "installedinfo". This resulted in:
a) an extra "backup" of the config being made after an install - it could be seen in Diagnostics, Backup Restore, Config History
b) Unnecessary conf_mount_rw and conf_mount_ro calls. These slow down the process on nanobsd-like systems.
This change fixes both these issues.
2012-08-03 13:39:16 +05:45
Seth Mos
17ad49a94c Merge pull request #203 from phil-davis/master
Minor fix to percentage output on pkg install
2012-08-02 22:06:03 -07:00
Phil Davis
82acb8b327 Minor fix to percentage output on pkg install
A variable not changed in a cut-paste.
When on console, update_progress_bar should also only be called for 1-9 then every 10% progress, to reduce serial output volume.
2012-08-03 10:30:51 +05:45
jim-p
665340db11 Activate more Hash, DH, and PFS options that are available in racoon now. Note that SHA256-512 are RFC4868 compliant in FreeBSD, may break with other incompatible stacks. 2012-08-02 12:38:29 -04:00
Ermal Luçi
919d450395 Merge pull request #201 from phil-davis/master
Bogons updated - make sure conf_mount_rw and conf_mount_ro are matched
2012-08-02 07:45:52 -07:00
jim-p
bc8a1938f5 In order for miniupnpd to latch onto IPv6, we just need to give the interface name here, not the subnet. The daemon is smart enough to latch onto the right subnet(s) here anyhow. 2012-08-02 10:23:18 -04:00
Phil Davis
342a2f18f9 Ensure conf_mount_rw and conf_mount_ro are matched
On nanobsd, running /etc/rc.update_bogons.sh gives:
[2.1-BETA0][admin@test02.homedomain]/tmp(12): /etc/rc.update_bogons.sh 1
/etc/rc.update_bogons.sh: cannot create /etc/bogonsv6: Read-only file system
The code does 1 conf_mount_rw but 2 conf_mount_ro
This is also seen in system.log:
Aug  2 17:47:59 test02 admin: rc.update_bogons.sh is starting up.
Aug  2 17:47:59 test02 admin: rc.update_bogons.sh is beginning the update cycle.
Aug  2 17:49:27 test02 admin: Bogons file downloaded:  1 addresses added.
Aug  2 17:49:29 test02 php: : Reference 1000 is going negative, not doing unreference.
Aug  2 17:49:29 test02 admin: Bogons files downloaded:  no changes.
Aug  2 17:49:29 test02 admin: rc.update_bogons.sh is ending the update cycle.

The V6 bogons file does not get applied because the filesystem is RO by that point.

I have reviewed the whole logic of this shell script. I believe it handles the various cases correctly now. On nanobsd I get the following in system.log:
Aug  2 18:17:13 test02 admin: rc.update_bogons.sh is starting up.
Aug  2 18:17:13 test02 admin: rc.update_bogons.sh is beginning the update cycle.
Aug  2 18:18:02 test02 admin: Bogons V4 file downloaded:  no changes.
Aug  2 18:18:10 test02 admin: Bogons V6 file downloaded:  58959 addresses added.
Aug  2 18:18:52 test02 admin: rc.update_bogons.sh is ending the update cycle.
2012-08-02 18:40:29 +05:45
Seth Mos
f6189bec54 Merge pull request #200 from phil-davis/master
require filter.inc so filter_configure is defined
2012-08-02 04:19:41 -07:00
Phil Davis
c9a98f18f5 require filter.inc so filter_configure is defined
The "renew" button on a DHCP connection ends up calling function interface_dhcpv6_configure() in interfaces.inc, which in turn calls filter_configure() (in filter.inc) but gives the error:
Fatal error: Call to undefined function filter_configure() in /etc/inc/interfaces.inc on line 3350
See forum post: http://forum.pfsense.org/index.php/topic,52046.0.html
2012-08-02 17:02:06 +05:45
Ermal Luçi
4e35161b70 Merge pull request #199 from phil-davis/master
Tidy package cleanup output
2012-08-02 03:49:43 -07:00
Phil Davis
449d3e96fd Tidy package cleanup output
Add a "done." and newline after "Cleaning up..."
Then when output is going to the serial console the next line will start cleanly and %age figures will not write over the top of "Clean".
2012-08-02 14:51:48 +05:45
Seth Mos
6675b01abe Merge pull request #198 from phil-davis/master
Tidy up percentage logging to console
2012-08-02 01:10:36 -07:00
Phil Davis
2a315bee5d Tidy up percentage logging to console
When on the console, the code only intended to update the percentage downloaded every 10%. Due to string-and-int type differences, the test was not working, all percentages were being logged. This is fixed.
Also, add a newline after 100% - then whatever outputs next gets a clean start on a new line of output.
Tidies up the console output during a post-firmware-upgrade package install.
2012-08-02 13:46:49 +05:45
jim-p
f7c8f633b6 Ensure this gets a set default value or things can break 2012-08-01 14:53:45 -04:00
jim-p
a0d1a4678e Protect against a potential infinite loop here. 2012-08-01 14:45:41 -04:00
jim-p
bfede3d446 Correct variable name. Fixes #2571 2012-08-01 12:13:44 -04:00
Ermal
9fd9b6bf71 Silence tar command to not garble console 2012-08-01 10:45:28 +00:00
Ermal
03b2cab6de To not clobber the console add \r when outputing status information on console 2012-08-01 10:40:41 +00:00
Ermal
74a4edc36f Correct mod_evasive setting per CP to confirm to what the CP page description says. Resolves #2270 2012-08-01 08:04:49 +00:00
Ermal
25fff26736 Refine test 2012-08-01 08:02:06 +00:00
Ermal
8b34498c90 Do some cleanup of code for zones 2012-08-01 07:53:52 +00:00
Ermal
6839a678b0 Correct generation of lighty config for CP now that zone is passed as parameter 2012-08-01 07:30:35 +00:00
Ermal Luçi
f15849b5e4 Merge pull request #196 from mtharp/dhcpv6-relay
Get DHCPv6 relay working (#1663)
2012-07-31 13:29:47 -07:00
jim-p
0b233932f2 Try to keep existing files rather than unlinking/replacing when restoring the package libraries during a package removal. Needs some testing, but for NanoBSD it fixes #1049 2012-07-31 16:28:44 -04:00
Ermal
712eb7695c Unlock on return 2012-07-31 11:08:35 +00:00
Ermal
eb295a1bcb There is no need to remove the @ from function names. Also properly unlock in case of exception. Size is constant and we know it no need for extra call to shmop. Put some more error checking just in case 2012-07-31 11:07:53 +00:00
Seth Mos
fa5c53fb3e Merge pull request #195 from phil-davis/master
Don't conf_mount_rw every time packages are listed
2012-07-31 02:26:35 -07:00
Phil Davis
a70cdb7364 Don't conf_mount_rw every time packages are listed
Every time System:Packages is selected, the code does a conf_mount_rw, checks for existence of some dirs, then does conf_mount_ro. This makes navigating the package install GUI slow on nanobsd, and it is not needed.
Do is_dir checks first, then conf_mount_rw only if they need to be created. The is_dir function works fine on a read-only filesystem.
2012-07-31 14:47:30 +05:45
Seth Mos
41454a132f Merge pull request #194 from phil-davis/master
Make acces to shared memory atomic
2012-07-31 00:38:53 -07:00
Phil Davis
7074a89aad Make access to shared memory atomic
Use lock and unlock to make sure that all incrementing and decrementing of the reference count in the shared memory section is atomic. This ensures that there are not unusual timing conditions that could see 2 callers trying to update the reference count at the same time, which could result in the count never returning to zero. If that happened, then the filesystems would never be restored to read-only. (this is really just relevant to nanobsd) (note that shmop_* calls in php do not do any locking themselves - callers must coordinate their own access to the shared memory section)
I also made the number stored in the shared memory be an ordinary integer followed by null chars to pad out the rest of the shared memory section. This makes the numbers stored look normal, and ensures that there is no other rubbish left in memory after them to cause problems on reading.
2012-07-31 13:10:14 +05:45
Michael Tharp
73c897eb14 Fix dhcpv6_relay writing to the dhcpv4 configuration
Implements ticket #1663
2012-07-30 17:45:13 -04:00
Michael Tharp
69dd70883e Construct the arguments to dhcrelay -6 correctly
Implements ticket #1663
2012-07-30 17:45:00 -04:00
jim-p
780705e9b8 Fix negative test 2012-07-30 15:18:31 -04:00
jim-p
a9f250d6a3 Pad data when adding to refcount reference, to avoid some oddities with how php handles such data. http://forum.pfsense.org/index.php/topic,51188.msg278141.html#msg278141 2012-07-30 15:07:33 -04:00
smos
4b163ecef5 Remove this filter configure call, something else will take care of this and we don't need to do that here. 2012-07-28 17:57:21 +02:00
Warren Baker
323dc2e792 Supress the error message if the ldap bind doesnt happen 2012-07-27 23:19:41 +02:00