fix Calling-Station-Id in RADIUS accounting records

diff --git a/Changes b/Changes
index 90d7075..e2f237f 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+* Fri Sep 30 2005 Brendan O'Dea <bod@optus.net> 2.1.9
+- Fix Calling-Station-Id in RADIUS accounting records (Slobodan Tomic).
+

 * Mon Sep 19 2005 Brendan O'Dea <bod@optus.net> 2.1.8
 - Move code from signal handlers into mainloop, avoiding a race
   condition when forking CLI.
 * Mon Sep 19 2005 Brendan O'Dea <bod@optus.net> 2.1.8
 - Move code from signal handlers into mainloop, avoiding a race
   condition when forking CLI.

diff --git a/THANKS b/THANKS
index 16e4f5b..08ca6e2 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -19,3 +19,4 @@ Vladislav Bjelic           <vladislav@gmail.com>
 Alex Kiernan               <alex.kiernan@gmail.com>
 Dominique Rousseau         <d.rousseau@nnx.com>
 Tim Devries                <tdevries@northrock.bm>
 Alex Kiernan               <alex.kiernan@gmail.com>
 Dominique Rousseau         <d.rousseau@nnx.com>
 Tim Devries                <tdevries@northrock.bm>

+Slobodan Tomic             <stomic@loznica.com>

diff --git a/l2tpns.h b/l2tpns.h
index 5c09dde..bc99ac1 100644 (file)
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
 // L2TPNS Global Stuff

-// $Id: l2tpns.h,v 1.92 2005/09/19 00:29:12 bodea Exp $
+// $Id: l2tpns.h,v 1.93 2005/09/30 13:13:26 bodea Exp $

 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__


@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <libcli.h>
 
 #include <sys/types.h>
 #include <libcli.h>
 

-#define VERSION        "2.1.8"
+#define VERSION        "2.1.9"

 
 // Limits
 #define MAXTUNNEL      500             // could be up to 65535
 
 // Limits
 #define MAXTUNNEL      500             // could be up to 65535

diff --git a/l2tpns.spec b/l2tpns.spec
index 1a278a0..1eab27c 100644 (file)
--- a/l2tpns.spec
+++ b/l2tpns.spec
@@ -1,6 +1,6 @@
 Summary: A high-speed clustered L2TP LNS
 Name: l2tpns
 Summary: A high-speed clustered L2TP LNS
 Name: l2tpns

-Version: 2.1.8
+Version: 2.1.9

 Release: 1
 Copyright: GPL
 Group: System Environment/Daemons
 Release: 1
 Copyright: GPL
 Group: System Environment/Daemons


@@ -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

-* Mon Sep 19 2005 Brendan O'Dea <bod@optus.net> 2.1.8-1
-- 2.1.8 release, see /usr/share/doc/l2tpns-2.1.8/Changes
+* Fri Sep 30 2005 Brendan O'Dea <bod@optus.net> 2.1.9-1
+- 2.1.9 release, see /usr/share/doc/l2tpns-2.1.9/Changes

diff --git a/radius.c b/radius.c
index ce1d39e..1cdfe7d 100644 (file)
--- a/radius.c
+++ b/radius.c
@@ -1,6 +1,6 @@
 // L2TPNS Radius Stuff
 
 // L2TPNS Radius Stuff
 

-char const *cvs_id_radius = "$Id: radius.c,v 1.41 2005/08/31 12:41:09 bodea Exp $";
+char const *cvs_id_radius = "$Id: radius.c,v 1.42 2005/09/30 13:13:26 bodea Exp $";

 
 #include <time.h>
 #include <stdio.h>
 
 #include <time.h>
 #include <stdio.h>


@@ -326,7 +326,7 @@ void radiussend(uint16_t r, uint8_t state)
                strcpy((char *) p + 2, session[s].called);
                p += p[1];
        }
                strcpy((char *) p + 2, session[s].called);
                p += p[1];
        }

-       else if (*session[s].calling)
+       if (*session[s].calling)

        {
                *p = 31;                // calling
                p[1] = strlen(session[s].calling) + 2;
        {
                *p = 31;                // calling
                p[1] = strlen(session[s].calling) + 2;