X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-client%2Fentrygroup.c;h=cd845343c2ccd4cce4ede7b2ef0adafe4d5c386b;hb=2a2ee0be70b99239f2cf99ea5b663eda965599f8;hp=2d882e67fcb33d3910b8a4a562d317e11d6b8baa;hpb=0c54764cf19428a0c52724a75ddf3368e3899209;p=catta

diff --git a/avahi-client/entrygroup.c b/avahi-client/entrygroup.c
index 2d882e6..cd84534 100644
--- a/avahi-client/entrygroup.c
+++ b/avahi-client/entrygroup.c
@@ -336,7 +336,6 @@ static int append_string_list(DBusMessage *message, AvahiStringList *txt) {
     AvahiStringList *p;
 
     assert(message);
-    assert(txt);
 
     dbus_message_iter_init_append(message, &iter);
 
@@ -477,37 +476,16 @@ int avahi_entry_group_add_service(
     ...) {
     
     va_list va;
-    int r;
-
-    assert(group);
-
-    va_start(va, port);
-    r = avahi_entry_group_add_service_va(group, interface, protocol, flags, name, type, domain, host, port, va);
-    va_end(va);
-    return r;
-}
-
-int avahi_entry_group_add_service_va(
-    AvahiEntryGroup *group,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiPublishFlags flags,
-    const char *name,
-    const char *type,
-    const char *domain,
-    const char *host,
-    uint16_t port,
-    va_list va) {
-
     int r;
     AvahiStringList *txt;
 
     assert(group);
 
+    va_start(va, port);
     txt = avahi_string_list_new_va(va);
     r = avahi_entry_group_add_service_strlst(group, interface, protocol, flags, name, type, domain, host, port, txt);
     avahi_string_list_free(txt);
-
+    va_end(va);
     return r;
 }
 
@@ -611,31 +589,14 @@ int avahi_entry_group_update_service_txt(
     ...) {
 
     va_list va;
-    int r;
-
-    va_start(va, domain);
-    r = avahi_entry_group_update_service_txt_va(group, interface, protocol, flags, name, type, domain, va);
-    va_end(va);
-    return r;
-}
-
-int avahi_entry_group_update_service_txt_va(
-    AvahiEntryGroup *group,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiPublishFlags flags,
-    const char *name,     
-    const char *type,     
-    const char *domain,   
-    va_list va) {
-
     int r;
     AvahiStringList *txt;
 
+    va_start(va, domain);
     txt = avahi_string_list_new_va(va);
     r = avahi_entry_group_update_service_txt_strlst(group, interface, protocol, flags, name, type, domain, txt);
     avahi_string_list_free(txt);
-
+    va_end(va);
     return r;
 }
 
@@ -728,3 +689,89 @@ fail:
     
 }
 
+/** Add a host/address pair */
+int avahi_entry_group_add_address(
+    AvahiEntryGroup *group,
+    AvahiIfIndex interface,
+    AvahiProtocol protocol,
+    AvahiPublishFlags flags,
+    const char *name,
+    const AvahiAddress *a) {
+
+    DBusMessage *message = NULL, *reply = NULL;
+    int r = AVAHI_OK;
+    DBusError error;
+    AvahiClient *client;
+    int32_t i_interface, i_protocol;
+    uint32_t u_flags;
+    char s_address[AVAHI_ADDRESS_STR_MAX];
+    char *p_address = s_address;
+
+    assert(name);
+
+    client = group->client;
+
+    if (!group->path || group->client->state == AVAHI_CLIENT_DISCONNECTED)
+        return avahi_client_set_errno(group->client, AVAHI_ERR_BAD_STATE);
+
+    dbus_error_init(&error);
+    
+    if (!(message = dbus_message_new_method_call (AVAHI_DBUS_NAME, group->path, AVAHI_DBUS_INTERFACE_ENTRY_GROUP, "AddAddress"))) {
+        r = avahi_client_set_errno(client, AVAHI_ERR_NO_MEMORY);
+        goto fail;
+    }
+
+    i_interface = (int32_t) interface;
+    i_protocol = (int32_t) protocol;
+    u_flags = (uint32_t) flags;
+        
+    if (!avahi_address_snprint (s_address, sizeof (s_address), a))
+    {
+        r = avahi_client_set_errno(client, AVAHI_ERR_INVALID_ADDRESS);
+        goto fail;
+    }
+
+    if (!dbus_message_append_args(
+            message,
+            DBUS_TYPE_INT32, &i_interface,
+            DBUS_TYPE_INT32, &i_protocol,
+            DBUS_TYPE_UINT32, &u_flags,
+            DBUS_TYPE_STRING, &name,
+            DBUS_TYPE_STRING, &p_address,
+            DBUS_TYPE_INVALID)) {
+        r = avahi_client_set_errno(group->client, AVAHI_ERR_NO_MEMORY);
+        goto fail;
+    }
+    
+    if (!(reply = dbus_connection_send_with_reply_and_block(client->bus, message, -1, &error)) ||
+        dbus_error_is_set (&error)) {
+        r = avahi_client_set_errno(client, AVAHI_ERR_DBUS_ERROR);
+        goto fail;
+    }
+    
+    if (!dbus_message_get_args(reply, &error, DBUS_TYPE_INVALID) ||
+        dbus_error_is_set (&error)) {
+        r = avahi_client_set_errno(client, AVAHI_ERR_DBUS_ERROR);
+        goto fail;
+    }
+
+    dbus_message_unref(message);
+    dbus_message_unref(reply);
+
+    return AVAHI_OK;
+
+fail:
+    
+    if (dbus_error_is_set(&error)) {
+        r = avahi_client_set_dbus_error(client, &error);
+        dbus_error_free(&error);
+    }
+
+    if (message)
+        dbus_message_unref(message);
+
+    if (reply)
+        dbus_message_unref(reply);
+
+    return r;
+}