X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=scripts%2Fnetifd-proto.sh;h=7f08b1d15c725dd45b85b919712b6bb0d6026fa6;hp=76dcd8dcae777213383642c970e42e802f95377e;hb=57bf943634acbdeaa41a0a67443e41627cc9c747;hpb=7115f236a57328f366cf6dbd2007b3899afda73e

diff --git a/scripts/netifd-proto.sh b/scripts/netifd-proto.sh
index 76dcd8d..7f08b1d 100644
--- a/scripts/netifd-proto.sh
+++ b/scripts/netifd-proto.sh
@@ -4,15 +4,15 @@ NETIFD_MAIN_DIR="${NETIFD_MAIN_DIR:-/lib/netifd}"
 . $NETIFD_MAIN_DIR/utils.sh
 
 proto_config_add_int() {
-	_config_add_generic "$1" 5
+	config_add_int "$@"
 }
 
 proto_config_add_string() {
-	_config_add_generic "$1" 3
+	config_add_string "$@"
 }
 
 proto_config_add_boolean() {
-	_config_add_generic "$1" 7
+	config_add_boolean "$@"
 }
 
 _proto_do_teardown() {
@@ -106,8 +106,9 @@ proto_add_ipv6_address() {
 	local preferred="$3"
 	local valid="$4"
 	local offlink="$5"
+	local class="$6"
 
-	append PROTO_IP6ADDR "$address/$mask/$preferred/$valid/$offlink"
+	append PROTO_IP6ADDR "$address/$mask/$preferred/$valid/$offlink/$class"
 }
 
 proto_add_ipv4_route() {
@@ -175,6 +176,8 @@ _proto_push_ipv6_addr() {
 	valid="${str%%/*}"
 	str="${str#*/}"
 	offlink="${str%%/*}"
+	str="${str#*/}"
+	class="${str%%/*}"
 
 	json_add_object ""
 	json_add_string ipaddr "$address"
@@ -182,6 +185,7 @@ _proto_push_ipv6_addr() {
 	[ -n "$preferred" ] && json_add_int preferred "$preferred"
 	[ -n "$valid" ] && json_add_int valid "$valid"
 	[ -n "$offlink" ] && json_add_boolean offlink "$offlink"
+	[ -n "$class" ] && json_add_string class "$class"
 	json_close_object
 }