contrib/package/freifunk-watchdog: fixup build and package dependencies, fix hysteres...

diff --git a/contrib/package/freifunk-watchdog/Makefile b/contrib/package/freifunk-watchdog/Makefile
index 6d36d09..403fb9c 100644 (file)
--- a/contrib/package/freifunk-watchdog/Makefile
+++ b/contrib/package/freifunk-watchdog/Makefile
@@ -11,6 +11,7 @@ PKG_NAME:=freifunk-watchdog
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

+PKG_BUILD_DEPENDS := uci

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -18,6 +19,7 @@ define Package/freifunk-watchdog
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Freifunk Ad-Hoc watchdog daemon
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Freifunk Ad-Hoc watchdog daemon

+  DEPENDS:=libuci

 endef
 
 define Package/freifunk-watchdog/description
 endef
 
 define Package/freifunk-watchdog/description

diff --git a/contrib/package/freifunk-watchdog/src/watchdog.c b/contrib/package/freifunk-watchdog/src/watchdog.c
index b431b6d..d4ccff8 100644 (file)
--- a/contrib/package/freifunk-watchdog/src/watchdog.c
+++ b/contrib/package/freifunk-watchdog/src/watchdog.c
@@ -69,7 +69,7 @@ static int iw_get_channel(int iwfd, const char *ifname, int *channel)
                }
 
                for(i = 0; i < range->num_frequency; i++)
                }
 
                for(i = 0; i < range->num_frequency; i++)

-           {
+               {

                        cmp_freq = ((double)range->freq[i].m) * pow(10, range->freq[i].e);
                        if( cmp_freq == cur_freq )
                        {
                        cmp_freq = ((double)range->freq[i].m) * pow(10, range->freq[i].e);
                        if( cmp_freq == cur_freq )
                        {


@@ -302,7 +302,7 @@ static int do_daemon(void)
                                }
 
                                /* Check channel */
                                }
 
                                /* Check channel */

-                               if( channel != curif->channel )
+                               else if( channel != curif->channel )

                                {
                                        syslog(LOG_WARNING, "Channel mismatch on %s: current=%d wanted=%d",
                                                curif->ifname, channel, curif->channel);
                                {
                                        syslog(LOG_WARNING, "Channel mismatch on %s: current=%d wanted=%d",
                                                curif->ifname, channel, curif->channel);