restart BGP on receipt of CEASE

diff --git a/Changes b/Changes
index 1b205bf..be6c2da 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,7 +1,8 @@
-* Thu Sep 1 2005 Brendan O'Dea <bod@optus.net> 2.1.5
+* Sat Sep 3 2005 Brendan O'Dea <bod@optus.net> 2.1.5

 - Avoid Code-Reject loop.
 - Increase size of PPP buffers to MAXETHER.
 - Bug fixes for CLI ringbuffer and tunnel HELLO from Yuri.
 - Avoid Code-Reject loop.
 - Increase size of PPP buffers to MAXETHER.
 - Bug fixes for CLI ringbuffer and tunnel HELLO from Yuri.

+- Restart rather than halt BGP on receipt of CEASE (Dominique Rousseau).

 
 * Mon Aug 29 2005 Brendan O'Dea <bod@optus.net> 2.1.4
 - Drop level of "Unexpected CHAP message" log.
 
 * Mon Aug 29 2005 Brendan O'Dea <bod@optus.net> 2.1.4
 - Drop level of "Unexpected CHAP message" log.

diff --git a/THANKS b/THANKS
index 3262976..679ec31 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -17,3 +17,4 @@ Roberto Chostakovis        <rchostakovis@users.sourceforge.net>
 Jordan Hrycaj              <jordan@mjh.teddy-net.com>
 Vladislav Bjelic           <vladislav@gmail.com>
 Alex Kiernan               <alex.kiernan@gmail.com>
 Jordan Hrycaj              <jordan@mjh.teddy-net.com>
 Vladislav Bjelic           <vladislav@gmail.com>
 Alex Kiernan               <alex.kiernan@gmail.com>

+Dominique Rousseau         <d.rousseau@nnx.com>

diff --git a/bgp.c b/bgp.c
index a318d96..6a868fa 100644 (file)
--- a/bgp.c
+++ b/bgp.c
@@ -10,7 +10,7 @@
  *   nor RFC2385 (which requires a kernel patch on 2.4 kernels).
  */
 
  *   nor RFC2385 (which requires a kernel patch on 2.4 kernels).
  */
 

-char const *cvs_id_bgp = "$Id: bgp.c,v 1.11 2005/07/31 10:04:09 bodea Exp $";
+char const *cvs_id_bgp = "$Id: bgp.c,v 1.12 2005/09/02 23:39:36 bodea Exp $";

 
 #include <stdlib.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 #include <unistd.h>


@@ -996,7 +996,7 @@ static int bgp_handle_input(struct bgp_peer *peer)
            if (notification->error_code == BGP_ERR_CEASE)
            {
                LOG(4, 0, 0, "BGP peer %s sent CEASE\n", peer->name);
            if (notification->error_code == BGP_ERR_CEASE)
            {
                LOG(4, 0, 0, "BGP peer %s sent CEASE\n", peer->name);

-               bgp_halt(peer);
+               bgp_restart(peer);

                return 0;
            }
 
                return 0;
            }
 

diff --git a/l2tpns.spec b/l2tpns.spec
index d54512a..ece8aae 100644 (file)
--- a/l2tpns.spec
+++ b/l2tpns.spec
@@ -43,5 +43,5 @@ rm -rf %{buildroot}
 %attr(644,root,root) /usr/share/man/man[58]/*
 
 %changelog
 %attr(644,root,root) /usr/share/man/man[58]/*
 
 %changelog

-* Thu Sep 1 2005 Brendan O'Dea <bod@optus.net> 2.1.5-1
+* Sat Sep 3 2005 Brendan O'Dea <bod@optus.net> 2.1.5-1

 - 2.1.5 release, see /usr/share/doc/l2tpns-2.1.5/Changes
 - 2.1.5 release, see /usr/share/doc/l2tpns-2.1.5/Changes