]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
Split avahi-client out from avahi-gobject.
authorFabian Deutsch <fabian.deutsch@gmx.de>
Fri, 21 Oct 2011 19:36:36 +0000 (12:36 -0700)
committerJürg Billeter <j@bitron.ch>
Wed, 30 Nov 2011 13:38:45 +0000 (14:38 +0100)
Fixes bug 662175.

vapi/Makefile.am
vapi/avahi-client.vapi [new file with mode: 0644]
vapi/avahi-gobject.deps
vapi/avahi-gobject.vapi

index ccdcd8620057c7c5eb122e008fa5a74e2d65618f..e2a3180091b0cb4381809de89dc857370cbcfe14 100644 (file)
@@ -9,6 +9,7 @@ dist_vapi_DATA = \
        alsa.vapi \
        alsa.deps \
        atk.vapi \
+       avahi-client.vapi \
        avahi-gobject.deps \
        avahi-gobject.vapi \
        bzlib.vapi \
diff --git a/vapi/avahi-client.vapi b/vapi/avahi-client.vapi
new file mode 100644 (file)
index 0000000..56857bf
--- /dev/null
@@ -0,0 +1,238 @@
+/* avahi-common.vala
+ *
+ * Copyright (C) 2009  Sebastian Noack
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * As a special exception, if you use inline functions from this file, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU Lesser General Public License.
+ *
+ * Author:
+ *  Sebastian Noack <sebastian.noack@gmail.com>
+ */
+
+[CCode(cprefix="Ga", lower_case_cprefix="ga_")]
+namespace Avahi {
+    /* Network addresses */
+
+       [SimpleType]
+       [CCode(cheader_filename="avahi-common/address.h", cname="AvahiProtocol", cprefix="AVAHI_PROTO_", lower_case_cprefix="avahi_proto_")]
+       public enum Protocol {
+               INET,
+               INET6,
+               UNSPEC;
+
+               [CCode(cname="avahi_af_to_proto")]
+               public static Protocol from_af(int af);
+
+               public unowned string to_string();
+               public int to_af();
+
+               [CCode(cname="AVAHI_PROTO_VALID")]
+               public bool is_valid();
+       }
+
+       [SimpleType]
+       [CCode(cheader_filename="avahi-common/address.h", cname="AvahiIfIndex")]
+       public struct Interface {
+               [CCode(cname="AVAHI_IF_UNSPEC")]
+               public static Interface UNSPEC;
+
+               [CCode(cname="AVAHI_IF_VALID")]
+               public bool is_valid();
+       }
+
+       [CCode(cheader_filename="avahi-common/address.h", cname="AvahiAddress", cprefix="avahi_address_")]
+       public struct Address {
+               public Protocol proto;
+
+               [CCode(cname="AVAHI_ADDRESS_STR_MAX")]
+               public static size_t STR_MAX;
+
+               [CCode(cname="avahi_address_parse", instance_pos=-1)]
+               public Address.parse(string s, Protocol proto=Protocol.UNSPEC);
+
+               [CCode(cname="avahi_address_snprint", instance_pos=-1)]
+               public unowned string to_string(char[] dest=new char[STR_MAX]);
+               public int cmp(Address other);
+       }
+
+
+       /* Linked list of strings used for DNS TXT record data */
+
+       [CCode(cheader_filename="avahi-common/defs.h", cname="AVAHI_SERVICE_COOKIE_INVALID")]
+       public const uint32 SERVICE_COOKIE_INVALID;
+
+       [Compact]
+       [CCode(cheader_filename="avahi-common/strlst.h", cname="AvahiStringList", cprefix="avahi_string_list_", dup_function="avahi_string_list_copy", free_function="avahi_string_list_free")]
+       public class StringList {
+               public StringList next;
+               [CCode(array_length_cname="size")]
+               public char[] text;
+
+               public StringList(string? txt=null, ...);
+               public StringList.from_array(string[] array);
+
+               [ReturnsModifiedPointer()]
+               public void add(string text);
+               [ReturnsModifiedPointer()]
+               [PrintfFormat]
+               public void add_printf(string format, ...);
+               [ReturnsModifiedPointer()]
+               public void add_arbitrary(char[] text);
+               [ReturnsModifiedPointer()]
+               public void add_anonymous(size_t size);
+               [ReturnsModifiedPointer()]
+               public void add_many(...);
+
+               public string to_string();
+               public int equal(StringList other);
+               public StringList copy();
+               [ReturnsModifiedPointer()]
+               public void reverse();
+               public uint length();
+
+               public unowned StringList find(string key);
+               public bool get_pair(out string key, out char[] value);
+               [ReturnsModifiedPointer()]
+               public void add_pair(string key, string? value);
+               [ReturnsModifiedPointer()]
+               public void add_pair_arbitrary(string key, char[] value);
+               public uint32 get_service_cookie();
+
+               [CCode(cname="avahi_string_list_serialize")]
+               private size_t _serialize(char[] dest);
+               [CCode(cname="avahi_string_list_serialize_dup")]
+               public char[] serialize() {
+                       char[] dest = new char[this.length() * 256];
+                       dest.length = (int) _serialize(dest);
+                       return dest;
+               }
+
+               [CCode(cname="avahi_string_list_parse")]
+               private static int _parse(char[] data, out StringList dest);
+               [CCode(cname="avahi_string_list_parse_dup")]
+               public static StringList parse(char[] data) throws Error {
+                       StringList dest;
+
+                       int errno = _parse(data, out dest);
+                       if (errno < 0) {
+                               var err = new Error.FAILURE(strerror(errno));
+                               err.code = errno;
+                               throw err;
+                       }
+
+                       return dest;
+               }
+       }
+
+
+       /* Domain name utility functions */
+
+       [CCode(cheader_filename="avahi-common/domain.h", lower_case_cprefix="avahi_")]
+       namespace Domain {
+               public const size_t DOMAIN_NAME_MAX;
+               public const size_t LABEL_MAX;
+
+               [CCode(cname="avahi_normalize_name_strdup")]
+               public string normalize_name(string s);
+               [CCode(cname="avahi_domain_equal")]
+               public bool equal(string a, string b);
+               [CCode(cname="avahi_domain_hash")]
+               public uint hash(string name);
+               public unowned string? get_type_from_subtype(string s);
+               public unowned string? unescape_label(ref unowned string name, char[] dest=new char[LABEL_MAX]);
+
+               [CCode(cname="avahi_escape_label")]
+               private string? _escape_label(char* src, size_t src_len, ref char* dest, ref size_t dest_len);
+               [CCode(cname="avahi_escape_label_dup")]
+               public string? escape_label(string s) {
+                       size_t len = LABEL_MAX * 4;
+                       char* dest = new char[len];
+                       return _escape_label(s, s.length, ref dest, ref len);
+               }
+
+               [CCode(cname="avahi_service_name_join")]
+               private int _service_name_join(char* dest, size_t dest_len, string name, string type, string domain);
+               [CCode(cname="avahi_service_name_join_dup")]
+               public string service_name_join(string name, string type, string domain) throws Error {
+                       char* dest = new char[DOMAIN_NAME_MAX];
+
+                       int errno = _service_name_join(dest, DOMAIN_NAME_MAX, name, type, domain);
+                       if (errno < 0) {
+                               var err = new Error.FAILURE(strerror(errno));
+                               err.code = errno;
+                               throw err;
+                       }
+
+                       return (string) dest;
+               }
+
+               [CCode(cname="avahi_service_name_split")]
+               private int _service_name_split(string src, char* name,   size_t name_len,
+                                                                                                       char* type,   size_t type_len,
+                                                                                                       char* domain, size_t domain_len);
+               [CCode(cname="avahi_service_name_split_dup")]
+               public void service_name_split(string src, out string name, out string type, out string domain) throws Error {
+                       name = (string) new char[LABEL_MAX];
+                       type = (string) new char[DOMAIN_NAME_MAX];
+                       domain = (string) new char[DOMAIN_NAME_MAX];
+
+                       int errno = _service_name_split(src, name,   LABEL_MAX,
+                                                                                                type,   DOMAIN_NAME_MAX,
+                                                                                                domain, DOMAIN_NAME_MAX);
+                       if (errno < 0) {
+                               var err = new Error.FAILURE(strerror(errno));
+                               err.code = errno;
+                               throw err;
+                       }
+               }
+
+               public bool is_valid_service_type_generic(string s);
+               public bool is_valid_service_type_strict(string s);
+               public bool is_valid_service_subtype(string s);
+               public bool is_valid_domain_name(string s);
+               public bool is_valid_service_name(string s);
+               public bool is_valid_host_name(string s);
+               public bool is_valid_fqdn(string s);
+
+               [CCode(cheader_filename="avahi-common/address.h")]
+               public unowned string reverse_lookup_name(Address addr, char[] dest=new char[DOMAIN_NAME_MAX]);
+       }
+
+       [CCode(cheader_filename="avahi-common/alternative.h", lower_case_cprefix="avahi_alternative_")]
+       namespace Alternative {
+               public string host_name(string s);
+               public string service_name(string s);
+       }
+
+
+    /* Entry group */
+
+       [Flags]
+       [CCode(cheader_filename="avahi-common/defs.h", cname="AvahiPublishFlags", cfrefix="AVAHI_PUBLISH_")]
+       public enum PublishFlags {
+               UNIQUE,
+               NO_PROBE,
+               NO_ANNOUNCE,
+               ALLOW_MULTIPLE,
+               NO_REVERSE,
+               NO_COOKIE,
+               UPDATE,
+               USE_WIDE_AREA,
+               USE_MULTICAST
+       }
+}
index 2bb8574fcc401eb8a04fea20a60caa81658a07e6..52735c291fa85880bfdf5720d762f02dca659f22 100644 (file)
@@ -1 +1,2 @@
 glib-2.0
