Skip to content

P
PPSi
Commit ffd48dca authored by Aurelio Colosimo's avatar Aurelio Colosimo
Browse files
Options

arch-gnu-linux and arch-bare: call pp_open_globals after pp_parse_cmdline 

pp_open_globals must be called after pp_parse_cmdline; ppg->rt_opts is thus
set explicitly before pp_parse_cmdline, since this parsing affect rt_opts.
Signed-off-by: Aurelio Colosimo's avatarAurelio Colosimo <aurelio@aureliocolosimo.it>
parent 2f92a669
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
arch-gnu-linux/posix-startup.c
View file @ ffd48dca
......@@ -69,6 +69,8 @@ int main(int argc, char **argv)
close(conf_fd);
}
ppg->rt_opts = &default_rt_opts;
if ((ret = pp_parse_conf(ppg, conf_buf, conf_len)) < 0) {
pp_printf("Fatal: Error in %s file at line %d\n", CONF_PATH, -ret);
exit(__LINE__);
......@@ -115,11 +117,11 @@ int main(int argc, char **argv)
exit(__LINE__);
}
pp_open_globals(ppg);
if (pp_parse_cmdline(ppg, argc, argv) != 0)
return -1;
pp_open_globals(ppg);
posix_main_loop(ppg);
return 0; /* never reached */
}
lib-bare/bare-startup.c
View file @ ffd48dca
......@@ -52,12 +52,14 @@ int ppsi_main(int argc, char **argv)
ppi->ethernet_mode = PP_DEFAULT_ETHERNET_MODE;
ppi->iface_name = "eth0";
/* This just llocates the stuff */
pp_open_globals(ppg);
ppg->rt_opts = &default_rt_opts;
if (pp_parse_cmdline(ppg, argc, argv) != 0)
return -1;
/* This just allocates the stuff */
pp_open_globals(ppg);
/* The actual sockets are opened in state-initializing */
bare_main_loop(ppi);
return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment