[BACK]Return to dbus.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / dnsmasq / src

Diff for /embedaddon/dnsmasq/src/dbus.c between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2016/11/02 09:57:01 version 1.1.1.4, 2021/03/17 00:56:46
Line 1 Line 1
/* dnsmasq is Copyright (c) 2000-2016 Simon Kelley/* dnsmasq is Copyright (c) 2000-2021 Simon Kelley
   
    This program is free software; you can redistribute it and/or modify     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     it under the terms of the GNU General Public License as published by
Line 85  const char* introspection_xml_template = Line 85  const char* introspection_xml_template =
 "       <arg name=\"success\" type=\"b\" direction=\"out\"/>\n"  "       <arg name=\"success\" type=\"b\" direction=\"out\"/>\n"
 "    </method>\n"  "    </method>\n"
 #endif  #endif
   "    <method name=\"GetMetrics\">\n"
   "      <arg name=\"metrics\" direction=\"out\" type=\"a{su}\"/>\n"
   "    </method>\n"
 "  </interface>\n"  "  </interface>\n"
 "</node>\n";  "</node>\n";
   
Line 182  static void dbus_read_servers(DBusMessage *message) Line 185  static void dbus_read_servers(DBusMessage *message)
                 }                  }
             }              }
   
 #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))            if (i == sizeof(struct in6_addr))
             {              {
               memcpy(&addr.in6.sin6_addr, p, sizeof(struct in6_addr));                memcpy(&addr.in6.sin6_addr, p, sizeof(struct in6_addr));
Line 199  static void dbus_read_servers(DBusMessage *message) Line 199  static void dbus_read_servers(DBusMessage *message)
               source_addr.in6.sin6_port = htons(daemon->query_port);                source_addr.in6.sin6_port = htons(daemon->query_port);
               skip = 0;                skip = 0;
             }              }
 #endif  
         }          }
       else        else
         /* At the end */          /* At the end */
