Commit Graph

116 Commits

Author SHA1 Message Date
Ermal
fb0eb20bb9 Actually do not allow the loop to continue. Related to Ticket #1928 2013-06-12 17:46:12 +00:00
Renato Botelho
c4bd43ccba Copy full dhcpd conf from master to slave. Fixes #2600 2013-02-22 14:22:40 -03:00
Renato Botelho
d026178fa6 Make sure we create / delete SPDs and SADs on secondary node when it changes on primary. Fixes #2303 2013-02-22 11:56:34 -03:00
Renato Botelho
a1fb7d61c4 Fully sync filter and nat sections. Fixes #2362 2013-02-13 17:19:52 -02:00
Ermal
c87f4b7092 Fixes #1928. Disallow sync loop only for certain types of calls but not for exec_[php|shell]. Also fix CARP loop detection to use correct variable 2013-01-30 10:57:00 +00:00
Renato Botelho
3dacbd7c6d Remove a couple of call-time pass-by-reference for interface_ipalias_configure() 2013-01-14 11:38:12 -02:00
Ermal
3e662cb0b2 Get rid of carpdev, it will never be 2012-06-07 08:51:16 +00:00
Ermal
7b47bd4c3c Make vips vhid be unique per parent interface! 2012-04-05 20:22:01 +00:00
Darren Embry
f97a5b0419 Move CARP settings from pkg XML to a real PHP page
https://redmine.pfsense.org/issues/647
2012-03-22 21:25:58 -04:00
jim-p
1b99e1e53a Some sections should just be copied and not merged or we end up unable to sync the deletion of the last item in a section. 2011-12-12 14:49:02 -05:00
Scott Ullrich
3dd2a27826 Log when XMLRPC auth fails so that the brute force lockout will kick in. 2011-08-28 13:06:42 -04:00
Ermal
2708a5cf16 NEw functiong does_vip_exist() which works for carp and ipalias type vips to help in carp sync issues. Fixes #1598 2011-06-14 11:36:20 +00:00
Ermal
63f81fbd88 Do not assume that every merge is about vips. Found-by: Jim 2011-06-13 18:16:03 +00:00
Ermal
19ed162443 unset after checking that no reconfiguring is needed. 2011-06-13 15:04:59 +00:00
Ermal
92ca32ccbe Actually make this code more readble. 2011-06-08 18:22:04 +00:00
Ermal
d1e0382258 Remove the entry from old entries even when there are no changes to prevent marking them down. 2011-06-08 18:21:00 +00:00
Ermal
7fc6c00573 Generate proper index for unsetting so we do not destroy all the vips in the backup. 2011-06-08 07:29:33 +00:00
Scott Ullrich
f9d7c5b3c4 Use array_overlay() 2011-05-31 14:42:22 -04:00
Scott Ullrich
0b581a8acf Use array_extend 2011-05-31 14:28:13 -04:00
Scott Ullrich
485b1ca5ce Remove debugging code 2011-05-31 13:47:53 -04:00
Scott Ullrich
db748384c1 Add merge handler code 2011-05-31 13:45:16 -04:00
jim-p
aa6699fbea Fix config sync issue. Resolves #1547 Fixed-by: Ermal 2011-05-20 10:27:29 -04:00
Ermal
c415a55bd3 Micro optimization. 2011-05-18 21:56:13 +00:00
Ermal
f51d4f989e Ticket #1534, #1433. Remove custom sync code for vip, since it array_merge() replaces same keys data when merging. But make the code for reloading only changed vips after merge better and some more checks. 2011-05-18 21:31:35 +00:00
Ermal
516114406b Ticket #1534, #1433. Properly merge carp interfaces and do not reload carp interfaces that have not change any configuration parameter. Also make merge_config_section_xmlrpc() an alias for restore_config_section_xmlrpc() since that what it is. 2011-05-18 21:11:10 +00:00
Ermal
67d78c87c9 Ticket #1534. Serialize all the xmlrpc requests coming to the firewall. Seems such request can stomp into each other and create either corruption of xmlrpc request or other issues. 2011-05-17 21:18:33 +00:00
Ermal
4e8c89fdbe Allow ipalias with carp as parent interface to be synchronized. 2011-02-01 19:09:37 +00:00
Pierre POMES
00752d5a82 Ticket #959. Keep local items at the top of vip section 2010-12-11 15:31:57 -05:00
Ermal
4d775dd000 Be consistent on shifting array during authentication. Also check for array to avoid strange errors. 2010-12-10 19:35:59 +00:00
Ermal
a79c72d709 Actually the passed config sections are part of index 1 of the array. This fixes config sync of vips as well. 2010-12-10 19:04:48 +00:00
Ermal
0567899d3d Fix config synchronization. Also unbreak the config when erroring out because it will loop indefinitely. 2010-12-10 18:34:56 +00:00
Ermal
01b1cc6aff Fix line because of copy/pasto. 2010-12-10 00:53:02 +00:00
Ermal
728719dd90 Its too late and this is optional. 2010-12-10 00:51:52 +00:00
Ermal
18be996dd7 Actually we expect an array to be returned. 2010-12-10 00:34:53 +00:00
Ermal
e501de37f7 Hello xmlrpc to another function! 2010-12-10 00:19:22 +00:00
Ermal
137f46d893 Whitespace fixes to make this readble. 2010-12-07 11:10:08 +00:00
Ermal
a8200dbfe7 Ticket #975. Rearrange code a little. 2010-10-27 20:56:57 +00:00
pierrepomes
b019222ac2 Ticket #959: keep local ipalias and proxyarp vip's during a XMLRPC restore 2010-10-26 20:29:50 -04:00
Ermal
2de2abe00c No need to triger a vips re-configure explicitly but rather detect this during config merges. This is the best way to do this after fixing Ticket #601. 2010-08-20 16:21:11 +00:00
Ermal
19b5c3e7f6 Ticket #601. If 'virtualip' section is going to be restored or merged through xmlrpc bring down all vips which will be brough up later on from the configure_carp call. This ensures that the peers on the cluster stay current to each other. 2010-08-20 13:04:08 +00:00
Ermal
68e1bc0f21 Not neccessary to call this here since vips_configure does this automatically. 2010-08-20 12:54:56 +00:00
Erik Fonnesbeck
3a3fb8eaba Fix printf/sprintf mixups. 2010-08-11 16:15:13 -06:00
Renato Botelho
f16ba51e6d Merge remote branch 'mainline/master'
Conflicts:
	usr/local/www/services_dhcp_edit.php
2010-08-03 10:54:45 -03:00
jim-p
0ce726624d Optionally sync users and groups via xmlrpc. Fixes #650 2010-08-02 17:17:46 -04:00
jim-p
62c4d0fb3e Resync DNS forwarder post-sync. Fixes #117 2010-08-02 16:54:04 -04:00
Scott Ullrich
a771c04477 Backout this commit, it was never intended to be committed 2010-08-02 16:14:56 -04:00
Vinicius Coque
72423b73c7 Merge remote branch 'mainline/master'
Conflicts:
	usr/local/www/carp_status.php
	usr/local/www/diag_nanobsd.php
	usr/local/www/services_captiveportal_ip_edit.php
2010-07-30 16:06:28 -03:00
Rafael Lucas
de63649b55 Implement gettext() calls on xmlrpc.php 2010-07-29 09:36:59 -03:00
Scott Ullrich
e702e6c959 Adding utility to show and maintain overflow tables 2010-07-28 22:32:26 -04:00
jim-p
c3fef0c9b4 Restart dhcpd and OpenVPN on backup box. Fixes #646 - Helps ticket #645 but that still needs work. 2010-06-11 14:08:13 -04:00