From b96da7bb83742c2b3013206f57d8fd45e5c817d7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 3 Nov 2005 00:28:24 +0000 Subject: rework and cleanup socket handling to improve support for OS that don't support a SO_RECVIF equivalent git-svn-id: file:///home/lennart/svn/public/avahi/trunk@923 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-core/socket.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'avahi-core/socket.h') diff --git a/avahi-core/socket.h b/avahi-core/socket.h index 57f9153..237b534 100644 --- a/avahi-core/socket.h +++ b/avahi-core/socket.h @@ -22,7 +22,6 @@ USA. ***/ -#include #include #include "dns.h" @@ -38,13 +37,13 @@ int avahi_open_socket_ipv6(int no_reuse); int avahi_open_unicast_socket_ipv4(void); int avahi_open_unicast_socket_ipv6(void); -int avahi_send_dns_packet_ipv4(int fd, int iface, AvahiDnsPacket *p, const AvahiIPv4Address *a, uint16_t port); -int avahi_send_dns_packet_ipv6(int fd, int iface, AvahiDnsPacket *p, const AvahiIPv6Address *a, uint16_t port); +int avahi_send_dns_packet_ipv4(int fd, AvahiIfIndex iface, AvahiDnsPacket *p, const AvahiIPv4Address *src_address, const AvahiIPv4Address *dst_address, uint16_t dst_port); +int avahi_send_dns_packet_ipv6(int fd, AvahiIfIndex iface, AvahiDnsPacket *p, const AvahiIPv6Address *src_address, const AvahiIPv6Address *dst_address, uint16_t dst_port); -AvahiDnsPacket *avahi_recv_dns_packet_ipv4(int fd, struct sockaddr_in*ret_sa, AvahiIPv4Address *ret_dest_address, int *ret_iface, uint8_t *ret_ttl); -AvahiDnsPacket *avahi_recv_dns_packet_ipv6(int fd, struct sockaddr_in6*ret_sa, AvahiIPv6Address *ret_dest_address, int *ret_iface, uint8_t *ret_ttl); +AvahiDnsPacket *avahi_recv_dns_packet_ipv4(int fd, AvahiIPv4Address *ret_src_address, uint16_t *ret_src_port, AvahiIPv4Address *ret_dst_address, AvahiIfIndex *ret_iface, uint8_t *ret_ttl); +AvahiDnsPacket *avahi_recv_dns_packet_ipv6(int fd, AvahiIPv6Address *ret_src_address, uint16_t *ret_src_port, AvahiIPv6Address *ret_dst_address, AvahiIfIndex *ret_iface, uint8_t *ret_ttl); -int avahi_mdns_mcast_join_ipv4(int fd, const AvahiIPv4Address *a, int iface, int join); -int avahi_mdns_mcast_join_ipv6(int fd, const AvahiIPv6Address *a, int iface, int join); +int avahi_mdns_mcast_join_ipv4(int fd, const AvahiIPv4Address *local_address, int iface, int join); +int avahi_mdns_mcast_join_ipv6(int fd, const AvahiIPv6Address *local_address, int iface, int join); #endif -- cgit