From f43187377e0c89ba02ca23e88efa01bbb255e037 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 2 Aug 2005 23:57:07 +0000 Subject: * replace guchar and gint by AvahiProtocol, AvahiIfIndex at many places where it make sense * change avahi_add_{service,txt}_strlst() to copy the string list * gcc warning fixes from Ikke * limit number of DBUS connections * limit objects created by a DBUS client * limit number of clients * limit number of entries a client may create * add legal blurb to avahi-discover * remove some obsolete import prototypes from avahi-discover * don't include config.h in dbus.h * add string definitions for DBUS errors git-svn-id: file:///home/lennart/svn/public/avahi/trunk@212 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-core/browse-dns-server.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'avahi-core/browse-dns-server.c') diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c index 9dd4798..f8e8f30 100644 --- a/avahi-core/browse-dns-server.c +++ b/avahi-core/browse-dns-server.c @@ -35,8 +35,8 @@ typedef struct AvahiDNSServerInfo AvahiDNSServerInfo; struct AvahiDNSServerInfo { AvahiDNSServerBrowser *browser; - gint interface; - guchar protocol; + AvahiIfIndex interface; + AvahiProtocol protocol; AvahiRecord *srv_record; AvahiHostNameResolver *host_name_resolver; AvahiAddress address; @@ -51,7 +51,7 @@ struct AvahiDNSServerBrowser { AvahiRecordBrowser *record_browser; AvahiDNSServerBrowserCallback callback; gpointer userdata; - guchar aprotocol; + AvahiProtocol aprotocol; guint n_info; @@ -59,7 +59,7 @@ struct AvahiDNSServerBrowser { AVAHI_LLIST_HEAD(AvahiDNSServerInfo, info); }; -static AvahiDNSServerInfo* get_server_info(AvahiDNSServerBrowser *b, gint interface, guchar protocol, AvahiRecord *r) { +static AvahiDNSServerInfo* get_server_info(AvahiDNSServerBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiRecord *r) { AvahiDNSServerInfo *i; g_assert(b); @@ -90,7 +90,7 @@ static void server_info_free(AvahiDNSServerBrowser *b, AvahiDNSServerInfo *i) { g_free(i); } -static void host_name_resolver_callback(AvahiHostNameResolver *r, gint interface, guchar protocol, AvahiResolverEvent event, const gchar *host_name, const AvahiAddress *a, gpointer userdata) { +static void host_name_resolver_callback(AvahiHostNameResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const gchar *host_name, const AvahiAddress *a, gpointer userdata) { AvahiDNSServerInfo *i = userdata; g_assert(r); @@ -107,7 +107,7 @@ static void host_name_resolver_callback(AvahiHostNameResolver *r, gint interface i->host_name_resolver = NULL; } -static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) { +static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) { AvahiDNSServerBrowser *b = userdata; g_assert(rr); @@ -148,7 +148,7 @@ static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, gucha } } -AvahiDNSServerBrowser *avahi_dns_server_browser_new(AvahiServer *server, gint interface, guchar protocol, const gchar *domain, AvahiDNSServerType type, guchar aprotocol, AvahiDNSServerBrowserCallback callback, gpointer userdata) { +AvahiDNSServerBrowser *avahi_dns_server_browser_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const gchar *domain, AvahiDNSServerType type, AvahiProtocol aprotocol, AvahiDNSServerBrowserCallback callback, gpointer userdata) { AvahiDNSServerBrowser *b; AvahiKey *k; gchar *n = NULL; -- cgit