fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-13 17:30:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: allowing changing route metric and route table

Browse source
This commit is contained in:
Beniamino Galvani 2018-07-20 16:32:10 +02:00
parent e2071e92f0
commit 9ca56089eb
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/dhcp/nm-dhcp-client.c
View file

@ -51,7 +51,7 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
NM_GOBJECT_PROPERTIES_DEFINE_BASE (
NM_GOBJECT_PROPERTIES_DEFINE (NMDhcpClient,
PROP_ADDR_FAMILY,
PROP_FLAGS,
PROP_HWADDR,
@ -163,6 +163,17 @@ nm_dhcp_client_get_route_table (NMDhcpClient *self)
return NM_DHCP_CLIENT_GET_PRIVATE (self)->route_table;
}
void
nm_dhcp_client_set_route_table (NMDhcpClient *self, guint32 route_table)
{
NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
if (route_table != priv->route_table) {
priv->route_table = route_table;
_notify (self, PROP_ROUTE_TABLE);
}
}
guint32
nm_dhcp_client_get_route_metric (NMDhcpClient *self)
{
@ -171,6 +182,17 @@ nm_dhcp_client_get_route_metric (NMDhcpClient *self)
return NM_DHCP_CLIENT_GET_PRIVATE (self)->route_metric;
}
void
nm_dhcp_client_set_route_metric (NMDhcpClient *self, guint32 route_metric)
{
NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
if (route_metric != priv->route_metric) {
priv->route_metric = route_metric;
_notify (self, PROP_ROUTE_METRIC);
}
}
guint32
nm_dhcp_client_get_timeout (NMDhcpClient *self)
{
@ -834,6 +856,9 @@ get_property (GObject *object, guint prop_id,
case PROP_ROUTE_METRIC:
g_value_set_uint (value, priv->route_metric);
break;
case PROP_ROUTE_TABLE:
g_value_set_uint (value, priv->route_table);
break;
case PROP_TIMEOUT:
g_value_set_uint (value, priv->timeout);
break;
@ -889,11 +914,9 @@ set_property (GObject *object, guint prop_id,
priv->uuid = g_value_dup_string (value);
break;
case PROP_ROUTE_TABLE:
/* construct-only */
priv->route_table = g_value_get_uint (value);
break;
case PROP_ROUTE_METRIC:
/* construct-only */
priv->route_metric = g_value_get_uint (value);
break;
case PROP_TIMEOUT:
@ -1002,13 +1025,13 @@ nm_dhcp_client_class_init (NMDhcpClientClass *client_class)
obj_properties[PROP_ROUTE_TABLE] =
g_param_spec_uint (NM_DHCP_CLIENT_ROUTE_TABLE, "", "",
0, G_MAXUINT32, RT_TABLE_MAIN,
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
obj_properties[PROP_ROUTE_METRIC] =
g_param_spec_uint (NM_DHCP_CLIENT_ROUTE_METRIC, "", "",
0, G_MAXUINT32, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS);
obj_properties[PROP_TIMEOUT] =

4
src/dhcp/nm-dhcp-client.h
View file

@ -131,8 +131,12 @@ GBytes *nm_dhcp_client_get_hw_addr (NMDhcpClient *self);
guint32 nm_dhcp_client_get_route_table (NMDhcpClient *self);
void nm_dhcp_client_set_route_table (NMDhcpClient *self, guint32 route_table);
guint32 nm_dhcp_client_get_route_metric (NMDhcpClient *self);
void nm_dhcp_client_set_route_metric (NMDhcpClient *self, guint32 route_metric);
guint32 nm_dhcp_client_get_timeout (NMDhcpClient *self);
GBytes *nm_dhcp_client_get_client_id (NMDhcpClient *self);