Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Startup Init Lite
提交
e9d044f0
S
Startup Init Lite
项目概览
OpenHarmony
/
Startup Init Lite
接近 2 年 前同步成功
通知
3
Star
37
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Startup Init Lite
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
e9d044f0
编写于
3月 31, 2022
作者:
X
xlei1030
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
SN从cmdLine获取
Signed-off-by:
N
xlei1030
<
xionglei6@huawei.com
>
上级
779e1987
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
69 addition
and
6 deletion
+69
-6
services/param/include/param_service.h
services/param/include/param_service.h
+2
-1
services/param/service/param_service.c
services/param/service/param_service.c
+67
-5
未找到文件。
services/param/include/param_service.h
浏览文件 @
e9d044f0
...
@@ -33,7 +33,8 @@ struct CmdLineEntry {
...
@@ -33,7 +33,8 @@ struct CmdLineEntry {
int
set
;
int
set
;
};
};
int
WriteParam
(
const
WorkSpace
*
workSpace
,
const
char
*
name
,
const
char
*
value
,
uint32_t
*
dataIndex
,
int
onlyAdd
);
int
WriteParam
(
const
WorkSpace
*
workSpace
,
const
char
*
name
,
const
char
*
value
,
uint32_t
*
dataIndex
,
int
onlyAdd
);
int
CheckAndResetSnValue
(
char
*
value
);
int
InitPersistParamWorkSpace
(
const
ParamWorkSpace
*
workSpace
);
int
InitPersistParamWorkSpace
(
const
ParamWorkSpace
*
workSpace
);
void
ClosePersistParamWorkSpace
(
void
);
void
ClosePersistParamWorkSpace
(
void
);
...
...
services/param/service/param_service.c
浏览文件 @
e9d044f0
...
@@ -37,6 +37,12 @@
...
@@ -37,6 +37,12 @@
static
ParamWorkSpace
g_paramWorkSpace
=
{
0
,
{},
NULL
,
{},
NULL
,
NULL
};
static
ParamWorkSpace
g_paramWorkSpace
=
{
0
,
{},
NULL
,
{},
NULL
,
NULL
};
#ifdef USE_MTK_EMMC
static
const
char
SN_FILE
[]
=
{
"/proc/bootdevice/cid"
};
#else
static
const
char
SN_FILE
[]
=
{
"/sys/block/mmcblk0/device/cid"
};
#endif
static
void
OnClose
(
ParamTaskPtr
client
)
static
void
OnClose
(
ParamTaskPtr
client
)
{
{
PARAM_LOGV
(
"OnClose %p"
,
client
);
PARAM_LOGV
(
"OnClose %p"
,
client
);
...
@@ -117,11 +123,24 @@ static int CheckParamValue(const WorkSpace *workSpace, const ParamTrieNode *node
...
@@ -117,11 +123,24 @@ static int CheckParamValue(const WorkSpace *workSpace, const ParamTrieNode *node
int
WriteParam
(
const
WorkSpace
*
workSpace
,
const
char
*
name
,
const
char
*
value
,
uint32_t
*
dataIndex
,
int
onlyAdd
)
int
WriteParam
(
const
WorkSpace
*
workSpace
,
const
char
*
name
,
const
char
*
value
,
uint32_t
*
dataIndex
,
int
onlyAdd
)
{
{
char
strValue
[
PARAM_CONST_VALUE_LEN_MAX
+
1
]
=
{};
int
res
=
strcpy_s
(
strValue
,
strlen
(
value
)
+
1
,
value
);
if
(
res
!=
EOK
)
{
PARAM_LOGE
(
"Error, strcpy failed!"
);
return
-
1
;
}
PARAM_CHECK
(
workSpace
!=
NULL
,
return
PARAM_CODE_INVALID_PARAM
,
"Invalid workSpace"
);
PARAM_CHECK
(
workSpace
!=
NULL
,
return
PARAM_CODE_INVALID_PARAM
,
"Invalid workSpace"
);
PARAM_CHECK
(
v
alue
!=
NULL
&&
name
!=
NULL
,
return
PARAM_CODE_INVALID_PARAM
,
"Invalid name or value"
);
PARAM_CHECK
(
strV
alue
!=
NULL
&&
name
!=
NULL
,
return
PARAM_CODE_INVALID_PARAM
,
"Invalid name or value"
);
ParamTrieNode
*
node
=
FindTrieNode
(
workSpace
,
name
,
strlen
(
name
),
NULL
);
ParamTrieNode
*
node
=
FindTrieNode
(
workSpace
,
name
,
strlen
(
name
),
NULL
);
int
ret
=
CheckParamValue
(
workSpace
,
node
,
name
,
value
);
int
ret
=
CheckParamValue
(
workSpace
,
node
,
name
,
strValue
);
PARAM_CHECK
(
ret
==
0
,
return
ret
,
"Invalid param value param: %s=%s"
,
name
,
value
);
PARAM_CHECK
(
ret
==
0
,
return
ret
,
"Invalid param value param: %s=%s"
,
name
,
strValue
);
if
(
strcmp
(
name
,
"ohos.boot.sn"
)
==
0
&&
CheckAndResetSnValue
(
strValue
)
!=
0
)
{
PARAM_LOGE
(
"Error,Reset sn value failed!"
);
return
PARAM_CODE_INVALID_PARAM
;
}
if
(
node
!=
NULL
&&
node
->
dataIndex
!=
0
)
{
if
(
node
!=
NULL
&&
node
->
dataIndex
!=
0
)
{
if
(
dataIndex
!=
NULL
)
{
if
(
dataIndex
!=
NULL
)
{
*
dataIndex
=
node
->
dataIndex
;
*
dataIndex
=
node
->
dataIndex
;
...
@@ -129,9 +148,45 @@ int WriteParam(const WorkSpace *workSpace, const char *name, const char *value,
...
@@ -129,9 +148,45 @@ int WriteParam(const WorkSpace *workSpace, const char *name, const char *value,
if
(
onlyAdd
)
{
if
(
onlyAdd
)
{
return
0
;
return
0
;
}
}
return
UpdateParam
(
workSpace
,
&
node
->
dataIndex
,
name
,
v
alue
);
return
UpdateParam
(
workSpace
,
&
node
->
dataIndex
,
name
,
strV
alue
);
}
}
return
AddParam
((
WorkSpace
*
)
workSpace
,
name
,
value
,
dataIndex
);
return
AddParam
((
WorkSpace
*
)
workSpace
,
name
,
strValue
,
dataIndex
);
}
int
CheckAndResetSnValue
(
char
*
value
)
{
char
snFile
[
PARAM_CONST_VALUE_LEN_MAX
]
=
{};
int
res
=
0
;
if
(
value
[
0
]
==
'/'
)
{
res
=
strcpy_s
(
snFile
,
strlen
(
value
)
+
1
,
value
);
if
(
res
!=
EOK
)
{
PARAM_LOGE
(
"Error, strcpy failed!"
);
return
-
1
;
}
}
else
{
return
0
;
}
char
*
data
=
ReadFileData
(
snFile
);
if
(
data
==
NULL
)
{
PARAM_LOGE
(
"Error, Read sn file failed!"
);
return
-
1
;
}
int
index
=
0
;
for
(
size_t
i
=
0
;
i
<
strlen
(
data
);
i
++
)
{
if
(
*
(
data
+
i
)
!=
':'
)
{
*
(
data
+
index
)
=
*
(
data
+
i
);
index
++
;
}
}
data
[
index
]
=
'\0'
;
res
=
strcpy_s
(
value
,
strlen
(
data
)
+
1
,
data
);
if
(
res
!=
EOK
)
{
PARAM_LOGE
(
"Error, strcpy failed!"
);
return
-
1
;
}
return
0
;
}
}
PARAM_STATIC
int
AddSecurityLabel
(
const
ParamAuditData
*
auditData
,
void
*
context
)
PARAM_STATIC
int
AddSecurityLabel
(
const
ParamAuditData
*
auditData
,
void
*
context
)
...
@@ -685,6 +740,7 @@ static int LoadParamFromCmdLine(void)
...
@@ -685,6 +740,7 @@ static int LoadParamFromCmdLine(void)
OHOS_BOOT
"hardware"
,
OHOS_BOOT
"hardware"
,
OHOS_BOOT
"bootgroup"
,
OHOS_BOOT
"bootgroup"
,
OHOS_BOOT
"reboot_reason"
,
OHOS_BOOT
"reboot_reason"
,
OHOS_BOOT
"sn"
,
#ifdef STARTUP_INIT_TEST
#ifdef STARTUP_INIT_TEST
OHOS_BOOT
"mem"
,
OHOS_BOOT
"mem"
,
OHOS_BOOT
"console"
,
OHOS_BOOT
"console"
,
...
@@ -712,6 +768,12 @@ static int LoadParamFromCmdLine(void)
...
@@ -712,6 +768,12 @@ static int LoadParamFromCmdLine(void)
#else
#else
ret
=
GetParamValueFromBuffer
(
cmdLines
[
i
],
data
,
value
,
PARAM_CONST_VALUE_LEN_MAX
);
ret
=
GetParamValueFromBuffer
(
cmdLines
[
i
],
data
,
value
,
PARAM_CONST_VALUE_LEN_MAX
);
#endif
#endif
//if cmdline not set sn or set sn value is null,read sn from default file
if
(
strcmp
(
cmdLines
[
i
],
"ohos.boot.sn"
)
==
0
&&
ret
!=
0
)
{
ret
=
0
;
strcpy_s
(
value
,
strlen
(
SN_FILE
)
+
1
,
SN_FILE
);
}
if
(
ret
==
0
)
{
if
(
ret
==
0
)
{
PARAM_LOGV
(
"Add param from cmdline %s %s"
,
cmdLines
[
i
],
value
);
PARAM_LOGV
(
"Add param from cmdline %s %s"
,
cmdLines
[
i
],
value
);
ret
=
CheckParamName
(
cmdLines
[
i
],
0
);
ret
=
CheckParamName
(
cmdLines
[
i
],
0
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录