
* src/dhcp-manager/nm-dhcp-manager.c - (nm_dhcp_manager_get_ip4_config): clean up; update for changes to NMIP4Config to support multiple IP addresses * src/NetworkManagerUtils.c - (nm_utils_merge_ip4_config): update for multiple IP addresses * src/nm-ip4-config.c src/nm-ip4-config.h - Store a list of IPv4 address/netmask/gateway tuples - (nm_ip4_config_get_gateway, nm_ip4_config_set_gateway, nm_ip4_config_get_netmask, nm_ip4_config_set_netmask, nm_ip4_config_get_broadcast, nm_ip4_config_set_broadcast, nm_ip4_config_set_address): remove - (nm_ip4_config_take_address, nm_ip4_config_add_address, nm_ip4_config_replace_address, nm_ip4_config_get_num_addresses): new functions; handle multiple IPv4 addresses * src/nm-device.c src/ppp-manager/nm-ppp-manager.c src/vpn-manager/nm-vpn-connection.c src/NetworkManagerPolicy.c test/nm-tool.c libnm-glib/libnm-glib-test.c - update for changes to NMIP4Config for multiple IPv4 addresses * src/NetworkManagerSystem.c - (nm_system_device_set_ip4_route): don't add the route if any address is on the same subnet as the destination - (check_one_address): ignore the exact match, just match family and interface index - (add_ip4_addresses): add all IPv4 addresses in an NMIP4Config to an interface - (nm_system_device_set_from_ip4_config): use add_ip4_addresses() - (nm_system_vpn_device_set_from_ip4_config): use add_ip4_addresses() * introspection/nm-ip4-config.xml - Remove 'address', 'gateway', 'netmask', and 'broadcast' properties - Add 'addresses' property which is an array of (uuu) tuples of address/netmask/gateway * libnm-util/nm-setting-ip4-config.c - (set_property): use ip-address <-> GValue converters from nm-utils.c * libnm-glib/nm-ip4-config.c libnm-glib/nm-ip4-config.h - Handle D-Bus interface changes to support multiple IP addresses git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3637 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
395 lines
10 KiB
C
395 lines
10 KiB
C
#include <string.h>
|
|
|
|
#include "nm-ip4-config.h"
|
|
#include "NetworkManager.h"
|
|
#include "nm-types-private.h"
|
|
#include "nm-object-private.h"
|
|
#include "nm-utils.h"
|
|
|
|
G_DEFINE_TYPE (NMIP4Config, nm_ip4_config, NM_TYPE_OBJECT)
|
|
|
|
#define NM_IP4_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_IP4_CONFIG, NMIP4ConfigPrivate))
|
|
|
|
typedef struct {
|
|
DBusGProxy *proxy;
|
|
|
|
GSList *addresses;
|
|
char *hostname;
|
|
GArray *nameservers;
|
|
GPtrArray *domains;
|
|
char *nis_domain;
|
|
GArray *nis_servers;
|
|
} NMIP4ConfigPrivate;
|
|
|
|
enum {
|
|
PROP_0,
|
|
PROP_ADDRESSES,
|
|
PROP_HOSTNAME,
|
|
PROP_NAMESERVERS,
|
|
PROP_DOMAINS,
|
|
PROP_NIS_DOMAIN,
|
|
PROP_NIS_SERVERS,
|
|
|
|
LAST_PROP
|
|
};
|
|
|
|
static void
|
|
nm_ip4_config_init (NMIP4Config *config)
|
|
{
|
|
}
|
|
|
|
static gboolean
|
|
demarshal_ip4_address_array (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field)
|
|
{
|
|
NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (object);
|
|
|
|
g_slist_foreach (priv->addresses, (GFunc) g_free, NULL);
|
|
g_slist_free (priv->addresses);
|
|
priv->addresses = NULL;
|
|
|
|
priv->addresses = nm_utils_ip4_addresses_from_gvalue (value);
|
|
nm_object_queue_notify (object, NM_IP4_CONFIG_ADDRESSES);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
static gboolean
|
|
demarshal_ip4_array (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field)
|
|
{
|
|
if (!nm_uint_array_demarshal (value, (GArray **) field))
|
|
return FALSE;
|
|
|
|
if (!strcmp (pspec->name, NM_IP4_CONFIG_NAMESERVERS))
|
|
nm_object_queue_notify (object, NM_IP4_CONFIG_NAMESERVERS);
|
|
else if (!strcmp (pspec->name, NM_IP4_CONFIG_NIS_SERVERS))
|
|
nm_object_queue_notify (object, NM_IP4_CONFIG_NAMESERVERS);
|
|
return TRUE;
|
|
}
|
|
|
|
static gboolean
|
|
demarshal_domains (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field)
|
|
{
|
|
if (!nm_string_array_demarshal (value, (GPtrArray **) field))
|
|
return FALSE;
|
|
|
|
nm_object_queue_notify (object, NM_IP4_CONFIG_DOMAINS);
|
|
return TRUE;
|
|
}
|
|
|
|
static void
|
|
register_for_property_changed (NMIP4Config *config)
|
|
{
|
|
NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (config);
|
|
const NMPropertiesChangedInfo property_changed_info[] = {
|
|
{ NM_IP4_CONFIG_ADDRESSES, demarshal_ip4_address_array, &priv->addresses },
|
|
{ NM_IP4_CONFIG_HOSTNAME, nm_object_demarshal_generic, &priv->hostname },
|
|
{ NM_IP4_CONFIG_NAMESERVERS, demarshal_ip4_array, &priv->nameservers },
|
|
{ NM_IP4_CONFIG_DOMAINS, demarshal_domains, &priv->domains },
|
|
{ NM_IP4_CONFIG_NIS_DOMAIN, nm_object_demarshal_generic, &priv->nis_domain },
|
|
{ NM_IP4_CONFIG_NIS_SERVERS, demarshal_ip4_array, &priv->nis_servers },
|
|
{ NULL },
|
|
};
|
|
|
|
nm_object_handle_properties_changed (NM_OBJECT (config),
|
|
priv->proxy,
|
|
property_changed_info);
|
|
}
|
|
|
|
static GObject*
|
|
constructor (GType type,
|
|
guint n_construct_params,
|
|
GObjectConstructParam *construct_params)
|
|
{
|
|
NMObject *object;
|
|
DBusGConnection *connection;
|
|
NMIP4ConfigPrivate *priv;
|
|
|
|
object = (NMObject *) G_OBJECT_CLASS (nm_ip4_config_parent_class)->constructor (type,
|
|
n_construct_params,
|
|
construct_params);
|
|
if (!object)
|
|
return NULL;
|
|
|
|
priv = NM_IP4_CONFIG_GET_PRIVATE (object);
|
|
connection = nm_object_get_connection (object);
|
|
|
|
priv->proxy = dbus_g_proxy_new_for_name (connection,
|
|
NM_DBUS_SERVICE,
|
|
nm_object_get_path (object),
|
|
NM_DBUS_INTERFACE_IP4_CONFIG);
|
|
|
|
register_for_property_changed (NM_IP4_CONFIG (object));
|
|
|
|
return G_OBJECT (object);
|
|
}
|
|
|
|
static void
|
|
finalize (GObject *object)
|
|
{
|
|
NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (object);
|
|
|
|
g_slist_foreach (priv->addresses, (GFunc) g_free, NULL);
|
|
g_slist_free (priv->addresses);
|
|
|
|
g_free (priv->hostname);
|
|
g_free (priv->nis_domain);
|
|
if (priv->nameservers)
|
|
g_array_free (priv->nameservers, TRUE);
|
|
if (priv->nis_servers)
|
|
g_array_free (priv->nis_servers, TRUE);
|
|
|
|
if (priv->domains) {
|
|
g_ptr_array_foreach (priv->domains, (GFunc) g_free, NULL);
|
|
g_ptr_array_free (priv->domains, TRUE);
|
|
}
|
|
|
|
G_OBJECT_CLASS (nm_ip4_config_parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
get_property (GObject *object,
|
|
guint prop_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
NMIP4Config *self = NM_IP4_CONFIG (object);
|
|
NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (self);
|
|
|
|
switch (prop_id) {
|
|
case PROP_ADDRESSES:
|
|
nm_utils_ip4_addresses_to_gvalue (priv->addresses, value);
|
|
break;
|
|
case PROP_HOSTNAME:
|
|
g_value_set_string (value, nm_ip4_config_get_hostname (self));
|
|
break;
|
|
case PROP_NAMESERVERS:
|
|
g_value_set_boxed (value, nm_ip4_config_get_nameservers (self));
|
|
break;
|
|
case PROP_DOMAINS:
|
|
g_value_set_boxed (value, nm_ip4_config_get_domains (self));
|
|
break;
|
|
case PROP_NIS_DOMAIN:
|
|
g_value_set_string (value, nm_ip4_config_get_nis_domain (self));
|
|
break;
|
|
case PROP_NIS_SERVERS:
|
|
g_value_set_boxed (value, nm_ip4_config_get_nis_servers (self));
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
nm_ip4_config_class_init (NMIP4ConfigClass *config_class)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (config_class);
|
|
|
|
g_type_class_add_private (config_class, sizeof (NMIP4ConfigPrivate));
|
|
|
|
/* virtual methods */
|
|
object_class->constructor = constructor;
|
|
object_class->get_property = get_property;
|
|
object_class->finalize = finalize;
|
|
|
|
/* properties */
|
|
g_object_class_install_property
|
|
(object_class, PROP_ADDRESSES,
|
|
g_param_spec_pointer (NM_IP4_CONFIG_ADDRESSES,
|
|
"Addresses",
|
|
"Addresses",
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_HOSTNAME,
|
|
g_param_spec_string (NM_IP4_CONFIG_HOSTNAME,
|
|
"Hostname",
|
|
"Hostname",
|
|
NULL,
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_NAMESERVERS,
|
|
g_param_spec_boxed (NM_IP4_CONFIG_NAMESERVERS,
|
|
"Nameservers",
|
|
"Nameservers",
|
|
NM_TYPE_UINT_ARRAY,
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_DOMAINS,
|
|
g_param_spec_boxed (NM_IP4_CONFIG_DOMAINS,
|
|
"Domains",
|
|
"Domains",
|
|
NM_TYPE_STRING_ARRAY,
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_NIS_DOMAIN,
|
|
g_param_spec_string (NM_IP4_CONFIG_NIS_DOMAIN,
|
|
"NIS domain",
|
|
"NIS domain",
|
|
NULL,
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_NIS_SERVERS,
|
|
g_param_spec_boxed (NM_IP4_CONFIG_NIS_SERVERS,
|
|
"NIS servers",
|
|
"NIS servers",
|
|
NM_TYPE_UINT_ARRAY,
|
|
G_PARAM_READABLE));
|
|
}
|
|
|
|
GObject *
|
|
nm_ip4_config_new (DBusGConnection *connection, const char *object_path)
|
|
{
|
|
return (GObject *) g_object_new (NM_TYPE_IP4_CONFIG,
|
|
NM_OBJECT_DBUS_CONNECTION, connection,
|
|
NM_OBJECT_DBUS_PATH, object_path,
|
|
NULL);
|
|
}
|
|
|
|
const GSList *
|
|
nm_ip4_config_get_addresses (NMIP4Config *config)
|
|
{
|
|
NMIP4ConfigPrivate *priv;
|
|
GValue value = { 0, };
|
|
|
|
g_return_val_if_fail (NM_IS_IP4_CONFIG (config), 0);
|
|
|
|
priv = NM_IP4_CONFIG_GET_PRIVATE (config);
|
|
if (priv->addresses)
|
|
return priv->addresses;
|
|
|
|
if (!nm_object_get_property (NM_OBJECT (config),
|
|
"org.freedesktop.DBus.Properties",
|
|
"Addresses",
|
|
&value)) {
|
|
return NULL;
|
|
}
|
|
|
|
demarshal_ip4_address_array (NM_OBJECT (config), NULL, &value, &priv->addresses);
|
|
g_value_unset (&value);
|
|
|
|
return priv->addresses;
|
|
}
|
|
|
|
const char *
|
|
nm_ip4_config_get_hostname (NMIP4Config *config)
|
|
{
|
|
NMIP4ConfigPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL);
|
|
|
|
priv = NM_IP4_CONFIG_GET_PRIVATE (config);
|
|
if (!priv->hostname) {
|
|
priv->hostname = nm_object_get_string_property (NM_OBJECT (config),
|
|
NM_DBUS_INTERFACE_IP4_CONFIG,
|
|
"Hostname");
|
|
}
|
|
|
|
return priv->hostname;
|
|
}
|
|
|
|
const GArray *
|
|
nm_ip4_config_get_nameservers (NMIP4Config *config)
|
|
{
|
|
NMIP4ConfigPrivate *priv;
|
|
GArray *array = NULL;
|
|
GValue value = {0,};
|
|
|
|
g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL);
|
|
|
|
priv = NM_IP4_CONFIG_GET_PRIVATE (config);
|
|
if (!priv->nameservers) {
|
|
if (nm_object_get_property (NM_OBJECT (config),
|
|
NM_DBUS_INTERFACE_IP4_CONFIG,
|
|
"Nameservers",
|
|
&value)) {
|
|
array = (GArray *) g_value_get_boxed (&value);
|
|
if (array && array->len) {
|
|
priv->nameservers = g_array_sized_new (FALSE, TRUE, sizeof (guint32), array->len);
|
|
g_array_append_vals (priv->nameservers, array->data, array->len);
|
|
}
|
|
g_value_unset (&value);
|
|
}
|
|
}
|
|
|
|
return priv->nameservers;
|
|
}
|
|
|
|
const GPtrArray *
|
|
nm_ip4_config_get_domains (NMIP4Config *config)
|
|
{
|
|
NMIP4ConfigPrivate *priv;
|
|
GValue value = {0,};
|
|
|
|
g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL);
|
|
|
|
priv = NM_IP4_CONFIG_GET_PRIVATE (config);
|
|
if (priv->domains)
|
|
return handle_ptr_array_return (priv->domains);
|
|
|
|
if (nm_object_get_property (NM_OBJECT (config),
|
|
NM_DBUS_INTERFACE_IP4_CONFIG,
|
|
"Domains",
|
|
&value)) {
|
|
char **array = NULL, **p;
|
|
|
|
array = (char **) g_value_get_boxed (&value);
|
|
if (array && g_strv_length (array)) {
|
|
priv->domains = g_ptr_array_sized_new (g_strv_length (array));
|
|
for (p = array; *p; p++)
|
|
g_ptr_array_add (priv->domains, g_strdup (*p));
|
|
}
|
|
g_value_unset (&value);
|
|
}
|
|
|
|
return handle_ptr_array_return (priv->domains);
|
|
}
|
|
|
|
const char *
|
|
nm_ip4_config_get_nis_domain (NMIP4Config *config)
|
|
{
|
|
NMIP4ConfigPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL);
|
|
|
|
priv = NM_IP4_CONFIG_GET_PRIVATE (config);
|
|
if (!priv->nis_domain) {
|
|
priv->nis_domain = nm_object_get_string_property (NM_OBJECT (config),
|
|
NM_DBUS_INTERFACE_IP4_CONFIG,
|
|
"NisDomain");
|
|
}
|
|
|
|
return priv->nis_domain;
|
|
}
|
|
|
|
GArray *
|
|
nm_ip4_config_get_nis_servers (NMIP4Config *config)
|
|
{
|
|
NMIP4ConfigPrivate *priv;
|
|
GArray *array = NULL;
|
|
GValue value = {0,};
|
|
|
|
g_return_val_if_fail (NM_IS_IP4_CONFIG (config), NULL);
|
|
|
|
priv = NM_IP4_CONFIG_GET_PRIVATE (config);
|
|
if (!priv->nis_servers) {
|
|
if (nm_object_get_property (NM_OBJECT (config),
|
|
NM_DBUS_INTERFACE_IP4_CONFIG,
|
|
"NisServers",
|
|
&value)) {
|
|
array = (GArray *) g_value_get_boxed (&value);
|
|
if (array && array->len) {
|
|
priv->nis_servers = g_array_sized_new (FALSE, TRUE, sizeof (guint32), array->len);
|
|
g_array_append_vals (priv->nis_servers, array->data, array->len);
|
|
}
|
|
g_value_unset (&value);
|
|
}
|
|
}
|
|
|
|
return priv->nis_servers;
|
|
}
|