mirror/icwmp
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/icwmp.git synced 2026-02-22 04:12:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ticket refs #12762: Device will not always send OUI in Inform

Browse source
This commit is contained in:
Omar 2017-09-28 11:14:11 +01:00
parent 6f1891d328
commit fd932429d3
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dm/dmtree/common/deviceinfo.c
View file

@ -47,14 +47,31 @@ char *get_deviceid_manufactureroui()
char str[16];
char *mac = NULL;
json_object *res;
FILE *nvrammac=NULL;
char macreadfile[18]={0};
dmuci_get_option_value_string("cwmp", "cpe", "override_oui", &v);
if (v[0] == '\0')
{
dmubus_call("router.system", "info", UBUS_ARGS{{}}, 0, &res);
if(!(res))
if(!(res)){
db_get_value_string("hw", "board", "BaseMacAddr", &mac);
if(!mac || strlen(mac)==0 ){
if ((nvrammac = fopen("/proc/nvram/BaseMacAddr", "r")) == NULL)
{
mac = NULL;
}
else{
fscanf(nvrammac,"%[^\n]", macreadfile);
macreadfile[17]='\0';
sscanf(macreadfile,"%2c %2c %2c", str, str+2, str+4);
str[6]='\0';
v = dmstrdup(str); // MEM WILL BE FREED IN DMMEMCLEAN
fclose(nvrammac);
return v;
}
}
}
else
mac = dm_ubus_get_value(res, 2, "system", "basemac");
if(mac)