mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-23 19:24:38 +00:00
51503b2d5f
* 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
47 lines
1.7 KiB
C
47 lines
1.7 KiB
C
#ifndef NM_IP4_CONFIG_H
|
|
#define NM_IP4_CONFIG_H
|
|
|
|
#include <glib/gtypes.h>
|
|
#include <glib-object.h>
|
|
#include <dbus/dbus-glib.h>
|
|
#include "nm-object.h"
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define NM_TYPE_IP4_CONFIG (nm_ip4_config_get_type ())
|
|
#define NM_IP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IP4_CONFIG, NMIP4Config))
|
|
#define NM_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_IP4_CONFIG, NMIP4ConfigClass))
|
|
#define NM_IS_IP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_IP4_CONFIG))
|
|
#define NM_IS_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_IP4_CONFIG))
|
|
#define NM_IP4_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP4_CONFIG, NMIP4ConfigClass))
|
|
|
|
typedef struct {
|
|
NMObject parent;
|
|
} NMIP4Config;
|
|
|
|
typedef struct {
|
|
NMObjectClass parent;
|
|
} NMIP4ConfigClass;
|
|
|
|
#define NM_IP4_CONFIG_ADDRESSES "addresses"
|
|
#define NM_IP4_CONFIG_HOSTNAME "hostname"
|
|
#define NM_IP4_CONFIG_NAMESERVERS "nameservers"
|
|
#define NM_IP4_CONFIG_DOMAINS "domains"
|
|
#define NM_IP4_CONFIG_NIS_DOMAIN "nis-domain"
|
|
#define NM_IP4_CONFIG_NIS_SERVERS "nis-servers"
|
|
|
|
GType nm_ip4_config_get_type (void);
|
|
|
|
GObject *nm_ip4_config_new (DBusGConnection *connection, const char *object_path);
|
|
|
|
const GSList * nm_ip4_config_get_addresses (NMIP4Config *config);
|
|
const char * nm_ip4_config_get_hostname (NMIP4Config *config);
|
|
const GArray * nm_ip4_config_get_nameservers (NMIP4Config *config);
|
|
const GPtrArray *nm_ip4_config_get_domains (NMIP4Config *config);
|
|
const char * nm_ip4_config_get_nis_domain (NMIP4Config *config);
|
|
GArray * nm_ip4_config_get_nis_servers (NMIP4Config *config);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* NM_IP4_CONFIG_H */
|