X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=dummy%2Fnetifd-proto.sh;h=365c4338f7ccaf38cf3cbf568243a6b01f7cfcf3;hb=3d49dba94c7a2ebaa8626acf81ca74a22c7784f7;hp=74265818218847a20dba28fbb8fd10f466ad150b;hpb=264a79bad6862c39f90c521f5321be9ba2ea5f24;p=project%2Fnetifd.git

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index 7426581..365c433 100755
--- a/dummy/netifd-proto.sh
+++ b/dummy/netifd-proto.sh
@@ -104,8 +104,10 @@ proto_add_dns_search() {
 proto_add_ipv4_address() {
 	local address="$1"
 	local mask="$2"
+	local broadcast="$3"
+	local ptp="$4"
 
-	jshn_append PROTO_IPADDR "$address/$mask"
+	jshn_append PROTO_IPADDR "$address/$mask/$broadcast/$ptp"
 }
 
 proto_add_ipv6_address() {
@@ -131,7 +133,41 @@ proto_add_ipv6_route() {
 	jshn_append PROTO_ROUTE6 "$target/$mask/$gw"
 }
 
-_proto_push_ip() {
+_proto_push_ipv4_addr() {
+	local str="$1"
+	local address mask broadcast ptp
+
+	address="${str%%/*}"
+	str="${str#*/}"
+	mask="${str%%/*}"
+	str="${str#*/}"
+	broadcast="${str%%/*}"
+	str="${str#*/}"
+	ptp="$str"
+
+	json_add_object ""
+	json_add_string ipaddr "$address"
+	[ -n "$mask" ] && json_add_string mask "$mask"
+	[ -n "$broadcast" ] && json_add_string broadcast "$broadcast"
+	[ -n "$ptp" ] && json_add_string ptp "$ptp"
+	json_close_object
+}
+
+_proto_push_ipv6_addr() {
+	local str="$1"
+	local address mask
+
+	address="${str%%/*}"
+	str="${str#*/}"
+	mask="$str"
+
+	json_add_object ""
+	json_add_string ipaddr "$address"
+	[ -n "$mask" ] && json_add_string mask "$mask"
+	json_close_object
+}
+
+_proto_push_string() {
 	json_add_string "" "$1"
 }
 
@@ -173,12 +209,12 @@ proto_send_update() {
 
 	proto_close_nested
 	json_add_boolean keep "$PROTO_KEEP"
-	_proto_push_array "ipaddr" "$PROTO_IPADDR" _proto_push_ip
-	_proto_push_array "ip6addr" "$PROTO_IP6ADDR" _proto_push_ip
+	_proto_push_array "ipaddr" "$PROTO_IPADDR" _proto_push_ipv4_addr
+	_proto_push_array "ip6addr" "$PROTO_IP6ADDR" _proto_push_ipv6_addr
 	_proto_push_array "routes" "$PROTO_ROUTE" _proto_push_route
 	_proto_push_array "routes6" "$PROTO_ROUTE6" _proto_push_route
-	_proto_push_array "dns" "$PROTO_DNS" _proto_push_ip
-	_proto_push_array "dns_search" "$PROTO_DNS_SEARCH" _proto_push_ip
+	_proto_push_array "dns" "$PROTO_DNS" _proto_push_string
+	_proto_push_array "dns_search" "$PROTO_DNS_SEARCH" _proto_push_string
 	_proto_notify "$interface"
 }
 
@@ -260,6 +296,13 @@ proto_add_host_dependency() {
 	_proto_notify "$interface" -S
 }
 
+proto_setup_failed() {
+	local interface="$1"
+	json_init
+	json_add_int action 7
+	_proto_notify "$interface"
+}
+
 init_proto() {
 	proto="$1"; shift
 	cmd="$1"; shift