fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 13:00:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: split reading file and parsing from read_route_file() function

Browse source 
Split the parsing of the file content to a separate function.

Next we will load IPv4 files only once, and thus only need to parse
the content without reading it.

Note that the function temporarily modifies the input buffer, but
restores the original content before returning.
This commit is contained in:
Thomas Haller 2020-01-10 17:07:12 +01:00
parent 9f35d9e49e
commit b1fa27f9bd
1 changed files with 47 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
View file

@ -1345,39 +1345,40 @@ read_one_ip4_route (shvarFile *ifcfg,
}
static gboolean
read_route_file (int addr_family,
const char *filename,
NMSettingIPConfig *s_ip,
GError **error)
read_route_file_parse (int addr_family,
const char *filename,
const char *contents,
gsize len,
NMSettingIPConfig *s_ip,
GError **error)
{
gs_free char *contents = NULL;
char *contents_rest = NULL;
const char *line;
gsize len = 0;
gsize line_num;
g_return_val_if_fail (filename, FALSE);
g_return_val_if_fail ( (addr_family == AF_INET && NM_IS_SETTING_IP4_CONFIG (s_ip))
|| (addr_family == AF_INET6 && NM_IS_SETTING_IP6_CONFIG (s_ip)), FALSE);
g_return_val_if_fail (!error || !*error, FALSE);
nm_assert (filename);
nm_assert (addr_family == nm_setting_ip_config_get_addr_family (s_ip));
nm_assert (!error || !*error);
if ( !g_file_get_contents (filename, &contents, &len, NULL)
|| !len) {
if (len <= 0)
return TRUE; /* missing/empty = success */
}
line_num = 0;
for (line = strtok_r (contents, "\n", &contents_rest);
line;
line = strtok_r (NULL, "\n", &contents_rest)) {
while (TRUE) {
nm_auto_unref_ip_route NMIPRoute *route = NULL;
gs_free_error GError *local = NULL;
const char *line = contents;
char *eol;
int e;
eol = strchr (contents, '\n');
if (eol) {
eol[0] = '\0';
contents = &eol[1];
}
line_num++;
if (parse_route_line_is_comment (line))
continue;
goto next;
e = parse_route_line (line, addr_family, NULL, &route, &local);
@ -1389,14 +1390,38 @@ read_route_file (int addr_family,
* entire connection. */
PARSE_WARNING ("ignoring invalid route at \"%s\" (%s:%lu): %s", line, filename, (long unsigned) line_num, local->message);
}
continue;
goto next;
}
if (!nm_setting_ip_config_add_route (s_ip, route))
PARSE_WARNING ("duplicate IPv%c route", addr_family == AF_INET ? '4' : '6');
}
return TRUE;
next:
if (!eol)
return TRUE;
/* restore original content. */
eol[0] = '\n';
}
}
static gboolean
read_route_file (int addr_family,
const char *filename,
NMSettingIPConfig *s_ip,
GError **error)
{
gs_free char *contents = NULL;
gsize len;
nm_assert (filename);
nm_assert (addr_family == nm_setting_ip_config_get_addr_family (s_ip));
nm_assert (!error || !*error);
if (!g_file_get_contents (filename, &contents, &len, NULL))
return TRUE; /* missing/empty = success */
return read_route_file_parse (addr_family, filename, contents, len, s_ip, error);
}
static void