property: Remove HOSTNAME and DOMAINNAME

diff --git a/include/element.h b/include/element.h
index 05a51d59baf1ca5e3e6e14682834b7f1141c557f..2e944d3c0db4023a0937852cf16585421ef34e61 100644 (file)
--- a/include/element.h
+++ b/include/element.h
@@ -86,9 +86,6 @@ struct connman_element {
        };
 
        GHashTable *properties;
-
-       gchar *hostname;
-       gchar *domainname;
 };
 
 struct connman_element *connman_element_create(const char *name);

diff --git a/include/property.h b/include/property.h
index 876908dcc35a4b2c1b9d1ba3847bf2fb15bc4ce0..8fed172364d0e73d3514286a60ac50cf39a24ac5 100644 (file)
--- a/include/property.h
+++ b/include/property.h
@@ -40,9 +40,6 @@ extern "C" {
 enum connman_property_id {
        CONNMAN_PROPERTY_ID_INVALID = 0,
 
-       CONNMAN_PROPERTY_ID_HOSTNAME,
-       CONNMAN_PROPERTY_ID_DOMAINNAME,
-
        CONNMAN_PROPERTY_ID_IPV6_METHOD,
        CONNMAN_PROPERTY_ID_IPV6_ADDRESS,
        CONNMAN_PROPERTY_ID_IPV6_PREFIXLEN,

diff --git a/src/element.c b/src/element.c
index 050efae0792738ee13eea4382dbfac21210b7ca0..0d796fa4f8b7f789f5f52e353734180d92b77e75 100644 (file)
--- a/src/element.c
+++ b/src/element.c
@@ -623,8 +623,6 @@ void connman_element_unref(struct connman_element *element)
                        element->destruct(element);
                free_children(element);
                free_properties(element);
-               g_free(element->hostname);
-               g_free(element->domainname);
                g_free(element->devname);
                g_free(element->path);
                g_free(element->name);
@@ -707,28 +705,7 @@ static int set_static_array_property(struct connman_element *element,
 int connman_element_get_value(struct connman_element *element,
                                enum connman_property_id id, void *value)
 {
-       if (element->type == CONNMAN_ELEMENT_TYPE_ROOT)
-               return -EINVAL;
-
-       switch (id) {
-       case CONNMAN_PROPERTY_ID_HOSTNAME:
-               if (element->hostname == NULL)
-                       return connman_element_get_value(element->parent,
-                                                               id, value);
-               *((char **) value) = element->hostname;
-               break;
-       case CONNMAN_PROPERTY_ID_DOMAINNAME:
-               if (element->domainname == NULL)
-                       return connman_element_get_value(element->parent,
-                                                               id, value);
-               *((char **) value) = element->domainname;
-               break;
-
-       default:
-               return -EINVAL;
-       }
-
-       return 0;
+       return -EINVAL;
 }
 
 static gboolean get_static_property(struct connman_element *element,