projects
/
project
/
mdnsd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ubus: assume that the service iface can be NULL
[project/mdnsd.git]
/
util.c
diff --git
a/util.c
b/util.c
index e68e9c9f5f0e27cbbc2f02382698475bb867dff0..f5cfdb864cc08857bf90a61d36ea7c3d4109599c 100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-16,8
+16,6
@@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/utsname.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/utsname.h>
-#include <linux/if.h>
-#include <linux/sockios.h>
#include <arpa/inet.h>
#include <unistd.h>
#include <arpa/inet.h>
#include <unistd.h>
@@
-29,6
+27,7
@@
#include <signal.h>
#include <libubox/uloop.h>
#include <signal.h>
#include <libubox/uloop.h>
+#include <libubox/utils.h>
#include "dns.h"
#include "util.h"
#include "dns.h"
#include "util.h"
@@
-36,7
+35,7
@@
uint8_t mdns_buf[MDNS_BUF_LEN];
int debug = 0;
uint8_t mdns_buf[MDNS_BUF_LEN];
int debug = 0;
-char
mdns_hostname
[HOSTNAME_LEN];
+char
umdns_host_label
[HOSTNAME_LEN];
char mdns_hostname_local[HOSTNAME_LEN + 6];
uint32_t
char mdns_hostname_local[HOSTNAME_LEN + 6];
uint32_t
@@
-66,23
+65,19
@@
void get_hostname(void)
{
struct utsname utsname;
{
struct utsname utsname;
-
mdns_hostname
[0] = 0;
+
umdns_host_label
[0] = 0;
mdns_hostname_local[0] = 0;
if (uname(&utsname) < 0)
return;
mdns_hostname_local[0] = 0;
if (uname(&utsname) < 0)
return;
- snprintf(
mdns_hostname, sizeof(mdns_hostname
), "%s", utsname.nodename);
+ snprintf(
umdns_host_label, sizeof(umdns_host_label
), "%s", utsname.nodename);
snprintf(mdns_hostname_local, sizeof(mdns_hostname_local), "%s.local", utsname.nodename);
}
snprintf(mdns_hostname_local, sizeof(mdns_hostname_local), "%s.local", utsname.nodename);
}
-void*
-memdup(const void *d, int l)
+time_t monotonic_time(void)
{
{
- void *r = malloc(l);
- if (!r)
- return NULL;
- memcpy(r, d, l);
- return r;
+ struct timespec ts;
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+ return ts.tv_sec;
}
}
-