mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

TR181 : Set/GET DHCP Client/Server options values in hexbinary format

Browse source
This commit is contained in:
Feten Besbes 2021-09-21 12:30:53 +01:00 • committed by Amin Ben Ramdhane
parent 0ddc89bda0
commit 56fa2ec2f1
4 changed files with 218 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

193
dmtree/tr181/dhcpv4.c
View file

@ -53,6 +53,24 @@ struct dhcp_client_option_args {
char *value; char *value;
}; };
/****************************************************************************/
static int get_dhcp_option(int t, char **option) {
switch(t) {
case DHCP_OPTION_VENDORID:
*option = "vendorid";
break;
case DHCP_OPTION_CLIENTID:
*option = "clientid";
break;
case DHCP_OPTION_HOSTNAME:
*option = "hostname";
break;
default:
*option = "sendopts";
break;
}
return 0;
}
/************************************************************************** /**************************************************************************
* LINKER * LINKER
***************************************************************************/ ***************************************************************************/
@ -399,23 +417,29 @@ static int addObjDHCPv4ClientSentOption(char *refparam, struct dmctx *ctx, void
static int delObjDHCPv4ClientSentOption(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action) static int delObjDHCPv4ClientSentOption(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action)
{ {
struct uci_section *s, *stmp; struct uci_section *s, *stmp;
char *list= NULL, *opt_value= NULL; char *list= NULL, *opt_value= NULL, *option = NULL;
int tag;
switch (del_action) { switch (del_action) {
case DEL_INST: case DEL_INST:
if(strcmp(((struct dhcp_client_option_args*) data)->option_tag, "0") != 0) tag = atoi(((struct dhcp_client_option_args*) data)->option_tag);
{ get_dhcp_option(tag, &option);
if (strcmp(option, "sendopts") == 0) {
dmasprintf(&opt_value, "%s:%s", ((struct dhcp_client_option_args*) data)->option_tag, ((struct dhcp_client_option_args*) data)->value); dmasprintf(&opt_value, "%s:%s", ((struct dhcp_client_option_args*) data)->option_tag, ((struct dhcp_client_option_args*) data)->value);
dmuci_get_value_by_section_string(((struct dhcp_client_option_args*) data)->client_sect, "sendopts", &list); dmuci_get_value_by_section_string(((struct dhcp_client_option_args*) data)->client_sect, "sendopts", &list);
if(list != NULL){ if(list != NULL){
remove_elt_from_str_list(&list, opt_value); remove_elt_from_str_list(&list, opt_value);
dmuci_set_value_by_section(((struct dhcp_client_option_args*) data)->client_sect, "sendopts", list); dmuci_set_value_by_section(((struct dhcp_client_option_args*) data)->client_sect, "sendopts", list);
} }
} else {
dmuci_set_value_by_section(((struct dhcp_client_option_args*) data)->client_sect, option, "");
} }
dmuci_delete_by_section_unnamed_bbfdm(((struct dhcp_client_option_args*) data)->opt_sect, NULL, NULL); dmuci_delete_by_section_unnamed_bbfdm(((struct dhcp_client_option_args*) data)->opt_sect, NULL, NULL);
break; break;
case DEL_ALL: case DEL_ALL:
dmuci_set_value_by_section(((struct dhcp_client_args*) data)->dhcp_client_conf, "sendopts", ""); dmuci_set_value_by_section(((struct dhcp_client_args*) data)->dhcp_client_conf, "sendopts", "");
dmuci_set_value_by_section(((struct dhcp_client_args*) data)->dhcp_client_conf, "clientid", "");
dmuci_set_value_by_section(((struct dhcp_client_args*) data)->dhcp_client_conf, "vendorid", "");
dmuci_set_value_by_section(((struct dhcp_client_args*) data)->dhcp_client_conf, "hostname", "");
uci_path_foreach_sections_safe(bbfdm, "dmmap_dhcp_client", "send_option", stmp, s) { uci_path_foreach_sections_safe(bbfdm, "dmmap_dhcp_client", "send_option", stmp, s) {
dmuci_delete_by_section_unnamed_bbfdm(s, NULL, NULL); dmuci_delete_by_section_unnamed_bbfdm(s, NULL, NULL);
} }
@ -1686,18 +1710,28 @@ static int get_DHCPv4Client_ReqOptionNumberOfEntries(char *refparam, struct dmct
static int get_DHCPv4ClientSentOption_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) static int get_DHCPv4ClientSentOption_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{ {
char *v, *opttagvalue = NULL; char *v, *opttagvalue = NULL;
char *option =NULL;
if (strcmp(((struct dhcp_client_option_args *)data)->option_tag, "0") == 0) { int tag = atoi (((struct dhcp_client_option_args *)data)->option_tag);
get_dhcp_option(tag, &option);
if (tag == 0) {
*value = "0"; *value = "0";
return 0; return 0;
} }
if(tag != 0 && strcmp(option, "sendopts")){
dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, option, &v);
if(strcmp (v, ((struct dhcp_client_option_args *)data)->value) == 0){
*value = "1";
return 0;
}
} else {
dmasprintf(&opttagvalue, "%s:%s", ((struct dhcp_client_option_args *)data)->option_tag, ((struct dhcp_client_option_args *)data)->value); dmasprintf(&opttagvalue, "%s:%s", ((struct dhcp_client_option_args *)data)->option_tag, ((struct dhcp_client_option_args *)data)->value);
dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", &v); dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", &v);
if (elt_exits_in_str_list(v, opttagvalue)) if (elt_exits_in_str_list(v, opttagvalue)){
*value = "1"; *value = "1";
else return 0;
}
}
*value = "0"; *value = "0";
return 0; return 0;
} }
@ -1713,18 +1747,23 @@ static int set_DHCPv4ClientSentOption_Enable(char *refparam, struct dmctx *ctx,
break; break;
case VALUESET: case VALUESET:
string_to_bool(value, &b); string_to_bool(value, &b);
char *option =NULL;
int tag = atoi (((struct dhcp_client_option_args *)data)->option_tag);
get_dhcp_option(tag, &option);
if(strcmp(option, "sendopts") == 0){
dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", &v); dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", &v);
if (strcmp(((struct dhcp_client_option_args *)data)->option_tag, "0") == 0)
return 0;
dmasprintf(&opttagvalue, "%s:%s", ((struct dhcp_client_option_args *)data)->option_tag, ((struct dhcp_client_option_args *)data)->value); dmasprintf(&opttagvalue, "%s:%s", ((struct dhcp_client_option_args *)data)->option_tag, ((struct dhcp_client_option_args *)data)->value);
if (b) { if (b)
if (!elt_exits_in_str_list(v, opttagvalue)) { if (!elt_exits_in_str_list(v, opttagvalue))
add_elt_to_str_list(&v, opttagvalue); add_elt_to_str_list(&v, opttagvalue);
dmuci_set_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", v); else
}
} else {
remove_elt_from_str_list(&v, opttagvalue); remove_elt_from_str_list(&v, opttagvalue);
dmuci_set_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", v); dmuci_set_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", v);
} else {
if (b)
dmuci_set_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, option, ((struct dhcp_client_option_args *)data)->value);
else
dmuci_set_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, option, "");
} }
break; break;
} }
@ -1762,12 +1801,15 @@ static int get_DHCPv4ClientSentOption_Tag(char *refparam, struct dmctx *ctx, voi
static int set_DHCPv4ClientSentOption_Tag(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) static int set_DHCPv4ClientSentOption_Tag(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{ {
char *pch, *spch = NULL, *list, *v, *opttagvalue, **sendopts, *oldopttagvalue; char *pch, *spch = NULL, *list, *v, *opttagvalue, **sendopts, *oldopttagvalue;
char *option =NULL, *newoption = NULL;
size_t length; size_t length;
get_dhcp_option(atoi(value), &newoption);
int tag;
switch (action) { switch (action) {
case VALUECHECK: case VALUECHECK:
if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","254"}}, 1)) if (dm_validate_unsignedInt(value, RANGE_ARGS{{"1","254"}}, 1))
return FAULT_9007; return FAULT_9007;
if(strcmp(newoption ,"sendopts") == 0) {
dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", &v); dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", &v);
if (v == NULL) if (v == NULL)
return 0; return 0;
@ -1777,15 +1819,33 @@ static int set_DHCPv4ClientSentOption_Tag(char *refparam, struct dmctx *ctx, voi
if (strcmp(sendopts[0], value) == 0) if (strcmp(sendopts[0], value) == 0)
return FAULT_9007; return FAULT_9007;
} }
} else {
dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, newoption, &v);
if(v && v[0]!='\0')
return FAULT_9007;
}
break; break;
case VALUESET: case VALUESET:
tag = atoi (((struct dhcp_client_option_args *)data)->option_tag);
get_dhcp_option(tag, &option);
if(strcmp(option ,"sendopts") == 0) {
dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", &v); dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", &v);
dmasprintf(&oldopttagvalue, "%s:%s", ((struct dhcp_client_option_args *)data)->option_tag, ((struct dhcp_client_option_args *)data)->value); dmasprintf(&oldopttagvalue, "%s:%s", ((struct dhcp_client_option_args *)data)->option_tag, ((struct dhcp_client_option_args *)data)->value);
if (v != NULL && strlen(v) > 0) if (v != NULL && strlen(v) > 0) {
remove_elt_from_str_list(&v, oldopttagvalue); remove_elt_from_str_list(&v, oldopttagvalue);
dmuci_set_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", v);
}
} else
dmuci_set_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, option, "");
if(strcmp(newoption ,"sendopts") == 0) {
dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", &v);
dmasprintf(&opttagvalue, "%s:%s", value, ((struct dhcp_client_option_args *)data)->value && strlen(((struct dhcp_client_option_args *)data)->value)>0 ? ((struct dhcp_client_option_args *)data)->value:"0"); dmasprintf(&opttagvalue, "%s:%s", value, ((struct dhcp_client_option_args *)data)->value && strlen(((struct dhcp_client_option_args *)data)->value)>0 ? ((struct dhcp_client_option_args *)data)->value:"0");
add_elt_to_str_list(&v, opttagvalue); add_elt_to_str_list(&v, opttagvalue);
dmuci_set_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", v); dmuci_set_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", v);
} else {
dmuci_set_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, newoption, ((struct dhcp_client_option_args *)data)->value);
}
DMUCI_SET_VALUE_BY_SECTION(bbfdm, ((struct dhcp_client_option_args *)data)->opt_sect, "option_tag", value); DMUCI_SET_VALUE_BY_SECTION(bbfdm, ((struct dhcp_client_option_args *)data)->opt_sect, "option_tag", value);
break; break;
} }
@ -1794,27 +1854,42 @@ static int set_DHCPv4ClientSentOption_Tag(char *refparam, struct dmctx *ctx, voi
static int get_DHCPv4ClientSentOption_Value(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) static int get_DHCPv4ClientSentOption_Value(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{ {
*value = dmstrdup(((struct dhcp_client_option_args *)data)->value); char hex[512] = {0};
char *v=NULL;
v = dmstrdup(((struct dhcp_client_option_args *)data)->value);
if (v && *v)
convert_string_to_hex(v, hex, sizeof(hex));
*value = (*hex) ? dmstrdup(hex) : "";
return 0; return 0;
} }
static int set_DHCPv4ClientSentOption_Value(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) static int set_DHCPv4ClientSentOption_Value(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{ {
char *v, *opttagvalue, *oldopttagvalue; char *v, *opttagvalue, *oldopttagvalue;
char *option = NULL;
int tag;
char res[512] = {0};
switch (action) { switch (action) {
case VALUECHECK: case VALUECHECK:
if (dm_validate_hexBinary(value, RANGE_ARGS{{"0","255"}}, 1)) if (dm_validate_hexBinary(value, RANGE_ARGS{{"0","255"}}, 1))
return FAULT_9007; return FAULT_9007;
break; break;
case VALUESET: case VALUESET:
convert_hex_to_string(value, res, sizeof(res));
tag = atoi (((struct dhcp_client_option_args *)data)->option_tag);
get_dhcp_option(tag, &option);
if(strcmp(option ,"sendopts") == 0) {
dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", &v); dmuci_get_value_by_section_string(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", &v);
dmasprintf(&oldopttagvalue, "%s:%s", ((struct dhcp_client_option_args *)data)->option_tag, ((struct dhcp_client_option_args *)data)->value); dmasprintf(&oldopttagvalue, "%s:%s", ((struct dhcp_client_option_args *)data)->option_tag, ((struct dhcp_client_option_args *)data)->value);
if (v != NULL && strlen(v) > 0)
remove_elt_from_str_list(&v, oldopttagvalue); remove_elt_from_str_list(&v, oldopttagvalue);
dmasprintf(&opttagvalue, "%s:%s", ((struct dhcp_client_option_args *)data)->option_tag, value); dmasprintf(&opttagvalue, "%s:%s", ((struct dhcp_client_option_args *)data)->option_tag, res);
add_elt_to_str_list(&v, opttagvalue); add_elt_to_str_list(&v, opttagvalue);
dmuci_set_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", v); dmuci_set_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, "sendopts", v);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, ((struct dhcp_client_option_args *)data)->opt_sect, "option_value", value); } else {
dmuci_set_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, option, res);
}
DMUCI_SET_VALUE_BY_SECTION(bbfdm, ((struct dhcp_client_option_args *)data)->opt_sect, "option_value", res);
break; break;
} }
return 0; return 0;
@ -2059,7 +2134,12 @@ static int set_DHCPv4ServerPoolOption_Tag(char *refparam, struct dmctx *ctx, voi
static int get_DHCPv4ServerPoolOption_Value(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) static int get_DHCPv4ServerPoolOption_Value(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{ {
*value = dmstrdup(((struct dhcp_client_option_args *)data)->value); const char *tag_value = dmstrdup(((struct dhcp_client_option_args *)data)->value);
char hex[512] = {0};
if (tag_value && *tag_value)
convert_string_to_hex(tag_value, hex, sizeof(hex));
*value = (*hex) ? dmstrdup(hex) : "";
return 0; return 0;
} }
@ -2069,28 +2149,34 @@ static int set_DHCPv4ServerPoolOption_Value(char *refparam, struct dmctx *ctx, v
size_t length; size_t length;
struct uci_list *dhcp_option_list = NULL; struct uci_list *dhcp_option_list = NULL;
struct uci_element *e; struct uci_element *e;
char res[512] = {0};
bool option_enabled = false;
switch (action) { switch (action) {
case VALUECHECK: case VALUECHECK:
if (dm_validate_hexBinary(value, RANGE_ARGS{{"0","255"}}, 1)) if (dm_validate_hexBinary(value, RANGE_ARGS{{"0","255"}}, 1))
return FAULT_9007; return FAULT_9007;
dmuci_get_value_by_section_list(((struct dhcp_client_option_args *)data)->client_sect, "dhcp_option", &dhcp_option_list);
if (dhcp_option_list == NULL)
return 0;
uci_foreach_element(dhcp_option_list, e) {
option = strsplit(e->name, ",", &length);
if (strcmp(option[0], value) == 0)
return FAULT_9007;
}
break; break;
case VALUESET: case VALUESET:
dmasprintf(&oldopttagvalue, "%s,%s", ((struct dhcp_client_option_args *)data)->option_tag, ((struct dhcp_client_option_args *)data)->value); convert_hex_to_string(value, res, sizeof(res));
dmasprintf(&opttagvalue, "%s,%s", ((struct dhcp_client_option_args *)data)->option_tag, value);
dmuci_get_value_by_section_list(((struct dhcp_client_option_args *)data)->client_sect, "dhcp_option", &dhcp_option_list); dmuci_get_value_by_section_list(((struct dhcp_client_option_args *)data)->client_sect, "dhcp_option", &dhcp_option_list);
if (dhcp_option_list != NULL) {
uci_foreach_element(dhcp_option_list, e) {
option = strsplit(e->name, ",", &length);
if (strcmp(option[0], ((struct dhcp_client_option_args *)data)->option_tag) == 0){
option_enabled = true;
break;
}
}
}
if (option_enabled) {
dmasprintf(&oldopttagvalue, "%s,%s", ((struct dhcp_client_option_args *)data)->option_tag, ((struct dhcp_client_option_args *)data)->value);
dmasprintf(&opttagvalue, "%s,%s", ((struct dhcp_client_option_args *)data)->option_tag, res);
dmuci_del_list_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, "dhcp_option", oldopttagvalue); dmuci_del_list_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, "dhcp_option", oldopttagvalue);
dmuci_add_list_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, "dhcp_option", opttagvalue); dmuci_add_list_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, "dhcp_option", opttagvalue);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, ((struct dhcp_client_option_args *)data)->opt_sect, "option_value", value); }
DMUCI_SET_VALUE_BY_SECTION(bbfdm, ((struct dhcp_client_option_args *)data)->opt_sect, "option_value", res);
break; break;
} }
return 0; return 0;
@ -2630,14 +2716,47 @@ static int browseDHCPv4ClientSentOptionInst(struct dmctx *dmctx, DMNODE *parent_
struct dhcp_client_option_args dhcp_client_opt_args = {0}; struct dhcp_client_option_args dhcp_client_opt_args = {0};
struct browse_args browse_args = {0}; struct browse_args browse_args = {0};
char *inst, *max_inst = NULL, *v1, *v2, **sentopts = NULL, **buf = NULL, *tmp, *optionvalue, *v = NULL; char *inst, *max_inst = NULL, *v1, *v2, **sentopts = NULL, **buf = NULL, *tmp, *optionvalue, *v = NULL;
char *vid, *cid, *hname;
size_t length = 0, lgh2 = 0; size_t length = 0, lgh2 = 0;
int i, j; int i, j;
if (dhcp_client_args->dhcp_client_conf != NULL) if (dhcp_client_args->dhcp_client_conf != NULL){
dmuci_get_value_by_section_string(dhcp_client_args->dhcp_client_conf, "sendopts", &v); dmuci_get_value_by_section_string(dhcp_client_args->dhcp_client_conf, "sendopts", &v);
dmuci_get_value_by_section_string(dhcp_client_args->dhcp_client_conf, "vendorid", &vid);
dmuci_get_value_by_section_string(dhcp_client_args->dhcp_client_conf, "clientid", &cid);
dmuci_get_value_by_section_string(dhcp_client_args->dhcp_client_conf, "hostname", &hname);
}
check_create_dmmap_package("dmmap_dhcp_client");
//vendorid option
if(vid && vid[0]!='\0'){
if((dmmap_sect = get_dup_section_in_dmmap_eq("dmmap_dhcp_client", "send_option", section_name(dhcp_client_args->dhcp_client_conf), "option_tag", "60") == NULL)) {
dmuci_add_section_bbfdm("dmmap_dhcp_client", "send_option", &dmmap_sect, &tmp);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_tag", "60");
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(dhcp_client_args->dhcp_client_conf));
}
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_value", vid);
}
//clienid option
if(cid && cid[0]!='\0'){
if((dmmap_sect = get_dup_section_in_dmmap_eq("dmmap_dhcp_client", "send_option", section_name(dhcp_client_args->dhcp_client_conf), "option_tag", "61") == NULL)) {
dmuci_add_section_bbfdm("dmmap_dhcp_client", "send_option", &dmmap_sect, &tmp);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_tag", "61");
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(dhcp_client_args->dhcp_client_conf));
}
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_value", cid);
}
//hostname option
if(hname && hname[0]!='\0'){
if((dmmap_sect = get_dup_section_in_dmmap_eq("dmmap_dhcp_client", "send_option", section_name(dhcp_client_args->dhcp_client_conf), "option_tag", "12") == NULL)) {
dmuci_add_section_bbfdm("dmmap_dhcp_client", "send_option", &dmmap_sect, &tmp);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_tag", "12");
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(dhcp_client_args->dhcp_client_conf));
}
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_value", hname);
}
if (v) sentopts = strsplit(v, " ", &length); if (v) sentopts = strsplit(v, " ", &length);
check_create_dmmap_package("dmmap_dhcp_client");
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
if (sentopts[i]) buf = strsplit(sentopts[i], ":", &lgh2); if (sentopts[i]) buf = strsplit(sentopts[i], ":", &lgh2);
if ((dmmap_sect = get_dup_section_in_dmmap_eq("dmmap_dhcp_client", "send_option", section_name(dhcp_client_args->dhcp_client_conf), "option_tag", buf[0])) == NULL) { if ((dmmap_sect = get_dup_section_in_dmmap_eq("dmmap_dhcp_client", "send_option", section_name(dhcp_client_args->dhcp_client_conf), "option_tag", buf[0])) == NULL) {

4
dmtree/tr181/dhcpv4.h
View file

@ -14,6 +14,10 @@
#include <libbbf_api/dmcommon.h> #include <libbbf_api/dmcommon.h>
#define DHCP_OPTION_VENDORID 60
#define DHCP_OPTION_CLIENTID 61
#define DHCP_OPTION_HOSTNAME 12
extern DMOBJ tDHCPv4Obj[]; extern DMOBJ tDHCPv4Obj[];
extern DMOBJ tDHCPv4ServerObj[]; extern DMOBJ tDHCPv4ServerObj[];
extern DMOBJ tDHCPv4ServerPoolObj[]; extern DMOBJ tDHCPv4ServerPoolObj[];

28
libbbf_api/dmcommon.c
View file

@ -1363,6 +1363,34 @@ int dm_time_format(time_t ts, char **dst)
return 0; return 0;
} }
void convert_string_to_hex(char *str, char *hex, int size)
{
int i, j, len = strlen(str);
for (i = 0, j = 0; j < size-2, i < len ; i++, j += 2) {
sprintf((char *)hex + j, "%02X", str[i]);
}
hex[j] = '\0';
}
void convert_hex_to_string(char *hex, char *str, int size)
{
int i=0, j, len = strlen(hex);
char buf[3] = {0};
for (i = 0, j = 0; j < size-1, hex[i] != '\0'; i += 2, j++) {
if(!isxdigit(hex[i]))
{
i--;
j--;
continue;
}
strncpy(buf, &hex[i], 2);
buf[2] = '\0';
sprintf((char*)str + j, "%c", (char)strtol(buf, NULL, 16));
}
str[j] = '\0';
}
bool match(const char *string, const char *pattern) bool match(const char *string, const char *pattern)
{ {
regex_t re; regex_t re;

2
libbbf_api/dmcommon.h
View file

@ -309,6 +309,8 @@ int get_net_iface_sysfs(const char *uci_iface, const char *name, char **value);
int get_net_device_sysfs(const char *uci_iface, const char *name, char **value); int get_net_device_sysfs(const char *uci_iface, const char *name, char **value);
char *get_device_from_wifi_iface(const char *wifi_iface, const char *wifi_section); char *get_device_from_wifi_iface(const char *wifi_iface, const char *wifi_section);
int dm_time_format(time_t ts, char **dst); int dm_time_format(time_t ts, char **dst);
void convert_string_to_hex(char *str, char *hex, int len);
void convert_hex_to_string(char *hex, char *str, int len);
bool match(const char *string, const char *pattern); bool match(const char *string, const char *pattern);
int dm_validate_string(char *value, int min_length, int max_length, char *enumeration[], int enumeration_size, char *pattern[], int pattern_size); int dm_validate_string(char *value, int min_length, int max_length, char *enumeration[], int enumeration_size, char *pattern[], int pattern_size);
int dm_validate_boolean(char *value); int dm_validate_boolean(char *value);