On 23.09.25 13:00, Vladimir Sementsov-Ogievskiy wrote:
Simplify handling scripts: parse all these "no" and '\0' once, and
then keep simpler logic for net_tap_open() and net_init_tap_one(): NULL
means no script to run, otherwise run script.
Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]>
---
net/tap.c | 45 +++++++++++++++++++++++++--------------------
1 file changed, 25 insertions(+), 20 deletions(-)
[..]
"%s", ifname);
@@ -950,10 +963,10 @@ free_fail:
return -1;
}
} else {
- const char *script = tap->script;
- const char *downscript = tap->downscript;
- g_autofree char *default_script = NULL;
- g_autofree char *default_downscript = NULL;
+ g_autofree char *script =
+ tap_parse_script(tap->script, DEFAULT_NETWORK_SCRIPT);
+ g_autofree char *downscript =
+ tap_parse_script(tap->script, DEFAULT_NETWORK_DOWN_SCRIPT);
Ohh, tap->downscript of-course
bool vnet_hdr_required = tap->has_vnet_hdr && tap->vnet_hdr;
if (tap->vhostfds) {
@@ -961,14 +974,6 @@ free_fail:
return -1;
}
--
Best regards,
Vladimir
