diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/ChangeLog /tmp/qZRLuX1bC7/keepalived-1.1.15/ChangeLog --- /tmp/uUQpUd4uAg/keepalived-1.1.13/ChangeLog 2006-10-11 11:32:24.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/ChangeLog 2007-09-14 18:41:35.000000000 +0200 @@ -1,3 +1,45 @@ +2007-09-15 Alexandre Cassen + * keepalived-1.1.15 released. + * Matthias Saou, fixed genhash + Makefile for man page installation. + * Casey Zacek, provided a patch + to check_http to remove buffer minimization while processing + stream. It appears some webserver cause healthchecker crash. + * Chris Marchesi, provided + a patch for better handling of SSL handshake errors. + * Shinji Tanaka, fixed parser "include" + directive to support declaration inside configuration directives, + like including file inside vrrp_instance declaration. + * Andreas Kotes, fixed HTTP healthchecker + while handling MD5SUM result. It appears checker never removed + realserver on MD5SUM mismatch !!! whats that crap. + * VRRP : Willy Tarreau, fixed a missing notifications + upon transition from fault to backup. + * VRRP : Add support to route metric in virtual_routes definition. + +2007-09-13 Alexandre Cassen + * keepalived-1.1.14 released. + * Shinji Tanaka, extended parsing + framework to support "include" directives. For more + informations and documentation please refer to Shinji + website : + http://misccs.dyndns.org/index.php?keepalived%20include%20patch + * Tobias Klausmann, add error loggin + while parsing configuration file. + * Merged patches from rpmforge.net on Makefile and redhat specfile. + * Create a goodies directory to store nice scripts received from + users. Add Steve Milton (milton AT isomedia.com) arpreset script + to delete a single ARP entry from a CISCO router. + * VRRP : David Woodhouse, fixed vrrp_arp + includes. + * VRRP : Pierre-Yves Ritschard, fixed negative + weights in script. + * VRRP : Michael Smith, extended + virtual_ipaddress setting to support Old-style Linux interface + aliases like eth0:1. + * VRRP : Ward Wouts, add support to + vrrp_script logging. + 2006-10-11 Alexandre Cassen * keepalived-1.1.13 released. * VRRP : Added a new notify script to be launch during vrrp diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/changelog /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/changelog --- /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/changelog 2008-01-02 21:13:30.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/changelog 2008-01-02 21:13:30.000000000 +0100 @@ -1,3 +1,20 @@ +keepalived (1.1.15-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #179992), remaining changes: + - Merged with Debian. Changes are: + + patch 99_linux_2.6_compat.patch changed as patched file changed + + -- Koen Beek Fri, 21 Dec 2007 09:40:47 +0000 + +keepalived (1.1.15-1) unstable; urgency=low + + * New upstream release (Closes: #401827) + * Remove 00_fix-manpagepath.patch and + 01_fix-genhash-manpagepath.patch(obsolete) + * Bump standards version + + -- Alexander Wirt Tue, 18 Dec 2007 18:44:55 +0100 + keepalived (1.1.13-1ubuntu1) hardy; urgency=low * Merge from Debian unstable (LP: #174796), remaining changes: diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/control /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/control --- /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/control 2008-01-02 21:13:30.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/control 2008-01-02 21:13:30.000000000 +0100 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: Alexander Wirt Build-Depends: debhelper (>> 4.1.0), libssl-dev, libpopt-dev, textutils, cdbs, autoconf -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Package: keepalived Section: admin diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/init.d /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/init.d --- /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/init.d 2008-01-02 21:13:30.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/init.d 2008-01-02 21:13:30.000000000 +0100 @@ -4,7 +4,15 @@ # # Written by Andres Salomon # - +### BEGIN INIT INFO +# Provides: keepalived +# Required-Start: $syslog $network +# Required-Stop: $syslog $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Starts keepalived +# Description: Starts keepalived lvs loadbalancer +### END INIT INFO PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/keepalived NAME=keepalived @@ -12,40 +20,57 @@ CONFIG=/etc/keepalived/keepalived.conf TMPFILES="/tmp/.vrrp /tmp/.healthcheckers" +#includes lsb functions +. /lib/lsb/init-functions + set -e test -f $CONFIG || exit 0 test -f $DAEMON || exit 0 case "$1" in start) - echo -n "Starting $DESC: " - for file in $TMPFILES - do + log_daemon_msg "Starting $DESC" "$NAME" + for file in $TMPFILES + do test -e $file && test ! -L $file && rm $file - done - start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ - --exec $DAEMON - echo "$NAME." + done + if start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON; then + log_end_msg 0 + else + log_end_msg 1 + fi ;; stop) - echo -n "Stopping $DESC: " - start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid \ - --exec $DAEMON - echo "$NAME." + log_daemon_msg "Stopping $DESC" "$NAME" + if start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON; then + log_end_msg 0 + else + log_end_msg 1 + fi ;; reload|force-reload) - echo "Reloading $DESC configuration file." - start-stop-daemon --stop --quiet --signal 1 --pidfile \ - /var/run/$NAME.pid --exec $DAEMON + log_action_begin_msg "Reloading $DESC configuration..." + if start-stop-daemon --stop --quiet --signal 1 --pidfile \ + /var/run/$NAME.pid --exec $DAEMON; then + log_end_msg 0 + else + log_action_end_msg 1 + fi ;; restart) - echo -n "Restarting $DESC: " - start-stop-daemon --stop --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON + log_action_begin_msg "Restarting $DESC" "$NAME" + + start-stop-daemon --stop --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON sleep 1 - start-stop-daemon --start --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON - echo "$NAME." + if start-stop-daemon --start --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON; then + log_end_msg 0 + else + log_end_msg 1 + fi ;; *) echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2 diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/patches/00_fix-manpagepath.patch /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/patches/00_fix-manpagepath.patch --- /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/patches/00_fix-manpagepath.patch 2008-01-02 21:13:30.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/patches/00_fix-manpagepath.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ ---- /tmp/keepalived-1.1.11/keepalived/Makefile.in 2005-03-01 00:32:01.000000000 +0100 -+++ keepalived/Makefile.in 2005-03-02 21:31:12.300052216 +0100 -@@ -102,7 +102,7 @@ - install -d $(DESTDIR)$(sysconfdir)/keepalived/samples - install -m 644 $(conf_file) $(DESTDIR)$(sysconfdir)/keepalived/ - install -m 644 ../doc/samples/* $(DESTDIR)$(sysconfdir)/keepalived/samples/ -- install -d $(DESTDIR)@mandir@/man/man5 -- install -d $(DESTDIR)@mandir@/man/man8 -- install -m 644 ../doc/man/man5/keepalived.conf.5 $(DESTDIR)@mandir@/man/man5 -- install -m 644 ../doc/man/man8/keepalived.8 $(DESTDIR)@mandir@/man/man8 -+ install -d $(DESTDIR)@mandir@/man5 -+ install -d $(DESTDIR)@mandir@/man8 -+ install -m 644 ../doc/man/man5/keepalived.conf.5 $(DESTDIR)@mandir@/man5 -+ install -m 644 ../doc/man/man8/keepalived.8 $(DESTDIR)@mandir@/man8 diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/patches/01_fix-genhash-manpagepath.patch /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/patches/01_fix-genhash-manpagepath.patch --- /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/patches/01_fix-genhash-manpagepath.patch 2008-01-02 21:13:30.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/patches/01_fix-genhash-manpagepath.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ ---- /tmp/keepalived-1.1.11/genhash/Makefile.in 2005-03-01 00:31:17.000000000 +0100 -+++ genhash/Makefile.in 2005-03-02 21:37:30.461562928 +0100 -@@ -44,8 +44,8 @@ - install: - install -d $(DESTDIR)$(bindir) - install -m 755 $(BIN)/$(EXEC) $(DESTDIR)$(bindir)/ -- install -d $(DESTDIR)@mandir@/man/man1 -- install -m 644 ../doc/man/man1/genhash.1 $(DESTDIR)@mandir@/man/man1 -+ install -d $(DESTDIR)@mandir@/man1 -+ install -m 644 ../doc/man/man1/genhash.1 $(DESTDIR)@mandir@/man1 - - mrproper: clean distclean - rm -f config.* diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/patches/99_linux_2.6_compat.patch /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/patches/99_linux_2.6_compat.patch --- /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/patches/99_linux_2.6_compat.patch 2008-01-02 21:13:30.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/patches/99_linux_2.6_compat.patch 2008-01-02 21:13:30.000000000 +0100 @@ -1,12 +1,13 @@ ---- keepalived-1.1.12.orig/keepalived/vrrp/vrrp_arp.c -+++ keepalived-1.1.12/keepalived/vrrp/vrrp_arp.c -@@ -22,6 +22,9 @@ - * Copyright (C) 2001-2006 Alexandre Cassen, - */ - -+/* Work around incompatibility between linux/types.h and sys/types.h */ -+#define __KERNEL_STRICT_NAMES -+ - /* system includes */ - #include - +diff -Nur keepalived-1.1.15/keepalived/vrrp/vrrp_arp.c keepalived-1.1.15.new/keepalived/vrrp/vrrp_arp.c +--- keepalived-1.1.15/keepalived/vrrp/vrrp_arp.c 2007-09-14 17:20:47.000000000 +0200 ++++ keepalived-1.1.15.new/keepalived/vrrp/vrrp_arp.c 2007-12-18 19:06:42.000000000 +0100 +@@ -22,6 +22,9 @@ + * Copyright (C) 2001-2007 Alexandre Cassen, + */ + ++/* Work around incompatibility between linux/types.h and sys/types.h */ ++#define __KERNEL_STRICT_NAMES ++ + /* local includes */ + #include "vrrp_arp.h" + #include "memory.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/rules /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/rules --- /tmp/uUQpUd4uAg/keepalived-1.1.13/debian/rules 2008-01-02 21:13:30.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/debian/rules 2008-01-02 21:13:30.000000000 +0100 @@ -13,6 +13,8 @@ rm -rf $(DEB_DESTDIR)/etc/keepalived/samples rm -rf $(DEB_DESTDIR)/etc/keepalived/keepalived.conf rm -rf $(DEB_DESTDIR)/etc/init.d/keepalived.init + rm -rf $(DEB_DESTDIR)/etc/rc.d + rm -rf $(DEB_DESTDIR)/etc/sysconfig rm -rf $(DEB_DESTDIR)/usr/man clean:: diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/doc/keepalived.conf.SYNOPSIS /tmp/qZRLuX1bC7/keepalived-1.1.15/doc/keepalived.conf.SYNOPSIS --- /tmp/uUQpUd4uAg/keepalived-1.1.13/doc/keepalived.conf.SYNOPSIS 2006-10-10 15:22:04.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/doc/keepalived.conf.SYNOPSIS 2007-09-14 17:57:37.000000000 +0200 @@ -165,8 +165,8 @@ auth_pass # Password string } virtual_ipaddress { # VRRP IP addres block - / brd dev scope - / brd dev scope + / brd dev scope label + / brd dev scope label ... } virtual_ipaddress_excluded { # VRRP IP excluded from VRRP @@ -175,8 +175,8 @@ ... } virtual_routes { # VRRP virtual routes - src [to] / via|gw dev scope table # to is optional - src [to] / via|gw dev scope table # to is optional + src [to] / via|gw dev scope table metric # to is optional + src [to] / via|gw dev scope table metric # to is optional ... } nopreempt # Override VRRP RFC preemption default @@ -198,6 +198,12 @@ * nowhere * global +LABEL is optional and creates a name for the alias. For compatibility with +"ifconfig", it should be of the form :, for example +eth0:1 for an alias on eth0. + +METRIC is optional and specify a route priority. + When a weight is specified in track_interface, instead of setting the vrrp instance to the FAULT state in case of failure, its priority will be increased by the weight when the interface is up (for positive weights), diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/doc/man/man5/keepalived.conf.5 /tmp/qZRLuX1bC7/keepalived-1.1.15/doc/man/man5/keepalived.conf.5 --- /tmp/uUQpUd4uAg/keepalived-1.1.13/doc/man/man5/keepalived.conf.5 2005-02-07 02:24:59.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/doc/man/man5/keepalived.conf.5 2007-09-13 16:07:36.000000000 +0200 @@ -199,9 +199,9 @@ #With the same entries on other machines, #the opposite transition will be occuring. virtual_ipaddress { - / brd dev scope + / brd dev scope label 192.168.200.17/24 dev eth1 - 192.168.200.18/24 dev eth2 + 192.168.200.18/24 dev eth2 label eth2:1 } #VRRP IP excluded from VRRP diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/doc/samples/keepalived.conf.vrrp /tmp/qZRLuX1bC7/keepalived-1.1.15/doc/samples/keepalived.conf.vrrp --- /tmp/uUQpUd4uAg/keepalived-1.1.13/doc/samples/keepalived.conf.vrrp 2004-05-28 15:10:12.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/doc/samples/keepalived.conf.vrrp 2007-09-13 16:08:24.000000000 +0200 @@ -27,6 +27,10 @@ 192.168.200.16 192.168.200.17 192.168.200.18 + + # optional label. should be of the form "realdev:sometext" for + # compatibility with ifconfig. + 192.168.200.18 label eth0:1 } } diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/AUTHOR /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/AUTHOR --- /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/AUTHOR 2002-11-18 17:59:41.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/AUTHOR 2007-09-13 16:45:51.000000000 +0200 @@ -1 +1 @@ -Alexandre Cassen, +Alexandre Cassen, diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/http.c /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/http.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/http.c 2005-02-14 16:36:28.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/http.c 2007-09-13 16:46:35.000000000 +0200 @@ -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-2007 Alexandre Cassen, */ #include diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/http.h /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/http.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/http.h 2005-02-14 16:37:11.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/http.h 2007-09-13 16:46:45.000000000 +0200 @@ -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-2007 Alexandre Cassen, */ #ifndef _HTTP_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/layer4.c /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/layer4.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/layer4.c 2005-02-14 16:39:57.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/layer4.c 2007-09-13 16:46:52.000000000 +0200 @@ -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-2007 Alexandre Cassen, */ #include "layer4.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/layer4.h /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/layer4.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/layer4.h 2005-01-26 00:21:03.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/layer4.h 2007-09-13 16:46:58.000000000 +0200 @@ -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-2007 Alexandre Cassen, */ #ifndef _LAYER4_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/main.c /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/main.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/main.c 2005-02-14 16:42:35.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/main.c 2007-09-13 16:47:03.000000000 +0200 @@ -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-2007 Alexandre Cassen, */ #include diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/main.h /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/main.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/main.h 2005-01-26 00:21:17.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/main.h 2007-09-13 16:47:07.000000000 +0200 @@ -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-2007 Alexandre Cassen, */ #ifndef _MAIN_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/Makefile.in /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/Makefile.in --- /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/Makefile.in 2006-10-11 11:46:49.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/Makefile.in 2007-09-14 10:36:50.000000000 +0200 @@ -1,13 +1,14 @@ # Makefile.in # -# Copyright (C) 2001-2006 Alexandre Cassen, +# Copyright (C) 2001-2007 Alexandre Cassen, EXEC = genhash BIN = ../bin prefix = @prefix@ exec_prefix = @exec_prefix@ -bindir = @bindir@ +bindir = @bindir@ +mandir = @mandir@ CC = @CC@ STRIP = @STRIP@ @@ -17,9 +18,8 @@ LDFLAGS = @LIBS@ @LDFLAGS@ OBJS = main.o sock.o layer4.o http.o ssl.o -LIB_OBJS = ../lib/timer.o ../lib/scheduler.o \ - ../lib/memory.o ../lib/list.o ../lib/utils.o \ - ../lib/html.o ../lib/signals.o +LIB_OBJS = ../lib/timer.o ../lib/scheduler.o ../lib/memory.o ../lib/list.o \ + ../lib/utils.o ../lib/html.o ../lib/signals.o all: $(BIN)/$(EXEC) $(STRIP) $(BIN)/$(EXEC) @@ -39,13 +39,13 @@ uninstall: rm -f $(DESTDIR)$(bindir)/$(EXEC) - rm -f $(DESTDIR)@mandir@/man/man1/genhash.1 + rm -f $(DESTDIR)$(mandir)/man1/genhash.1 install: install -d $(DESTDIR)$(bindir) install -m 755 $(BIN)/$(EXEC) $(DESTDIR)$(bindir)/ - install -d $(DESTDIR)@mandir@/man/man1 - install -m 644 ../doc/man/man1/genhash.1 $(DESTDIR)@mandir@/man/man1 + install -d $(DESTDIR)$(mandir)/man1 + install -m 644 ../doc/man/man1/genhash.1 $(DESTDIR)$(mandir)/man1 mrproper: clean distclean rm -f config.* diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/sock.c /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/sock.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/sock.c 2005-02-14 16:42:21.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/sock.c 2007-09-13 16:47:20.000000000 +0200 @@ -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-2007 Alexandre Cassen, */ #include diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/sock.h /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/sock.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/sock.h 2005-02-14 16:42:52.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/sock.h 2007-09-13 16:47:25.000000000 +0200 @@ -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-2007 Alexandre Cassen, */ #ifndef _SOCK_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/ssl.c /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/ssl.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/ssl.c 2005-02-14 16:44:19.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/ssl.c 2007-09-13 16:47:29.000000000 +0200 @@ -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-2007 Alexandre Cassen, */ #include diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/ssl.h /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/ssl.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/genhash/ssl.h 2005-02-14 16:45:26.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/genhash/ssl.h 2007-09-13 16:47:34.000000000 +0200 @@ -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-2007 Alexandre Cassen, */ #ifndef _SSL_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/goodies/arpreset.pl /tmp/qZRLuX1bC7/keepalived-1.1.15/goodies/arpreset.pl --- /tmp/uUQpUd4uAg/keepalived-1.1.13/goodies/arpreset.pl 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/goodies/arpreset.pl 2007-09-13 16:21:46.000000000 +0200 @@ -0,0 +1,97 @@ +#!/usr/bin/perl -w + +################################################################### +# arpreset 0.2 +# Copyright (C) 2005 Steve Milton (milton AT isomedia.com) +# +# Utility for deleting a single ARP entry from a cisco router. +# Script adapted from description on Cisco tech article. +# http://www.cisco.com/warp/public/477/SNMP/clear_arp.shtml +# +# The Cisco router needs to have a read/write community setup +# for the utility to work. I recommend using the following +# IOS commands to setup a restricted community that can only +# work with the MAC table. You will need ENABLE level access +# to the router to execute these commands. +# +# access-list 50 permit 123.123.123.123 +# access-list 50 permit 123.123.123.124 +# access-list 50 deny any +# snmp-server view arpchange ipNetToMediaEntry.4 included +# snmp-server community blahblah view arpchange RW 50 +# +# Set the access-list permit to the IP addresses of the systems +# you want to be able to make changes to the MAC table. Set +# the community name (above blahblah) to something random and +# password-like. +################################################################### +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. +################################################################### + +use strict; +use Getopt::Long; +&Getopt::Long::config('auto_abbrev'); + +my ($router,$community,$address,$help,$check); +$router=$community=$address=$help=$check=""; + +my $status = GetOptions("router:s" => \$router, + "community:s" => \$community, + "address:s" => \$address, + "help" => \$help, + "check" => \$check); + +if (($status == 0) or $help) { + &PrintUsage; + exit 1; +} + +if (!$router or !$community or !$address) { + &PrintUsage; + exit 1; +} + +# OID for the ARP table entries +my $ciscoOID = ".1.3.6.1.2.1.4.22.1.4"; +my $target = ""; + +# Walk the SNMP ARP table on the router to locate the target address +open(GET, "/usr/bin/snmpwalk -v1 -c $community $router $ciscoOID |"); +while() { + if (/^(.*?\.$address)\s/) { + $target = $1; + print $_; + } +} +close(GET); +if ($target and !$check) { + print "-- changed to --\n"; + # set the target address to "invalid" + system("/usr/bin/snmpset -v1 -c $community $router $target i 2"); +} elsif (!$check) { + print "No target OID located."; + exit 1; +} +exit; + +sub PrintUsage { + print "arpreset 0.2\nCopyright (c) 2005 by Steve Milton\narpreset comes with ABSOLUTELY NO WARRANTY\n\n"; + print "Usage: arpreset --router=routeraddress --community=rwcommunity --address=ipaddress\n"; + print " arpreset --help\n"; + print "\nWhere ipaddress is the IP address in the Cisco router that you want to invalidate\nfrom the MAC address cache.\n"; + print "\nYou can add --check to the command to make it NOT update the router, but check for\nthe entry only.\n"; + exit; +} diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_api.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_api.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_api.c 2006-10-11 11:40:17.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_api.c 2007-09-14 17:19:09.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Checkers registration. * - * Version: $Id: check_api.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_api.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_daemon.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_daemon.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_daemon.c 2006-10-11 11:40:23.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_daemon.c 2007-09-14 17:19:14.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Healthcheckrs child process handling. * - * Version: $Id: check_daemon.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_daemon.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "check_daemon.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_data.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_data.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_data.c 2006-10-11 11:40:28.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_data.c 2007-09-14 17:19:19.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Healthcheckers dynamic data structure definition. * - * Version: $Id: check_data.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_data.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "check_data.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_http.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_http.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_http.c 2006-10-11 11:40:33.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_http.c 2007-09-14 17:19:24.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: WEB CHECK. Common HTTP/SSL checker primitives. * - * Version: $Id: check_http.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_http.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include @@ -471,6 +471,13 @@ inet_ntop2(CHECKER_RIP(checker_obj)), ntohs(addr_port), fetched_url->path, digest_tmp); + smtp_alert(checker_obj->rs, NULL, NULL, + "DOWN", + "=> CHECK failed on service" + " : HTTP MD5SUM mismatch <="); + update_svr_checker_state(DOWN, checker_obj->id + , checker_obj->vs + , checker_obj->rs); } else { DBG("MD5SUM to [%s:%d] url(%d) = [%s].", inet_ntop2(CHECKER_RIP(checker_obj)) @@ -515,13 +522,6 @@ r = 0; } req->len = r; - } else { - /* minimize buffer using no 2*CR/LF found yet */ - if (req->len > 4) { - memmove(req->buffer, - req->buffer + req->len - 4, 4); - req->len = 4; - } } } else if (req->len) { MD5_Update(&req->context, req->buffer, @@ -830,6 +830,23 @@ ssl_printerr(SSL_get_error (req->ssl, ret)); #endif + if ((http_get_check->proto == PROTO_SSL) && + (svr_checker_up(checker_obj->id, checker_obj->rs))) { + syslog(LOG_INFO, "SSL handshake/communication error" + " connecting to server" + " (openssl errno: %d) [%s:%d]." + , SSL_get_error (http_arg_obj->req->ssl, ret) + , inet_ntop2(CHECKER_RIP(checker_obj)) + , ntohs(addr_port)); + smtp_alert(checker_obj->rs, NULL, NULL, + "DOWN", + "=> CHECK failed on service" + " : SSL connection error <="); + update_svr_checker_state(DOWN, checker_obj->id + , checker_obj->vs + , checker_obj->rs); + } + return epilog(thread_obj, 1, 0, 0); } } diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_misc.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_misc.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_misc.c 2006-10-11 11:40:38.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_misc.c 2007-09-14 17:19:28.000000000 +0200 @@ -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.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_misc.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "check_misc.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_parser.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_parser.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_parser.c 2006-10-11 11:40:43.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_parser.c 2007-09-14 17:19:33.000000000 +0200 @@ -7,7 +7,7 @@ * data structure representation the conf file representing * the loadbalanced server pool. * - * Version: $Id: check_parser.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_parser.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "check_parser.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_smtp.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_smtp.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_smtp.c 2006-10-11 11:40:48.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_smtp.c 2007-09-14 17:19:38.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: SMTP CHECK. Check an SMTP-server. * - * Version: $Id: check_smtp.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_smtp.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_ssl.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_ssl.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_ssl.c 2006-10-11 11:40:53.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_ssl.c 2007-09-14 17:19:43.000000000 +0200 @@ -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.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_ssl.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_tcp.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_tcp.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/check_tcp.c 2006-10-11 11:40:58.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/check_tcp.c 2007-09-14 17:19:47.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: TCP checker. * - * Version: $Id: check_tcp.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_tcp.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "check_tcp.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/ipfwwrapper.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/ipfwwrapper.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/ipfwwrapper.c 2006-10-11 11:41:03.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/ipfwwrapper.c 2007-09-14 17:19:53.000000000 +0200 @@ -7,7 +7,7 @@ * library to add/remove server MASQ rules to the kernel * firewall framework. * - * Version: $Id: ipfwwrapper.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: ipfwwrapper.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "ipfwwrapper.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/ipvswrapper.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/ipvswrapper.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/ipvswrapper.c 2006-10-11 11:41:09.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/ipvswrapper.c 2007-09-14 17:19:57.000000000 +0200 @@ -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.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: ipvswrapper.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "ipvswrapper.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/ipwrapper.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/ipwrapper.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/ipwrapper.c 2006-10-11 11:41:13.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/ipwrapper.c 2007-09-14 17:20:01.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Manipulation functions for IPVS & IPFW wrappers. * - * Version: $Id: ipwrapper.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: ipwrapper.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "ipwrapper.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/Makefile.in /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/Makefile.in --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/check/Makefile.in 2006-03-09 14:19:59.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/check/Makefile.in 2007-09-13 16:56:12.000000000 +0200 @@ -2,7 +2,7 @@ # # Keepalived OpenSource project. # -# Copyright (C) 2001-2006 Alexandre Cassen, +# Copyright (C) 2001-2007 Alexandre Cassen, KERNEL = @KERN@ CC = @CC@ diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/daemon.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/daemon.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/daemon.c 2006-10-11 11:41:20.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/daemon.c 2007-09-14 17:20:08.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Main program structure. * - * Version: $Id: main.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: main.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/global_data.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/global_data.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/global_data.c 2006-10-11 11:41:25.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/global_data.c 2007-09-14 17:20:13.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Dynamic data structure definition. * - * Version: $Id: global_data.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: global_data.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/global_parser.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/global_parser.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/global_parser.c 2006-10-11 11:41:30.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/global_parser.c 2007-09-14 17:20:17.000000000 +0200 @@ -7,7 +7,7 @@ * data structure representation the conf file representing * the loadbalanced server pool. * - * Version: $Id: global_parser.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: global_parser.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "global_parser.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/layer4.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/layer4.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/layer4.c 2006-10-11 11:41:35.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/layer4.c 2007-09-14 17:20:22.000000000 +0200 @@ -6,7 +6,7 @@ * Part: Layer4 checkers handling. Register worker threads & * upper layer checkers. * - * Version: $Id: layer4.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: layer4.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "layer4.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/main.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/main.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/main.c 2006-10-11 11:41:40.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/main.c 2007-09-14 17:20:28.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Main program structure. * - * Version: $Id: main.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: main.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "main.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/Makefile.in /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/Makefile.in --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/Makefile.in 2006-03-09 14:22:26.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/Makefile.in 2007-09-13 16:56:49.000000000 +0200 @@ -2,7 +2,7 @@ # # Keepalived OpenSource project. # -# Copyright (C) 2001-2006 Alexandre Cassen, +# Copyright (C) 2001-2007 Alexandre Cassen, CC = @CC@ INCLUDES = -I../include -I../../lib diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/pidfile.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/pidfile.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/pidfile.c 2006-10-11 11:41:47.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/pidfile.c 2007-09-14 17:20:36.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: pidfile utility. * - * Version: $Id: pidfile.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: pidfile.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "pidfile.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/smtp.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/smtp.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/core/smtp.c 2006-10-11 11:41:52.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/core/smtp.c 2007-09-14 17:20:41.000000000 +0200 @@ -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.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: smtp.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/etc/init.d/keepalived.init /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/etc/init.d/keepalived.init --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/etc/init.d/keepalived.init 2003-07-06 22:12:26.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/etc/init.d/keepalived.init 2007-09-13 15:19:01.000000000 +0200 @@ -5,44 +5,69 @@ # processname: keepalived # pidfile: /var/run/keepalived.pid # config: /etc/keepalived/keepalived.conf -# chkconfig: 35 21 79 +# chkconfig: - 21 79 # description: Start and stop Keepalived -# Global definitions -PID_FILE="/var/run/keepalived.pid" +# Source function library +. /etc/rc.d/init.d/functions + +# Source configuration file (we set KEEPALIVED_OPTIONS there) +. /etc/sysconfig/keepalived + +RETVAL=0 + +prog="keepalived" + +start() { + echo -n $"Starting $prog: " + daemon keepalived ${KEEPALIVED_OPTIONS} + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog +} + +stop() { + echo -n $"Stopping $prog: " + killproc keepalived + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog +} + +reload() { + echo -n $"Reloading $prog: " + killproc keepalived -1 + RETVAL=$? + echo +} # See how we were called. case "$1" in - start) - echo -n "Starting Keepalived for LVS: " - keepalived -D - touch /var/lock/subsys/keepalived - echo - ;; - stop) - echo -n "Shutting down Keepalived for LVS: " - PID=`cat $PID_FILE` - kill $PID - rm -rf /var/lock/subsys/keepalived - echo - ;; - restart) - echo -n "Shutting down Keepalived for LVS: " - PID=`cat $PID_FILE` - kill $PID - echo - echo -n "Starting Keepalived for LVS: " - keepalived -D - echo - ;; - reload) - echo -n "Reloading Keepalived config: " - killall -HUP keepalived - echo - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 + start) + start + ;; + stop) + stop + ;; + reload) + reload + ;; + restart) + stop + start + ;; + condrestart) + if [ -f /var/lock/subsys/$prog ]; then + stop + start + fi + ;; + status) + status keepalived + ;; + *) + echo "Usage: $0 {start|stop|reload|restart|condrestart|status}" + exit 1 esac -exit 0 +exit $RETVAL diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/etc/init.d/keepalived.sysconfig /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/etc/init.d/keepalived.sysconfig --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/etc/init.d/keepalived.sysconfig 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/etc/init.d/keepalived.sysconfig 2007-09-13 15:20:25.000000000 +0200 @@ -0,0 +1,15 @@ +# Options for keepalived. See `keepalived --help' output and keepalived(8) and +# keepalived.conf(5) man pages for a list of all options. Here are the most +# common ones : +# +# --vrrp -P Only run with VRRP subsystem. +# --check -C Only run with Health-checker subsystem. +# --dont-release-vrrp -V Dont remove VRRP VIPs & VROUTEs on daemon stop. +# --dont-release-ipvs -I Dont remove IPVS topology on daemon stop. +# --dump-conf -d Dump the configuration data. +# --log-detail -D Detailed log messages. +# --log-facility -S 0-7 Set local syslog facility (default=LOG_DAEMON) +# + +KEEPALIVED_OPTIONS="-D" + diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_api.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_api.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_api.h 2006-10-11 11:41:57.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_api.h 2007-09-14 17:22:07.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Checkers arguments structures definitions. * - * Version: $Id: check_api.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_api.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _CHECK_API_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_daemon.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_daemon.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_daemon.h 2006-10-11 11:42:02.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_daemon.h 2007-09-14 17:22:11.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: check_daemon.c include file. * - * Version: $Id: check_daemon.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_daemon.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _CHECK_DAEMON_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_data.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_data.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_data.h 2006-10-11 11:42:06.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_data.h 2007-09-14 17:22:16.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Healthcheckers dynamic data structure definition. * - * Version: $Id: check_data.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_data.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _CHECK_DATA_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_http.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_http.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_http.h 2006-10-11 11:42:14.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_http.h 2007-09-14 17:22:21.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: check_http.c include file. * - * Version: $Id: check_http.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_http.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _CHECK_HTTP_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_misc.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_misc.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_misc.h 2006-10-11 11:42:19.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_misc.h 2007-09-14 17:22:25.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: check_misc.c include file. * - * Version: $Id: check_misc.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_misc.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _CHECK_MISC_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_parser.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_parser.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_parser.h 2006-10-11 11:42:23.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_parser.h 2007-09-14 17:22:30.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: check_parser.c include file. * - * Version: $Id: check_parser.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_parser.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _CHECK_PARSER_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_smtp.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_smtp.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_smtp.h 2006-10-11 11:42:30.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_smtp.h 2007-09-14 17:22:35.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: check_smtp.c include file. * - * Version: $Id: check_smtp.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_smtp.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _CHECK_SMTP_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_ssl.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_ssl.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_ssl.h 2006-10-11 11:42:35.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_ssl.h 2007-09-14 17:22:39.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: check_http.c include file. * - * Version: $Id: check_http.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_http.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _CHECK_SSL_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_tcp.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_tcp.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/check_tcp.h 2006-10-11 11:42:40.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/check_tcp.h 2007-09-14 17:22:44.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: check_tcp.c include file. * - * Version: $Id: check_tcp.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: check_tcp.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _CHECK_TCP_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/config.h.in /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/config.h.in --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/config.h.in 2006-10-11 11:42:45.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/config.h.in 2007-09-14 17:22:49.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Configuration include file. * - * Version: $Id: config.h.in,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: config.h.in,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _CONFIG_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/daemon.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/daemon.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/daemon.h 2006-10-11 11:42:50.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/daemon.h 2007-09-14 17:22:53.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Daemon process handling. * - * Version: $Id: daemon.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: daemon.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _DAEMON_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/global_data.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/global_data.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/global_data.h 2006-10-11 11:42:54.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/global_data.h 2007-09-14 17:22:58.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Dynamic data structure definition. * - * Version: $Id: global_data.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: global_data.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _GLOBAL_DATA_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/global_parser.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/global_parser.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/global_parser.h 2006-10-11 11:43:00.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/global_parser.h 2007-09-14 17:23:03.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: vrrp_parser.c include file. * - * Version: $Id: global_parser.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: global_parser.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _GLOBAL_PARSER_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/ipfwwrapper.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/ipfwwrapper.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/ipfwwrapper.h 2006-10-11 11:43:04.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/ipfwwrapper.h 2007-09-14 17:23:08.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: ipfwwrapper.c include file. * - * Version: $Id: ipfwwrapper.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: ipfwwrapper.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _IPFWWRAPPER_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/ipvswrapper.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/ipvswrapper.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/ipvswrapper.h 2006-10-11 11:43:09.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/ipvswrapper.h 2007-09-14 17:23:12.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: ipvswrapper.c include file. * - * Version: $Id: ipvswrapper.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: ipvswrapper.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _IPVSWRAPPER_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/ipwrapper.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/ipwrapper.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/ipwrapper.h 2006-10-11 11:43:19.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/ipwrapper.h 2007-09-14 17:23:17.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: ipwrapper.c include file. * - * Version: $Id: ipwrapper.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: ipwrapper.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _IPWRAPPER_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/layer4.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/layer4.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/layer4.h 2006-10-11 11:43:23.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/layer4.h 2007-09-14 17:23:22.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: layer4.c include file. * - * Version: $Id: layer4.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: layer4.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _LAYER4_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/main.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/main.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/main.h 2006-10-11 11:43:29.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/main.h 2007-09-14 17:23:29.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Main program include file. * - * Version: $Id: main.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: main.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _MAIN_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/pidfile.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/pidfile.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/pidfile.h 2006-10-11 11:43:34.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/pidfile.h 2007-09-14 17:23:33.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: pidfile.c include file. * - * Version: $Id: pidfile.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: pidfile.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _PIDFILE_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/smtp.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/smtp.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/smtp.h 2006-10-11 11:43:38.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/smtp.h 2007-09-14 17:23:39.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: smtp.c include file. * - * Version: $Id: smtp.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: smtp.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _SMTP_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_arp.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_arp.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_arp.h 2006-10-11 11:43:45.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_arp.h 2007-09-14 17:23:44.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: vrrp_arp.c include file. * - * Version: $Id: vrrp_arp.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_arp.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_ARP_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_daemon.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_daemon.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_daemon.h 2006-10-11 11:43:50.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_daemon.h 2007-09-14 17:23:49.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: vrrp_daemon.c include file. * - * Version: $Id: vrrp_daemon.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_daemon.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_DAEMON_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_data.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_data.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_data.h 2006-10-11 11:43:54.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_data.h 2007-09-14 17:23:54.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Dynamic data structure definition. * - * Version: $Id: vrrp_data.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_data.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_DATA_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp.h 2006-10-11 11:43:59.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp.h 2007-09-14 17:23:59.000000000 +0200 @@ -6,7 +6,7 @@ * * Part: vrrp.c program include file. * - * Version: $Id: vrrp.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_if.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_if.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_if.h 2006-10-11 11:44:03.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_if.h 2007-09-14 17:24:06.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: vrrp_if.c include file. * - * Version: $Id: vrrp_if.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_if.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_IF_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_index.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_index.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_index.h 2006-10-11 11:44:08.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_index.h 2007-09-14 17:24:11.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: vrrp_index.c include file. * - * Version: $Id: vrrp_index.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_index.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_INDEX_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_ipaddress.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_ipaddress.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_ipaddress.h 2006-10-11 11:44:13.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_ipaddress.h 2007-09-14 17:24:15.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: vrrp_ipaddress.c include file. * - * Version: $Id: vrrp_ipaddress.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_ipaddress.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_IPADDR_H @@ -45,6 +45,7 @@ int ifindex; /* Interface index owning IP address */ interface *ifp; /* Interface owning IP address */ int scope; /* the ip address scope */ + char *label; /* Alias name, e.g. eth0:1 */ int set; /* TRUE if addr is set */ } ip_address; diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_iproute.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_iproute.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_iproute.h 2006-10-11 11:44:18.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_iproute.h 2007-09-14 17:54:11.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: vrrp_iproute.c include file. * - * Version: $Id: vrrp_iproute.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_iproute.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_IPROUTE_H @@ -36,11 +36,12 @@ /* types definition */ typedef struct _ip_route { - uint32_t dst; /* RTA_DST */ + uint32_t dst; /* RTA_DST */ uint8_t dmask; - uint32_t gw; /* RTA_GATEWAY */ - uint32_t src; /* RTA_PREFSRC */ - int index; /* RTA_OIF */ + uint32_t gw; /* RTA_GATEWAY */ + uint32_t src; /* RTA_PREFSRC */ + uint32_t metric; /* RTA_PRIORITY */ + int index; /* RTA_OIF */ int scope; int table; int set; diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_ipsecah.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_ipsecah.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_ipsecah.h 2006-10-11 11:44:24.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_ipsecah.h 2007-09-14 17:24:24.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: vrrp_ipsecah.c include file. * - * Version: $Id: vrrp_ipsecah.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_ipsecah.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_IPSEC_AH_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_netlink.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_netlink.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_netlink.h 2006-10-11 11:44:28.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_netlink.h 2007-09-14 17:24:30.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: vrrp_netlink.c include file. * - * Version: $Id: vrrp_netlink.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_netlink.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_NETLINK_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_notify.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_notify.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_notify.h 2006-10-11 11:44:34.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_notify.h 2007-09-14 17:24:35.000000000 +0200 @@ -6,7 +6,7 @@ * * Part: vrrp_notify.c include file. * - * Version: $Id: vrrp_notify.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_notify.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_NOTIFY_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_parser.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_parser.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_parser.h 2006-10-11 11:44:38.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_parser.h 2007-09-14 17:24:40.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: vrrp_parser.c include file. * - * Version: $Id: vrrp_parser.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_parser.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_PARSER_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_scheduler.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_scheduler.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_scheduler.h 2006-10-11 11:44:43.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_scheduler.h 2007-09-14 17:24:45.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: vrrp_scheduler.c include file. * - * Version: $Id: vrrp_scheduler.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_scheduler.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_SCHEDULER_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_sync.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_sync.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_sync.h 2006-10-11 11:44:48.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_sync.h 2007-09-14 17:24:50.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: vrrp_sync.c include file. * - * Version: $Id: vrrp_sync.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_sync.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_SYNC_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_track.h /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_track.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/include/vrrp_track.h 2006-10-11 11:44:53.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/include/vrrp_track.h 2007-09-14 17:24:55.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: vrrp_track.c include file. * - * Version: $Id: vrrp_track.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_track.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _VRRP_TRACK_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/Makefile.in /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/Makefile.in --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/Makefile.in 2006-10-11 11:46:32.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/Makefile.in 2007-09-13 15:44:39.000000000 +0200 @@ -14,8 +14,10 @@ exec_prefix = @exec_prefix@ sbindir = @sbindir@ sysconfdir = @sysconfdir@ -init_script = etc/init.d/keepalived.init -conf_file = etc/keepalived/keepalived.conf +mandir = @mandir@ +init_dir = $(sysconfdir)/rc.d/init.d +conf_dir = $(sysconfdir)/keepalived +sysconf_dir = $(sysconfdir)/sysconfig CC = @CC@ STRIP = @STRIP@ @@ -89,20 +91,23 @@ uninstall: rm -f $(DESTDIR)$(sbindir)/$(EXEC) + rm -f $(DESTDIR)$(init_dir)/keepalived.init + rm -f $(DESTDIR)$(sysconf_dir)/keepalived rm -rf $(DESTDIR)$(sysconfdir)/keepalived - rm -f $(DESTDIR)$(init_dir)/$(init_script) - rm -f $(DESTDIR)@mandir@/man/man5/keepalived.conf.5 - rm -f $(DESTDIR)@mandir@/man/man8/keepalived.8 + rm -f $(DESTDIR)$(mandir)/man/man5/keepalived.conf.5 + rm -f $(DESTDIR)$(mandir)/man/man8/keepalived.8 install: install -d $(DESTDIR)$(sbindir) install -m 700 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/ - install -d $(DESTDIR)$(sysconfdir)/init.d - install -m 755 $(init_script) $(DESTDIR)$(sysconfdir)/init.d/keepalived + install -d $(DESTDIR)$(init_dir) + install -m 755 etc/init.d/keepalived.init $(DESTDIR)$(init_dir)/keepalived + install -d $(DESTDIR)$(sysconf_dir) + install -m 755 etc/init.d/keepalived.sysconfig $(DESTDIR)$(sysconf_dir)/keepalived install -d $(DESTDIR)$(sysconfdir)/keepalived/samples - install -m 644 $(conf_file) $(DESTDIR)$(sysconfdir)/keepalived/ + install -m 644 etc/keepalived/keepalived.conf $(DESTDIR)$(sysconfdir)/keepalived/ install -m 644 ../doc/samples/* $(DESTDIR)$(sysconfdir)/keepalived/samples/ - install -d $(DESTDIR)@mandir@/man/man5 - install -d $(DESTDIR)@mandir@/man/man8 - install -m 644 ../doc/man/man5/keepalived.conf.5 $(DESTDIR)@mandir@/man/man5 - install -m 644 ../doc/man/man8/keepalived.8 $(DESTDIR)@mandir@/man/man8 + install -d $(DESTDIR)$(mandir)/man5 + install -d $(DESTDIR)$(mandir)/man8 + install -m 644 ../doc/man/man5/keepalived.conf.5 $(DESTDIR)$(mandir)/man5 + install -m 644 ../doc/man/man8/keepalived.8 $(DESTDIR)$(mandir)/man8 diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/Makefile.in /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/Makefile.in --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/Makefile.in 2006-10-10 15:30:34.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/Makefile.in 2007-09-13 16:57:47.000000000 +0200 @@ -2,7 +2,7 @@ # # Keepalived OpenSource project. # -# Copyright (C) 2001-2006 Alexandre Cassen, +# Copyright (C) 2001-2007 Alexandre Cassen, CC = @CC@ INCLUDES = -I../include -I../../lib diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_arp.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_arp.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_arp.c 2006-10-11 11:44:59.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_arp.c 2007-09-14 17:20:47.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: ARP primitives. * - * Version: $Id: vrrp_arp.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_arp.c,v 1.1.15 2007/09/15 04:07:41 acassen Exp $ * * Author: Alexandre Cassen, * @@ -19,17 +19,17 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ -/* system includes */ -#include - /* local includes */ #include "vrrp_arp.h" #include "memory.h" #include "utils.h" +/* system includes */ +#include + /* global vars */ char *garp_buffer; int garp_fd; diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp.c 2008-01-02 21:13:30.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp.c 2008-01-02 21:13:30.000000000 +0100 @@ -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.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ /* local include */ diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_daemon.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_daemon.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_daemon.c 2006-10-11 11:45:09.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_daemon.c 2007-09-14 17:20:57.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: VRRP child process handling. * - * Version: $Id: vrrp_daemon.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_daemon.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "vrrp_daemon.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_data.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_data.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_data.c 2006-10-11 11:45:14.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_data.c 2007-09-14 17:21:02.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Dynamic data structure definition. * - * Version: $Id: vrrp_data.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_data.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "vrrp_data.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_if.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_if.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_if.c 2006-10-11 11:45:19.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_if.c 2007-09-14 17:21:06.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Interfaces manipulation. * - * Version: $Id: vrrp_if.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_if.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ /* global include */ diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_index.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_index.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_index.c 2006-10-11 11:45:23.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_index.c 2007-09-14 17:21:11.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: VRRP instance index table. * - * Version: $Id: vrrp_index.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_index.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ /* local include */ diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_ipaddress.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_ipaddress.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_ipaddress.c 2006-10-11 11:45:28.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_ipaddress.c 2007-09-14 17:21:16.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: NETLINK IPv4 address manipulation. * - * Version: $Id: vrrp_ipaddress.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_ipaddress.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ /* local include */ @@ -54,6 +54,10 @@ addattr_l(&req.n, sizeof (req), IFA_BROADCAST, &ipaddr->broadcast, sizeof (ipaddr->broadcast)); + if (ipaddr->label) + addattr_l(&req.n, sizeof (req), IFA_LABEL, + ipaddr->label, strlen(ipaddr->label) + 1); + if (netlink_talk(&nl_cmd, &req.n) < 0) status = -1; return status; @@ -90,18 +94,23 @@ void free_ipaddress(void *if_data_obj) { - FREE(if_data_obj); + ip_address *ip_addr = if_data_obj; + + FREE_PTR(ip_addr->label); + FREE(ip_addr); } void dump_ipaddress(void *if_data_obj) { ip_address *ip_addr = if_data_obj; - syslog(LOG_INFO, " %s/%d brd %s dev %s scope %s" + syslog(LOG_INFO, " %s/%d brd %s dev %s scope %s%s%s" , inet_ntop2(ip_addr->addr) , ip_addr->mask , inet_ntop2(ip_addr->broadcast) , IF_NAME(if_get_by_ifindex(ip_addr->ifindex)) - , netlink_scope_n2a(ip_addr->scope)); + , netlink_scope_n2a(ip_addr->scope) + , ip_addr->label ? " label " : "" + , ip_addr->label ? ip_addr->label : ""); } void alloc_ipaddress(list ip_list, vector strvec, interface *ifp) @@ -139,6 +148,9 @@ new->scope = netlink_scope_a2n(VECTOR_SLOT(strvec, ++i)); } else if (!strcmp(str, "broadcast") || !strcmp(str, "brd")) { inet_ston(VECTOR_SLOT(strvec, ++i), &new->broadcast); + } else if (!strcmp(str, "label")) { + new->label = MALLOC(IFNAMSIZ); + strncpy(new->label, VECTOR_SLOT(strvec, ++i), IFNAMSIZ); } else { if (inet_ston(VECTOR_SLOT(strvec, i), &ipaddr)) { inet_ston(VECTOR_SLOT(strvec, i), &new->addr); diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_iproute.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_iproute.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_iproute.c 2006-10-11 11:45:32.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_iproute.c 2007-09-14 17:52:54.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: NETLINK IPv4 routes manipulation. * - * Version: $Id: vrrp_iproute.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_iproute.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ /* local include */ @@ -64,6 +64,8 @@ addattr32(&req.n, sizeof(req), RTA_OIF, iproute->index); if (iproute->src) addattr_l(&req.n, sizeof(req), RTA_PREFSRC, &iproute->src, 4); + if (iproute->metric) + addattr32(&req.n, sizeof(req), RTA_PRIORITY, iproute->metric); if (netlink_talk(&nl_cmd, &req.n) < 0) status = -1; @@ -103,7 +105,7 @@ dump_iproute(void *rt_data_obj) { ip_route *route = rt_data_obj; - char *log_msg = MALLOC(100); + char *log_msg = MALLOC(150); char *tmp = MALLOC(30); if (route->dst) { @@ -132,6 +134,10 @@ netlink_scope_n2a(route->scope)); strncat(log_msg, tmp, 30); } + if (route->metric) { + snprintf(tmp, 30, " metric %d", route->metric); + strncat(log_msg, tmp, 30); + } syslog(LOG_INFO, " %s", log_msg); @@ -170,6 +176,8 @@ new->index = IF_INDEX(ifp); } else if (!strcmp(str, "table")) { new->table = atoi(VECTOR_SLOT(strvec, ++i)); + } else if (!strcmp(str, "metric")) { + new->metric = atoi(VECTOR_SLOT(strvec, ++i)); } else if (!strcmp(str, "scope")) { new->scope = netlink_scope_a2n(VECTOR_SLOT(strvec, ++i)); } else { diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_ipsecah.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_ipsecah.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_ipsecah.c 2006-10-11 11:45:37.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_ipsecah.c 2007-09-14 17:21:27.000000000 +0200 @@ -7,7 +7,7 @@ * authentication data encryption using HMAC MD5 according to * RFCs 2085 & 2104. * - * Version: $Id: vrrp_ipsecah.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_ipsecah.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "vrrp_ipsecah.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_netlink.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_netlink.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_netlink.c 2006-10-11 11:45:43.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_netlink.c 2007-09-14 17:21:32.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: NETLINK kernel command channel. * - * Version: $Id: vrrp_netlink.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_netlink.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ /* global include */ diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_notify.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_notify.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_notify.c 2006-10-11 11:45:47.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_notify.c 2007-09-14 17:21:37.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: VRRP state transition notification scripts handling. * - * Version: $Id: vrrp_notify.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_notify.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ /* system include */ diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_parser.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_parser.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_parser.c 2006-10-11 11:45:52.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_parser.c 2007-09-14 17:21:42.000000000 +0200 @@ -7,7 +7,7 @@ * data structure representation the conf file representing * the loadbalanced server pool. * - * Version: $Id: vrrp_parser.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_parser.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "vrrp_parser.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_scheduler.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_scheduler.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_scheduler.c 2008-01-02 21:13:30.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_scheduler.c 2008-01-02 21:13:30.000000000 +0100 @@ -5,7 +5,7 @@ * * Part: Sheduling framework for vrrp code. * - * Version: $Id: vrrp_scheduler.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_scheduler.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "vrrp_scheduler.h" @@ -650,8 +650,8 @@ notify_instance_exec(vrrp, VRRP_STATE_FAULT); } vrrp->state = VRRP_STATE_FAULT; - vrrp->ms_down_timer = - 3 * vrrp->adver_int + VRRP_TIMER_SKEW(vrrp); + vrrp->ms_down_timer = 3 * vrrp->adver_int + VRRP_TIMER_SKEW(vrrp); + notify_instance_exec(vrrp, VRRP_STATE_FAULT); } else { /* If becoming MASTER in IPSEC AH AUTH, we reset the anti-replay */ if (vrrp->ipsecah_counter->cycle) { @@ -789,10 +789,12 @@ vrrp_ah_sync(vrrp); } else { /* Otherwise, we transit to init state */ - if (vrrp->init_state == VRRP_STATE_BACK) + if (vrrp->init_state == VRRP_STATE_BACK) { vrrp->state = VRRP_STATE_BACK; - else + notify_instance_exec(vrrp, VRRP_STATE_BACK); + } else { vrrp_goto_master(vrrp); + } } } @@ -988,6 +990,12 @@ if (WIFEXITED(wait_status)) { int status; status = WEXITSTATUS(wait_status); + if (status == 0 && vscript->result != VRRP_SCRIPT_STATUS_GOOD) { + syslog(LOG_INFO, "VRRP_Script(%s) succeeded", vscript->sname); + } + if (status != 0 && vscript->result != VRRP_SCRIPT_STATUS_NONE) { + syslog(LOG_INFO, "VRRP_Script(%s) failed", vscript->sname); + } vscript->result = (status == 0) ? VRRP_SCRIPT_STATUS_GOOD : VRRP_SCRIPT_STATUS_NONE; } diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_sync.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_sync.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_sync.c 2006-10-11 11:46:01.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_sync.c 2007-09-14 17:21:52.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: VRRP synchronization framework. * - * Version: $Id: vrrp_sync.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_sync.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "vrrp_sync.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_track.c /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_track.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived/vrrp/vrrp_track.c 2006-10-11 11:46:05.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived/vrrp/vrrp_track.c 2007-09-14 17:21:57.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Interface tracking framework. * - * Version: $Id: vrrp_track.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: vrrp_track.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ /* local include */ @@ -125,7 +125,7 @@ tsc = (tracked_sc *) MALLOC(sizeof (tracked_sc)); tsc->scr = vsc; tsc->weight = weight; - if (weight > 0) + if (weight != 0) vsc->inuse++; list_add(track_list, tsc); } diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived.spec.in /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived.spec.in --- /tmp/uUQpUd4uAg/keepalived-1.1.13/keepalived.spec.in 2006-03-07 17:05:52.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/keepalived.spec.in 2007-09-18 11:43:49.000000000 +0200 @@ -1,57 +1,160 @@ -Name: keepalived +# $Id$ +# Authority: dag + +# Ugly, but we need headers from a kernel to rebuild against +%define kernel %(rpm -q kernel-devel --qf '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}\\n' 2>/dev/null | head -1) + Summary: HA monitor built upon LVS, VRRP and services poller -Packager: Christophe Varoqui, -Version: @VERSION@ -Release: 1 -Source: http://www.keepalived.org/software/%{name}-%{version}.tar.gz -Copyright: GPL +Name: keepalived +Version: 1.1.15 +Release: 5 +License: GPL Group: Applications/System -BuildRoot: /tmp/%{name}-%{version}.build +URL: http://www.keepalived.org/ + +Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -%define _exec_prefix / +BuildRequires: openssl-devel +# We need both of these for proper LVS support +BuildRequires: kernel, kernel-devel +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service, /sbin/chkconfig +Requires(postun): /sbin/service %description -The main goal of the keepalived project is to add a strong & robust keepalive facility to the Linux Virtual Server project. This project is written in C with multilayer TCP/IP stack checks. Keepalived implements a framework based on three family checks : Layer3, Layer4 & Layer5. This framework gives the daemon the ability of checking a LVS server pool states. When one of the server of the LVS server pool is down, keepalived informs the linux kernel via a setsockopt call to remove this server entrie from the LVS topology. In addition keepalived implements a VRRPv2 stack to handle director failover. So in short keepalived is a userspace daemon for LVS cluster nodes healthchecks and LVS directors failover. +The main goal of the keepalived project is to add a strong & robust keepalive +facility to the Linux Virtual Server project. This project is written in C with +multilayer TCP/IP stack checks. Keepalived implements a framework based on +three family checks : Layer3, Layer4 & Layer5/7. This framework gives the +daemon the ability to check the state of an LVS server pool. When one of the +servers of the LVS server pool is down, keepalived informs the linux kernel via +a setsockopt call to remove this server entry from the LVS topology. In +addition keepalived implements an independent VRRPv2 stack to handle director +failover. So in short keepalived is a userspace daemon for LVS cluster nodes +healthchecks and LVS directors failover. + %prep -rm -rf %{buildroot} -%setup -q +%setup + %build -export CFLAGS=-D__KERNGLUE__ -# 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 +%{?el3:export CPPFLAGS="-I/usr/kerberos/include"} +%{?rh9:export CPPFLAGS="-I/usr/kerberos/include"} +%configure \ +%{?el3:--includedir="/usr/kerberos/include"} \ +%{?rh9:--includedir="/usr/kerberos/include"} \ + --with-kernel-dir="/lib/modules/%{kernel}/build" +%{__make} %{?_smp_mflags} STRIP=/bin/true + %install -rm -rf %{buildroot} -%makeinstall -rm -rf %{buildroot}/etc/keepalived/samples +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} +# Remove "samples", as we include them in %%doc +%{__rm} -rf %{buildroot}%{_sysconfdir}/keepalived/samples/ + +%check +# A build could silently have LVS support disabled if the kernel includes can't +# be properly found, we need to avoid that. +if ! grep -q "IPVS_SUPPORT='_WITH_LVS_'" config.log; then + echo "ERROR: We do not want keeepalived lacking LVS support." + exit 1 +fi + %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} + %post /sbin/chkconfig --add keepalived %preun -/sbin/chkconfig --del keepalived +if [ $1 -eq 0 ]; then + /sbin/service keepalived stop &>/dev/null || : + /sbin/chkconfig --del keepalived +fi + +%postun +if [ $1 -ge 1 ]; then + /sbin/service keepalived condrestart &>/dev/null || : +fi + %files -%defattr(-,root,root) +%defattr(-, root, root, 0755) +%doc AUTHOR ChangeLog CONTRIBUTORS COPYING README TODO +%doc doc/keepalived.conf.SYNOPSIS doc/samples/ +%dir %{_sysconfdir}/keepalived/ +%attr(0600, root, root) %config(noreplace) %{_sysconfdir}/keepalived/keepalived.conf +%attr(0600, root, root) %config(noreplace) %{_sysconfdir}/sysconfig/keepalived +%{_sysconfdir}/rc.d/init.d/keepalived %{_bindir}/genhash %{_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 +%{_mandir}/man1/genhash.1* +%{_mandir}/man5/keepalived.conf.5* +%{_mandir}/man8/keepalived.8* + + +%changelog +* Thu Sep 13 2007 Alexandre Cassen 1.1.14 +- Merge work done by freshrpms.net... Thanks guys !!! ;) + +* Wed Feb 14 2007 Matthias Saou 1.1.13-5 +- Add missing scriplet requirements. + +* Tue Feb 13 2007 Matthias Saou 1.1.13-4 +- Add missing \n to the kernel define, for when multiple kernels are installed. +- Pass STRIP=/bin/true to "make" in order to get a useful debuginfo package. + +* Tue Feb 13 2007 Matthias Saou 1.1.13-3 +- Add %%check section to make sure any build without LVS support will fail. + +* Mon Feb 5 2007 Matthias Saou 1.1.13-2 +- Use our own init script, include a sysconfig entry used by it for options. + +* Thu Jan 25 2007 Matthias Saou 1.1.13-1 +- Update to 1.1.13. +- Change mode of configuration file to 0600. +- Don't include all of "doc" since it meant re-including all man pages. +- Don't include samples in the main configuration path, they're in %%doc. +- Include patch to add an optional label to interfaces. + +* Sat Apr 08 2006 Dries Verachtert - 1.1.12-1.2 +- Rebuild for Fedora Core 5. + +* Sun Mar 12 2006 Dag Wieers - 1.1.12-1 +- Updated to release 1.1.12. + +* Fri Mar 04 2005 Dag Wieers - 1.1.11-1 +- Updated to release 1.1.11. + +* Wed Feb 23 2005 Dag Wieers - 1.1.10-2 +- Fixed IPVS/LVS support. (Joe Sauer) + +* Tue Feb 15 2005 Dag Wieers - 1.1.10-1 +- Updated to release 1.1.10. + +* Mon Feb 07 2005 Dag Wieers - 1.1.9-1 +- Updated to release 1.1.9. + +* Sun Oct 17 2004 Dag Wieers - 1.1.7-2 +- Fixes to build with kernel IPVS support. (Tim Verhoeven) + +* Fri Sep 24 2004 Dag Wieers - 1.1.7-1 +- Updated to release 1.1.7. (Mathieu Lubrano) + +* Mon Feb 23 2004 Dag Wieers - 1.1.6-0 +- Updated to release 1.1.6. + +* Mon Jan 26 2004 Dag Wieers - 1.1.5-0 +- Updated to release 1.1.5. + +* Mon Dec 29 2003 Dag Wieers - 1.1.4-0 +- Updated to release 1.1.4. + +* Fri Jun 06 2003 Dag Wieers - 1.0.3-0 +- Initial package. (using DAR) + diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/html.c /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/html.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/html.c 2006-10-11 11:38:34.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/html.c 2007-09-14 17:17:08.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: HTML stream parser utility functions. * - * Version: $Id: html.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: html.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/html.h /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/html.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/html.h 2006-10-11 11:38:38.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/html.h 2007-09-14 17:17:13.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: parser.c include file. * - * Version: $Id: html.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: html.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _HTML_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/list.c /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/list.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/list.c 2006-10-11 11:38:44.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/list.c 2007-09-14 17:17:18.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: List structure manipulation. * - * Version: $Id: list.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: list.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "list.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/list.h /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/list.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/list.h 2006-10-11 11:38:48.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/list.h 2007-09-14 17:17:24.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: list.c include file. * - * Version: $Id: list.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: list.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _LIST_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/Makefile.in /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/Makefile.in --- /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/Makefile.in 2006-03-09 14:35:36.000000000 +0100 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/Makefile.in 2007-09-13 17:08:47.000000000 +0200 @@ -2,7 +2,7 @@ # # Keepalived OpenSource project. # -# Copyright (C) 2001-2006 Alexandre Cassen, +# Copyright (C) 2001-2007 Alexandre Cassen, CC = @CC@ INCLUDES = -I. diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/memory.c /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/memory.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/memory.c 2006-10-11 11:38:54.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/memory.c 2007-09-14 17:17:32.000000000 +0200 @@ -6,7 +6,7 @@ * Part: Memory management framework. This framework is used to * find any memory leak. * - * Version: $Id: memory.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: memory.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include "memory.h" diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/memory.h /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/memory.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/memory.h 2006-10-11 11:38:58.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/memory.h 2007-09-14 17:17:37.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: memory.c include file. * - * Version: $Id: memory.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: memory.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _MEMORY_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/notify.c /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/notify.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/notify.c 2006-10-11 11:39:02.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/notify.c 2007-09-14 17:17:43.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: Forked system call to launch an extra script. * - * Version: $Id: notify.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: notify.c,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #include diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/notify.h /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/notify.h --- /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/notify.h 2006-10-11 11:39:05.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/notify.h 2007-09-14 17:17:48.000000000 +0200 @@ -5,7 +5,7 @@ * * Part: notify.c include file. * - * Version: $Id: notify.h,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: notify.h,v 1.1.15 2007/09/15 04:07:41 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-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ #ifndef _NOTIFY_H diff -Nru /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/parser.c /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/parser.c --- /tmp/uUQpUd4uAg/keepalived-1.1.13/lib/parser.c 2006-10-11 11:39:10.000000000 +0200 +++ /tmp/qZRLuX1bC7/keepalived-1.1.15/lib/parser.c 2007-09-14 17:17:53.000000000 +0200 @@ -7,7 +7,7 @@ * data structure representation the conf file representing * the loadbalanced server pool. * - * Version: $Id: parser.c,v 1.1.13 2006/10/11 05:22:13 acassen Exp $ + * Version: $Id: parser.c,v 1.1.15 2007/09/15 04:07:41 acassen Exp $ * * Author: Alexandre Cassen, * @@ -21,15 +21,21 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * Copyright (C) 2001-2006 Alexandre Cassen, + * Copyright (C) 2001-2007 Alexandre Cassen, */ +#include