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

trivial: clarify comments in test-general.c and NetworkManagerUtils.c

Browse Source
This commit is contained in:
Jiří Klimeš
2014-05-30 09:06:24 +02:00
parent fbdf8857c3
commit a7fa1aed1b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/NetworkManagerUtils.c
View File

@@ -691,7 +691,7 @@ check_ip6_method (NMConnection *orig,
if (!props) if (!props)
return TRUE; return TRUE;
/* If the original connection is 'link-local' and the candidate is both 'auto' /* If the generated connection is 'link-local' and the candidate is both 'auto'
* and may-fail=TRUE, then the candidate is OK to use. may-fail is included * and may-fail=TRUE, then the candidate is OK to use. may-fail is included
* in the decision because if the candidate is 'auto' but may-fail=FALSE, then * in the decision because if the candidate is 'auto' but may-fail=FALSE, then
* the connection could not possibly have been previously activated on the * the connection could not possibly have been previously activated on the
@@ -741,7 +741,7 @@ check_ip4_method (NMConnection *orig,
if (!props) if (!props)
return TRUE; return TRUE;
/* If the original connection is 'disabled' (device had no IP addresses) /* If the generated connection is 'disabled' (device had no IP addresses)
* but it has no carrier, that most likely means that IP addressing could * but it has no carrier, that most likely means that IP addressing could
* not complete and thus no IP addresses were assigned. In that case, allow * not complete and thus no IP addresses were assigned. In that case, allow
* matching to the "auto" method. * matching to the "auto" method.
@@ -777,7 +777,7 @@ check_connection_interface_name (NMConnection *orig,
if (!props) if (!props)
return TRUE; return TRUE;
/* If one of the interface name is NULL, we accept that connection */ /* If one of the interface names is NULL, we accept that connection */
s_con_orig = nm_connection_get_setting_connection (orig); s_con_orig = nm_connection_get_setting_connection (orig);
s_con_cand = nm_connection_get_setting_connection (candidate); s_con_cand = nm_connection_get_setting_connection (candidate);
orig_ifname = nm_setting_connection_get_interface_name (s_con_orig); orig_ifname = nm_setting_connection_get_interface_name (s_con_orig);

10
src/tests/test-general.c
View File

@@ -308,7 +308,7 @@ test_connection_match_ip6_method (void)
copy = nm_connection_duplicate (orig); copy = nm_connection_duplicate (orig);
connections = g_slist_append (connections, copy); connections = g_slist_append (connections, copy);
/* Check that if the original connection is IPv6 method=link-local, and the /* Check that if the generated connection is IPv6 method=link-local, and the
* candidate is both method=auto and may-faily=true, that the candidate is * candidate is both method=auto and may-faily=true, that the candidate is
* matched. * matched.
*/ */
@@ -344,7 +344,7 @@ test_connection_match_ip6_method_ignore (void)
copy = nm_connection_duplicate (orig); copy = nm_connection_duplicate (orig);
connections = g_slist_append (connections, copy); connections = g_slist_append (connections, copy);
/* Check that if the original connection is IPv6 method=link-local, and the /* Check that if the generated connection is IPv6 method=link-local, and the
* candidate is method=ignore, that the candidate is matched. * candidate is method=ignore, that the candidate is matched.
*/ */
s_ip6 = nm_connection_get_setting_ip6_config (orig); s_ip6 = nm_connection_get_setting_ip6_config (orig);
@@ -413,7 +413,7 @@ test_connection_match_ip4_method (void)
copy = nm_connection_duplicate (orig); copy = nm_connection_duplicate (orig);
connections = g_slist_append (connections, copy); connections = g_slist_append (connections, copy);
/* Check that if the original connection is IPv4 method=disabled, and the /* Check that if the generated connection is IPv4 method=disabled, and the
* candidate is both method=auto and may-faily=true, and the device has no * candidate is both method=auto and may-faily=true, and the device has no
* carrier that the candidate is matched. * carrier that the candidate is matched.
*/ */
@@ -453,8 +453,8 @@ test_connection_match_interface_name (void)
copy = nm_connection_duplicate (orig); copy = nm_connection_duplicate (orig);
connections = g_slist_append (connections, copy); connections = g_slist_append (connections, copy);
/* Check that if the original connection is IPv6 method=link-local, and the /* Check that if the generated connection has an interface name and the
* candidate is method=ignore, that the candidate is matched. * candidate's interface name is NULL, that the candidate is matched.
*/ */
s_con = nm_connection_get_setting_connection (orig); s_con = nm_connection_get_setting_connection (orig);
g_assert (s_con); g_assert (s_con);