correct addition of single IP to pool

diff --git a/Changes b/Changes
index 48ceaa1..b37bb45 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
-* Tue Dec 20 2005 Brendan O'Dea <bod@optus.net> 2.1.16
+* Fri Jan 20 2006 Brendan O'Dea <bod@optus.net> 2.1.16

 - Send configured magic-no in LCP EchoReq when LCP is opened.
 - Send configured magic-no in LCP EchoReq when LCP is opened.

+- Correct addition of single IP to pool (Jonathan Yarden).

 
 * Mon Dec 19 2005 Brendan O'Dea <bod@optus.net> 2.1.15
 - Drop backtrace.
 
 * Mon Dec 19 2005 Brendan O'Dea <bod@optus.net> 2.1.15
 - Drop backtrace.

diff --git a/THANKS b/THANKS
index 73c5086..9b245f2 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -24,3 +24,4 @@ Michael Chapman            <mike.chapman@optus.net>
 Charlie Brady              <charlieb@e-smith.com>
 Jon Morby                  <jon@fido.net>
 Paul Martin                <pm@zetnet.net>
 Charlie Brady              <charlieb@e-smith.com>
 Jon Morby                  <jon@fido.net>
 Paul Martin                <pm@zetnet.net>

+Jonathan Yarden            <jyarden@bluegrass.net>

diff --git a/l2tpns.c b/l2tpns.c
index 6287c3e..ecae249 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
 
 // 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.154 2005/12/20 04:57:16 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.155 2006/01/19 20:55:03 bodea Exp $";

 
 #include <arpa/inet.h>
 #include <assert.h>
 
 #include <arpa/inet.h>
 #include <assert.h>


@@ -3949,7 +3949,7 @@ static void initippool()
                else
                {
                        // It's a single ip address
                else
                {
                        // It's a single ip address

-                       add_to_ip_pool(inet_addr(pool), 0);
+                       add_to_ip_pool(ntohl(inet_addr(pool)), 0);

                }
        }
        fclose(f);
                }
        }
        fclose(f);

diff --git a/l2tpns.spec b/l2tpns.spec
index 905fa1e..eff1e7c 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

-* Tue Dec 20 2005 Brendan O'Dea <bod@optus.net> 2.1.16-1
+* Fri Jan 20 2006 Brendan O'Dea <bod@optus.net> 2.1.16-1

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