#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
-#include <avahi-core/llist.h>
+#include <avahi-common/llist.h>
#include <avahi-core/log.h>
#include <avahi-core/core.h>
#include <avahi-common/dbus.h>
#define MAX_OBJECTS_PER_CLIENT 50
#define MAX_ENTRIES_PER_ENTRY_GROUP 20
+/* #define VALGRIND_WORKAROUND */
+
struct EntryGroupInfo {
guint id;
Client *client;
return DBUS_HANDLER_RESULT_HANDLED;
} else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_ENTRY_GROUP, "GetState")) {
-
+ AvahiEntryGroupState state;
+
if (!dbus_message_get_args(m, &error, DBUS_TYPE_INVALID)) {
avahi_log_warn("Error parsing EntryGroup::GetState message");
goto fail;
}
- return respond_int32(c, m, (gint32) avahi_entry_group_get_state(i->entry_group));
+ state = avahi_entry_group_get_state(i->entry_group);
+ return respond_int32(c, m, (gint32) state);
} else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_ENTRY_GROUP, "AddService")) {
gint32 interface, protocol;
gchar *type, *name, *domain, *host;
guint16 port;
- gchar **txt = NULL;
- gint txt_len;
AvahiStringList *strlst;
+ DBusMessageIter iter, sub;
+ int j;
if (!dbus_message_get_args(
m, &error,
DBUS_TYPE_STRING, &domain,
DBUS_TYPE_STRING, &host,
DBUS_TYPE_UINT16, &port,
- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &txt, &txt_len,
DBUS_TYPE_INVALID) || !type || !name) {
avahi_log_warn("Error parsing EntryGroup::AddService message");
goto fail;
}
+ dbus_message_iter_init(m, &iter);
+
+ for (j = 0; j < 7; j++)
+ dbus_message_iter_next(&iter);
+
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY ||
+ dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_ARRAY) {
+ avahi_log_warn("Error parsing EntryGroup::AddService message 2");
+ goto fail;
+ }
+
+ strlst = NULL;
+ dbus_message_iter_recurse(&iter, &sub);
+
+ for (;;) {
+ DBusMessageIter sub2;
+ int at, n;
+ guint8 *k;
+
+ if ((at = dbus_message_iter_get_arg_type(&sub)) == DBUS_TYPE_INVALID)
+ break;
+
+ g_assert(at == DBUS_TYPE_ARRAY);
+
+ if (dbus_message_iter_get_element_type(&sub) != DBUS_TYPE_BYTE) {
+ avahi_log_warn("Error parsing EntryGroup::AddService message");
+ goto fail;
+ }
+
+ dbus_message_iter_recurse(&sub, &sub2);
+ dbus_message_iter_get_fixed_array(&sub2, &k, &n);
+ strlst = avahi_string_list_add_arbitrary(strlst, k, n);
+
+ dbus_message_iter_next(&sub);
+ }
+
if (i->n_entries >= MAX_ENTRIES_PER_ENTRY_GROUP) {
+ avahi_string_list_free(strlst);
avahi_log_warn("Too many entries per entry group, client request failed.");
- dbus_free_string_array(txt);
return respond_error(c, m, AVAHI_ERR_TOO_MANY_ENTRIES, NULL);
}
- strlst = avahi_string_list_new_from_array((const gchar**) txt, txt_len);
- dbus_free_string_array(txt);
-
if (domain && !*domain)
domain = NULL;
if (event == AVAHI_RESOLVER_FOUND) {
char t[256], *pt = t;
gint32 i_interface, i_protocol, i_aprotocol;
- gchar **array;
guint n, j;
AvahiStringList *p;
DBusMessage *reply;
+ DBusMessageIter iter, sub;
g_assert(host_name);
i_protocol = (gint32) protocol;
i_aprotocol = (gint32) a->family;
- array = g_new(gchar*, (n = avahi_string_list_length(txt)));
-
- /** FIXME: DBUS doesn't support strings that include NUL bytes (?) */
- for (p = txt, j = n-1; p; p = p->next, j--)
- array[j] = g_strndup((gchar*) p->text, p->size);
-
reply = dbus_message_new_method_return(i->message);
dbus_message_append_args(
reply,
DBUS_TYPE_INT32, &i_aprotocol,
DBUS_TYPE_STRING, &pt,
DBUS_TYPE_UINT16, &port,
- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &array, n,
DBUS_TYPE_INVALID);
- for (j = 0; j < n; j++)
- g_free(array[j]);
+ dbus_message_iter_init_append(reply, &iter);
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "ay", &sub);
+ for (p = txt, j = n-1; p; p = p->next, j--) {
+ DBusMessageIter sub2;
+ const guint8 *data = p->text;
+
+ dbus_message_iter_open_container(&sub, DBUS_TYPE_ARRAY, "y", &sub2);
+ dbus_message_iter_append_fixed_array(&sub2, DBUS_TYPE_BYTE, &data, p->size);
+ dbus_message_iter_close_container(&sub, &sub2);
+
+ }
+ dbus_message_iter_close_container(&iter, &sub);
+
dbus_connection_send(server->bus, reply, NULL);
dbus_message_unref(reply);
} else {
return respond_string(c, m, PACKAGE_STRING);
} else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetState")) {
-
+ AvahiServerState state;
+
if (!(dbus_message_get_args(m, &error, DBUS_TYPE_INVALID))) {
avahi_log_warn("Error parsing Server::GetState message");
goto fail;
}
-
- return respond_int32(c, m, (gint32) avahi_server_get_state(avahi_server));
+
+ state = avahi_server_get_state(avahi_server);
+ return respond_int32(c, m, (gint32) state);
} else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetNetworkInterfaceNameByIndex")) {
gint32 idx;
goto fail;
}
+#ifdef VALGRIND_WORKAROUND
+ return respond_string(c, m, "blah");
+#else
+
if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
gchar txt[256];
g_snprintf(txt, sizeof(txt), "OS Error: %s", strerror(errno));
close(fd);
return respond_string(c, m, ifr.ifr_name);
-
+#endif
+
} else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetNetworkInterfaceIndexByName")) {
gchar *n;
int fd;
goto fail;
}
+#ifdef VALGRIND_WORKAROUND
+ return respond_int32(c, m, 1);
+#else
if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
gchar txt[256];
g_snprintf(txt, sizeof(txt), "OS Error: %s", strerror(errno));
close(fd);
return respond_int32(c, m, ifr.ifr_ifindex);
+#endif
} else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetAlternativeHostName")) {
gchar *n, * t;
}
dbus_connection_setup_with_g_main(server->bus, NULL);
- dbus_connection_set_exit_on_disconnect(server->bus, FALSE);
+ dbus_connection_set_exit_on_disconnect(server->bus, TRUE);
dbus_bus_request_name(server->bus, AVAHI_DBUS_NAME, 0, &error);
if (dbus_error_is_set(&error)) {
projects / catta / blobdiff