Merge pull request #13184 from PolynomialDivision/feature/dawnupdate

dawn: bump to latest version

net/dawn/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dawn
-PKG_SOURCE_DATE:=2020-08-07
+PKG_SOURCE_DATE:=2020-08-21
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/berlin-open-wireless-lab/DAWN.git
-PKG_SOURCE_VERSION:=50d54a625366cffd48f0ec3f23456d5a04c45fd3
-PKG_MIRROR_HASH:=cdea4f6ff0209afa0320e143043e0417fd6d65c349651e491f6023affd39fa10
+PKG_SOURCE_VERSION:=25a493c4384e00027cc0f38465ea19d2555b036e
+PKG_MIRROR_HASH:=2f959d5ad60d14224c1dc1bb77fe998cc909c69480dc444c89a7071dc5c8dbea
 
 PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
 PKG_LICENSE:=GPL-2.0-only

net/dawn/files/dawn.config

@@ -1,6 +1,7 @@
 config network
     option broadcast_ip         '10.0.0.255'
     option broadcast_port       '1025'
+    option server_ip            ''
     option tcp_port             '1026'
     option network_option       '2' # 0 udp broadcast, 1 multicast, 2 tcp
     option shared_key           'Niiiiiiiiiiiiiik'

net/dawn/files/dawn.init

@@ -38,11 +38,14 @@ service_triggers()
 start_service()
 {
 	local _tcp_buffer
+	local _network_option
+
 	config_load dawn
-	load_tcp_port() {
+	load_tcp_config() {
 		config_get _tcp_buffer "$1" tcp_port
+		config_get _network_option "$1" network_option
 	}
-	config_foreach load_tcp_port network
+	config_foreach load_tcp_config network
 
 	touch /tmp/dawn_mac_list
 
@@ -51,9 +54,11 @@ start_service()
 	procd_set_param command $PROG
 	procd_set_param stdout 0 # here it is possible to remove the debug output...
 	procd_set_param stderr 1
-	procd_add_mdns "dawn" "tcp" "${_tcp_buffer}"
+	if [ ${_network_option} -eq 2 ]; then
+		procd_add_mdns "dawn" "tcp" "${_tcp_buffer}"
+		echo "UMDNS with port ${_tcp_buffer}"
+	fi
 	procd_close_instance
   	echo "Dawn instance started!"
-  	echo "UMDNS with port ${_tcp_buffer}"
 }