diff options
Diffstat (limited to 'src/dbus.c')
| -rw-r--r-- | src/dbus.c | 668 |
1 files changed, 543 insertions, 125 deletions
@@ -1,4 +1,4 @@ -/* dnsmasq is Copyright (c) 2000-2011 Simon Kelley +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ #include <dbus/dbus.h> -const char* introspection_xml = +const char* introspection_xml_template = "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n" "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n" "<node name=\"" DNSMASQ_PATH "\">\n" @@ -29,15 +29,32 @@ const char* introspection_xml = " <arg name=\"data\" direction=\"out\" type=\"s\"/>\n" " </method>\n" " </interface>\n" -" <interface name=\"" DNSMASQ_SERVICE "\">\n" +" <interface name=\"%s\">\n" " <method name=\"ClearCache\">\n" " </method>\n" " <method name=\"GetVersion\">\n" " <arg name=\"version\" direction=\"out\" type=\"s\"/>\n" " </method>\n" +#ifdef HAVE_LOOP +" <method name=\"GetLoopServers\">\n" +" <arg name=\"server\" direction=\"out\" type=\"as\"/>\n" +" </method>\n" +#endif " <method name=\"SetServers\">\n" " <arg name=\"servers\" direction=\"in\" type=\"av\"/>\n" " </method>\n" +" <method name=\"SetDomainServers\">\n" +" <arg name=\"servers\" direction=\"in\" type=\"as\"/>\n" +" </method>\n" +" <method name=\"SetServersEx\">\n" +" <arg name=\"servers\" direction=\"in\" type=\"aas\"/>\n" +" </method>\n" +" <method name=\"SetFilterWin2KOption\">\n" +" <arg name=\"filterwin2k\" direction=\"in\" type=\"b\"/>\n" +" </method>\n" +" <method name=\"SetBogusPrivOption\">\n" +" <arg name=\"boguspriv\" direction=\"in\" type=\"b\"/>\n" +" </method>\n" " <signal name=\"DhcpLeaseAdded\">\n" " <arg name=\"ipaddr\" type=\"s\"/>\n" " <arg name=\"hwaddr\" type=\"s\"/>\n" @@ -53,9 +70,26 @@ const char* introspection_xml = " <arg name=\"hwaddr\" type=\"s\"/>\n" " <arg name=\"hostname\" type=\"s\"/>\n" " </signal>\n" +#ifdef HAVE_DHCP +" <method name=\"AddDhcpLease\">\n" +" <arg name=\"ipaddr\" type=\"s\"/>\n" +" <arg name=\"hwaddr\" type=\"s\"/>\n" +" <arg name=\"hostname\" type=\"ay\"/>\n" +" <arg name=\"clid\" type=\"ay\"/>\n" +" <arg name=\"lease_duration\" type=\"u\"/>\n" +" <arg name=\"ia_id\" type=\"u\"/>\n" +" <arg name=\"is_temporary\" type=\"b\"/>\n" +" </method>\n" +" <method name=\"DeleteDhcpLease\">\n" +" <arg name=\"ipaddr\" type=\"s\"/>\n" +" <arg name=\"success\" type=\"b\" direction=\"out\"/>\n" +" </method>\n" +#endif " </interface>\n" "</node>\n"; +static char *introspection_xml = NULL; + struct watch { DBusWatch *watch; struct watch *next; @@ -83,33 +117,32 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *data) static void remove_watch(DBusWatch *watch, void *data) { - struct watch **up, *w; + struct watch **up, *w, *tmp; - for (up = &(daemon->watches), w = daemon->watches; w; w = w->next) - if (w->watch == watch) - { - *up = w->next; - free(w); - } - else - up = &(w->next); + for (up = &(daemon->watches), w = daemon->watches; w; w = tmp) + { + tmp = w->next; + if (w->watch == watch) + { + *up = tmp; + free(w); + } + else + up = &(w->next); + } w = data; /* no warning */ } static void dbus_read_servers(DBusMessage *message) { - struct server *serv, *tmp, **up; DBusMessageIter iter; union mysockaddr addr, source_addr; char *domain; dbus_message_iter_init(message, &iter); - - /* mark everything from DBUS */ - for (serv = daemon->servers; serv; serv = serv->next) - if (serv->flags & SERV_FROM_DBUS) - serv->flags |= SERV_MARK; + + mark_servers(SERV_FROM_DBUS); while (1) { @@ -143,13 +176,16 @@ static void dbus_read_servers(DBusMessage *message) dbus_message_iter_get_basic(&iter, &p[i]); dbus_message_iter_next (&iter); if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BYTE) - break; + { + i++; + break; + } } #ifndef HAVE_IPV6 my_syslog(LOG_WARNING, _("attempt to set an IPv6 server address via DBus - no IPv6 support")); #else - if (i == sizeof(struct in6_addr)-1) + if (i == sizeof(struct in6_addr)) { memcpy(&addr.in6.sin6_addr, p, sizeof(struct in6_addr)); #ifdef HAVE_SOCKADDR_SA_LEN @@ -169,6 +205,7 @@ static void dbus_read_servers(DBusMessage *message) /* At the end */ break; + /* process each domain */ do { if (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING) { @@ -179,123 +216,500 @@ static void dbus_read_servers(DBusMessage *message) domain = NULL; if (!skip) - { - /* See if this is already there, and unmark */ - for (serv = daemon->servers; serv; serv = serv->next) - if ((serv->flags & SERV_FROM_DBUS) && - (serv->flags & SERV_MARK)) + add_update_server(SERV_FROM_DBUS, &addr, &source_addr, NULL, domain); + + } while (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING); + } + + /* unlink and free anything still marked. */ + cleanup_servers(); +} + +#ifdef HAVE_LOOP +static DBusMessage *dbus_reply_server_loop(DBusMessage *message) +{ + DBusMessageIter args, args_iter; + struct server *serv; + DBusMessage *reply = dbus_message_new_method_return(message); + + dbus_message_iter_init_append (reply, &args); + dbus_message_iter_open_container (&args, DBUS_TYPE_ARRAY,DBUS_TYPE_STRING_AS_STRING, &args_iter); + + for (serv = daemon->servers; serv; serv = serv->next) + if (serv->flags & SERV_LOOP) + { + prettyprint_addr(&serv->addr, daemon->addrbuff); + dbus_message_iter_append_basic (&args_iter, DBUS_TYPE_STRING, &daemon->addrbuff); + } + + dbus_message_iter_close_container (&args, &args_iter); + + return reply; +} +#endif + +static DBusMessage* dbus_read_servers_ex(DBusMessage *message, int strings) +{ + DBusMessageIter iter, array_iter, string_iter; + DBusMessage *error = NULL; + const char *addr_err; + char *dup = NULL; + + if (!dbus_message_iter_init(message, &iter)) + { + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Failed to initialize dbus message iter"); + } + + /* check that the message contains an array of arrays */ + if ((dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) || + (dbus_message_iter_get_element_type(&iter) != (strings ? DBUS_TYPE_STRING : DBUS_TYPE_ARRAY))) + { + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + strings ? "Expected array of string" : "Expected array of string arrays"); + } + + mark_servers(SERV_FROM_DBUS); + + /* array_iter points to each "as" element in the outer array */ + dbus_message_iter_recurse(&iter, &array_iter); + while (dbus_message_iter_get_arg_type(&array_iter) != DBUS_TYPE_INVALID) + { + const char *str = NULL; + union mysockaddr addr, source_addr; + int flags = 0; + char interface[IF_NAMESIZE]; + char *str_addr, *str_domain = NULL; + + if (strings) + { + dbus_message_iter_get_basic(&array_iter, &str); + if (!str || !strlen (str)) + { + error = dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Empty string"); + break; + } + + /* dup the string because it gets modified during parsing */ + if (dup) + free(dup); + if (!(dup = str_domain = whine_malloc(strlen(str)+1))) + break; + + strcpy(str_domain, str); + + /* point to address part of old string for error message */ + if ((str_addr = strrchr(str, '/'))) + str = str_addr+1; + + if ((str_addr = strrchr(str_domain, '/'))) + { + if (*str_domain != '/' || str_addr == str_domain) { - if (!(serv->flags & SERV_HAS_DOMAIN) && !domain) - { - serv->flags &= ~SERV_MARK; - break; - } - if ((serv->flags & SERV_HAS_DOMAIN) && - domain && - hostname_isequal(domain, serv->domain)) - { - serv->flags &= ~SERV_MARK; - break; - } + error = dbus_message_new_error_printf(message, + DBUS_ERROR_INVALID_ARGS, + "No domain terminator '%s'", + str); + break; } - - if (!serv && (serv = whine_malloc(sizeof (struct server)))) - { - /* Not found, create a new one. */ - memset(serv, 0, sizeof(struct server)); - - if (domain) - serv->domain = whine_malloc(strlen(domain)+1); - - if (domain && !serv->domain) - { - free(serv); - serv = NULL; - } - else - { - serv->next = daemon->servers; - daemon->servers = serv; - serv->flags = SERV_FROM_DBUS; - if (domain) - { - strcpy(serv->domain, domain); - serv->flags |= SERV_HAS_DOMAIN; - } - } - } + *str_addr++ = 0; + str_domain++; + } + else + { + str_addr = str_domain; + str_domain = NULL; + } + + + } + else + { + /* check the types of the struct and its elements */ + if ((dbus_message_iter_get_arg_type(&array_iter) != DBUS_TYPE_ARRAY) || + (dbus_message_iter_get_element_type(&array_iter) != DBUS_TYPE_STRING)) + { + error = dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Expected inner array of strings"); + break; + } + + /* string_iter points to each "s" element in the inner array */ + dbus_message_iter_recurse(&array_iter, &string_iter); + if (dbus_message_iter_get_arg_type(&string_iter) != DBUS_TYPE_STRING) + { + /* no IP address given */ + error = dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Expected IP address"); + break; + } + + dbus_message_iter_get_basic(&string_iter, &str); + if (!str || !strlen (str)) + { + error = dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Empty IP address"); + break; + } + + /* dup the string because it gets modified during parsing */ + if (dup) + free(dup); + if (!(dup = str_addr = whine_malloc(strlen(str)+1))) + break; + + strcpy(str_addr, str); + } + + memset(&addr, 0, sizeof(addr)); + memset(&source_addr, 0, sizeof(source_addr)); + memset(&interface, 0, sizeof(interface)); - if (serv) + /* parse the IP address */ + if ((addr_err = parse_server(str_addr, &addr, &source_addr, (char *) &interface, &flags))) + { + error = dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS, + "Invalid IP address '%s': %s", + str, addr_err); + break; + } + + /* 0.0.0.0 for server address == NULL, for Dbus */ + if (addr.in.sin_family == AF_INET && + addr.in.sin_addr.s_addr == 0) + flags |= SERV_NO_ADDR; + + if (strings) + { + char *p; + + do { + if (str_domain) { - if (source_addr.in.sin_family == AF_INET && - addr.in.sin_addr.s_addr == 0 && - serv->domain) - serv->flags |= SERV_NO_ADDR; - else - { - serv->flags &= ~SERV_NO_ADDR; - serv->addr = addr; - serv->source_addr = source_addr; - } + if ((p = strchr(str_domain, '/'))) + *p++ = 0; } - } - } while (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING); + else + p = NULL; + + add_update_server(flags | SERV_FROM_DBUS, &addr, &source_addr, interface, str_domain); + } while ((str_domain = p)); + } + else + { + /* jump past the address to the domain list (if any) */ + dbus_message_iter_next (&string_iter); + + /* parse domains and add each server/domain pair to the list */ + do { + str = NULL; + if (dbus_message_iter_get_arg_type(&string_iter) == DBUS_TYPE_STRING) + dbus_message_iter_get_basic(&string_iter, &str); + dbus_message_iter_next (&string_iter); + + add_update_server(flags | SERV_FROM_DBUS, &addr, &source_addr, interface, str); + } while (dbus_message_iter_get_arg_type(&string_iter) == DBUS_TYPE_STRING); + } + + /* jump to next element in outer array */ + dbus_message_iter_next(&array_iter); } + + cleanup_servers(); + + if (dup) + free(dup); + + return error; +} + +static DBusMessage *dbus_set_bool(DBusMessage *message, int flag, char *name) +{ + DBusMessageIter iter; + dbus_bool_t enabled; + + if (!dbus_message_iter_init(message, &iter) || dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BOOLEAN) + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, "Expected boolean argument"); - /* unlink and free anything still marked. */ - for (serv = daemon->servers, up = &daemon->servers; serv; serv = tmp) + dbus_message_iter_get_basic(&iter, &enabled); + + if (enabled) + { + my_syslog(LOG_INFO, _("Enabling --%s option from D-Bus"), name); + set_option_bool(flag); + } + else { - tmp = serv->next; - if (serv->flags & SERV_MARK) - { - server_gone(serv); - *up = serv->next; - free(serv); - } - else - up = &serv->next; + my_syslog(LOG_INFO, _("Disabling --%s option from D-Bus"), name); + reset_option_bool(flag); + } + + return NULL; +} + +#ifdef HAVE_DHCP +static DBusMessage *dbus_add_lease(DBusMessage* message) +{ + struct dhcp_lease *lease; + const char *ipaddr, *hwaddr, *hostname, *tmp; + const unsigned char* clid; + int clid_len, hostname_len, hw_len, hw_type; + dbus_uint32_t expires, ia_id; + dbus_bool_t is_temporary; + struct all_addr addr; + time_t now = dnsmasq_time(); + unsigned char dhcp_chaddr[DHCP_CHADDR_MAX]; + + DBusMessageIter iter, array_iter; + if (!dbus_message_iter_init(message, &iter)) + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Failed to initialize dbus message iter"); + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Expected string as first argument"); + + dbus_message_iter_get_basic(&iter, &ipaddr); + dbus_message_iter_next(&iter); + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Expected string as second argument"); + + dbus_message_iter_get_basic(&iter, &hwaddr); + 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_BYTE)) + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Expected byte array as third argument"); + + dbus_message_iter_recurse(&iter, &array_iter); + dbus_message_iter_get_fixed_array(&array_iter, &hostname, &hostname_len); + tmp = memchr(hostname, '\0', hostname_len); + if (tmp) + { + if (tmp == &hostname[hostname_len - 1]) + hostname_len--; + else + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Hostname contains an embedded NUL character"); + } + 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_BYTE)) + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Expected byte array as fourth argument"); + + dbus_message_iter_recurse(&iter, &array_iter); + dbus_message_iter_get_fixed_array(&array_iter, &clid, &clid_len); + dbus_message_iter_next(&iter); + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT32) + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Expected uint32 as fifth argument"); + + dbus_message_iter_get_basic(&iter, &expires); + dbus_message_iter_next(&iter); + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT32) + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Expected uint32 as sixth argument"); + + dbus_message_iter_get_basic(&iter, &ia_id); + dbus_message_iter_next(&iter); + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BOOLEAN) + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Expected uint32 as sixth argument"); + + dbus_message_iter_get_basic(&iter, &is_temporary); + + if (inet_pton(AF_INET, ipaddr, &addr.addr.addr4)) + { + if (ia_id != 0 || is_temporary) + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "ia_id and is_temporary must be zero for IPv4 lease"); + + if (!(lease = lease_find_by_addr(addr.addr.addr4))) + lease = lease4_allocate(addr.addr.addr4); } +#ifdef HAVE_DHCP6 + else if (inet_pton(AF_INET6, ipaddr, &addr.addr.addr6)) + { + if (!(lease = lease6_find_by_addr(&addr.addr.addr6, 128, 0))) + lease = lease6_allocate(&addr.addr.addr6, + is_temporary ? LEASE_TA : LEASE_NA); + lease_set_iaid(lease, ia_id); + } +#endif + else + return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS, + "Invalid IP address '%s'", ipaddr); + + hw_len = parse_hex((char*)hwaddr, dhcp_chaddr, DHCP_CHADDR_MAX, NULL, + &hw_type); + if (hw_type == 0 && hw_len != 0) + hw_type = ARPHRD_ETHER; + + lease_set_hwaddr(lease, dhcp_chaddr, clid, hw_len, hw_type, + clid_len, now, 0); + lease_set_expires(lease, expires, now); + if (hostname_len != 0) + lease_set_hostname(lease, hostname, 0, get_domain(lease->addr), NULL); + + lease_update_file(now); + lease_update_dns(0); + + return NULL; +} + +static DBusMessage *dbus_del_lease(DBusMessage* message) +{ + struct dhcp_lease *lease; + DBusMessageIter iter; + const char *ipaddr; + DBusMessage *reply; + struct all_addr addr; + dbus_bool_t ret = 1; + time_t now = dnsmasq_time(); + + if (!dbus_message_iter_init(message, &iter)) + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Failed to initialize dbus message iter"); + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) + return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, + "Expected string as first argument"); + + dbus_message_iter_get_basic(&iter, &ipaddr); + if (inet_pton(AF_INET, ipaddr, &addr.addr.addr4)) + lease = lease_find_by_addr(addr.addr.addr4); +#ifdef HAVE_DHCP6 + else if (inet_pton(AF_INET6, ipaddr, &addr.addr.addr6)) + lease = lease6_find_by_addr(&addr.addr.addr6, 128, 0); +#endif + else + return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS, + "Invalid IP address '%s'", ipaddr); + + if (lease) + { + lease_prune(lease, now); + lease_update_file(now); + lease_update_dns(0); + } + else + ret = 0; + + if ((reply = dbus_message_new_method_return(message))) + dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &ret, + DBUS_TYPE_INVALID); + + + return reply; } +#endif DBusHandlerResult message_handler(DBusConnection *connection, DBusMessage *message, void *user_data) { char *method = (char *)dbus_message_get_member(message); - + DBusMessage *reply = NULL; + int clear_cache = 0, new_servers = 0; + if (dbus_message_is_method_call(message, DBUS_INTERFACE_INTROSPECTABLE, "Introspect")) { - DBusMessage *reply = dbus_message_new_method_return(message); - - dbus_message_append_args(reply, DBUS_TYPE_STRING, &introspection_xml, DBUS_TYPE_INVALID); - dbus_connection_send (connection, reply, NULL); - dbus_message_unref (reply); + /* string length: "%s" provides space for termination zero */ + if (!introspection_xml && + (introspection_xml = whine_malloc(strlen(introspection_xml_template) + strlen(daemon->dbus_name)))) + sprintf(introspection_xml, introspection_xml_template, daemon->dbus_name); + + if (introspection_xml) + { + reply = dbus_message_new_method_return(message); + dbus_message_append_args(reply, DBUS_TYPE_STRING, &introspection_xml, DBUS_TYPE_INVALID); + } } else if (strcmp(method, "GetVersion") == 0) { char *v = VERSION; - DBusMessage *reply = dbus_message_new_method_return(message); + reply = dbus_message_new_method_return(message); dbus_message_append_args(reply, DBUS_TYPE_STRING, &v, DBUS_TYPE_INVALID); - dbus_connection_send (connection, reply, NULL); - dbus_message_unref (reply); } +#ifdef HAVE_LOOP + else if (strcmp(method, "GetLoopServers") == 0) + { + reply = dbus_reply_server_loop(message); + } +#endif else if (strcmp(method, "SetServers") == 0) { - my_syslog(LOG_INFO, _("setting upstream servers from DBus")); dbus_read_servers(message); - check_servers(); + new_servers = 1; + } + else if (strcmp(method, "SetServersEx") == 0) + { + reply = dbus_read_servers_ex(message, 0); + new_servers = 1; + } + else if (strcmp(method, "SetDomainServers") == 0) + { + reply = dbus_read_servers_ex(message, 1); + new_servers = 1; + } + else if (strcmp(method, "SetFilterWin2KOption") == 0) + { + reply = dbus_set_bool(message, OPT_FILTER, "filterwin2k"); + } + else if (strcmp(method, "SetBogusPrivOption") == 0) + { + reply = dbus_set_bool(message, OPT_BOGUSPRIV, "bogus-priv"); + } +#ifdef HAVE_DHCP + else if (strcmp(method, "AddDhcpLease") == 0) + { + reply = dbus_add_lease(message); + } + else if (strcmp(method, "DeleteDhcpLease") == 0) + { + reply = dbus_del_lease(message); } +#endif else if (strcmp(method, "ClearCache") == 0) - clear_cache_and_reload(dnsmasq_time()); + clear_cache = 1; else return (DBUS_HANDLER_RESULT_NOT_YET_HANDLED); + + if (new_servers) + { + my_syslog(LOG_INFO, _("setting upstream servers from DBus")); + check_servers(); + if (option_bool(OPT_RELOAD)) + clear_cache = 1; + } + + if (clear_cache) + clear_cache_and_reload(dnsmasq_time()); method = user_data; /* no warning */ + /* If no reply or no error, return nothing */ + if (!reply) + reply = dbus_message_new_method_return(message); + + if (reply) + { + dbus_connection_send (connection, reply, NULL); + dbus_message_unref (reply); + } + return (DBUS_HANDLER_RESULT_HANDLED); - } @@ -315,7 +729,7 @@ char *dbus_init(void) dbus_connection_set_watch_functions(connection, add_watch, remove_watch, NULL, NULL, NULL); dbus_error_init (&dbus_error); - dbus_bus_request_name (connection, DNSMASQ_SERVICE, 0, &dbus_error); + dbus_bus_request_name (connection, daemon->dbus_name, 0, &dbus_error); if (dbus_error_is_set (&dbus_error)) return (char *)dbus_error.message; @@ -325,7 +739,7 @@ char *dbus_init(void) daemon->dbus = connection; - if ((message = dbus_message_new_signal(DNSMASQ_PATH, DNSMASQ_SERVICE, "Up"))) + if ((message = dbus_message_new_signal(DNSMASQ_PATH, daemon->dbus_name, "Up"))) { dbus_connection_send(connection, message, NULL); dbus_message_unref(message); @@ -335,8 +749,7 @@ char *dbus_init(void) } -void set_dbus_listeners(int *maxfdp, - fd_set *rset, fd_set *wset, fd_set *eset) +void set_dbus_listeners(void) { struct watch *w; @@ -346,19 +759,17 @@ void set_dbus_listeners(int *maxfdp, unsigned int flags = dbus_watch_get_flags(w->watch); int fd = dbus_watch_get_unix_fd(w->watch); - bump_maxfd(fd, maxfdp); - if (flags & DBUS_WATCH_READABLE) - FD_SET(fd, rset); + poll_listen(fd, POLLIN); if (flags & DBUS_WATCH_WRITABLE) - FD_SET(fd, wset); + poll_listen(fd, POLLOUT); - FD_SET(fd, eset); + poll_listen(fd, POLLERR); } } -void check_dbus_listeners(fd_set *rset, fd_set *wset, fd_set *eset) +void check_dbus_listeners() { DBusConnection *connection = (DBusConnection *)daemon->dbus; struct watch *w; @@ -369,13 +780,13 @@ void check_dbus_listeners(fd_set *rset, fd_set *wset, fd_set *eset) unsigned int flags = 0; int fd = dbus_watch_get_unix_fd(w->watch); - if (FD_ISSET(fd, rset)) + if (poll_check(fd, POLLIN)) flags |= DBUS_WATCH_READABLE; - if (FD_ISSET(fd, wset)) + if (poll_check(fd, POLLOUT)) flags |= DBUS_WATCH_WRITABLE; - if (FD_ISSET(fd, eset)) + if (poll_check(fd, POLLERR)) flags |= DBUS_WATCH_ERROR; if (flags != 0) @@ -396,7 +807,7 @@ void emit_dbus_signal(int action, struct dhcp_lease *lease, char *hostname) DBusConnection *connection = (DBusConnection *)daemon->dbus; DBusMessage* message = NULL; DBusMessageIter args; - char *action_str, *addr, *mac = daemon->namebuff; + char *action_str, *mac = daemon->namebuff; unsigned char *p; int i; @@ -406,29 +817,36 @@ void emit_dbus_signal(int action, struct dhcp_lease *lease, char *hostname) if (!hostname) hostname = ""; - p = extended_hwaddr(lease->hwaddr_type, lease->hwaddr_len, - lease->hwaddr, lease->clid_len, lease->clid, &i); - print_mac(mac, p, i); - +#ifdef HAVE_DHCP6 + if (lease->flags & (LEASE_TA | LEASE_NA)) + { + print_mac(mac, lease->clid, lease->clid_len); + inet_ntop(AF_INET6, &lease->addr6, daemon->addrbuff, ADDRSTRLEN); + } + else +#endif + { + p = extended_hwaddr(lease->hwaddr_type, lease->hwaddr_len, + lease->hwaddr, lease->clid_len, lease->clid, &i); + print_mac(mac, p, i); + inet_ntop(AF_INET, &lease->addr, daemon->addrbuff, ADDRSTRLEN); + } + if (action == ACTION_DEL) action_str = "DhcpLeaseDeleted"; else if (action == ACTION_ADD) action_str = "DhcpLeaseAdded"; else if (action == ACTION_OLD) action_str = "DhcpLeaseUpdated"; - else if (action == ACTION_CONNECT) - action_str = "DhcpConnected"; else return; - addr = inet_ntoa(lease->addr); - - if (!(message = dbus_message_new_signal(DNSMASQ_PATH, DNSMASQ_SERVICE, action_str))) + if (!(message = dbus_message_new_signal(DNSMASQ_PATH, daemon->dbus_name, action_str))) return; dbus_message_iter_init_append(message, &args); - - if (dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &addr) && + + if (dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &daemon->addrbuff) && dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &mac) && dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &hostname)) dbus_connection_send(connection, message, NULL); |