From ef1d4c04584076dc77fc8df62c996feb1ac10c41 Mon Sep 17 00:00:00 2001
From: Dmitry Kozlov <xeb@mail.ru>
Date: Sat, 20 Aug 2011 10:03:12 +0400
Subject: ppp: initial IPV6CP support

---
 accel-pppd/CMakeLists.txt | 1 +
 accel-pppd/ppp/ccp_mppe.c | 1 +
 accel-pppd/ppp/ppp.c      | 1 +
 accel-pppd/ppp/ppp.h      | 5 ++---
 accel-pppd/ppp/ppp_ccp.c  | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'accel-pppd')

diff --git a/accel-pppd/CMakeLists.txt b/accel-pppd/CMakeLists.txt
index 10de4bbf..aaafbd94 100644
--- a/accel-pppd/CMakeLists.txt
+++ b/accel-pppd/CMakeLists.txt
@@ -65,6 +65,7 @@ ADD_EXECUTABLE(accel-pppd
 	ppp/ppp_ipcp.c
 	ppp/ipcp_opt_ipaddr.c
 	ppp/ipcp_opt_dns.c
+	ppp/ipv6cp_opt_intfid.c
 	ppp/ppp_ipv6cp.c
 	ppp/ppp_ccp.c	
 	ppp/ccp_mppe.c
diff --git a/accel-pppd/ppp/ccp_mppe.c b/accel-pppd/ppp/ccp_mppe.c
index 0952aa01..cf83d2d7 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 a044d9a6..7ce3b4ba 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 8556b2c2..e8141cc1 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 d4732fa3..58a4abf6 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"
-- 
cgit v1.2.3