#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include <netinet/in.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include <avahi-common/error.h>
#include <avahi-common/malloc.h>
if (m->list_complete &&
!remove_rrs &&
m->server->config.publish_workstation &&
- (m->server->state == AVAHI_SERVER_RUNNING ||
- m->server->state == AVAHI_SERVER_REGISTERING)) {
+ (m->server->state == AVAHI_SERVER_RUNNING)) {
if (!hw->entry_group)
hw->entry_group = avahi_s_entry_group_new(m->server, avahi_host_rr_entry_group_callback, NULL);
return; /* OOM */
if (avahi_s_entry_group_is_empty(hw->entry_group)) {
- char name[AVAHI_LABEL_MAX];
- char *t;
-
- if (!(t = avahi_format_mac_address(hw->mac_address, hw->mac_address_size)))
- return; /* OOM */
+ char name[AVAHI_LABEL_MAX], mac[256];
- snprintf(name, sizeof(name), "%s [%s]", m->server->host_name, t);
- avahi_free(t);
+ avahi_format_mac_address(mac, sizeof(mac), hw->mac_address, hw->mac_address_size);
+ snprintf(name, sizeof(name), "%s [%s]", m->server->host_name, mac);
- if (!name)
- return; /* OOM */
-
if (avahi_server_add_service(m->server, hw->entry_group, hw->index, AVAHI_PROTO_UNSPEC, 0, name, "_workstation._tcp", NULL, NULL, 9, NULL) < 0) {
avahi_log_warn(__FILE__": avahi_server_add_service() failed: %s", avahi_strerror(m->server->error));
avahi_s_entry_group_free(hw->entry_group);
static int interface_mdns_mcast_join(AvahiInterface *i, int join) {
char at[AVAHI_ADDRESS_STR_MAX];
+ int r;
assert(i);
- assert((join && !i->mcast_joined) || (!join && i->mcast_joined));
+ if (!!join == !!i->mcast_joined)
+ return 0;
if (join) {
AvahiInterfaceAddress *a;
avahi_address_snprint(at, sizeof(at), &i->local_mcast_address));
if (i->protocol == AVAHI_PROTO_INET6)
- avahi_mdns_mcast_join_ipv6(i->monitor->server->fd_ipv6, &i->local_mcast_address.data.ipv6, i->hardware->index, join);
+ r = avahi_mdns_mcast_join_ipv6(i->monitor->server->fd_ipv6, &i->local_mcast_address.data.ipv6, i->hardware->index, join);
else {
assert(i->protocol == AVAHI_PROTO_INET);
- avahi_mdns_mcast_join_ipv4(i->monitor->server->fd_ipv4, &i->local_mcast_address.data.ipv4, i->hardware->index, join);
+ r = avahi_mdns_mcast_join_ipv4(i->monitor->server->fd_ipv4, &i->local_mcast_address.data.ipv4, i->hardware->index, join);
}
- i->mcast_joined = join;
+ if (r < 0)
+ i->mcast_joined = 0;
+ else
+ i->mcast_joined = join;
+
return 0;
}
return NULL;
}
-
void avahi_interface_send_packet_unicast(AvahiInterface *i, AvahiDnsPacket *p, const AvahiAddress *a, uint16_t port) {
assert(i);
assert(p);
-/* char t[AVAHI_ADDRESS_STR_MAX]; */
if (!avahi_interface_is_relevant(i))
return;
assert(!a || a->proto == i->protocol);
-/* if (a) */
-/* avahi_log_debug("unicast sending on '%s.%i' to %s:%u", i->hardware->name, i->protocol, avahi_address_snprint(t, sizeof(t), a), port); */
-/* else */
-/* avahi_log_debug("multicast sending on '%s.%i'", i->hardware->name, i->protocol); */
-
if (i->protocol == AVAHI_PROTO_INET && i->monitor->server->fd_ipv4 >= 0)
avahi_send_dns_packet_ipv4(i->monitor->server->fd_ipv4, i->hardware->index, p, i->mcast_joined ? &i->local_mcast_address.data.ipv4 : NULL, a ? &a->data.ipv4 : NULL, port);
else if (i->protocol == AVAHI_PROTO_INET6 && i->monitor->server->fd_ipv6 >= 0)