colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings: make connections always have s_ip4 and s_ip6

Browse Source 
Make sure that all connections returned from NMSettings or created via
AddAndActivateConnection have an NMSettingIP4Config and an
NMSettingIP6Config, with non-NULL methods, and get rid of
now-unnecessary checks for those.

Also move the slaves-can't-have-IP-config checks into the
platform-independent code as well. This also gets rid of spurious
"ignoring IP4/IP6 configuration" warnings in ifcfg-rh when reading a
slave ifcfg file.

Partly based on a patch from Pavel.

https://bugzilla.gnome.org/show_bug.cgi?id=708875
This commit is contained in:
Dan Winship
2013-09-26 17:34:23 -04:00
parent 5bcdfd3985
commit 68f12b4e9c
12 changed files with 299 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/dhcp-manager/nm-dhcp-dhclient-utils.c
View File

@@ -70,35 +70,33 @@ add_hostname (GString *str, const char *format, const char *hostname)
static void
add_ip4_config (GString *str, NMSettingIP4Config *s_ip4, const char *hostname)
{
if (s_ip4) {
const char *tmp;
const char *tmp;
tmp = nm_setting_ip4_config_get_dhcp_client_id (s_ip4);
if (tmp) {
gboolean is_octets = TRUE;
int i = 0;
tmp = nm_setting_ip4_config_get_dhcp_client_id (s_ip4);
if (tmp) {
gboolean is_octets = TRUE;
int i = 0;
while (tmp[i]) {
if ((i % 3) != 2 && !g_ascii_isxdigit (tmp[i])) {
is_octets = FALSE;
break;
}
if ((i % 3) == 2 && tmp[i] != ':') {
is_octets = FALSE;
break;
}
i++;
while (tmp[i]) {
if ((i % 3) != 2 && !g_ascii_isxdigit (tmp[i])) {
is_octets = FALSE;
break;
}
/* If the client ID is just hex digits and : then don't use quotes,
* because dhclient expects either a quoted ASCII string, or a byte
* array formated as hex octets separated by :
*/
if (is_octets)
g_string_append_printf (str, CLIENTID_FORMAT_OCTETS "\n", tmp);
else
g_string_append_printf (str, CLIENTID_FORMAT "\n", tmp);
if ((i % 3) == 2 && tmp[i] != ':') {
is_octets = FALSE;
break;
}
i++;
}
/* If the client ID is just hex digits and : then don't use quotes,
* because dhclient expects either a quoted ASCII string, or a byte
* array formated as hex octets separated by :
*/
if (is_octets)
g_string_append_printf (str, CLIENTID_FORMAT_OCTETS "\n", tmp);
else
g_string_append_printf (str, CLIENTID_FORMAT "\n", tmp);
}
add_hostname (str, HOSTNAME4_FORMAT "\n", hostname);
@@ -159,8 +157,7 @@ nm_dhcp_dhclient_create_config (const char *interface,
/* Override config file "dhcp-client-id" and use one from the
* connection.
*/
if ( s_ip4
&& nm_setting_ip4_config_get_dhcp_client_id (s_ip4)
if ( nm_setting_ip4_config_get_dhcp_client_id (s_ip4)
&& !strncmp (p, CLIENTID_TAG, strlen (CLIENTID_TAG)))
continue;