summaryrefslogtreecommitdiff
path: root/accel-pppd/ppp
diff options
context:
space:
mode:
authorDmitry Kozlov <xeb@mail.ru>2011-08-20 10:03:12 +0400
committerDmitry Kozlov <xeb@mail.ru>2011-08-20 10:05:00 +0400
commitef1d4c04584076dc77fc8df62c996feb1ac10c41 (patch)
tree5b27de8450435d72d13d7c9d3c764ba8df4460f8 /accel-pppd/ppp
parenta04cc1eba9bdf614eea9d7858db4581fc22474d7 (diff)
downloadaccel-ppp-xebd-ef1d4c04584076dc77fc8df62c996feb1ac10c41.tar.gz
accel-ppp-xebd-ef1d4c04584076dc77fc8df62c996feb1ac10c41.zip
ppp: initial IPV6CP support
Diffstat (limited to 'accel-pppd/ppp')
-rw-r--r--accel-pppd/ppp/ccp_mppe.c1
-rw-r--r--accel-pppd/ppp/ppp.c1
-rw-r--r--accel-pppd/ppp/ppp.h5
-rw-r--r--accel-pppd/ppp/ppp_ccp.c1
4 files changed, 5 insertions, 3 deletions
diff --git a/accel-pppd/ppp/ccp_mppe.c b/accel-pppd/ppp/ccp_mppe.c
index 0952aa0..cf83d2d 100644
--- a/accel-pppd/ppp/ccp_mppe.c
+++ b/accel-pppd/ppp/ccp_mppe.c
@@ -1,6 +1,7 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <arpa/inet.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include "linux_ppp.h"
diff --git a/accel-pppd/ppp/ppp.c b/accel-pppd/ppp/ppp.c
index a044d9a..7ce3b4b 100644
--- a/accel-pppd/ppp/ppp.c
+++ b/accel-pppd/ppp/ppp.c
@@ -493,6 +493,7 @@ static int get_layer_order(const char *name)
if (!strcmp(name,"auth")) return 1;
if (!strcmp(name,"ccp")) return 2;
if (!strcmp(name,"ipcp")) return 2;
+ if (!strcmp(name,"ipv6cp")) return 2;
return -1;
}
diff --git a/accel-pppd/ppp/ppp.h b/accel-pppd/ppp/ppp.h
index 8556b2c..e8141cc 100644
--- a/accel-pppd/ppp/ppp.h
+++ b/accel-pppd/ppp/ppp.h
@@ -3,7 +3,6 @@
#include <sys/types.h>
#include <time.h>
-#include <netinet/in.h>
#include <pthread.h>
#include "triton.h"
@@ -95,8 +94,8 @@ struct ppp_t
time_t start_time;
time_t stop_time;
char *username;
- in_addr_t ipaddr;
- in_addr_t peer_ipaddr;
+ uint32_t ipaddr;
+ uint32_t peer_ipaddr;
struct ppp_ctrl_t *ctrl;
diff --git a/accel-pppd/ppp/ppp_ccp.c b/accel-pppd/ppp/ppp_ccp.c
index d4732fa..58a4abf 100644
--- a/accel-pppd/ppp/ppp_ccp.c
+++ b/accel-pppd/ppp/ppp_ccp.c
@@ -1,6 +1,7 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <arpa/inet.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include "linux_ppp.h"