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/resolve-service.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'avahi-core/resolve-service.c') diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c index cf07d91..b15af4f 100644 --- a/avahi-core/resolve-service.c +++ b/avahi-core/resolve-service.c @@ -33,10 +33,10 @@ struct AvahiServiceResolver { gchar *service_name; gchar *service_type; gchar *domain_name; - guchar address_protocol; + AvahiProtocol address_protocol; - gint interface; - guchar protocol; + AvahiIfIndex interface; + AvahiProtocol protocol; AvahiRecordBrowser *record_browser_srv; AvahiRecordBrowser *record_browser_txt; @@ -121,7 +121,7 @@ static void finish(AvahiServiceResolver *r, AvahiResolverEvent event) { } } -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) { AvahiServiceResolver *r = userdata; g_assert(rr); @@ -192,7 +192,7 @@ static void time_event_callback(AvahiTimeEvent *e, void *userdata) { finish(r, AVAHI_RESOLVER_TIMEOUT); } -AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, gint interface, guchar protocol, const gchar *name, const gchar *type, const gchar *domain, guchar aprotocol, AvahiServiceResolverCallback callback, gpointer userdata) { +AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const gchar *name, const gchar *type, const gchar *domain, AvahiProtocol aprotocol, AvahiServiceResolverCallback callback, gpointer userdata) { AvahiServiceResolver *r; AvahiKey *k; GTimeVal tv; -- cgit