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

ifcfg-rh: fix handling of legacy IPv4 route files without gateway.

Browse Source 
Routes without gateway are legal and should be treated as a device route
(direct route).

https://bugzilla.gnome.org/show_bug.cgi?id=697525

The original patch was written by Scott Shambarger <scott-gnome@shambarger.net>.
This is a modified version of the patch.

Signed-off-by: Thomas Haller <thaller@redhat.com>
Reported-by: Scott Shambarger <scott-gnome@shambarger.net>
This commit is contained in:
Scott Shambarger
2013-08-19 19:39:17 +02:00
committed by Thomas Haller
parent f6703f540c
commit 04f6e09d50
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/settings/plugins/ifcfg-rh/reader.c
View File

@@ -859,7 +859,7 @@ read_route_file_legacy (const char *filename, NMSettingIP4Config *s_ip4, GError
GMatchInfo *match_info;
NMIP4Route *route;
guint32 ip4_addr;
char *dest = NULL, *prefix = NULL, *next_hop = NULL, *metric = NULL;
char *dest = NULL, *prefix = NULL, *metric = NULL;
long int prefix_int, metric_int;
gboolean success = FALSE;
@@ -942,22 +942,23 @@ read_route_file_legacy (const char *filename, NMSettingIP4Config *s_ip4, GError
/* Next hop */
g_regex_match (regex_via, *iter, 0, &match_info);
if (!g_match_info_matches (match_info)) {
g_match_info_free (match_info);
g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
"Missing IP4 route gateway address in record: '%s'", *iter);
goto error;
}
next_hop = g_match_info_fetch (match_info, 1);
g_match_info_free (match_info);
if (inet_pton (AF_INET, next_hop, &ip4_addr) != 1) {
g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
"Invalid IP4 route gateway address '%s'", next_hop);
if (g_match_info_matches (match_info)) {
char *next_hop = g_match_info_fetch (match_info, 1);
if (inet_pton (AF_INET, next_hop, &ip4_addr) != 1) {
g_set_error (error, IFCFG_PLUGIN_ERROR, 0,
"Invalid IP4 route gateway address '%s'",
next_hop);
g_match_info_free (match_info);
g_free (next_hop);
goto error;
}
g_free (next_hop);
goto error;
} else {
/* we don't make distinction between missing GATEWAY IP and 0.0.0.0 */
ip4_addr = 0;
}
nm_ip4_route_set_next_hop (route, ip4_addr);
g_free (next_hop);
g_match_info_free (match_info);
/* Metric */
g_regex_match (regex_metric, *iter, 0, &match_info);

1
src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy
View File

@@ -1,3 +1,4 @@
1.2.3.0/24 via 222.173.190.239 metric 0
3.2.1.0/24 via 202.254.171.190 metric 77
7.7.7.7/32 via 10.0.2.2 metric 11
8.8.8.8/32 metric 12