#include <assert.h>
#include <string.h>
+#include <sys/types.h>
#include <sys/socket.h>
#include <stdio.h>
#include <unistd.h>
#include <sys/un.h>
#include <errno.h>
#include <fcntl.h>
+#include <sys/stat.h>
#include <avahi-common/llist.h>
#include <avahi-common/malloc.h>
#include "simple-protocol.h"
#include "main.h"
+#ifdef ENABLE_CHROOT
+#include "chroot.h"
+#endif
+
+#ifndef AF_LOCAL
+#define AF_LOCAL AF_UNIX
+#endif
+#ifndef PF_LOCAL
+#define PF_LOCAL PF_UNIX
+#endif
+
#define BUFFER_SIZE (20*1024)
#define CLIENTS_MAX 50
goto fail;
client_output_printf(c, "+ Browsing ...\n");
- avahi_log_debug(__FILE__": Got %s request for '%s'.", cmd, arg);
+ avahi_log_debug(__FILE__": Got %s request.", cmd);
} else if (strcmp(cmd, "BROWSE-DNS-SERVERS-IPV6") == 0 && n_args == 1) {
c->state = CLIENT_BROWSE_DNS_SERVERS;
goto fail;
client_output_printf(c, "+ Browsing ...\n");
- avahi_log_debug(__FILE__": Got %s request for '%s'.", cmd, arg);
+ avahi_log_debug(__FILE__": Got %s request.", cmd);
} else if (strcmp(cmd, "BROWSE-DNS-SERVERS") == 0 && n_args == 1) {
c->state = CLIENT_BROWSE_DNS_SERVERS;
goto fail;
client_output_printf(c, "+ Browsing ...\n");
- avahi_log_debug(__FILE__": Got %s request for '%s'.", cmd, arg);
+ avahi_log_debug(__FILE__": Got %s request.", cmd);
} else {
client_output_printf(c, "%+i Invalid command \"%s\", try \"HELP\".\n", AVAHI_ERR_INVALID_OPERATION, cmd);
unlink(AVAHI_SOCKET);
- if (bind(server->fd, &sa, sizeof(sa)) < 0) {
+ if (bind(server->fd, (struct sockaddr*) &sa, sizeof(sa)) < 0) {
avahi_log_warn("bind(): %s", strerror(errno));
goto fail;
}
if (server) {
if (server->bind_successful)
+#ifdef ENABLE_CHROOT
+ avahi_chroot_helper_unlink(AVAHI_SOCKET);
+#else
unlink(AVAHI_SOCKET);
+#endif
while (server->clients)
client_free(server->clients);