+avahi-client
index 2c440bdf04ff699b0e9c903e880ef09df293197c..b453565ca9ee096c5e035768df600ca717cc7e34 100644 (file)
@@ -94,200 +94,6 @@ namespace Avahi {
        public unowned string strerror(int errno);
 
 
-       /* Network addresses */
-
-       [SimpleType]
-       [CCode(cheader_filename="avahi-common/address.h", cname="AvahiProtocol", cprefix="AVAHI_PROTO_", lower_case_cprefix="avahi_proto_")]
-       public enum Protocol {
-               INET,
-               INET6,
-               UNSPEC;
-
-               [CCode(cname="avahi_af_to_proto")]
-               public static Protocol from_af(int af);
-
-               public unowned string to_string();
-               public int to_af();
-
-               [CCode(cname="AVAHI_PROTO_VALID")]
-               public bool is_valid();
-       }
-
-       [SimpleType]
-       [CCode(cheader_filename="avahi-common/address.h", cname="AvahiIfIndex")]
-       public struct Interface {
-               [CCode(cname="AVAHI_IF_UNSPEC")]
-               public static Interface UNSPEC;
-
-               [CCode(cname="AVAHI_IF_VALID")]
-               public bool is_valid();
-       }
-
-       [CCode(cheader_filename="avahi-common/address.h", cname="AvahiAddress", cprefix="avahi_address_")]
-       public struct Address {
-               public Protocol proto;
-
-               [CCode(cname="AVAHI_ADDRESS_STR_MAX")]
-               public static size_t STR_MAX;
-
-               [CCode(cname="avahi_address_parse", instance_pos=-1)]
-               public Address.parse(string s, Protocol proto=Protocol.UNSPEC);
-
-               [CCode(cname="avahi_address_snprint", instance_pos=-1)]
-               public unowned string to_string(char[] dest=new char[STR_MAX]);
-               public int cmp(Address other);
-       }
-
-
-       /* Linked list of strings used for DNS TXT record data */
-
-       [CCode(cheader_filename="avahi-common/defs.h", cname="AVAHI_SERVICE_COOKIE_INVALID")]
-       public const uint32 SERVICE_COOKIE_INVALID;
-
-       [Compact]
-       [CCode(cheader_filename="avahi-common/strlst.h", cname="AvahiStringList", cprefix="avahi_string_list_", dup_function="avahi_string_list_copy", free_function="avahi_string_list_free")]
-       public class StringList {
-               public StringList next;
-               [CCode(array_length_cname="size")]
-               public char[] text;
-
-               public StringList(string? txt=null, ...);
-               public StringList.from_array(string[] array);
-
-               [ReturnsModifiedPointer()]
-               public void add(string text);
-               [ReturnsModifiedPointer()]
-               [PrintfFormat]
-               public void add_printf(string format, ...);
-               [ReturnsModifiedPointer()]
-               public void add_arbitrary(char[] text);
-               [ReturnsModifiedPointer()]
-               public void add_anonymous(size_t size);
-               [ReturnsModifiedPointer()]
-               public void add_many(...);
-
-               public string to_string();
-               public int equal(StringList other);
-               public StringList copy();
-               [ReturnsModifiedPointer()]
-               public void reverse();
-               public uint length();
-
-               public unowned StringList find(string key);
-               public bool get_pair(out string key, out char[] value);
-               [ReturnsModifiedPointer()]
-               public void add_pair(string key, string? value);
-               [ReturnsModifiedPointer()]
-               public void add_pair_arbitrary(string key, char[] value);
-               public uint32 get_service_cookie();
-
-               [CCode(cname="avahi_string_list_serialize")]
-               private size_t _serialize(char[] dest);
-               [CCode(cname="avahi_string_list_serialize_dup")]
-               public char[] serialize() {
-                       char[] dest = new char[this.length() * 256];
-                       dest.length = (int) _serialize(dest);
-                       return dest;
-               }
-
-               [CCode(cname="avahi_string_list_parse")]
-               private static int _parse(char[] data, out StringList dest);
-               [CCode(cname="avahi_string_list_parse_dup")]
-               public static StringList parse(char[] data) throws Error {
-                       StringList dest;
-
-                       int errno = _parse(data, out dest);
-                       if (errno < 0) {
-                               var err = new Error.FAILURE(strerror(errno));
-                               err.code = errno;
-                               throw err;
-                       }
-
-                       return dest;
-               }
-       }
-
-
-       /* Domain name utility functions */
-
-       [CCode(cheader_filename="avahi-common/domain.h", lower_case_cprefix="avahi_")]
-       namespace Domain {
-               public const size_t DOMAIN_NAME_MAX;
-               public const size_t LABEL_MAX;
-
-               [CCode(cname="avahi_normalize_name_strdup")]
-               public string normalize_name(string s);
-               [CCode(cname="avahi_domain_equal")]
-               public bool equal(string a, string b);
-               [CCode(cname="avahi_domain_hash")]
-               public uint hash(string name);
-               public unowned string? get_type_from_subtype(string s);
-               public unowned string? unescape_label(ref unowned string name, char[] dest=new char[LABEL_MAX]);
-
-               [CCode(cname="avahi_escape_label")]
-               private string? _escape_label(char* src, size_t src_len, ref char* dest, ref size_t dest_len);
-               [CCode(cname="avahi_escape_label_dup")]
-               public string? escape_label(string s) {
-                       size_t len = LABEL_MAX * 4;
-                       char* dest = new char[len];
-                       return _escape_label(s, s.length, ref dest, ref len);
-               }
-
-               [CCode(cname="avahi_service_name_join")]
-               private int _service_name_join(char* dest, size_t dest_len, string name, string type, string domain);
-               [CCode(cname="avahi_service_name_join_dup")]
-               public string service_name_join(string name, string type, string domain) throws Error {
-                       char* dest = new char[DOMAIN_NAME_MAX];
-
-                       int errno = _service_name_join(dest, DOMAIN_NAME_MAX, name, type, domain);
-                       if (errno < 0) {
-                               var err = new Error.FAILURE(strerror(errno));
-                               err.code = errno;
-                               throw err;
-                       }
-
-                       return (string) dest;
-               }
-
-               [CCode(cname="avahi_service_name_split")]
-               private int _service_name_split(string src, char* name,   size_t name_len,
-                                                                                                       char* type,   size_t type_len,
-                                                                                                       char* domain, size_t domain_len);
-               [CCode(cname="avahi_service_name_split_dup")]
-               public void service_name_split(string src, out string name, out string type, out string domain) throws Error {
-                       name = (string) new char[LABEL_MAX];
-                       type = (string) new char[DOMAIN_NAME_MAX];
-                       domain = (string) new char[DOMAIN_NAME_MAX];
-
-                       int errno = _service_name_split(src, name,   LABEL_MAX,
-                                                                                                type,   DOMAIN_NAME_MAX,
-                                                                                                domain, DOMAIN_NAME_MAX);
-                       if (errno < 0) {
-                               var err = new Error.FAILURE(strerror(errno));
-                               err.code = errno;
-                               throw err;
-                       }
-               }
-
-               public bool is_valid_service_type_generic(string s);
-               public bool is_valid_service_type_strict(string s);
-               public bool is_valid_service_subtype(string s);
-               public bool is_valid_domain_name(string s);
-               public bool is_valid_service_name(string s);
-               public bool is_valid_host_name(string s);
-               public bool is_valid_fqdn(string s);
-
-               [CCode(cheader_filename="avahi-common/address.h")]
-               public unowned string reverse_lookup_name(Address addr, char[] dest=new char[DOMAIN_NAME_MAX]);
-       }
-
-       [CCode(cheader_filename="avahi-common/alternative.h", lower_case_cprefix="avahi_alternative_")]
-       namespace Alternative {
-               public string host_name(string s);
-               public string service_name(string s);
-       }
-
-
        /* Lookup flags */
 
        [CCode(cheader_filename="avahi-gobject/ga-enums.h", cprefix="GA_LOOKUP_RESULT_")]
@@ -434,23 +240,6 @@ namespace Avahi {
                public signal void failure(GLib.Error error);
        }
 
-
-       /* Entry group */
-
-       [Flags]
-       [CCode(cheader_filename="avahi-common/defs.h", cname="AvahiPublishFlags", cfrefix="AVAHI_PUBLISH_")]
-       public enum PublishFlags {
-               UNIQUE,
-               NO_PROBE,
-               NO_ANNOUNCE,
-               ALLOW_MULTIPLE,
-               NO_REVERSE,
-               NO_COOKIE,
-               UPDATE,
-               USE_WIDE_AREA,
-               USE_MULTICAST
-       }
-
        [CCode(cheader_filename="avahi-gobject/ga-entry-group.h")]
        public enum EntryGroupState {
                UNCOMMITED,