Add string_option_to_env() to easily generate environment variables for known simple options.
Signed-off-by: Samuel Mendoza-Jonas <[email protected]> --- v2: Simplify ptr check networking/udhcp/d6_dhcpc.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c index 85d9da724..eea50c9ee 100644 --- a/networking/udhcp/d6_dhcpc.c +++ b/networking/udhcp/d6_dhcpc.c @@ -195,6 +195,37 @@ static char** new_env(void) return &client6_data.env_ptr[client6_data.env_idx++]; } +static char *string_option_to_env(uint8_t *option, uint8_t *option_end) +{ + const char *ptr, *name = NULL; + uint8_t val_len; + int i; + + ptr = d6_option_strings; + i = 0; + while (ptr && *ptr) { + if (d6_optflags[i].code == option[1]) { + name = ptr; + break; + } + ptr += strlen(ptr) + 1; + i++; + } + + if (!name) { + bb_error_msg("could not find option name for 0x%x, skipping\n", + option[1]); + return NULL; + } + + val_len = option[2] << 8 | option[3]; + if (val_len + &option[D6_OPT_DATA] > option_end) { + bb_error_msg("option data exceeds option length\n"); + return NULL; + } + return xasprintf("%s=%.*s", name, val_len, (char*)option + 4); +} + /* put all the parameters into the environment */ static void option_to_env(uint8_t *option, uint8_t *option_end) { -- 2.17.0 _______________________________________________ busybox mailing list [email protected] http://lists.busybox.net/mailman/listinfo/busybox
