Commit Graph

24219 Commits

Author SHA1 Message Date
Phil Davis a3fad59243 Fixup dhcpd interface enabled check 2014-11-03 22:28:46 +05:45
Phil Davis ba667cc6f4 Fix console set interface IP address
Problem as per forum https://forum.pfsense.org/index.php?topic=83651.0
The problem comes whenever services_dhcpd_configure is called - the global $config gets reset from the actual current config, and any pending changes in the current process are lost.
It was introduced by commit 86ce2df
in which services_dhcpdv4_configure() does:

require_once('pkg-utils.inc')

and pkg-utils.inc does various stuff like:

if(file_exists("/cf/conf/use_xmlreader"))
require_once("xmlreader.inc");
else
require_once("xmlparse.inc");

which seems to cause a reset of the $config variable, thus losing the pending changes the user has entered at the console.

The top-level code in rc.initial.setlanip really does not need to (and should not) implement any changes along the way - it should collect all the answers from the user, then write_config and then make all the necessary calls to routines to implement the changes on the running system. This fixes it - defer any calls to services_dhcpd_configure() until after all questions are answered and write_config has happened.
2014-11-03 20:49:15 +05:45
Renato Botelho ec2904649f Merge pull request #1328 from wagonza/master 2014-11-03 10:56:16 -02:00
Renato Botelho fe9d4894a2 Fix indent 2014-11-03 10:54:21 -02:00
Renato Botelho 2783e408c4 Revert "Indent better"
This reverts commit a431bfc9e6.
2014-11-03 10:52:09 -02:00
Warren Baker d5566d43f4 Make sure defaults values are actually used. Fixes #3974 2014-11-03 14:45:13 +02:00
Renato Botelho 7bb24e18e0 Merge pull request #1327 from wagonza/pfSense-master 2014-11-03 08:48:52 -02:00
Warren Baker 46a989ce90 Indent here as well 2014-11-03 12:08:25 +02:00
Warren Baker a431bfc9e6 Indent better 2014-11-03 12:08:01 +02:00
Warren Baker 1b436de1ac Be consistent with the other pages 2014-11-03 12:04:42 +02:00
Warren Baker be11b6f1b8 Add braces 2014-11-03 12:03:08 +02:00
Renato Botelho 0a89d05955 Merge pull request #1324 from phil-davis/patch-3 2014-11-03 05:54:09 -02:00
Phil Davis 8727b3c8ec Set interface address from consol tidy output
While trying to see why this is not working for me (forum https://forum.pfsense.org/index.php?topic=83651.0 ) I have fixed some little things:
1) Get the new-lines right so the output of the restarting looks neat
2) Fix a comparison that had just a single equal sign - it did not break anything real because the subsequent code was just text output to the console. Now that text output does take notice of the correctly-evaluated condition, and $interface is not overwritten.

The issue in the forum post, about the interface IP address config not actually changing, is still the case, at least for me.

