fix generateload

diff --git a/Changes b/Changes
index d718511..37ccf82 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,4 +1,4 @@
-* Sun Jul 31 2005 Brendan O'Dea <bod@> 2.1.2
+* Tue Aug 2 2005 Brendan O'Dea <bod@optus.net> 2.1.2

 - Clear cluster_master on election so that slaves will accept a new master.
 - Provide more comments/defaults in etc/startup-config.default.
 - Add DAE support (PoD/CoA) from Vladislav Bjelic.
 - Clear cluster_master on election so that slaves will accept a new master.
 - Provide more comments/defaults in etc/startup-config.default.
 - Add DAE support (PoD/CoA) from Vladislav Bjelic.


@@ -6,6 +6,7 @@
 - Replace flags used for LCP/IPCP with state machine.
 - Use openssl MD5, fix DAE vector (Alex Kiernan).
 - Include Acct-Session-Time in interim records.
 - Replace flags used for LCP/IPCP with state machine.
 - Use openssl MD5, fix DAE vector (Alex Kiernan).
 - Include Acct-Session-Time in interim records.

+- Fix generateload (Alex Kiernan).

 
 * Tue Jun 14 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.1
 - Add missing newline to backtrace macro.
 
 * Tue Jun 14 2005 Brendan O'Dea <bod@optusnet.com.au> 2.1.1
 - Add missing newline to backtrace macro.

diff --git a/l2tpns.spec b/l2tpns.spec
index c3d63ca..afa79be 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

-* Sun Jul 31 2005 Brendan O'Dea <bod@> 2.1.2-1
+* Tue Aug 2 2005 Brendan O'Dea <bod@optus.net> 2.1.2-1

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

diff --git a/test/generateload.c b/test/generateload.c
index a58d5f2..0b32199 100644 (file)
--- a/test/generateload.c
+++ b/test/generateload.c
@@ -284,7 +284,7 @@ int main(int argc, char *argv[])
                                break;
                        case 'm' :
                                max_packets = atoi(optarg);
                                break;
                        case 'm' :
                                max_packets = atoi(optarg);

-                               if (packet_length < 64)
+                               if (max_packets < 50)

                                {
                                        printf("You must send at least 50 packets.\n");
                                        return -1;
                                {
                                        printf("You must send at least 50 packets.\n");
                                        return -1;


@@ -1023,9 +1023,9 @@ void reader_thread(int updfd)/*{{{*/
                                                controlfree(r);
                                                break;
                                        case CONFNAK :
                                                controlfree(r);
                                                break;
                                        case CONFNAK :

-                                               // Ack whatever address we are given - it's ours
-                                               r = ppp_ipcp(s, CONFACK, time(NULL) % 255);
-                                               ppp_lcp_add_option(r, 3, 4, address); // Request 0.0.0.0
+                                               // Request whatever address we are given - it's ours
+                                               r = ppp_ipcp(s, CONFREQ, time(NULL) % 255);
+                                               ppp_lcp_add_option(r, 3, 4, address);

                                                ppp_send(r);
                                                controlfree(r);
                                                printf("Session %d: %s\n", s, inet_toa(address));
                                                ppp_send(r);
                                                controlfree(r);
                                                printf("Session %d: %s\n", s, inet_toa(address));