Convert time-related variables to consistently use "unsigned long".

[srvx.git] / src / sar.c

diff --git a/src/sar.c b/src/sar.c
index 545c89005b7170996bc7d94c91129c0c124133ea..6c5c73194b053bbb9e4f6677ecb1f9aef8af4b5a 100644 (file)
--- a/src/sar.c
+++ b/src/sar.c
@@ -24,6 +24,10 @@
 #include "log.h"
 #include "timeq.h"
 
+#if defined(HAVE_NETINET_IN_H)
+# include <netinet/in.h> /* sockaddr_in6 on some BSDs */
+#endif
+
 static const char hexdigits[] = "0123456789abcdef";
 
 struct dns_rr;
@@ -255,14 +259,14 @@ sar_request_fail(struct sar_request *req, unsigned int rcode)
     sar_request_abort(req);
 }
 
-static time_t next_sar_timeout;
+static unsigned long next_sar_timeout;
 
 static void
 sar_timeout_cb(void *data)
 {
     dict_iterator_t it;
     dict_iterator_t next;
-    time_t next_timeout = INT_MAX;
+    unsigned long next_timeout = INT_MAX;
 
     for (it = dict_first(sar_requests); it; it = next) {
         struct sar_request *req;
@@ -285,7 +289,7 @@ sar_timeout_cb(void *data)
 }
 
 static void
-sar_check_timeout(time_t when)
+sar_check_timeout(unsigned long when)
 {
     if (!next_sar_timeout || when < next_sar_timeout) {
         timeq_del(0, sar_timeout_cb, NULL, TIMEQ_IGNORE_WHEN | TIMEQ_IGNORE_DATA);
@@ -1076,8 +1080,19 @@ sar_services_init(const char *etc_services)
     struct service_byname *byname;
     unsigned int ii;
 
+    /* Forget old services dicts and allocate new ones. */
+    dict_delete(services_byname);
+    services_byname = dict_new();
+    dict_set_free_data(services_byname, free);
+
+    dict_delete(services_byport);
+    services_byport = dict_new();
+    dict_set_free_data(services_byport, free);
+
+    /* Load the list from the services file. */
     sar_services_load_file(etc_services);
 
+    /* Mark well-known services as using DNS-SD SRV records. */
     for (ii = 0; tcp_srvs[ii]; ++ii) {
         byname = sar_service_byname(tcp_srvs[ii], 1);
         byname->protos[SERVICE_TCP].srv = 1;
@@ -1995,6 +2010,8 @@ sar_cleanup(void)
     dict_delete(services_byport);
     dict_delete(sar_nameservers);
     dict_delete(sar_requests);
+    free_string_list(conf.sar_search);
+    free_string_list(conf.sar_nslist);
 }
 
 static void
@@ -2028,12 +2045,6 @@ sar_init(void)
     sar_nameservers = dict_new();
     dict_set_free_data(sar_nameservers, free);
 
-    services_byname = dict_new();
-    dict_set_free_data(services_byname, free);
-
-    services_byport = dict_new();
-    dict_set_free_data(services_byport, free);
-
     sar_register_helper(&sar_ipv4_helper);
 #if defined(AF_INET6)
     sar_register_helper(&sar_ipv6_helper);