IMO these little tidy ups might as well be committed. They make this code better!
2014-11-03 11:49:45 +05:45
Ermal ce21dfca21 Correct dispaly of checkboxes for ipsec 2014-11-02 00:20:27 +01:00
Ermal 8cb7d3e386 Properly configure NAT Tranversal setting. 2014-11-01 23:41:38 +01:00
Ermal 6af857182b Remove debugging code 2014-11-01 20:54:49 +01:00
Ermal f3dd7e8cdb Properly test if FCGI is calling or are being triggered from shell. Normally Fixes #3361 2014-11-01 18:56:36 +01:00
Ermal 9fdc167f4e Properly test if FCGI is calling or are being triggered from shell. Normally Fixes #3361 2014-11-01 18:55:45 +01:00
Ermal d338018f47 Fixes #3938. Do more error checking. 2014-11-01 18:49:45 +01:00
Ermal d35dfaaecb Fixes #3941. When optimizations of the loops were made this brought the problems of overriding default gateway by dynamic interfaces. Try to stick to the first found for now! 2014-11-01 18:43:28 +01:00
Chris Buechler 038f6e9676 clarify logs generated by newwanip(v6) when restarting packages, it's not only IP changes that end up here (by design). 2014-11-01 01:42:19 -05:00
derelict-pf a94a16cd46 s/a/an/ and speling. 2014-10-31 15:05:22 -07:00
derelict-pf 162a7b4edf s/then/than/ 2014-10-31 14:55:14 -07:00
jim-p 8560c7568a Fix two more instances of rrd.tgz renaming. 2014-10-31 10:26:02 -04:00
Phil Davis c656bc75f8 Fix getext to gettext typo 2014-10-31 08:09:39 +05:45
Phil Davis 41aa5cd4da Fix getext to gettext typo 2014-10-31 08:08:54 +05:45
Phil Davis 29af62653b Fix getext to gettext typo 2014-10-31 08:08:06 +05:45
Phil Davis 24516832ea Fix getext to gettext typo 2014-10-31 08:07:23 +05:45
Phil Davis b3f0b2e1a8 Fix getext to gettext typo 2014-10-31 08:06:17 +05:45
Chris Buechler 1ae41bfe84 Kill states associated with the old WAN IP when WAN IP has changed. Retain
hidden config option to wipe all states on IP change, as there seemed to
be circumstances where the 'pfctl -k $oldip' didn't suffice for others
(much of history in redmine ticket, some on forum and elsewhere). ticket
2014-10-30 16:37:14 -05:00
Ermal 737b18f23b Allow accept_unencrypted_mainmode_messages to be enabled if needed 2014-10-30 21:35:51 +01:00
Chris Buechler 461eac099b only kill all states if the IP changed. ticket #1629 2014-10-30 13:15:41 -05:00
Chris Buechler 5274102ea4 Hide burst for limiters, since it doesn't do anything. more details in
ticket #3933
2014-10-29 15:39:15 -05:00
Renato Botelho a437287444 Fix a typo on array index, related to ticket #3963 2014-10-29 11:02:47 -02:00
Chris Buechler 002d286c9c fix up text 2014-10-29 01:08:03 -05:00
Chris Buechler eea2ad5d61 FreeBSD fails to set advskew back to 0 after you set it to any other
value. That's a separate issue that needs fixing upstream, but in the mean
time, we can work around it by removing all CARP VIPs in the same way we
do when "Temporarily Disable CARP" is chosen before adding them all back.
Ticket #3910
2014-10-28 16:33:09 -05:00
Chris Buechler 569e2fdfac Add option to kill all states on IP change, currently a hidden option for more testing. ticket #1629 2014-10-28 13:31:51 -05:00
Renato Botelho fd057a5676 Merge pull request #1317 from phil-davis/patch-1 2014-10-28 15:00:16 -02:00
Renato Botelho 0a8dd27b5f Remove redundancy as pointed out by phil-davis 2014-10-28 14:55:07 -02:00
Renato Botelho 7c1997914f Merge pull request #1297 from phil-davis/patch-23 2014-10-28 14:26:51 -02:00
Renato Botelho 143c22f771 Decode recently created cert and key. It fixes #3964. While here, fix logical condition to create a new cert if crt or key is not present 2014-10-28 10:17:16 -02:00
Renato Botelho 0a8d7fe996 Back to use listr instead of vncellt since it has small fonts and mitigate changes of go outside the sidget. It should fix #3937 2014-10-28 09:49:25 -02:00
Renato Botelho 30cb409d63 Simplify logic 2014-10-28 09:24:56 -02:00
Renato Botelho bf50b0a42f Remove unecessary variables 2014-10-28 09:10:47 -02:00
Renato Botelho 9c76c0f1e0 Whitespace and indent 2014-10-28 09:08:28 -02:00
Chris Buechler 7e1aa4b771 fix ping_hosts.sh to not ping IPsec if CARP is in backup 2014-10-27 15:32:17 -05:00
Chris Buechler e8b5f72496 domain and search should not both be defined in resolv.conf per FreeBSD man page and handbook (only the latter is actually used). Change this to just not use domain, and set the search to the system's domain where not using the function that generates the search list for dynamic WANs. 2014-10-25 22:11:45 -05:00
Ermal 23ed5b7871 Enable unity plugin as per request from https://forum.pfsense.org/index.php?topic=79737.msg452808#msg452808 2014-10-24 19:18:15 +02:00
Phil Davis 577b776e55 Warn if attempting to import IPv6 range
There is currently no code to convert an IPv6 range to a set of corresponding IPv6 subnets, so warn the user if they attempt that from the alias bulk import GUI.
2014-10-24 20:23:00 +05:45
Phil Davis bb67ac32bc Support converting an IP range to an array of addresses
so that it can be used for expanding ranges in host alias input.
2014-10-24 20:17:04 +05:45