Line 238  static DBusMessage *dbus_reply_server_loop(DBusMessage Line 237  static DBusMessage *dbus_reply_server_loop(DBusMessage
   for (serv = daemon->servers; serv; serv = serv->next)    for (serv = daemon->servers; serv; serv = serv->next)
     if (serv->flags & SERV_LOOP)      if (serv->flags & SERV_LOOP)
       {        {
        prettyprint_addr(&serv->addr, daemon->addrbuff);        (void)prettyprint_addr(&serv->addr, daemon->addrbuff);
         dbus_message_iter_append_basic (&args_iter, DBUS_TYPE_STRING, &daemon->addrbuff);          dbus_message_iter_append_basic (&args_iter, DBUS_TYPE_STRING, &daemon->addrbuff);
       }        }
       
Line 457  static DBusMessage *dbus_add_lease(DBusMessage* messag Line 456  static DBusMessage *dbus_add_lease(DBusMessage* messag
   int clid_len, hostname_len, hw_len, hw_type;    int clid_len, hostname_len, hw_len, hw_type;
   dbus_uint32_t expires, ia_id;    dbus_uint32_t expires, ia_id;
   dbus_bool_t is_temporary;    dbus_bool_t is_temporary;
  struct all_addr addr;  union all_addr addr;
   time_t now = dnsmasq_time();    time_t now = dnsmasq_time();
   unsigned char dhcp_chaddr[DHCP_CHADDR_MAX];    unsigned char dhcp_chaddr[DHCP_CHADDR_MAX];
   
Line 527  static DBusMessage *dbus_add_lease(DBusMessage* messag Line 526  static DBusMessage *dbus_add_lease(DBusMessage* messag
   
   dbus_message_iter_get_basic(&iter, &is_temporary);    dbus_message_iter_get_basic(&iter, &is_temporary);
   
  if (inet_pton(AF_INET, ipaddr, &addr.addr.addr4))  if (inet_pton(AF_INET, ipaddr, &addr.addr4))
     {      {
       if (ia_id != 0 || is_temporary)        if (ia_id != 0 || is_temporary)
         return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS,          return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS,
                                       "ia_id and is_temporary must be zero for IPv4 lease");                                        "ia_id and is_temporary must be zero for IPv4 lease");
               
      if (!(lease = lease_find_by_addr(addr.addr.addr4)))      if (!(lease = lease_find_by_addr(addr.addr4)))
        lease = lease4_allocate(addr.addr.addr4);        lease = lease4_allocate(addr.addr4);
     }      }
 #ifdef HAVE_DHCP6  #ifdef HAVE_DHCP6
  else if (inet_pton(AF_INET6, ipaddr, &addr.addr.addr6))  else if (inet_pton(AF_INET6, ipaddr, &addr.addr6))
     {      {
      if (!(lease = lease6_find_by_addr(&addr.addr.addr6, 128, 0)))      if (!(lease = lease6_find_by_addr(&addr.addr6, 128, 0)))
        lease = lease6_allocate(&addr.addr.addr6,        lease = lease6_allocate(&addr.addr6,
                                 is_temporary ? LEASE_TA : LEASE_NA);                                  is_temporary ? LEASE_TA : LEASE_NA);
       lease_set_iaid(lease, ia_id);        lease_set_iaid(lease, ia_id);
     }      }
Line 549  static DBusMessage *dbus_add_lease(DBusMessage* messag Line 548  static DBusMessage *dbus_add_lease(DBusMessage* messag
     return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,      return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
                                          "Invalid IP address '%s'", ipaddr);                                           "Invalid IP address '%s'", ipaddr);
         
  hw_len = parse_hex((char*)hwaddr, dhcp_chaddr, DHCP_CHADDR_MAX, NULL,  hw_len = parse_hex((char*)hwaddr, dhcp_chaddr, DHCP_CHADDR_MAX, NULL, &hw_type);
                     &hw_type); 
   if (hw_type == 0 && hw_len != 0)    if (hw_type == 0 && hw_len != 0)
     hw_type = ARPHRD_ETHER;      hw_type = ARPHRD_ETHER;
  
    lease_set_hwaddr(lease, dhcp_chaddr, clid, hw_len, hw_type,  lease_set_hwaddr(lease, dhcp_chaddr, clid, hw_len, hw_type,
                    clid_len, now, 0);                     clid_len, now, 0);
   lease_set_expires(lease, expires, now);    lease_set_expires(lease, expires, now);
   if (hostname_len != 0)    if (hostname_len != 0)
     lease_set_hostname(lease, hostname, 0, get_domain(lease->addr), NULL);      lease_set_hostname(lease, hostname, 0, get_domain(lease->addr), NULL);
      
   lease_update_file(now);    lease_update_file(now);
   lease_update_dns(0);    lease_update_dns(0);
   
Line 572  static DBusMessage *dbus_del_lease(DBusMessage* messag Line 570  static DBusMessage *dbus_del_lease(DBusMessage* messag
   DBusMessageIter iter;    DBusMessageIter iter;
   const char *ipaddr;    const char *ipaddr;
   DBusMessage *reply;    DBusMessage *reply;
  struct all_addr addr;  union all_addr addr;
   dbus_bool_t ret = 1;    dbus_bool_t ret = 1;
   time_t now = dnsmasq_time();    time_t now = dnsmasq_time();
   
Line 586  static DBusMessage *dbus_del_lease(DBusMessage* messag Line 584  static DBusMessage *dbus_del_lease(DBusMessage* messag
         
   dbus_message_iter_get_basic(&iter, &ipaddr);    dbus_message_iter_get_basic(&iter, &ipaddr);
   
  if (inet_pton(AF_INET, ipaddr, &addr.addr.addr4))  if (inet_pton(AF_INET, ipaddr, &addr.addr4))
    lease = lease_find_by_addr(addr.addr.addr4);    lease = lease_find_by_addr(addr.addr4);
 #ifdef HAVE_DHCP6  #ifdef HAVE_DHCP6
  else if (inet_pton(AF_INET6, ipaddr, &addr.addr.addr6))  else if (inet_pton(AF_INET6, ipaddr, &addr.addr6))
    lease = lease6_find_by_addr(&addr.addr.addr6, 128, 0);    lease = lease6_find_by_addr(&addr.addr6, 128, 0);
 #endif  #endif
   else    else
     return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,      return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
Line 614  static DBusMessage *dbus_del_lease(DBusMessage* messag Line 612  static DBusMessage *dbus_del_lease(DBusMessage* messag
 }  }
 #endif  #endif
   
   static DBusMessage *dbus_get_metrics(DBusMessage* message)
   {
     DBusMessage *reply = dbus_message_new_method_return(message);
     DBusMessageIter array, dict, iter;
     int i;
   
     dbus_message_iter_init_append(reply, &iter);
     dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{su}", &array);
   
     for (i = 0; i < __METRIC_MAX; i++) {
       const char *key     = get_metric_name(i);
       dbus_uint32_t value = daemon->metrics[i];
   
       dbus_message_iter_open_container(&array, DBUS_TYPE_DICT_ENTRY, NULL, &dict);
       dbus_message_iter_append_basic(&dict, DBUS_TYPE_STRING, &key);
       dbus_message_iter_append_basic(&dict, DBUS_TYPE_UINT32, &value);
       dbus_message_iter_close_container(&array, &dict);
     }
   
     dbus_message_iter_close_container(&iter, &array);
   
     return reply;
   }
   
 DBusHandlerResult message_handler(DBusConnection *connection,   DBusHandlerResult message_handler(DBusConnection *connection, 
                                   DBusMessage *message,                                     DBusMessage *message, 
                                   void *user_data)                                    void *user_data)
Line 681  DBusHandlerResult message_handler(DBusConnection *conn Line 703  DBusHandlerResult message_handler(DBusConnection *conn
       reply = dbus_del_lease(message);        reply = dbus_del_lease(message);
     }      }
 #endif  #endif
     else if (strcmp(method, "GetMetrics") == 0)
       {
         reply = dbus_get_metrics(message);
       }
   else if (strcmp(method, "ClearCache") == 0)    else if (strcmp(method, "ClearCache") == 0)
     clear_cache = 1;      clear_cache = 1;
   else    else
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>