bug fix

diff --git a/Changes b/Changes
index 9253ee3..1b205bf 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
-* Wed Aug 31 2005 Brendan O'Dea <bod@optus.net> 2.1.5
+* Thu Sep 1 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.
 
 * Mon Aug 29 2005 Brendan O'Dea <bod@optus.net> 2.1.4
 - Drop level of "Unexpected CHAP message" log.

diff --git a/cli.c b/cli.c
index edccf11..80b92a9 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -2,7 +2,7 @@
 // vim: sw=8 ts=8
 
 char const *cvs_name = "$Name:  $";
-char const *cvs_id_cli = "$Id: cli.c,v 1.65 2005/08/10 07:53:56 bodea Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.66 2005/09/01 06:59:06 bodea Exp $";
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -1938,7 +1938,7 @@ int regular_stuff(struct cli_def *cli)
                if (!show) continue;
 
                if (!(p = strchr(m, '\n')))
-                       p = m + strlen(p);
+                       p = m + strlen(m);
 
                cli_error(cli, "\r%s-%u-%u %.*s",
                        debug_levels[(int)ringbuffer->buffer[i].level],

diff --git a/l2tpns.c b/l2tpns.c
index bc15a43..64d2ebc 100644 (file)
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,7 +4,7 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.126 2005/08/31 12:41:09 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.127 2005/09/01 06:59:06 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -2645,7 +2645,7 @@ static void regular_cleanups(double period)
                        }
                }
                // Send hello
-               if (tunnel[t].state == TUNNELOPEN && tunnel[t].lastrec < TIME + 600)
+               if (tunnel[t].state == TUNNELOPEN && (time_now - tunnel[t].lastrec) > 60)
                {
                        controlt *c = controlnew(6); // sending HELLO
                        controladd(c, 0, t); // send the message

diff --git a/l2tpns.spec b/l2tpns.spec
index 72943db..d54512a 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
-* Wed Aug 31 2005 Brendan O'Dea <bod@optus.net> 2.1.5-1
+* Thu Sep 1 2005 Brendan O'Dea <bod@optus.net> 2.1.5-1
 - 2.1.5 release, see /usr/share/doc/l2tpns-2.1.5/Changes