From fd91a82f99ceeff8fdbbfe066f5d14939f236d9f Mon Sep 17 00:00:00 2001 From: Alexandre Cassen Date: Thu, 9 Mar 2006 15:11:03 +0100 Subject: [PATCH] keepalived-1.1.12 * keepalived-1.1.12 released. * VRRP : Christophe Varoqui, extended VRRP framework to use virtual_router_id as syncid in LVS mcast datagram while using LVS syncd in VRRP instance. * Kevin Lindsay, and Christophe Varoqui, fixed SSL checker to properly use openssl when dealing with asynchronous stream handling. Kevin fixed asynchronous handling during connection stage while Christophe fixed stream handling after connection stage. * Kjetil Torgrim Homme, extended keepalived spec file to cleanly compile on RedHat enterprise 3 and 4. * Heinz Knutzen, fixed SMTP checker to overwrite default_host while parsing configuration file. A SMTP_CHECK without a "host" section should use the ip of the current real server as default. --- ChangeLog | 17 ++++++++++ VERSION | 2 +- keepalived.spec.in | 14 +++++++- keepalived/check/Makefile.in | 2 +- keepalived/check/check_api.c | 4 +-- keepalived/check/check_daemon.c | 4 +-- keepalived/check/check_data.c | 4 +-- keepalived/check/check_http.c | 63 ++++++++++++++++++++++++++++------- keepalived/check/check_misc.c | 4 +-- keepalived/check/check_parser.c | 4 +-- keepalived/check/check_smtp.c | 13 +++++--- keepalived/check/check_ssl.c | 55 +++++++++++++++++++----------- keepalived/check/check_tcp.c | 4 +-- keepalived/check/ipfwwrapper.c | 4 +-- keepalived/check/ipvswrapper.c | 24 +++++++------ keepalived/check/ipwrapper.c | 4 +-- keepalived/core/Makefile.in | 2 +- keepalived/core/daemon.c | 4 +-- keepalived/core/global_data.c | 4 +-- keepalived/core/global_parser.c | 4 +-- keepalived/core/layer4.c | 4 +-- keepalived/core/main.c | 4 +-- keepalived/core/pidfile.c | 4 +-- keepalived/core/smtp.c | 4 +-- keepalived/include/check_api.h | 4 +-- keepalived/include/check_daemon.h | 4 +-- keepalived/include/check_data.h | 4 +-- keepalived/include/check_http.h | 4 +-- keepalived/include/check_misc.h | 4 +-- keepalived/include/check_parser.h | 4 +-- keepalived/include/check_smtp.h | 4 +-- keepalived/include/check_ssl.h | 6 ++-- keepalived/include/check_tcp.h | 4 +-- keepalived/include/config.h.in | 4 +-- keepalived/include/daemon.h | 4 +-- keepalived/include/global_data.h | 4 +-- keepalived/include/global_parser.h | 4 +-- keepalived/include/ipfwwrapper.h | 4 +-- keepalived/include/ipvswrapper.h | 10 +++--- keepalived/include/ipwrapper.h | 4 +-- keepalived/include/layer4.h | 4 +-- keepalived/include/main.h | 4 +-- keepalived/include/pidfile.h | 4 +-- keepalived/include/smtp.h | 4 +-- keepalived/include/vrrp.h | 4 +-- keepalived/include/vrrp_arp.h | 4 +-- keepalived/include/vrrp_daemon.h | 4 +-- keepalived/include/vrrp_data.h | 4 +-- keepalived/include/vrrp_if.h | 4 +-- keepalived/include/vrrp_index.h | 4 +-- keepalived/include/vrrp_ipaddress.h | 4 +-- keepalived/include/vrrp_iproute.h | 4 +-- keepalived/include/vrrp_ipsecah.h | 4 +-- keepalived/include/vrrp_netlink.h | 4 +-- keepalived/include/vrrp_notify.h | 4 +-- keepalived/include/vrrp_parser.h | 4 +-- keepalived/include/vrrp_scheduler.h | 4 +-- keepalived/include/vrrp_sync.h | 4 +-- keepalived/include/vrrp_track.h | 4 +-- keepalived/vrrp/Makefile.in | 2 +- keepalived/vrrp/vrrp.c | 11 +++--- keepalived/vrrp/vrrp_arp.c | 4 +-- keepalived/vrrp/vrrp_daemon.c | 4 +-- keepalived/vrrp/vrrp_data.c | 4 +-- keepalived/vrrp/vrrp_if.c | 4 +-- keepalived/vrrp/vrrp_index.c | 4 +-- keepalived/vrrp/vrrp_ipaddress.c | 4 +-- keepalived/vrrp/vrrp_iproute.c | 4 +-- keepalived/vrrp/vrrp_ipsecah.c | 4 +-- keepalived/vrrp/vrrp_netlink.c | 4 +-- keepalived/vrrp/vrrp_notify.c | 4 +-- keepalived/vrrp/vrrp_parser.c | 4 +-- keepalived/vrrp/vrrp_scheduler.c | 10 +++--- keepalived/vrrp/vrrp_sync.c | 4 +-- keepalived/vrrp/vrrp_track.c | 4 +-- lib/Makefile.in | 2 +- lib/html.c | 4 +-- lib/html.h | 4 +-- lib/list.c | 4 +-- lib/list.h | 4 +-- lib/memory.c | 4 +-- lib/memory.h | 4 +-- lib/notify.c | 4 +-- lib/notify.h | 4 +-- lib/parser.c | 4 +-- lib/parser.h | 4 +-- lib/scheduler.c | 4 +-- lib/scheduler.h | 4 +-- lib/signals.c | 4 +-- lib/signals.h | 4 +-- lib/timer.c | 4 +-- lib/timer.h | 4 +-- lib/utils.c | 4 +-- lib/utils.h | 4 +-- lib/vector.c | 4 +-- lib/vector.h | 4 +-- 96 files changed, 326 insertions(+), 231 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc4c509..8a99983 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2006-03-09 Alexandre Cassen + * keepalived-1.1.12 released. + * VRRP : Christophe Varoqui, extended + VRRP framework to use virtual_router_id as syncid in LVS mcast + datagram while using LVS syncd in VRRP instance. + * Kevin Lindsay, and Christophe Varoqui, + fixed SSL checker to properly + use openssl when dealing with asynchronous stream handling. + Kevin fixed asynchronous handling during connection stage + while Christophe fixed stream handling after connection stage. + * Kjetil Torgrim Homme, extended keepalived + spec file to cleanly compile on RedHat enterprise 3 and 4. + * Heinz Knutzen, fixed SMTP checker + to overwrite default_host while parsing configuration file. + A SMTP_CHECK without a "host" section should use the ip of the + current real server as default. + 2005-03-01 Alexandre Cassen * keepalived-1.1.11 released. * Asier Llano Palacios, extended diff --git a/VERSION b/VERSION index 9ee1f78..ccad953 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.11 +1.1.12 diff --git a/keepalived.spec.in b/keepalived.spec.in index a89bfc2..457b0f8 100644 --- a/keepalived.spec.in +++ b/keepalived.spec.in @@ -19,12 +19,20 @@ rm -rf %{buildroot} %build export CFLAGS=-D__KERNGLUE__ -./configure --prefix=%{buildroot} --exec-prefix=%{buildroot} --sysconfdir=%{buildroot}/etc +# the setting of mandir should be %{buildroot}/usr/share/man, but the +# makefile adds "man" itself. +./configure --prefix=%{buildroot} \ + --exec-prefix=%{buildroot} \ + --sysconfdir=%{buildroot}/etc \ + --with-kernel-dir=/lib/modules/$(uname -r)/build \ + --mandir=%{buildroot}/usr/share \ + --enable-syncd make %install rm -rf %{buildroot} %makeinstall +rm -rf %{buildroot}/etc/keepalived/samples %clean rm -rf %{buildroot} @@ -41,5 +49,9 @@ rm -rf %{buildroot} %{_sbindir}/keepalived %{_sysconfdir}/init.d/keepalived %dir %{_sysconfdir}/keepalived/ +%config %{_sysconfdir}/keepalived/keepalived.conf +%doc %{_mandir}/man5/keepalived.conf.5.gz +%doc %{_mandir}/man1/genhash.1.gz +%doc %{_mandir}/man8/keepalived.8.gz %doc doc %doc AUTHOR CONTRIBUTORS TODO COPYING README INSTALL VERSION ChangeLog diff --git a/keepalived/check/Makefile.in b/keepalived/check/Makefile.in index 92b2d89..d67c3c0 100644 --- a/keepalived/check/Makefile.in +++ b/keepalived/check/Makefile.in @@ -2,7 +2,7 @@ # # Keepalived OpenSource project. # -# Copyright (C) 2001-2005 Alexandre Cassen, +# Copyright (C) 2001-2006 Alexandre Cassen, KERNEL = @KERN@ CC = @CC@ diff --git a/keepalived/check/check_api.c b/keepalived/check/check_api.c index 89c5bf5..02c4907 100644 --- a/keepalived/check/check_api.c +++ b/keepalived/check/check_api.c @@ -5,7 +5,7 @@ * * Part: Checkers registration. * - * Version: $Id: check_api.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_api.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include diff --git a/keepalived/check/check_daemon.c b/keepalived/check/check_daemon.c index 832e0d0..fff7cdc 100644 --- a/keepalived/check/check_daemon.c +++ b/keepalived/check/check_daemon.c @@ -5,7 +5,7 @@ * * Part: Healthcheckrs child process handling. * - * Version: $Id: check_daemon.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_daemon.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "check_daemon.h" diff --git a/keepalived/check/check_data.c b/keepalived/check/check_data.c index 4ae5b8f..dc6b8d2 100644 --- a/keepalived/check/check_data.c +++ b/keepalived/check/check_data.c @@ -5,7 +5,7 @@ * * Part: Healthcheckers dynamic data structure definition. * - * Version: $Id: check_data.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_data.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "check_data.h" diff --git a/keepalived/check/check_http.c b/keepalived/check/check_http.c index 7edd18e..63e2ef5 100644 --- a/keepalived/check/check_http.c +++ b/keepalived/check/check_http.c @@ -5,7 +5,7 @@ * * Part: WEB CHECK. Common HTTP/SSL checker primitives. * - * Version: $Id: check_http.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_http.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Authors: Alexandre Cassen, * Jan Holmberg, @@ -20,7 +20,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include @@ -737,6 +737,9 @@ http_check_thread(thread * thread_obj) #endif int ret = 1; int status; + long timeout = 0; + int ssl_err = 0; + int new_req = 0; status = tcp_socket_state(thread_obj->u.fd, thread_obj, CHECKER_RIP(checker_obj) , addr_port, http_check_thread); @@ -752,8 +755,8 @@ http_check_thread(thread * thread_obj) "=> CHECK failed on service" " : connection error <="); update_svr_checker_state(DOWN, checker_obj->id - , checker_obj->vs - , checker_obj->rs); + , checker_obj->vs + , checker_obj->rs); } return epilog(thread_obj, 1, 0, 0); break; @@ -765,11 +768,47 @@ http_check_thread(thread * thread_obj) break; case connect_success:{ - /* Allocate & clean request struct */ - http_arg_obj->req = (REQ *) MALLOC(sizeof (REQ)); - - if (http_get_check->proto == PROTO_SSL) - ret = ssl_connect(thread_obj); + if (!http_arg_obj->req) { + http_arg_obj->req = (REQ *) MALLOC(sizeof (REQ)); + new_req = 1; + } else + new_req = 0; + + if (http_get_check->proto == PROTO_SSL) { + timeout = TIMER_LONG(thread_obj->sands)-TIMER_LONG(time_now); + if (thread_obj->type != THREAD_WRITE_TIMEOUT && + thread_obj->type != THREAD_READ_TIMEOUT) + ret = ssl_connect(thread_obj, new_req); + else { + return timeout_epilog(thread_obj, "==> CHECK failed on service" + " : connection timeout <=\n\n", + "connect, timeout"); + } + + if (ret == -1) { + switch ((ssl_err = SSL_get_error(http_arg_obj->req->ssl, + ret))) { + case SSL_ERROR_WANT_READ: + thread_add_read(thread_obj->master, + http_check_thread, + THREAD_ARG(thread_obj), + thread_obj->u.fd, timeout); + break; + case SSL_ERROR_WANT_WRITE: + thread_add_write(thread_obj->master, + http_check_thread, + THREAD_ARG(thread_obj), + thread_obj->u.fd, timeout); + break; + default: + ret = 0; + break; + } + if (ret == -1) + break; + } else if (ret != 1) + ret = 0; + } if (ret) { /* Remote WEB server is connected. @@ -783,9 +822,9 @@ http_check_thread(thread * thread_obj) thread_obj->u.fd, http_get_check->connection_to); } else { - syslog(LOG_INFO, "Connection trouble to: [%s:%d].", - inet_ntop2(CHECKER_RIP(checker_obj)) - , ntohs(addr_port)); + DBG(LOG_INFO, "Connection trouble to: [%s:%d]." + , inet_ntop2(CHECKER_RIP(checker_obj)) + , ntohs(addr_port)); #ifdef _DEBUG_ if (http_get_check->proto == PROTO_SSL) ssl_printerr(SSL_get_error diff --git a/keepalived/check/check_misc.c b/keepalived/check/check_misc.c index 398e65c..87eb29c 100644 --- a/keepalived/check/check_misc.c +++ b/keepalived/check/check_misc.c @@ -6,7 +6,7 @@ * Part: MISC CHECK. Perform a system call to run an extra * system prog or script. * - * Version: $Id: check_misc.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_misc.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Authors: Alexandre Cassen, * Eric Jarman, @@ -22,7 +22,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "check_misc.h" diff --git a/keepalived/check/check_parser.c b/keepalived/check/check_parser.c index 4e8608f..bcde285 100644 --- a/keepalived/check/check_parser.c +++ b/keepalived/check/check_parser.c @@ -7,7 +7,7 @@ * data structure representation the conf file representing * the loadbalanced server pool. * - * Version: $Id: check_parser.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_parser.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -21,7 +21,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "check_parser.h" diff --git a/keepalived/check/check_smtp.c b/keepalived/check/check_smtp.c index ad6e998..27045d0 100644 --- a/keepalived/check/check_smtp.c +++ b/keepalived/check/check_smtp.c @@ -5,7 +5,7 @@ * * Part: SMTP CHECK. Check an SMTP-server. * - * Version: $Id: check_smtp.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_smtp.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Authors: Jeremy Rumpf, * Alexandre Cassen, @@ -20,7 +20,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include @@ -148,11 +148,16 @@ smtp_check_handler(vector strvec) * configuration structures. We'll set a "default host", which * is the same ip as the real server. If there are additional "host" * sections in the config, the default will be deleted and overridden. + * If the default is still set by a previous "SMTP_CHECK" section, + * we must simply overwrite the old value: + * - it must not be reused, because it was probably located in a + * different "real_server" section and + * - it must not be freed, because it is still referenced + * by some other smtp_chk->host. * This must come after queue_checker()! */ smtp_chk->host = alloc_list(smtp_free_host, smtp_dump_host); - if (!default_host) - default_host = smtp_alloc_host(); + default_host = smtp_alloc_host(); list_add(smtp_chk->host, default_host); } diff --git a/keepalived/check/check_ssl.c b/keepalived/check/check_ssl.c index bb6bf47..f5f2ca0 100644 --- a/keepalived/check/check_ssl.c +++ b/keepalived/check/check_ssl.c @@ -7,7 +7,7 @@ * url, compute a MD5 over this result and match it to the * expected value. * - * Version: $Id: check_ssl.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_ssl.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Authors: Alexandre Cassen, * Jan Holmberg, @@ -22,7 +22,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include @@ -189,18 +189,32 @@ ssl_printerr(int err) } int -ssl_connect(thread * thread_obj) +ssl_connect(thread * thread_obj, int new_req) { checker *checker_obj = THREAD_ARG(thread_obj); http_get_checker *http_get_check = CHECKER_ARG(checker_obj); http_arg *http_arg_obj = HTTP_ARG(http_get_check); REQ *req = HTTP_REQ(http_arg_obj); + int ret = 0; + int val = 0; + + /* First round, create SSL context */ + if (new_req) { + req->ssl = SSL_new(check_data->ssl->ctx); + req->bio = BIO_new_socket(thread_obj->u.fd, BIO_NOCLOSE); + SSL_set_bio(req->ssl, req->bio, req->bio); + } + + /* Set descriptor non blocking */ + val = fcntl(thread_obj->u.fd, F_GETFL, 0); + fcntl(thread_obj->u.fd, F_SETFL, val | O_NONBLOCK); + + ret = SSL_connect(req->ssl); - req->ssl = SSL_new(check_data->ssl->ctx); - req->bio = BIO_new_socket(thread_obj->u.fd, BIO_NOCLOSE); - SSL_set_bio(req->ssl, req->bio, req->bio); + /* restore descriptor flags */ + fcntl(thread_obj->u.fd, F_SETFL, val); - return (SSL_connect(req->ssl) > 0) ? 1 : 0; + return ret; } int @@ -253,7 +267,21 @@ ssl_read_thread(thread * thread_obj) req->error = SSL_get_error(req->ssl, r); - if (req->error) { + if (req->error == SSL_ERROR_WANT_READ) { + /* async read unfinished */ + thread_add_read(thread_obj->master, ssl_read_thread, checker_obj, + thread_obj->u.fd, http_get_check->connection_to); + } else if (r > 0 && req->error == 0) { + /* Handle response stream */ + http_process_response(req, r); + + /* + * Register next ssl stream reader. + * Register itself to not perturbe global I/O multiplexer. + */ + thread_add_read(thread_obj->master, ssl_read_thread, checker_obj, + thread_obj->u.fd, http_get_check->connection_to); + } else if (req->error) { /* All the SSL streal has been parsed */ MD5_Final(digest, &req->context); @@ -279,17 +307,6 @@ ssl_read_thread(thread * thread_obj) /* Handle response stream */ http_handle_response(thread_obj, digest, (!req->extracted) ? 1 : 0); - } else if (r > 0 && req->error == 0) { - - /* Handle response stream */ - http_process_response(req, r); - - /* - * Register next ssl stream reader. - * Register itself to not perturbe global I/O multiplexer. - */ - thread_add_read(thread_obj->master, ssl_read_thread, checker_obj, - thread_obj->u.fd, http_get_check->connection_to); } return 0; diff --git a/keepalived/check/check_tcp.c b/keepalived/check/check_tcp.c index 91a80a3..1ee1b1e 100644 --- a/keepalived/check/check_tcp.c +++ b/keepalived/check/check_tcp.c @@ -5,7 +5,7 @@ * * Part: TCP checker. * - * Version: $Id: check_tcp.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_tcp.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "check_tcp.h" diff --git a/keepalived/check/ipfwwrapper.c b/keepalived/check/ipfwwrapper.c index 6d27d68..fbddafc 100644 --- a/keepalived/check/ipfwwrapper.c +++ b/keepalived/check/ipfwwrapper.c @@ -7,7 +7,7 @@ * library to add/remove server MASQ rules to the kernel * firewall framework. * - * Version: $Id: ipfwwrapper.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: ipfwwrapper.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -21,7 +21,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "ipfwwrapper.h" diff --git a/keepalived/check/ipvswrapper.c b/keepalived/check/ipvswrapper.c index c457e5e..1a99cb2 100644 --- a/keepalived/check/ipvswrapper.c +++ b/keepalived/check/ipvswrapper.c @@ -6,7 +6,7 @@ * Part: IPVS Kernel wrapper. Use setsockopt call to add/remove * server to/from the loadbalanced server pool. * - * Version: $Id: ipvswrapper.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: ipvswrapper.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -20,7 +20,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "ipvswrapper.h" @@ -63,7 +63,7 @@ ipvs_stop(void) } int -ipvs_syncd_cmd(int cmd, char *ifname, int state) +ipvs_syncd_cmd(int cmd, char *ifname, int state, int syncid) { syslog(LOG_INFO, "IPVS : Sync daemon not supported on kernel v2.2"); return IPVS_ERROR; @@ -200,7 +200,7 @@ ipvs_talk(int cmd) } int -ipvs_syncd_cmd(int cmd, char *ifname, int state) +ipvs_syncd_cmd(int cmd, char *ifname, int state, int syncid) { #ifdef _HAVE_IPVS_SYNCD_ @@ -208,6 +208,7 @@ ipvs_syncd_cmd(int cmd, char *ifname, int state) /* prepare user rule */ urule->state = state; + urule->syncid = syncid; if (ifname != NULL) strncpy(urule->mcast_ifn, ifname, IP_VS_IFNAME_MAXLEN); @@ -504,12 +505,13 @@ ipvs_talk(int cmd) } int -ipvs_syncd_cmd(int cmd, char *ifname, int state) +ipvs_syncd_cmd(int cmd, char *ifname, int state, int syncid) { memset(daemonrule, 0, sizeof (struct ip_vs_daemon_user)); /* prepare user rule */ daemonrule->state = state; + daemonrule->syncid = syncid; if (ifname != NULL) strncpy(daemonrule->mcast_ifn, ifname, IP_VS_IFNAME_MAXLEN); @@ -721,17 +723,17 @@ ipvs_group_remove_entry(virtual_server *vs, virtual_server_group_entry *vsge) * Common IPVS functions */ void -ipvs_syncd_master(char *ifname) +ipvs_syncd_master(char *ifname, int syncid) { - ipvs_syncd_cmd(IPVS_STOPDAEMON, ifname, IPVS_BACKUP); - ipvs_syncd_cmd(IPVS_STARTDAEMON, ifname, IPVS_MASTER); + ipvs_syncd_cmd(IPVS_STOPDAEMON, ifname, IPVS_BACKUP, syncid); + ipvs_syncd_cmd(IPVS_STARTDAEMON, ifname, IPVS_MASTER, syncid); } void -ipvs_syncd_backup(char *ifname) +ipvs_syncd_backup(char *ifname, int syncid) { - ipvs_syncd_cmd(IPVS_STOPDAEMON, ifname, IPVS_MASTER); - ipvs_syncd_cmd(IPVS_STARTDAEMON, ifname, IPVS_BACKUP); + ipvs_syncd_cmd(IPVS_STOPDAEMON, ifname, IPVS_MASTER, syncid); + ipvs_syncd_cmd(IPVS_STARTDAEMON, ifname, IPVS_BACKUP, syncid); } /* diff --git a/keepalived/check/ipwrapper.c b/keepalived/check/ipwrapper.c index 3b4fa0b..b21123a 100644 --- a/keepalived/check/ipwrapper.c +++ b/keepalived/check/ipwrapper.c @@ -5,7 +5,7 @@ * * Part: Manipulation functions for IPVS & IPFW wrappers. * - * Version: $Id: ipwrapper.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: ipwrapper.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "ipwrapper.h" diff --git a/keepalived/core/Makefile.in b/keepalived/core/Makefile.in index 1ef025e..c69721a 100644 --- a/keepalived/core/Makefile.in +++ b/keepalived/core/Makefile.in @@ -2,7 +2,7 @@ # # Keepalived OpenSource project. # -# Copyright (C) 2001-2005 Alexandre Cassen, +# Copyright (C) 2001-2006 Alexandre Cassen, CC = @CC@ INCLUDES = -I../include -I../../lib diff --git a/keepalived/core/daemon.c b/keepalived/core/daemon.c index ba67361..efb8c20 100644 --- a/keepalived/core/daemon.c +++ b/keepalived/core/daemon.c @@ -5,7 +5,7 @@ * * Part: Main program structure. * - * Version: $Id: main.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: main.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include diff --git a/keepalived/core/global_data.c b/keepalived/core/global_data.c index 751d7cc..2ed4ac8 100644 --- a/keepalived/core/global_data.c +++ b/keepalived/core/global_data.c @@ -5,7 +5,7 @@ * * Part: Dynamic data structure definition. * - * Version: $Id: global_data.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: global_data.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include diff --git a/keepalived/core/global_parser.c b/keepalived/core/global_parser.c index 5c2fb11..b370ddb 100644 --- a/keepalived/core/global_parser.c +++ b/keepalived/core/global_parser.c @@ -7,7 +7,7 @@ * data structure representation the conf file representing * the loadbalanced server pool. * - * Version: $Id: global_parser.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: global_parser.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -21,7 +21,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "global_parser.h" diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c index 1eeb028..e51f1b9 100644 --- a/keepalived/core/layer4.c +++ b/keepalived/core/layer4.c @@ -6,7 +6,7 @@ * Part: Layer4 checkers handling. Register worker threads & * upper layer checkers. * - * Version: $Id: layer4.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: layer4.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -20,7 +20,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "layer4.h" diff --git a/keepalived/core/main.c b/keepalived/core/main.c index 2c2f8a9..b59000e 100644 --- a/keepalived/core/main.c +++ b/keepalived/core/main.c @@ -5,7 +5,7 @@ * * Part: Main program structure. * - * Version: $Id: main.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: main.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "main.h" diff --git a/keepalived/core/pidfile.c b/keepalived/core/pidfile.c index 4740490..2e95292 100644 --- a/keepalived/core/pidfile.c +++ b/keepalived/core/pidfile.c @@ -5,7 +5,7 @@ * * Part: pidfile utility. * - * Version: $Id: pidfile.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: pidfile.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "pidfile.h" diff --git a/keepalived/core/smtp.c b/keepalived/core/smtp.c index 93093a5..acfaa36 100644 --- a/keepalived/core/smtp.c +++ b/keepalived/core/smtp.c @@ -7,7 +7,7 @@ * using the smtp protocol according to the RFC 821. A non blocking * timeouted connection is used to handle smtp protocol. * - * Version: $Id: smtp.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: smtp.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -21,7 +21,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include diff --git a/keepalived/include/check_api.h b/keepalived/include/check_api.h index e58af26..1904a82 100644 --- a/keepalived/include/check_api.h +++ b/keepalived/include/check_api.h @@ -5,7 +5,7 @@ * * Part: Checkers arguments structures definitions. * - * Version: $Id: check_api.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_api.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _CHECK_API_H diff --git a/keepalived/include/check_daemon.h b/keepalived/include/check_daemon.h index c25253e..a0fd6b6 100644 --- a/keepalived/include/check_daemon.h +++ b/keepalived/include/check_daemon.h @@ -5,7 +5,7 @@ * * Part: check_daemon.c include file. * - * Version: $Id: check_daemon.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_daemon.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _CHECK_DAEMON_H diff --git a/keepalived/include/check_data.h b/keepalived/include/check_data.h index b5430c2..b642171 100644 --- a/keepalived/include/check_data.h +++ b/keepalived/include/check_data.h @@ -5,7 +5,7 @@ * * Part: Healthcheckers dynamic data structure definition. * - * Version: $Id: check_data.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_data.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _CHECK_DATA_H diff --git a/keepalived/include/check_http.h b/keepalived/include/check_http.h index 6a0231a..ec79093 100644 --- a/keepalived/include/check_http.h +++ b/keepalived/include/check_http.h @@ -5,7 +5,7 @@ * * Part: check_http.c include file. * - * Version: $Id: check_http.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_http.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Authors: Alexandre Cassen, * Jan Holmberg, @@ -20,7 +20,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _CHECK_HTTP_H diff --git a/keepalived/include/check_misc.h b/keepalived/include/check_misc.h index 80808de..c34640f 100644 --- a/keepalived/include/check_misc.h +++ b/keepalived/include/check_misc.h @@ -5,7 +5,7 @@ * * Part: check_misc.c include file. * - * Version: $Id: check_misc.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_misc.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * Eric Jarman, @@ -20,7 +20,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _CHECK_MISC_H diff --git a/keepalived/include/check_parser.h b/keepalived/include/check_parser.h index 2731b23..0c706e9 100644 --- a/keepalived/include/check_parser.h +++ b/keepalived/include/check_parser.h @@ -5,7 +5,7 @@ * * Part: check_parser.c include file. * - * Version: $Id: check_parser.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_parser.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _CHECK_PARSER_H diff --git a/keepalived/include/check_smtp.h b/keepalived/include/check_smtp.h index 25d6991..94fc827 100644 --- a/keepalived/include/check_smtp.h +++ b/keepalived/include/check_smtp.h @@ -5,7 +5,7 @@ * * Part: check_smtp.c include file. * - * Version: $Id: check_smtp.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_smtp.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * Jeremy Rumpf, @@ -20,7 +20,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _CHECK_SMTP_H diff --git a/keepalived/include/check_ssl.h b/keepalived/include/check_ssl.h index c9d88f6..dadb487 100644 --- a/keepalived/include/check_ssl.h +++ b/keepalived/include/check_ssl.h @@ -5,7 +5,7 @@ * * Part: check_http.c include file. * - * Version: $Id: check_http.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_http.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Authors: Alexandre Cassen, * Jan Holmberg, @@ -20,7 +20,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _CHECK_SSL_H @@ -33,7 +33,7 @@ extern void install_ssl_check_keyword(void); extern int init_ssl_ctx(void); extern void clear_ssl(SSL_DATA * ssl); -extern int ssl_connect(thread * thread_obj); +extern int ssl_connect(thread * thread_obj, int new_req); extern int ssl_printerr(int err); extern int ssl_send_request(SSL * ssl, char *str_request, int request_len); extern int ssl_read_thread(thread * thread_obj); diff --git a/keepalived/include/check_tcp.h b/keepalived/include/check_tcp.h index f5e7cdd..75b4409 100644 --- a/keepalived/include/check_tcp.h +++ b/keepalived/include/check_tcp.h @@ -5,7 +5,7 @@ * * Part: check_tcp.c include file. * - * Version: $Id: check_tcp.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: check_tcp.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _CHECK_TCP_H diff --git a/keepalived/include/config.h.in b/keepalived/include/config.h.in index 937e294..2332e45 100644 --- a/keepalived/include/config.h.in +++ b/keepalived/include/config.h.in @@ -5,7 +5,7 @@ * * Part: Configuration include file. * - * Version: $Id: config.h.in,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: config.h.in,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Jacob Rief, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _CONFIG_H diff --git a/keepalived/include/daemon.h b/keepalived/include/daemon.h index 5a5db74..04d4fd3 100644 --- a/keepalived/include/daemon.h +++ b/keepalived/include/daemon.h @@ -5,7 +5,7 @@ * * Part: Daemon process handling. * - * Version: $Id: daemon.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: daemon.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _DAEMON_H diff --git a/keepalived/include/global_data.h b/keepalived/include/global_data.h index 9cc702a..88d6c92 100644 --- a/keepalived/include/global_data.h +++ b/keepalived/include/global_data.h @@ -5,7 +5,7 @@ * * Part: Dynamic data structure definition. * - * Version: $Id: global_data.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: global_data.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _GLOBAL_DATA_H diff --git a/keepalived/include/global_parser.h b/keepalived/include/global_parser.h index abceb87..278e4e0 100644 --- a/keepalived/include/global_parser.h +++ b/keepalived/include/global_parser.h @@ -5,7 +5,7 @@ * * Part: vrrp_parser.c include file. * - * Version: $Id: global_parser.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: global_parser.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _GLOBAL_PARSER_H diff --git a/keepalived/include/ipfwwrapper.h b/keepalived/include/ipfwwrapper.h index 3f4ce8b..2d43b15 100644 --- a/keepalived/include/ipfwwrapper.h +++ b/keepalived/include/ipfwwrapper.h @@ -5,7 +5,7 @@ * * Part: ipfwwrapper.c include file. * - * Version: $Id: ipfwwrapper.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: ipfwwrapper.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _IPFWWRAPPER_H diff --git a/keepalived/include/ipvswrapper.h b/keepalived/include/ipvswrapper.h index 744de22..b132f4d 100644 --- a/keepalived/include/ipvswrapper.h +++ b/keepalived/include/ipvswrapper.h @@ -5,7 +5,7 @@ * * Part: ipvswrapper.c include file. * - * Version: $Id: ipvswrapper.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: ipvswrapper.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _IPVSWRAPPER_H @@ -99,8 +99,8 @@ extern int ipvs_group_remove_entry(virtual_server * vs, virtual_server_group_entry * vsge); extern int ipvs_cmd(int cmd, list vs_group, virtual_server * vserver, real_server * rserver); -extern int ipvs_syncd_cmd(int cmd, char *ifname, int state); -extern void ipvs_syncd_master(char *ifname); -extern void ipvs_syncd_backup(char *ifname); +extern int ipvs_syncd_cmd(int cmd, char *ifname, int state, int syncid); +extern void ipvs_syncd_master(char *ifname, int syncid); +extern void ipvs_syncd_backup(char *ifname, int syncid); #endif diff --git a/keepalived/include/ipwrapper.h b/keepalived/include/ipwrapper.h index 569533e..34084b1 100644 --- a/keepalived/include/ipwrapper.h +++ b/keepalived/include/ipwrapper.h @@ -5,7 +5,7 @@ * * Part: ipwrapper.c include file. * - * Version: $Id: ipwrapper.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: ipwrapper.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _IPWRAPPER_H diff --git a/keepalived/include/layer4.h b/keepalived/include/layer4.h index 4b38a2b..c6ae2c1 100644 --- a/keepalived/include/layer4.h +++ b/keepalived/include/layer4.h @@ -5,7 +5,7 @@ * * Part: layer4.c include file. * - * Version: $Id: layer4.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: layer4.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _LAYER4_H diff --git a/keepalived/include/main.h b/keepalived/include/main.h index e33c3d8..f407cbe 100644 --- a/keepalived/include/main.h +++ b/keepalived/include/main.h @@ -5,7 +5,7 @@ * * Part: Main program include file. * - * Version: $Id: main.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: main.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _MAIN_H diff --git a/keepalived/include/pidfile.h b/keepalived/include/pidfile.h index 9f0912f..dd87c02 100644 --- a/keepalived/include/pidfile.h +++ b/keepalived/include/pidfile.h @@ -5,7 +5,7 @@ * * Part: pidfile.c include file. * - * Version: $Id: pidfile.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: pidfile.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _PIDFILE_H diff --git a/keepalived/include/smtp.h b/keepalived/include/smtp.h index 40c4ea7..8a05f04 100644 --- a/keepalived/include/smtp.h +++ b/keepalived/include/smtp.h @@ -5,7 +5,7 @@ * * Part: smtp.c include file. * - * Version: $Id: smtp.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: smtp.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _SMTP_H diff --git a/keepalived/include/vrrp.h b/keepalived/include/vrrp.h index 36b3cb8..dd93106 100644 --- a/keepalived/include/vrrp.h +++ b/keepalived/include/vrrp.h @@ -6,7 +6,7 @@ * * Part: vrrp.c program include file. * - * Version: $Id: vrrp.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -20,7 +20,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_H diff --git a/keepalived/include/vrrp_arp.h b/keepalived/include/vrrp_arp.h index a2b9498..7917374 100644 --- a/keepalived/include/vrrp_arp.h +++ b/keepalived/include/vrrp_arp.h @@ -5,7 +5,7 @@ * * Part: vrrp_arp.c include file. * - * Version: $Id: vrrp_arp.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_arp.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_ARP_H diff --git a/keepalived/include/vrrp_daemon.h b/keepalived/include/vrrp_daemon.h index 8f5ade0..6806cce 100644 --- a/keepalived/include/vrrp_daemon.h +++ b/keepalived/include/vrrp_daemon.h @@ -5,7 +5,7 @@ * * Part: vrrp_daemon.c include file. * - * Version: $Id: vrrp_daemon.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_daemon.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_DAEMON_H diff --git a/keepalived/include/vrrp_data.h b/keepalived/include/vrrp_data.h index 3e7d5ae..a2fcbde 100644 --- a/keepalived/include/vrrp_data.h +++ b/keepalived/include/vrrp_data.h @@ -5,7 +5,7 @@ * * Part: Dynamic data structure definition. * - * Version: $Id: vrrp_data.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_data.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_DATA_H diff --git a/keepalived/include/vrrp_if.h b/keepalived/include/vrrp_if.h index 5d8a95e..35e83a4 100644 --- a/keepalived/include/vrrp_if.h +++ b/keepalived/include/vrrp_if.h @@ -5,7 +5,7 @@ * * Part: vrrp_if.c include file. * - * Version: $Id: vrrp_if.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_if.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_IF_H diff --git a/keepalived/include/vrrp_index.h b/keepalived/include/vrrp_index.h index 7d6faf3..d6b17fe 100644 --- a/keepalived/include/vrrp_index.h +++ b/keepalived/include/vrrp_index.h @@ -5,7 +5,7 @@ * * Part: vrrp_index.c include file. * - * Version: $Id: vrrp_index.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_index.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_INDEX_H diff --git a/keepalived/include/vrrp_ipaddress.h b/keepalived/include/vrrp_ipaddress.h index 80a4630..8a7da2f 100644 --- a/keepalived/include/vrrp_ipaddress.h +++ b/keepalived/include/vrrp_ipaddress.h @@ -5,7 +5,7 @@ * * Part: vrrp_ipaddress.c include file. * - * Version: $Id: vrrp_ipaddress.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_ipaddress.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_IPADDR_H diff --git a/keepalived/include/vrrp_iproute.h b/keepalived/include/vrrp_iproute.h index 48af45f..84e7c6b 100644 --- a/keepalived/include/vrrp_iproute.h +++ b/keepalived/include/vrrp_iproute.h @@ -5,7 +5,7 @@ * * Part: vrrp_iproute.c include file. * - * Version: $Id: vrrp_iproute.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_iproute.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_IPROUTE_H diff --git a/keepalived/include/vrrp_ipsecah.h b/keepalived/include/vrrp_ipsecah.h index 1e2d750..df45413 100644 --- a/keepalived/include/vrrp_ipsecah.h +++ b/keepalived/include/vrrp_ipsecah.h @@ -5,7 +5,7 @@ * * Part: vrrp_ipsecah.c include file. * - * Version: $Id: vrrp_ipsecah.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_ipsecah.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_IPSEC_AH_H diff --git a/keepalived/include/vrrp_netlink.h b/keepalived/include/vrrp_netlink.h index 9bb7df6..fc39e22 100644 --- a/keepalived/include/vrrp_netlink.h +++ b/keepalived/include/vrrp_netlink.h @@ -5,7 +5,7 @@ * * Part: vrrp_netlink.c include file. * - * Version: $Id: vrrp_netlink.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_netlink.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_NETLINK_H diff --git a/keepalived/include/vrrp_notify.h b/keepalived/include/vrrp_notify.h index 7598ba1..04fe029 100644 --- a/keepalived/include/vrrp_notify.h +++ b/keepalived/include/vrrp_notify.h @@ -6,7 +6,7 @@ * * Part: vrrp_notify.c include file. * - * Version: $Id: vrrp_notify.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_notify.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -20,7 +20,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_NOTIFY_H diff --git a/keepalived/include/vrrp_parser.h b/keepalived/include/vrrp_parser.h index 2729109..7cdb6f8 100644 --- a/keepalived/include/vrrp_parser.h +++ b/keepalived/include/vrrp_parser.h @@ -5,7 +5,7 @@ * * Part: vrrp_parser.c include file. * - * Version: $Id: vrrp_parser.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_parser.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_PARSER_H diff --git a/keepalived/include/vrrp_scheduler.h b/keepalived/include/vrrp_scheduler.h index a0e89c7..0e4e3d2 100644 --- a/keepalived/include/vrrp_scheduler.h +++ b/keepalived/include/vrrp_scheduler.h @@ -5,7 +5,7 @@ * * Part: vrrp_scheduler.c include file. * - * Version: $Id: vrrp_scheduler.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_scheduler.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_SCHEDULER_H diff --git a/keepalived/include/vrrp_sync.h b/keepalived/include/vrrp_sync.h index 737bd7e..97d65a3 100644 --- a/keepalived/include/vrrp_sync.h +++ b/keepalived/include/vrrp_sync.h @@ -5,7 +5,7 @@ * * Part: vrrp_sync.c include file. * - * Version: $Id: vrrp_sync.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_sync.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_SYNC_H diff --git a/keepalived/include/vrrp_track.h b/keepalived/include/vrrp_track.h index 2f3b0f8..cbccc61 100644 --- a/keepalived/include/vrrp_track.h +++ b/keepalived/include/vrrp_track.h @@ -5,7 +5,7 @@ * * Part: vrrp_track.c include file. * - * Version: $Id: vrrp_track.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_track.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VRRP_TRACK_H diff --git a/keepalived/vrrp/Makefile.in b/keepalived/vrrp/Makefile.in index 52b5f81..497d0bb 100644 --- a/keepalived/vrrp/Makefile.in +++ b/keepalived/vrrp/Makefile.in @@ -2,7 +2,7 @@ # # Keepalived OpenSource project. # -# Copyright (C) 2001-2005 Alexandre Cassen, +# Copyright (C) 2001-2006 Alexandre Cassen, CC = @CC@ INCLUDES = -I../include -I../../lib diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c index 645a41b..73ffadc 100644 --- a/keepalived/vrrp/vrrp.c +++ b/keepalived/vrrp/vrrp.c @@ -8,7 +8,7 @@ * master fails, a backup server takes over. * The original implementation has been made by jerome etienne. * - * Version: $Id: vrrp.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -22,7 +22,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ /* local include */ @@ -630,7 +630,7 @@ vrrp_state_become_master(vrrp_rt * vrrp) #ifdef _HAVE_IPVS_SYNCD_ /* Check if sync daemon handling is needed */ if (vrrp->lvs_syncd_if) - ipvs_syncd_master(vrrp->lvs_syncd_if); + ipvs_syncd_master(vrrp->lvs_syncd_if, vrrp->vrid); #endif } @@ -685,7 +685,7 @@ vrrp_state_leave_master(vrrp_rt * vrrp) #ifdef _HAVE_IPVS_SYNCD_ /* Check if sync daemon handling is needed */ if (vrrp->lvs_syncd_if) - ipvs_syncd_backup(vrrp->lvs_syncd_if); + ipvs_syncd_backup(vrrp->lvs_syncd_if, vrrp->vrid); #endif } @@ -1010,7 +1010,8 @@ shutdown_vrrp_instances(void) if (vrrp->lvs_syncd_if) ipvs_syncd_cmd(IPVS_STOPDAEMON, NULL, (vrrp->state == VRRP_STATE_MAST) ? IPVS_MASTER: - IPVS_BACKUP); + IPVS_BACKUP, + vrrp->vrid); #endif } } diff --git a/keepalived/vrrp/vrrp_arp.c b/keepalived/vrrp/vrrp_arp.c index dabb0fc..e4916cf 100644 --- a/keepalived/vrrp/vrrp_arp.c +++ b/keepalived/vrrp/vrrp_arp.c @@ -5,7 +5,7 @@ * * Part: ARP primitives. * - * Version: $Id: vrrp_arp.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_arp.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ /* system includes */ diff --git a/keepalived/vrrp/vrrp_daemon.c b/keepalived/vrrp/vrrp_daemon.c index c5e586b..9b9d8d6 100644 --- a/keepalived/vrrp/vrrp_daemon.c +++ b/keepalived/vrrp/vrrp_daemon.c @@ -5,7 +5,7 @@ * * Part: VRRP child process handling. * - * Version: $Id: vrrp_daemon.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_daemon.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "vrrp_daemon.h" diff --git a/keepalived/vrrp/vrrp_data.c b/keepalived/vrrp/vrrp_data.c index 8518d39..33d9d25 100644 --- a/keepalived/vrrp/vrrp_data.c +++ b/keepalived/vrrp/vrrp_data.c @@ -5,7 +5,7 @@ * * Part: Dynamic data structure definition. * - * Version: $Id: vrrp_data.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_data.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "vrrp_data.h" diff --git a/keepalived/vrrp/vrrp_if.c b/keepalived/vrrp/vrrp_if.c index 2af10fd..11df6c2 100644 --- a/keepalived/vrrp/vrrp_if.c +++ b/keepalived/vrrp/vrrp_if.c @@ -5,7 +5,7 @@ * * Part: Interfaces manipulation. * - * Version: $Id: vrrp_if.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_if.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ /* global include */ diff --git a/keepalived/vrrp/vrrp_index.c b/keepalived/vrrp/vrrp_index.c index 3037173..767cdda 100644 --- a/keepalived/vrrp/vrrp_index.c +++ b/keepalived/vrrp/vrrp_index.c @@ -5,7 +5,7 @@ * * Part: VRRP instance index table. * - * Version: $Id: vrrp_index.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_index.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ /* local include */ diff --git a/keepalived/vrrp/vrrp_ipaddress.c b/keepalived/vrrp/vrrp_ipaddress.c index 2bc6417..0c71457 100644 --- a/keepalived/vrrp/vrrp_ipaddress.c +++ b/keepalived/vrrp/vrrp_ipaddress.c @@ -5,7 +5,7 @@ * * Part: NETLINK IPv4 address manipulation. * - * Version: $Id: vrrp_ipaddress.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_ipaddress.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ /* local include */ diff --git a/keepalived/vrrp/vrrp_iproute.c b/keepalived/vrrp/vrrp_iproute.c index d800b7e..93bf914 100644 --- a/keepalived/vrrp/vrrp_iproute.c +++ b/keepalived/vrrp/vrrp_iproute.c @@ -5,7 +5,7 @@ * * Part: NETLINK IPv4 routes manipulation. * - * Version: $Id: vrrp_iproute.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_iproute.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ /* local include */ diff --git a/keepalived/vrrp/vrrp_ipsecah.c b/keepalived/vrrp/vrrp_ipsecah.c index a829011..cb5193c 100644 --- a/keepalived/vrrp/vrrp_ipsecah.c +++ b/keepalived/vrrp/vrrp_ipsecah.c @@ -7,7 +7,7 @@ * authentication data encryption using HMAC MD5 according to * RFCs 2085 & 2104. * - * Version: $Id: vrrp_ipsecah.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_ipsecah.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -21,7 +21,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "vrrp_ipsecah.h" diff --git a/keepalived/vrrp/vrrp_netlink.c b/keepalived/vrrp/vrrp_netlink.c index 830c195..6a821f5 100644 --- a/keepalived/vrrp/vrrp_netlink.c +++ b/keepalived/vrrp/vrrp_netlink.c @@ -5,7 +5,7 @@ * * Part: NETLINK kernel command channel. * - * Version: $Id: vrrp_netlink.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_netlink.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ /* global include */ diff --git a/keepalived/vrrp/vrrp_notify.c b/keepalived/vrrp/vrrp_notify.c index 1123dd3..7e6555f 100644 --- a/keepalived/vrrp/vrrp_notify.c +++ b/keepalived/vrrp/vrrp_notify.c @@ -5,7 +5,7 @@ * * Part: VRRP state transition notification scripts handling. * - * Version: $Id: vrrp_notify.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_notify.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ /* system include */ diff --git a/keepalived/vrrp/vrrp_parser.c b/keepalived/vrrp/vrrp_parser.c index e6e8c70..bae878a 100644 --- a/keepalived/vrrp/vrrp_parser.c +++ b/keepalived/vrrp/vrrp_parser.c @@ -7,7 +7,7 @@ * data structure representation the conf file representing * the loadbalanced server pool. * - * Version: $Id: vrrp_parser.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_parser.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -21,7 +21,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "vrrp_parser.h" diff --git a/keepalived/vrrp/vrrp_scheduler.c b/keepalived/vrrp/vrrp_scheduler.c index c21cd38..f1bbe09 100644 --- a/keepalived/vrrp/vrrp_scheduler.c +++ b/keepalived/vrrp/vrrp_scheduler.c @@ -5,7 +5,7 @@ * * Part: Sheduling framework for vrrp code. * - * Version: $Id: vrrp_scheduler.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_scheduler.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "vrrp_scheduler.h" @@ -186,7 +186,8 @@ vrrp_init_state(list l) /* Check if sync daemon handling is needed */ if (vrrp->lvs_syncd_if) ipvs_syncd_cmd(IPVS_STARTDAEMON, - vrrp->lvs_syncd_if, IPVS_MASTER); + vrrp->lvs_syncd_if, IPVS_MASTER, + vrrp->vrid); #endif vrrp->state = VRRP_STATE_GOTO_MASTER; } else { @@ -196,7 +197,8 @@ vrrp_init_state(list l) /* Check if sync daemon handling is needed */ if (vrrp->lvs_syncd_if) ipvs_syncd_cmd(IPVS_STARTDAEMON, - vrrp->lvs_syncd_if, IPVS_BACKUP); + vrrp->lvs_syncd_if, IPVS_BACKUP, + vrrp->vrid); #endif syslog(LOG_INFO, "VRRP_Instance(%s) Entering BACKUP STATE", vrrp->iname); diff --git a/keepalived/vrrp/vrrp_sync.c b/keepalived/vrrp/vrrp_sync.c index 1641e08..7c44316 100644 --- a/keepalived/vrrp/vrrp_sync.c +++ b/keepalived/vrrp/vrrp_sync.c @@ -5,7 +5,7 @@ * * Part: VRRP synchronization framework. * - * Version: $Id: vrrp_sync.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_sync.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "vrrp_sync.h" diff --git a/keepalived/vrrp/vrrp_track.c b/keepalived/vrrp/vrrp_track.c index 1bd1f75..18578b9 100644 --- a/keepalived/vrrp/vrrp_track.c +++ b/keepalived/vrrp/vrrp_track.c @@ -5,7 +5,7 @@ * * Part: Interface tracking framework. * - * Version: $Id: vrrp_track.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vrrp_track.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ /* local include */ diff --git a/lib/Makefile.in b/lib/Makefile.in index 108082c..dac429d 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -2,7 +2,7 @@ # # Keepalived OpenSource project. # -# Copyright (C) 2001-2005 Alexandre Cassen, +# Copyright (C) 2001-2006 Alexandre Cassen, CC = @CC@ INCLUDES = -I. diff --git a/lib/html.c b/lib/html.c index 038a5b3..b18076f 100644 --- a/lib/html.c +++ b/lib/html.c @@ -5,7 +5,7 @@ * * Part: HTML stream parser utility functions. * - * Version: $Id: html.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: html.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Authors: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include diff --git a/lib/html.h b/lib/html.h index 1d2c8dd..0af5c60 100644 --- a/lib/html.h +++ b/lib/html.h @@ -5,7 +5,7 @@ * * Part: parser.c include file. * - * Version: $Id: html.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: html.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Authors: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _HTML_H diff --git a/lib/list.c b/lib/list.c index b88027e..e9b8ff1 100644 --- a/lib/list.c +++ b/lib/list.c @@ -5,7 +5,7 @@ * * Part: List structure manipulation. * - * Version: $Id: list.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: list.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "list.h" diff --git a/lib/list.h b/lib/list.h index 3a6c1b6..4aa110d 100644 --- a/lib/list.h +++ b/lib/list.h @@ -5,7 +5,7 @@ * * Part: list.c include file. * - * Version: $Id: list.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: list.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _LIST_H diff --git a/lib/memory.c b/lib/memory.c index 083fa2f..da90e06 100644 --- a/lib/memory.c +++ b/lib/memory.c @@ -6,7 +6,7 @@ * Part: Memory management framework. This framework is used to * find any memory leak. * - * Version: $Id: memory.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: memory.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Authors: Alexandre Cassen, * Jan Holmberg, @@ -21,7 +21,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "memory.h" diff --git a/lib/memory.h b/lib/memory.h index 09c6243..43e6f6c 100644 --- a/lib/memory.h +++ b/lib/memory.h @@ -5,7 +5,7 @@ * * Part: memory.c include file. * - * Version: $Id: memory.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: memory.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Authors: Alexandre Cassen, * Jan Holmberg, @@ -20,7 +20,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _MEMORY_H diff --git a/lib/notify.c b/lib/notify.c index f1782be..9456f1d 100644 --- a/lib/notify.c +++ b/lib/notify.c @@ -5,7 +5,7 @@ * * Part: Forked system call to launch an extra script. * - * Version: $Id: notify.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: notify.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include diff --git a/lib/notify.h b/lib/notify.h index 4966841..5e1d8dd 100644 --- a/lib/notify.h +++ b/lib/notify.h @@ -5,7 +5,7 @@ * * Part: notify.c include file. * - * Version: $Id: notify.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: notify.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _NOTIFY_H diff --git a/lib/parser.c b/lib/parser.c index 6ccbd36..1095bd4 100644 --- a/lib/parser.c +++ b/lib/parser.c @@ -7,7 +7,7 @@ * data structure representation the conf file representing * the loadbalanced server pool. * - * Version: $Id: parser.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: parser.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -21,7 +21,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "parser.h" diff --git a/lib/parser.h b/lib/parser.h index 5081430..7bb6327 100644 --- a/lib/parser.h +++ b/lib/parser.h @@ -5,7 +5,7 @@ * * Part: cfreader.c include file. * - * Version: $Id: parser.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: parser.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _PARSER_H diff --git a/lib/scheduler.c b/lib/scheduler.c index 2056832..6454f54 100644 --- a/lib/scheduler.c +++ b/lib/scheduler.c @@ -7,7 +7,7 @@ * the thread management routine (thread.c) present in the * very nice zebra project (http://www.zebra.org). * - * Version: $Id: scheduler.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: scheduler.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -21,7 +21,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include diff --git a/lib/scheduler.h b/lib/scheduler.h index 51e8e50..dbe27d6 100644 --- a/lib/scheduler.h +++ b/lib/scheduler.h @@ -5,7 +5,7 @@ * * Part: scheduler.c include file. * - * Version: $Id: scheduler.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: scheduler.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _SCHEDULER_H diff --git a/lib/signals.c b/lib/signals.c index d87e821..650fd6e 100644 --- a/lib/signals.c +++ b/lib/signals.c @@ -5,7 +5,7 @@ * * Part: Signals framework. * - * Version: $Id: signals.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: signals.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Kevin Lindsay, * Alexandre Cassen, @@ -20,7 +20,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include diff --git a/lib/signals.h b/lib/signals.h index dd0e398..c8bd115 100644 --- a/lib/signals.h +++ b/lib/signals.h @@ -5,7 +5,7 @@ * * Part: signals.c include file. * - * Version: $Id: signals.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: signals.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Kevin Lindsay, * Alexandre Cassen, @@ -20,7 +20,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _SIGNALS_H diff --git a/lib/timer.c b/lib/timer.c index aa67c06..31c9a20 100644 --- a/lib/timer.c +++ b/lib/timer.c @@ -5,7 +5,7 @@ * * Part: Timer manipulations. * - * Version: $Id: timer.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: timer.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include diff --git a/lib/timer.h b/lib/timer.h index 26f947f..ad7f19c 100644 --- a/lib/timer.h +++ b/lib/timer.h @@ -5,7 +5,7 @@ * * Part: timer.c include file. * - * Version: $Id: timer.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: timer.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _TIMER_H diff --git a/lib/utils.c b/lib/utils.c index ac6221e..504128a 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -5,7 +5,7 @@ * * Part: General program utils. * - * Version: $Id: utils.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: utils.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "utils.h" diff --git a/lib/utils.h b/lib/utils.h index e14e253..83f6703 100644 --- a/lib/utils.h +++ b/lib/utils.h @@ -5,7 +5,7 @@ * * Part: utils.h include file. * - * Version: $Id: utils.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: utils.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _UTILS_H diff --git a/lib/vector.c b/lib/vector.c index b65f401..5b50912 100644 --- a/lib/vector.c +++ b/lib/vector.c @@ -5,7 +5,7 @@ * * Part: Vector structure manipulation. * - * Version: $Id: vector.c,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vector.c,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #include "vector.h" diff --git a/lib/vector.h b/lib/vector.h index f0097ec..b6f7865 100644 --- a/lib/vector.h +++ b/lib/vector.h @@ -5,7 +5,7 @@ * * Part: vector.c include file. * - * Version: $Id: vector.h,v 1.1.11 2005/03/01 01:22:13 acassen Exp $ + * Version: $Id: vector.h,v 1.1.12 2006/03/09 01:22:13 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,7 +19,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2005 Alexandre Cassen, + * Copyright (C) 2001-2006 Alexandre Cassen, */ #ifndef _VECTOR_H -- 1.7.10.4