avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_ID, slot->id);
for (j = s->monitor->interfaces; j; j = j->interface_next)
- if (avahi_interface_relevant(j) &&
+ if (avahi_interface_is_relevant(j) &&
j != i &&
(s->config.reflect_ipv || j->protocol == i->protocol)) {
struct sockaddr_in lsa;
socklen_t l = sizeof(lsa);
- if (getsockname(s->fd_legacy_unicast_ipv4, &lsa, &l) != 0)
+ if (getsockname(s->fd_legacy_unicast_ipv4, (struct sockaddr*) &lsa, &l) != 0)
avahi_log_warn("getsockname(): %s", strerror(errno));
else
return lsa.sin_port == ((const struct sockaddr_in*) sa)->sin_port;
struct sockaddr_in6 lsa;
socklen_t l = sizeof(lsa);
- if (getsockname(s->fd_legacy_unicast_ipv6, &lsa, &l) != 0)
+ if (getsockname(s->fd_legacy_unicast_ipv6, (struct sockaddr*) &lsa, &l) != 0)
avahi_log_warn("getsockname(): %s", strerror(errno));
else
return lsa.sin6_port == ((const struct sockaddr_in6*) sa)->sin6_port;
assert(iface > 0);
if (!(i = avahi_interface_monitor_get_interface(s->monitor, iface, avahi_af_to_proto(sa->sa_family))) ||
- !avahi_interface_relevant(i)) {
+ !avahi_interface_is_relevant(i)) {
avahi_log_warn("Recieved packet from invalid interface.");
return;
}
assert(iface > 0);
if (!(i = avahi_interface_monitor_get_interface(s->monitor, iface, avahi_af_to_proto(sa->sa_family))) ||
- !avahi_interface_relevant(i)) {
+ !avahi_interface_is_relevant(i)) {
avahi_log_warn("Recieved packet from invalid interface.");
return;
}
}
if (!(j = avahi_interface_monitor_get_interface(s->monitor, slot->interface, slot->address.proto)) ||
- !avahi_interface_relevant(j))
+ !avahi_interface_is_relevant(j))
return;
/* Patch the original ID into this response */
if (s->browse_domain_entry_group)
avahi_s_entry_group_reset(s->browse_domain_entry_group);
- avahi_update_host_rrs(s->monitor, 1);
+ avahi_interface_monitor_update_rrs(s->monitor, 1);
s->n_host_rr_pending = 0;
}
register_hinfo(s);
register_browse_domain(s);
- avahi_update_host_rrs(s->monitor, 0);
+ avahi_interface_monitor_update_rrs(s->monitor, 0);
s->n_host_rr_pending --;
AvahiServer *s;
int e;
- if ((e = valid_server_config(sc)) < 0) {
+ if (sc && (e = valid_server_config(sc)) < 0) {
if (error)
*error = e;
return NULL;