projects
/
l2tpns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
handle LCP NAK of magic-number
[l2tpns.git]
/
l2tpns.c
diff --git
a/l2tpns.c
b/l2tpns.c
index
5fe05c9
..
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.15
3 2005/12/19 06:08:42
bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.15
5 2006/01/19 20:55:03
bodea Exp $";
#include <arpa/inet.h>
#include <assert.h>
#include <arpa/inet.h>
#include <assert.h>
@@
-2918,7
+2918,7
@@
static void regular_cleanups(double period)
*q = EchoReq;
*(uint8_t *)(q + 1) = (time_now % 255); // ID
*(uint16_t *)(q + 2) = htons(8); // Length
*q = EchoReq;
*(uint8_t *)(q + 1) = (time_now % 255); // ID
*(uint16_t *)(q + 2) = htons(8); // Length
- *(uint32_t *)(q + 4) =
0; // Magic Number (not supported)
+ *(uint32_t *)(q + 4) =
session[s].ppp.lcp == Opened ? htonl(session[s].magic) : 0; // Magic Number
LOG(4, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n",
(int)(time_now - session[s].last_packet));
LOG(4, s, session[s].tunnel, "No data in %d seconds, sending LCP ECHO\n",
(int)(time_now - session[s].last_packet));
@@
-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);