From 4f0a5e7572a4257894b4bfede42c26d65152609e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 13 Aug 2005 21:25:09 +0000 Subject: * strip glib from avahi-core * implement glib memory allocator * add new documentation file MALLOC * initialize pseudo-RNG from /dev/urandom in avahi-daemon * remove some gcc 4.0 warnings * beef up watch system with real timeouts * move GCC __attribute__ macros into its own header avahi-common/gccmacro.h * make use of GCC's sentinel attribute where it make sense * add malloc() implementations that abort on OOM and enable them by default git-svn-id: file:///home/lennart/svn/public/avahi/trunk@308 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-core/socket.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'avahi-core/socket.h') diff --git a/avahi-core/socket.h b/avahi-core/socket.h index 0643d79..d795156 100644 --- a/avahi-core/socket.h +++ b/avahi-core/socket.h @@ -23,6 +23,7 @@ ***/ #include +#include #include "dns.h" @@ -30,22 +31,22 @@ #define AVAHI_IPV4_MCAST_GROUP "224.0.0.251" #define AVAHI_IPV6_MCAST_GROUP "ff02::fb" -gint avahi_open_socket_ipv4(void); -gint avahi_open_socket_ipv6(void); +int avahi_open_socket_ipv4(void); +int avahi_open_socket_ipv6(void); -gint avahi_open_legacy_unicast_socket_ipv4(void); -gint avahi_open_legacy_unicast_socket_ipv6(void); +int avahi_open_legacy_unicast_socket_ipv4(void); +int avahi_open_legacy_unicast_socket_ipv6(void); -gint avahi_send_dns_packet_ipv4(gint fd, gint iface, AvahiDnsPacket *p, const AvahiIPv4Address *a, guint16 port); -gint avahi_send_dns_packet_ipv6(gint fd, gint iface, AvahiDnsPacket *p, const AvahiIPv6Address *a, guint16 port); +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); -AvahiDnsPacket *avahi_recv_dns_packet_ipv4(gint fd, struct sockaddr_in*ret_sa, AvahiIPv4Address *ret_dest_address, gint *ret_iface, guint8 *ret_ttl); -AvahiDnsPacket *avahi_recv_dns_packet_ipv6(gint fd, struct sockaddr_in6*ret_sa, AvahiIPv6Address *ret_dest_address, gint *ret_iface, guint8 *ret_ttl); +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); -int avahi_mdns_mcast_join_ipv4(gint fd, gint idx); -int avahi_mdns_mcast_join_ipv6(gint fd, gint idx); +int avahi_mdns_mcast_join_ipv4(int fd, int idx); +int avahi_mdns_mcast_join_ipv6(int fd, int idx); -int avahi_mdns_mcast_leave_ipv4(gint fd, gint idx); -int avahi_mdns_mcast_leave_ipv6(gint fd, gint idx); +int avahi_mdns_mcast_leave_ipv4(int fd, int idx); +int avahi_mdns_mcast_leave_ipv6(int fd, int idx); #endif -- cgit