X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fdbus-protocol.c;h=9bfc15113d0fd6d406f39aa08655b93ed6eb0542;hb=758381efbaa40d604253259cd43f194db1162859;hp=19e956b6c214145900abf78a759c6885efe619ab;hpb=c4ee97bf1fe6ca9caf4f17a2a5a77a620ff7d9d7;p=catta diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c index 19e956b..9bfc151 100644 --- a/avahi-daemon/dbus-protocol.c +++ b/avahi-daemon/dbus-protocol.c @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include @@ -190,7 +189,7 @@ static DBusHandlerResult msg_signal_filter_impl(AVAHI_GCC_UNUSED DBusConnection struct timeval tv; if (server->reconnect) { - avahi_log_warn("Disconnnected from D-BUS, trying to reconnect in %ims...", RECONNECT_MSEC); + avahi_log_warn("Disconnnected from D-Bus, trying to reconnect in %ims...", RECONNECT_MSEC); dbus_disconnect(); @@ -201,7 +200,7 @@ static DBusHandlerResult msg_signal_filter_impl(AVAHI_GCC_UNUSED DBusConnection else server->reconnect_timeout = server->poll_api->timeout_new(server->poll_api, &tv, reconnect_callback, NULL); } else { - avahi_log_warn("Disconnnected from D-BUS, exiting."); + avahi_log_warn("Disconnnected from D-Bus, exiting."); raise(SIGQUIT); } @@ -265,6 +264,22 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, AVAH return avahi_dbus_respond_string(c, m, avahi_server_get_host_name(avahi_server)); + } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "SetHostName")) { + + char *name; + + if (!dbus_message_get_args(m, &error, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) { + avahi_log_warn("Error parsing Server::SetHostName message"); + goto fail; + } + + if (avahi_server_set_host_name(avahi_server, name) < 0) + return avahi_dbus_respond_error(c, m, avahi_server_errno(avahi_server), NULL); + + avahi_log_info("Changing host name to '%s'.", name); + + return avahi_dbus_respond_ok(c, m); + } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetDomainName")) { if (!dbus_message_get_args(m, &error, DBUS_TYPE_INVALID)) { @@ -331,9 +346,7 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, AVAH } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetNetworkInterfaceNameByIndex")) { int32_t idx; - int fd; char name[IF_NAMESIZE]; - if (!(dbus_message_get_args(m, &error, DBUS_TYPE_INT32, &idx, DBUS_TYPE_INVALID))) { avahi_log_warn("Error parsing Server::GetNetworkInterfaceNameByIndex message"); @@ -343,29 +356,17 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, AVAH #ifdef VALGRIND_WORKAROUND return respond_string(c, m, "blah"); #else - - if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) - if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { - char txt[256]; - snprintf(txt, sizeof(txt), "OS Error: %s", strerror(errno)); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_OS, txt); - } - if ((!if_indextoname(idx, name))) { char txt[256]; snprintf(txt, sizeof(txt), "OS Error: %s", strerror(errno)); - close(fd); return avahi_dbus_respond_error(c, m, AVAHI_ERR_OS, txt); } - - close(fd); return avahi_dbus_respond_string(c, m, name); #endif } else if (dbus_message_is_method_call(m, AVAHI_DBUS_INTERFACE_SERVER, "GetNetworkInterfaceIndexByName")) { char *n; - int fd; int32_t idx; if (!(dbus_message_get_args(m, &error, DBUS_TYPE_STRING, &n, DBUS_TYPE_INVALID)) || !n) { @@ -376,21 +377,11 @@ static DBusHandlerResult msg_server_impl(DBusConnection *c, DBusMessage *m, AVAH #ifdef VALGRIND_WORKAROUND return respond_int32(c, m, 1); #else - if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) - if ((fd = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { - char txt[256]; - snprintf(txt, sizeof(txt), "OS Error: %s", strerror(errno)); - return avahi_dbus_respond_error(c, m, AVAHI_ERR_OS, txt); - } - if (!(idx = if_nametoindex(n))) { char txt[256]; snprintf(txt, sizeof(txt), "OS Error: %s", strerror(errno)); - close(fd); return avahi_dbus_respond_error(c, m, AVAHI_ERR_OS, txt); } - - close(fd); return avahi_dbus_respond_int32(c, m, idx); #endif @@ -1060,12 +1051,34 @@ static int dbus_connect(void) { assert(!server->bus); dbus_error_init(&error); - - if (!(server->bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error))) { + +#ifdef HAVE_DBUS_BUS_GET_PRIVATE + if (!(server->bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error))) { assert(dbus_error_is_set(&error)); - avahi_log_error("dbus_bus_get(): %s", error.message); + avahi_log_error("dbus_bus_get_private(): %s", error.message); goto fail; } +#else + { + const char *a; + + if (!(a = getenv("DBUS_SYSTEM_BUS_ADDRESS")) || !*a) + a = DBUS_SYSTEM_BUS_DEFAULT_ADDRESS; + + if (!(server->bus = dbus_connection_open_private(a, &error))) { + assert(dbus_error_is_set(&error)); + avahi_log_error("dbus_bus_open_private(): %s", error.message); + goto fail; + } + + if (!dbus_bus_register(server->bus, &error)) { + assert(dbus_error_is_set(&error)); + avahi_log_error("dbus_bus_register(): %s", error.message); + goto fail; + } + } +#endif + if (avahi_dbus_connection_glue(server->bus, server->poll_api) < 0) { avahi_log_error("avahi_dbus_connection_glue() failed"); goto fail; @@ -1076,10 +1089,10 @@ static int dbus_connect(void) { if (dbus_bus_request_name( server->bus, AVAHI_DBUS_NAME, -#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) - DBUS_NAME_FLAG_DO_NOT_QUEUE, -#else +#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60) DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, +#else + DBUS_NAME_FLAG_DO_NOT_QUEUE, #endif &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { if (dbus_error_is_set(&error)) { @@ -1087,7 +1100,7 @@ static int dbus_connect(void) { goto fail; } - avahi_log_error("Failed to acquire DBUS name '"AVAHI_DBUS_NAME"'"); + avahi_log_error("Failed to acquire D-Bus name '"AVAHI_DBUS_NAME"'"); goto fail; } @@ -1115,7 +1128,11 @@ fail: dbus_error_free(&error); if (server->bus) { +#ifdef HAVE_DBUS_CONNECTION_CLOSE + dbus_connection_close(server->bus); +#else dbus_connection_disconnect(server->bus); +#endif dbus_connection_unref(server->bus); server->bus = NULL; } @@ -1132,7 +1149,11 @@ static void dbus_disconnect(void) { assert(server->n_clients == 0); if (server->bus) { +#ifdef HAVE_DBUS_CONNECTION_CLOSE + dbus_connection_close(server->bus); +#else dbus_connection_disconnect(server->bus); +#endif dbus_connection_unref(server->bus); server->bus = NULL; } @@ -1157,7 +1178,7 @@ int dbus_protocol_setup(const AvahiPoll *poll_api, int _disable_user_service_pub if (!force) goto fail; - avahi_log_warn("WARNING: Failed to contact D-BUS daemon, retrying in %ims.", RECONNECT_MSEC); + avahi_log_warn("WARNING: Failed to contact D-Bus daemon, retrying in %ims.", RECONNECT_MSEC); avahi_elapse_time(&tv, RECONNECT_MSEC, 0); server->reconnect_timeout = server->poll_api->timeout_new(server->poll_api, &tv, reconnect_callback, NULL); @@ -1167,7 +1188,12 @@ int dbus_protocol_setup(const AvahiPoll *poll_api, int _disable_user_service_pub fail: if (server->bus) { +#ifdef HAVE_DBUS_CONNECTION_CLOSE + dbus_connection_close(server->bus); +#else dbus_connection_disconnect(server->bus); +#endif + dbus_connection_unref(server->bus); }