-#include <glib.h>
-
-#include <avahi-common/util.h>
-#include <avahi-core/llist.h>
+#include <avahi-common/llist.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/address.h>
AVAHI_LLIST_FIELDS(DNSServerInfo, servers);
};
static AVAHI_LLIST_HEAD(DNSServerInfo, servers);
static void server_info_free(DNSServerInfo *i) {
AVAHI_LLIST_FIELDS(DNSServerInfo, servers);
};
static AVAHI_LLIST_HEAD(DNSServerInfo, servers);
static void server_info_free(DNSServerInfo *i) {
AVAHI_LLIST_REMOVE(DNSServerInfo, servers, servers, i);
AVAHI_LLIST_REMOVE(DNSServerInfo, servers, servers, i);
-static DNSServerInfo* get_server_info(gint interface, guchar protocol, const gchar *address) {
+static DNSServerInfo* get_server_info(AvahiIfIndex interface, AvahiProtocol protocol, const char *address) {
-static DNSServerInfo* new_server_info(gint interface, guchar protocol, const gchar *address) {
+static DNSServerInfo* new_server_info(AvahiIfIndex interface, AvahiProtocol protocol, const char *address) {
AVAHI_LLIST_PREPEND(DNSServerInfo, servers, servers, i);
return i;
}
AVAHI_LLIST_PREPEND(DNSServerInfo, servers, servers, i);
return i;
}
+static int set_cloexec(int fd) {
+ int n;
+
+ assert(fd >= 0);
+
+ if ((n = fcntl(fd, F_GETFD)) < 0)
+ return -1;
+
+ if (n & FD_CLOEXEC)
+ return 0;
+
+ return fcntl(fd, F_SETFD, n|FD_CLOEXEC);
+}
+
if (connect(fd, (struct sockaddr*) &sa, sizeof(sa)) < 0) {
daemon_log(LOG_ERR, "connect(): %s", strerror(errno));
if (connect(fd, (struct sockaddr*) &sa, sizeof(sa)) < 0) {
daemon_log(LOG_ERR, "connect(): %s", strerror(errno));
-static gchar *getifname(gint interface, gchar *name, guint len) {
- int fd = -1;
- gchar *ret = NULL;
- struct ifreq ifr;
-
- g_assert(interface >= 0);
+static void set_env(const char *name, const char *value) {
+ char **e;
+ size_t l;
- memset(&ifr, 0, sizeof(ifr));
- ifr.ifr_ifindex = interface;
-
- if (ioctl(fd, SIOCGIFNAME, &ifr) < 0) {
- daemon_log(LOG_ERR, "SIOCGIFNAME: %s\n", strerror(errno));
- goto finish;
+ l = strlen(name);
+
+ for (e = environ; *e; e++) {
+ /* Search for the variable */
+ if (strlen(*e) < l+1)
+ continue;
+
+ if (strncmp(*e, name, l) != 0 || (*e)[l] != '=')
+ continue;
+
+ /* We simply free the record, sicne we know that we created it previously */
+ avahi_free(*e);
+ *e = avahi_strdup_printf("%s=%s", name, value);
+ return;
- strncpy(name, ifr.ifr_name, len-1);
- name[len-1] = 0;
- ret = name;
-
-finish:
- if (fd >= 0)
- close(fd);
-
- return ret;
- }
+ assert(0);
+}
+
+static void run_script(int new, AvahiIfIndex interface, AvahiProtocol protocol, const char *address) {
+ char *p;
+ int ret;
+ char ia[16], pa[16];
+ char name[IF_NAMESIZE];
-static void run_script(gboolean new, gint interface, guchar protocol, const gchar *address) {
- gchar *p;
- g_assert(interface > 0);
- gint ret;
- gchar ia[16], pa[16];
- gchar name[IFNAMSIZ+1];
- snprintf(ia, sizeof(ia), "%i", interface);
- snprintf(pa, sizeof(pa), "%u", protocol);
+ snprintf(ia, sizeof(ia), "%i", (int) interface);
+ snprintf(pa, sizeof(pa), "%i", (int) protocol);
- if (daemon_exec("/", &ret, AVAHI_DNSCONF_SCRIPT, AVAHI_DNSCONF_SCRIPT, new ? "+" : "-", address, ia, pa, NULL) < 0)
+ if (daemon_exec("/", &ret, AVAHI_DNSCONF_SCRIPT, AVAHI_DNSCONF_SCRIPT, new ? "+" : "-", address, ia, pa, avahi_proto_to_string(protocol), NULL) < 0)
daemon_log(LOG_WARNING, "Failed to run script");
else if (ret != 0)
daemon_log(LOG_WARNING, "Script returned with non-zero exit code %i", ret);
}
daemon_log(LOG_WARNING, "Failed to run script");
else if (ret != 0)
daemon_log(LOG_WARNING, "Script returned with non-zero exit code %i", ret);
}
- gint interface;
- guint protocol;
- guint port;
- gchar a[64];
+ AvahiIfIndex interface;
+ AvahiProtocol protocol;
+ int i_interface, i_protocol, port;
+ char a[AVAHI_ADDRESS_STR_MAX];
if (*l != '<' && *l != '>') {
daemon_log(LOG_ERR, "Avahi sent us an invalid browsing line: %s", l);
return -1;
}
if (*l != '<' && *l != '>') {
daemon_log(LOG_ERR, "Avahi sent us an invalid browsing line: %s", l);
return -1;
}
- if (sscanf(l+1, "%i %u %64s %u", &interface, &protocol, a, &port) != 4) {
+ if (sscanf(l+1, "%i %i %39s %i", &i_interface, &i_protocol, a, &port) != 4) {
- daemon_log(LOG_INFO, "New DNS Server %s (interface: %i.%u)", a, interface, protocol);
- new_server_info(interface, (guchar) protocol, a);
- run_script(TRUE, interface, (guchar) protocol, a);
+ daemon_log(LOG_INFO, "New DNS Server %s (interface: %i.%s)", a, interface, avahi_proto_to_string(protocol));
+ new_server_info(interface, protocol, a);
+ run_script(1, interface, protocol, a);
- if ((i = get_server_info(interface, (guchar) protocol, a))) {
- daemon_log(LOG_INFO, "DNS Server %s removed (interface: %i.%u)", a, interface, protocol);
+ if ((i = get_server_info(interface, protocol, a))) {
+ daemon_log(LOG_INFO, "DNS Server %s removed (interface: %i.%s)", a, interface, avahi_proto_to_string(protocol));
- run_script(FALSE, interface, (guchar) protocol, a);
+ run_script(0, interface, protocol, a);
- gint interface = servers->interface;
- guchar protocol = servers->protocol;
- gchar *address = g_strdup(servers->address);
+ AvahiIfIndex interface = servers->interface;
+ AvahiProtocol protocol = servers->protocol;
+ char *address = avahi_strdup(servers->address);
- run_script(FALSE, interface, protocol, address);
- g_free(address);
+ run_script(0, interface, protocol, address);
+ avahi_free(address);
fprintf(f,
"%s [options]\n"
" -h --help Show this help\n"
" -D --daemonize Daemonize after startup\n"
" -k --kill Kill a running daemon\n"
fprintf(f,
"%s [options]\n"
" -h --help Show this help\n"
" -D --daemonize Daemonize after startup\n"
" -k --kill Kill a running daemon\n"
" -c --check Return 0 if a daemon is already running\n"
" -V --version Show version\n",
argv0);
}
" -c --check Return 0 if a daemon is already running\n"
" -V --version Show version\n",
argv0);
}
{ "help", no_argument, NULL, 'h' },
{ "daemonize", no_argument, NULL, 'D' },
{ "kill", no_argument, NULL, 'k' },
{ "version", no_argument, NULL, 'V' },
{ "help", no_argument, NULL, 'h' },
{ "daemonize", no_argument, NULL, 'D' },
{ "kill", no_argument, NULL, 'k' },
{ "version", no_argument, NULL, 'V' },
- { "reload", no_argument, NULL, 'r' },
+ { "refresh", no_argument, NULL, 'r' },
{ "check", no_argument, NULL, 'c' },
};
{ "check", no_argument, NULL, 'c' },
};
size_t buflen = 0;
AVAHI_LLIST_HEAD_INIT(DNSServerInfo, servers);
daemon_signal_init(SIGINT, SIGTERM, SIGCHLD, SIGHUP, 0);
size_t buflen = 0;
AVAHI_LLIST_HEAD_INIT(DNSServerInfo, servers);
daemon_signal_init(SIGINT, SIGTERM, SIGCHLD, SIGHUP, 0);
if ((r = read(fd, buf, sizeof(buf) - buflen - 1)) <= 0) {
daemon_log(LOG_ERR, "read(): %s", r < 0 ? strerror(errno) : "EOF");
if ((r = read(fd, buf, sizeof(buf) - buflen - 1)) <= 0) {
daemon_log(LOG_ERR, "read(): %s", r < 0 ? strerror(errno) : "EOF");
-gint main(gint argc, gchar *argv[]) {
- gchar *argv0;
- gint r = 1;
- gboolean wrote_pid_file = FALSE;
+int main(int argc, char *argv[]) {
+ char *argv0;
+ int r = 1;
+ int wrote_pid_file = 0;
if (daemon_pid_file_kill(SIGHUP) < 0) {
daemon_log(LOG_WARNING, "Failed to kill daemon: %s", strerror(errno));
goto finish;
if (daemon_pid_file_kill(SIGHUP) < 0) {
daemon_log(LOG_WARNING, "Failed to kill daemon: %s", strerror(errno));
goto finish;