[source] mdns: update and rename package to the umdns
LEDE Commits
lede-commits at lists.infradead.org
Wed Feb 15 03:05:57 PST 2017
rmilecki pushed a commit to source.git, branch master:
https://git.lede-project.org/2a6fbce1218e7ed8ffaf997b1da03be244d744c9
commit 2a6fbce1218e7ed8ffaf997b1da03be244d744c9
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Wed Feb 15 11:46:57 2017 +0100
mdns: update and rename package to the umdns
This update includes numerous small fixes for:
1) Interfaces setup
2) Packets parsing
3) Sending replies
Without this there were multiple problems with exchanging information
between (u)mdns and other implementations (including (u)mdns as well).
This also follows project rename to umdns which was required to avoid
confusion with Apple's mdnsd from mDNSResponder project.
Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
package/network/services/{mdns => umdns}/Makefile | 26 +++++++++++-----------
.../files/mdns.config => umdns/files/umdns.config} | 2 +-
.../files/mdns.init => umdns/files/umdns.init} | 20 ++++++++---------
.../files/mdns.json => umdns/files/umdns.json} | 0
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/package/network/services/mdns/Makefile b/package/network/services/umdns/Makefile
similarity index 56%
rename from package/network/services/mdns/Makefile
rename to package/network/services/umdns/Makefile
index 2c6d1b7..832cf6e 100644
--- a/package/network/services/mdns/Makefile
+++ b/package/network/services/umdns/Makefile
@@ -7,14 +7,14 @@
include $(TOPDIR)/rules.mk
-PKG_NAME:=mdns
+PKG_NAME:=umdns
PKG_RELEASE:=1
PKG_SOURCE_URL=$(LEDE_GIT)/project/mdnsd.git
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2017-01-31
-PKG_SOURCE_VERSION:=9cbbb141068c12ed032736e20f982e2a0fb43edc
-PKG_MIRROR_HASH:=2b981bd2f695f4da63b51be33b42dcda132c6adab227eda2f68a5c534284aea9
+PKG_SOURCE_DATE:=2017-02-15
+PKG_SOURCE_VERSION:=0d545ed7287026584722a3f9aa855c29bd24d59f
+PKG_MIRROR_HASH:=9670680a31f8eca5724da4cd12efedcbc27563b09ed4d94218f5debee1673abc
PKG_MAINTAINER:=John Crispin <john at phrozen.org>
PKG_LICENSE:=LGPL-2.1
@@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package-seccomp.mk
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
-define Package/mdns
+define Package/umdns
SECTION:=net
CATEGORY:=Network
TITLE:=OpenWrt Multicast DNS Daemon
@@ -32,16 +32,16 @@ endef
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-define Package/mdns/conffiles
-/etc/config/mdns
+define Package/umdns/conffiles
+/etc/config/umdns
endef
-define Package/mdns/install
+define Package/umdns/install
$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/mdns $(1)/usr/sbin/
- $(INSTALL_BIN) ./files/mdns.init $(1)/etc/init.d/mdns
- $(INSTALL_CONF) ./files/mdns.config $(1)/etc/config/mdns
- $(call InstallSeccomp,$(1),./files/mdns.json)
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/umdns $(1)/usr/sbin/
+ $(INSTALL_BIN) ./files/umdns.init $(1)/etc/init.d/umdns
+ $(INSTALL_CONF) ./files/umdns.config $(1)/etc/config/umdns
+ $(call InstallSeccomp,$(1),./files/umdns.json)
endef
-$(eval $(call BuildPackage,mdns))
+$(eval $(call BuildPackage,umdns))
diff --git a/package/network/services/mdns/files/mdns.config b/package/network/services/umdns/files/umdns.config
similarity index 71%
rename from package/network/services/mdns/files/mdns.config
rename to package/network/services/umdns/files/umdns.config
index b09eaf5..d4936bb 100644
--- a/package/network/services/mdns/files/mdns.config
+++ b/package/network/services/umdns/files/umdns.config
@@ -1,3 +1,3 @@
-config mdns
+config umdns
option jail 1
list network lan
diff --git a/package/network/services/mdns/files/mdns.init b/package/network/services/umdns/files/umdns.init
similarity index 59%
rename from package/network/services/mdns/files/mdns.init
rename to package/network/services/umdns/files/umdns.init
index c0f9155..627930b 100644
--- a/package/network/services/mdns/files/mdns.init
+++ b/package/network/services/umdns/files/umdns.init
@@ -6,11 +6,11 @@
START=80
USE_PROCD=1
-PROG=/usr/sbin/mdns
+PROG=/usr/sbin/umdns
IFACES=""
load_ifaces() {
- local network="$(uci get mdns. at mdns[-1].network)"
+ local network="$(uci get umdns. at umdns[-1].network)"
for n in $network; do
local device
json_load "$(ifstatus $n)"
@@ -27,28 +27,28 @@ reload_service() {
done
json_close_array
- ubus call mdns set_config "$(json_dump)"
+ ubus call umdns set_config "$(json_dump)"
}
start_service() {
- local network="$(uci get mdns. at mdns[-1].network)"
+ local network="$(uci get umdns. at umdns[-1].network)"
procd_open_instance
procd_set_param command "$PROG"
- procd_set_param seccomp /etc/seccomp/mdns.json
+ procd_set_param seccomp /etc/seccomp/umdns.json
procd_set_param respawn
procd_open_trigger
- procd_add_config_trigger "config.change" "mdns" /etc/init.d/mdns reload
+ procd_add_config_trigger "config.change" "umdns" /etc/init.d/umdns reload
for n in $network; do
- procd_add_interface_trigger "interface.*" $n /etc/init.d/mdns reload
+ procd_add_interface_trigger "interface.*" $n /etc/init.d/umdns reload
done
- procd_add_raw_trigger "instance.update" 5000 "/bin/ubus" "call" "mdns" "reload"
+ procd_add_raw_trigger "instance.update" 5000 "/bin/ubus" "call" "umdns" "reload"
procd_close_trigger
- [ "$(uci get mdns. at mdns[-1].jail)" = 1 ] && procd_add_jail mdns ubus log
+ [ "$(uci get umdns. at umdns[-1].jail)" = 1 ] && procd_add_jail umdns ubus log
procd_close_instance
}
service_started() {
- ubus -t 10 wait_for mdns
+ ubus -t 10 wait_for umdns
[ $? = 0 ] && reload_service
}
diff --git a/package/network/services/mdns/files/mdns.json b/package/network/services/umdns/files/umdns.json
similarity index 100%
rename from package/network/services/mdns/files/mdns.json
rename to package/network/services/umdns/files/umdns.json
More information about the lede-commits
mailing list