X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=dummy%2Fproto%2Fppp.sh;h=c710bf2e020b428de15e423f065630abb7460c0e;hp=6f5dfcc3292e1b3fe1dd6d3c63f200ee0f4e645e;hb=c78fa1d049d932dae93c64f7819e112083cd3d55;hpb=14f7651a6e61ccd870be78dd6b303057ea982414

diff --git a/dummy/proto/ppp.sh b/dummy/proto/ppp.sh
index 6f5dfcc..c710bf2 100755
--- a/dummy/proto/ppp.sh
+++ b/dummy/proto/ppp.sh
@@ -3,50 +3,62 @@
 . ../netifd-proto.sh
 init_proto "$@"
 
-ppp_init_config() {
+ppp_generic_init_config() {
 	proto_config_add_string "username"
 	proto_config_add_string "password"
 	proto_config_add_int "keepalive"
 }
 
-ppp_setup() {
-	echo "ppp_setup($1): $2"
+proto_ppp_init_config() {
+	no_device=1
+	available=1
+	ppp_generic_init_config
 }
 
-ppp_teardown() {
-	return
+proto_ppp_setup() {
+	echo "ppp_setup($1): $2"
 }
 
-ppp_init() {
-	no_device=1
-	available=1
+proto_ppp_teardown() {
+	return
 }
 
 add_protocol ppp
 
-pppoe_init_config() {
-	ppp_init_config
-}
-
-pppoe_init() {
-	return
+proto_pppoe_init_config() {
+	ppp_generic_init_config
 }
 
-pppoe_setup() {
+proto_pppoe_setup() {
 	local interface="$1"
 	local device="$2"
 
 	json_get_var username username
 	json_get_var password password
 	echo "pppoe_setup($interface, $device), username=$username, password=$password"
-	proto_init_update ppp0 1
+	proto_init_update pppoe-$interface 1
+	proto_set_keep 1
 	proto_add_ipv4_address "192.168.2.1" 32
 	proto_add_dns_server "192.168.2.2"
+	proto_add_ipv4_route "0.0.0.0" 0 192.168.2.2
+	proto_add_data
+	json_add_string "ppp-type" "pppoe"
+	proto_close_data
 	proto_send_update "$interface"
+
+	proto_init_update pppoe-$interface 1
+	proto_set_keep 1
+	proto_add_ipv6_address "fe80::2" 64
+	proto_add_ipv6_route "::0" 0 "fe80::1"
+	proto_add_data
+	json_add_string "ppp-type" "pppoe"
+	proto_close_data
+	proto_send_update "$interface"
+
 	proto_run_command "$interface" sleep 30
 }
 
-pppoe_teardown() {
+proto_pppoe_teardown() {
 	[ "$ERROR" = 9 ] && {
 		proto_notify_error "$interface" PROCESS_KILLED
 		proto_block_restart "$interface"