Merge pull request #184 from acv/reorg-util-c

Split util.c into generic and gateway specific parts

Author: mhaas

src/Makefile.am

@@ -33,7 +33,8 @@ libgateway_a_SOURCES = commandline.c \
 	safe.c \
 	httpd_thread.c \
 	simple_http.c \
-	pstring.c
+	pstring.c \
+	wd_util.c
 
 noinst_HEADERS = commandline.h \
 	common.h \
@@ -53,7 +54,8 @@ noinst_HEADERS = commandline.h \
 	safe.h \
 	httpd_thread.h \
 	simple_http.h \
-	pstring.h
+	pstring.h \
+	wd_util.h
 
 wdctl_LDADD = libgateway.a
 

src/auth.c

@@ -48,6 +48,7 @@
 #include "firewall.h"
 #include "client_list.h"
 #include "util.h"
+#include "wd_util.h"
 
 /** Launches a thread that periodically checks if any of the connections has timed out
 @param arg Must contain a pointer to a string containing the IP adress of the client to check to check

src/centralserver.c

@@ -43,6 +43,7 @@
 #include "common.h"
 #include "safe.h"
 #include "util.h"
+#include "wd_util.h"
 #include "auth.h"
 #include "conf.h"
 #include "debug.h"
@@ -258,6 +259,7 @@ _connect_auth_server(int level)
         /*
          * DNS resolving was successful
          */
+        mark_online();
         ip = safe_strdup(inet_ntoa(*h_addr));
         debug(LOG_DEBUG, "Level %d: Resolving auth server [%s] succeeded = [%s]", level, hostname, ip);
 

src/conf.h

@@ -30,12 +30,6 @@
 
 /*@{*/
 /** Defines */
-/** How many times should we try detecting the interface with the default route
- * (in seconds).  If set to 0, it will keep retrying forever */
-#define NUM_EXT_INTERFACE_DETECT_RETRY 0
-/** How often should we try to detect the interface with the default route
- *  if it isn't up yet (interval in seconds) */
-#define EXT_INTERFACE_DETECT_RETRY_INTERVAL 1
 
 /** Defaults configuration values */
 #ifndef SYSCONFDIR

src/http.c

@@ -52,8 +52,8 @@
 #include "client_list.h"
 #include "common.h"
 #include "centralserver.h"
-
 #include "util.h"
+#include "wd_util.h"
 
 #include "../config.h"
 

src/util.c

@@ -19,9 +19,6 @@
  *                                                                  *
  \********************************************************************/
 
-/*
- * $Id$
- */
 /**
   @file util.c
   @brief Misc utility functions
@@ -38,12 +35,12 @@
 #include <pthread.h>
 #include <sys/wait.h>
 #include <sys/types.h>
+#include <sys/time.h>
 #include <sys/unistd.h>
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <arpa/inet.h>
 
-#include <netinet/in.h>
 #include <net/if.h>
 
 #include <fcntl.h>
@@ -53,35 +50,34 @@
 #include <netpacket/packet.h>
 
 #include <string.h>
-#include <pthread.h>
 #include <netdb.h>
 
 #include "common.h"
-#include "client_list.h"
 #include "safe.h"
 #include "util.h"
-#include "conf.h"
 #include "debug.h"
 #include "pstring.h"
-#include "gateway.h"
-#include "commandline.h"
 
 #include "../config.h"
 
+#define LOCK_GHBN() do { \
+	debug(LOG_DEBUG, "Locking wd_gethostbyname()"); \
+	pthread_mutex_lock(&ghbn_mutex); \
+	debug(LOG_DEBUG, "wd_gethostbyname() locked"); \
+} while (0)
+
+#define UNLOCK_GHBN() do { \
+	debug(LOG_DEBUG, "Unlocking wd_gethostbyname()"); \
+	pthread_mutex_unlock(&ghbn_mutex); \
+	debug(LOG_DEBUG, "wd_gethostbyname() unlocked"); \
+} while (0)
+
 /** @brief FD for icmp raw socket */
 static int icmp_fd;
 
 /** @brief Mutex to protect gethostbyname since not reentrant */
 static pthread_mutex_t ghbn_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-/* XXX Do these need to be locked ? */
