mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2026-02-19 10:41:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

T#8720: unable to set option 43 for dhcp server

Browse source
This commit is contained in:
Amin Ben Ramdhane 2022-09-19 15:37:59 +00:00
parent 95134bb3b0
commit 9bdcb1ac18
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libbbf_api/dmcommon.c
View file

@ -103,6 +103,7 @@ struct option_tag_type TYPE_TAG_ARRAY[] = {
{39, OPTION_INT, 1},
{41, OPTION_IP, 4},
{42, OPTION_IP, 4},
{43, OPTION_HEX, 1},
{44, OPTION_IP, 4},
{45, OPTION_IP, 4},
{46, OPTION_INT, 1},
@ -127,6 +128,7 @@ struct option_tag_type TYPE_TAG_ARRAY[] = {
{75, OPTION_IP, 4},
{76, OPTION_IP, 4},
{118, OPTION_IP, 4},
{125, OPTION_HEX, 1},
{145, OPTION_INT, 1},
{152, OPTION_INT, 4},
{153, OPTION_INT, 4},
@ -1212,6 +1214,13 @@ void convert_str_option_to_hex(unsigned int tag, const char *str, char *hex, siz
unsigned int ip = ntohl(ip_bin.s_addr);
pos += snprintf(&hex[pos], size - pos, "%08X", ip);
} else if (TYPE_TAG_ARRAY[idx].type == OPTION_HEX) {
for (int j = 0; j < DM_STRLEN(pch); j++) {
if (pch[j] == ':')
continue;
pos += snprintf(&hex[pos], size - pos, "%c", pch[j]);
}
} else {
long int val = DM_STRTOL(pch);
pos += snprintf(&hex[pos], size - pos, (TYPE_TAG_ARRAY[idx].len == 4) ? "%08lX" : (TYPE_TAG_ARRAY[idx].len == 2) ? "%04lX" : "%02lX", val);
@ -1249,6 +1258,8 @@ void convert_hex_option_to_string(unsigned int tag, const char *hex, char *str,
addr.s_addr = htonl(ip);
char *ipaddr = inet_ntoa(addr);
pos += snprintf(&str[pos], size - pos, "%s,", ipaddr);
} else if (TYPE_TAG_ARRAY[idx].type == OPTION_HEX) {
pos += snprintf(&str[pos], size - pos, "%s:", buf);
} else {
int a = (int)strtol(buf, NULL, 16);
pos += snprintf(&str[pos], size - pos, "%d,", a);

3
libbbf_api/dmcommon.h
View file

@ -165,7 +165,8 @@ enum fs_size_type_enum {
enum option_type_enum {
OPTION_IP,
OPTION_INT
OPTION_INT,
OPTION_HEX
};
#define IPPING_PATH "/usr/share/bbfdm/ipping_launch"