-static time_t last_online_time = 0;
-static time_t last_offline_time = 0;
-static time_t last_auth_online_time = 0;
-static time_t last_auth_offline_time = 0;
-
-long served_this_session = 0;
-
 static unsigned short rand16(void);
 
 /** Fork a child and execute a shell command, the parent
@@ -153,8 +149,6 @@ wd_gethostbyname(const char *name)
         return NULL;
     }
 
-    mark_online();
-
     in_addr_temp = (struct in_addr *)he->h_addr_list[0];
     addr->s_addr = in_addr_temp->s_addr;
 
@@ -285,190 +279,6 @@ get_ext_iface(void)
     return NULL;
 }
 
-void
-mark_online()
-{
-    int before;
-    int after;
-
-    before = is_online();
-    time(&last_online_time);
-    after = is_online();        /* XXX is_online() looks at last_online_time... */
-
-    if (before != after) {
-        debug(LOG_INFO, "ONLINE status became %s", (after ? "ON" : "OFF"));
-    }
-
-}
-
-void
-mark_offline()
-{
-    int before;
-    int after;
-
-    before = is_online();
-    time(&last_offline_time);
-    after = is_online();
-
-    if (before != after) {
-        debug(LOG_INFO, "ONLINE status became %s", (after ? "ON" : "OFF"));
-    }
-
-    /* If we're offline it definately means the auth server is offline */
-    mark_auth_offline();
-
-}
-
-int
-is_online()
-{
-    if (last_online_time == 0 || (last_offline_time - last_online_time) >= (config_get_config()->checkinterval * 2)) {
-        /* We're probably offline */
-        return (0);
-    } else {
-        /* We're probably online */
-        return (1);
-    }
-}
-
-void
-mark_auth_online()
-{
-    int before;
-    int after;
-
-    before = is_auth_online();
-    time(&last_auth_online_time);
-    after = is_auth_online();
-
-    if (before != after) {
-        debug(LOG_INFO, "AUTH_ONLINE status became %s", (after ? "ON" : "OFF"));
-    }
-
-    /* If auth server is online it means we're definately online */
-    mark_online();
-
-}
-
-void
-mark_auth_offline()
-{
-    int before;
-    int after;
-
-    before = is_auth_online();
-    time(&last_auth_offline_time);
-    after = is_auth_online();
-
-    if (before != after) {
-        debug(LOG_INFO, "AUTH_ONLINE status became %s", (after ? "ON" : "OFF"));
-    }
-
-}
-
-int
-is_auth_online()
-{
-    if (!is_online()) {
-        /* If we're not online auth is definately not online :) */
-        return (0);
-    } else if (last_auth_online_time == 0
-               || (last_auth_offline_time - last_auth_online_time) >= (config_get_config()->checkinterval * 2)) {
-        /* Auth is  probably offline */
-        return (0);
-    } else {
-        /* Auth is probably online */
-        return (1);
-    }
-}
-
-        /*
-         * @return A string containing human-readable status text. MUST BE free()d by caller
-         */
-char *
-get_status_text()
-{
-    pstr_t *pstr = pstr_new();
-    s_config *config;
-    t_auth_serv *auth_server;
-    t_client *sublist, *current;
-    int count;
-    time_t uptime = 0;
-    unsigned int days = 0, hours = 0, minutes = 0, seconds = 0;
-    t_trusted_mac *p;
-
-    pstr_cat(pstr, "WiFiDog status\n\n");
-
-    uptime = time(NULL) - started_time;
-    days = (unsigned int)uptime / (24 * 60 * 60);
-    uptime -= days * (24 * 60 * 60);
-    hours = (unsigned int)uptime / (60 * 60);
-    uptime -= hours * (60 * 60);
-    minutes = (unsigned int)uptime / 60;
-    uptime -= minutes * 60;
-    seconds = (unsigned int)uptime;
-
-    pstr_cat(pstr, "Version: " VERSION "\n");
-    pstr_append_sprintf(pstr, "Uptime: %ud %uh %um %us\n", days, hours, minutes, seconds);
-    pstr_cat(pstr, "Has been restarted: ");
-
-    if (restart_orig_pid) {
-        pstr_append_sprintf(pstr, "yes (from PID %d)\n", restart_orig_pid);
-    } else {
-        pstr_cat(pstr, "no\n");
-    }
-
-    pstr_append_sprintf(pstr, "Internet Connectivity: %s\n", (is_online()? "yes" : "no"));
-    pstr_append_sprintf(pstr, "Auth server reachable: %s\n", (is_auth_online()? "yes" : "no"));
-    pstr_append_sprintf(pstr, "Clients served this session: %lu\n\n", served_this_session);
-
-    LOCK_CLIENT_LIST();
-
-    count = client_list_dup(&sublist);
-
-    UNLOCK_CLIENT_LIST();
-
-    current = sublist;
-
-    pstr_append_sprintf(pstr, "%d clients " "connected.\n", count);
-
-    count = 1;
-    while (current != NULL) {
-        pstr_append_sprintf(pstr, "\nClient %d\n", count);
-        pstr_append_sprintf(pstr, "  IP: %s MAC: %s\n", current->ip, current->mac);
-        pstr_append_sprintf(pstr, "  Token: %s\n", current->token);
-        pstr_append_sprintf(pstr, "  Downloaded: %llu\n  Uploaded: %llu\n", current->counters.incoming,
-                            current->counters.outgoing);
-        count++;
-        current = current->next;
-    }
-
-    client_list_destroy(sublist);
-
-    config = config_get_config();
-
-    if (config->trustedmaclist != NULL) {
-        pstr_cat(pstr, "\nTrusted MAC addresses:\n");
-
-        for (p = config->trustedmaclist; p != NULL; p = p->next) {
-            pstr_append_sprintf(pstr, "  %s\n", p->mac);
-        }
-    }
-
-    pstr_cat(pstr, "\nAuthentication servers:\n");
-
-    LOCK_CONFIG();
-
-    for (auth_server = config->auth_servers; auth_server != NULL; auth_server = auth_server->next) {
-        pstr_append_sprintf(pstr, "  Host: %s (%s)\n", auth_server->authserv_hostname, auth_server->last_ip);
-    }
-
-    UNLOCK_CONFIG();
-
-    return pstr_to_string(pstr);
-}
-
 /** Initialize the ICMP socket
  * @return A boolean of the success
  */