Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
61e1545e
提交
61e1545e
authored
12月 01, 2016
作者:
Shane Bryldt
提交者:
Mike Jerris
1月 25, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-9775: Replaced initialization of nodeid to use safer passing through raw fixed size type
上级
ed8e4dc6
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
12 行增加
和
7 行删除
+12
-7
c
libs/libks/src/dht/c
+0
-0
ks_dht.c
libs/libks/src/dht/ks_dht.c
+2
-2
ks_dht.h
libs/libks/src/dht/ks_dht.h
+2
-2
ks_dht_nodeid.c
libs/libks/src/dht/ks_dht_nodeid.c
+2
-2
ks_dht_nodeid.h
libs/libks/src/dht/ks_dht_nodeid.h
+6
-1
没有找到文件。
libs/libks/src/dht/c
0 → 100644
浏览文件 @
61e1545e
libs/libks/src/dht/ks_dht.c
浏览文件 @
61e1545e
...
@@ -57,7 +57,7 @@ KS_DECLARE(ks_status_t) ks_dht2_free(ks_dht2_t *dht)
...
@@ -57,7 +57,7 @@ KS_DECLARE(ks_status_t) ks_dht2_free(ks_dht2_t *dht)
/**
/**
*
*
*/
*/
KS_DECLARE
(
ks_status_t
)
ks_dht2_init
(
ks_dht2_t
*
dht
,
const
uint8
_t
*
nodeid
)
KS_DECLARE
(
ks_status_t
)
ks_dht2_init
(
ks_dht2_t
*
dht
,
const
ks_dht2_nodeid_raw
_t
*
nodeid
)
{
{
ks_assert
(
dht
);
ks_assert
(
dht
);
ks_assert
(
dht
->
pool
);
ks_assert
(
dht
->
pool
);
...
@@ -392,7 +392,7 @@ KS_DECLARE(ks_status_t) ks_dht2_process_query_ping(ks_dht2_t *dht, ks_sockaddr_t
...
@@ -392,7 +392,7 @@ KS_DECLARE(ks_status_t) ks_dht2_process_query_ping(ks_dht2_t *dht, ks_sockaddr_t
return
KS_STATUS_FAIL
;
return
KS_STATUS_FAIL
;
}
}
if
(
ks_dht2_nodeid_init
(
&
nid
,
(
const
uint8
_t
*
)
idv
)
!=
KS_STATUS_SUCCESS
)
{
if
(
ks_dht2_nodeid_init
(
&
nid
,
(
const
ks_dht2_nodeid_raw
_t
*
)
idv
)
!=
KS_STATUS_SUCCESS
)
{
return
KS_STATUS_FAIL
;
return
KS_STATUS_FAIL
;
}
}
...
...
libs/libks/src/dht/ks_dht.h
浏览文件 @
61e1545e
...
@@ -43,8 +43,8 @@ KS_DECLARE(ks_status_t) ks_dht2_alloc(ks_dht2_t **dht, ks_pool_t *pool);
...
@@ -43,8 +43,8 @@ KS_DECLARE(ks_status_t) ks_dht2_alloc(ks_dht2_t **dht, ks_pool_t *pool);
KS_DECLARE
(
ks_status_t
)
ks_dht2_prealloc
(
ks_dht2_t
*
dht
,
ks_pool_t
*
pool
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_prealloc
(
ks_dht2_t
*
dht
,
ks_pool_t
*
pool
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_free
(
ks_dht2_t
*
dht
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_free
(
ks_dht2_t
*
dht
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_init
(
ks_dht2_t
*
dht
,
const
uint8
_t
*
nodeid
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_init
(
ks_dht2_t
*
dht
,
const
ks_dht2_nodeid_raw
_t
*
nodeid
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_deinit
(
ks_dht2_t
*
dht
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_deinit
(
ks_dht2_t
*
dht
);
...
...
libs/libks/src/dht/ks_dht_nodeid.c
浏览文件 @
61e1545e
...
@@ -47,7 +47,7 @@ KS_DECLARE(ks_status_t) ks_dht2_nodeid_free(ks_dht2_nodeid_t *nodeid)
...
@@ -47,7 +47,7 @@ KS_DECLARE(ks_status_t) ks_dht2_nodeid_free(ks_dht2_nodeid_t *nodeid)
/**
/**
*
*
*/
*/
KS_DECLARE
(
ks_status_t
)
ks_dht2_nodeid_init
(
ks_dht2_nodeid_t
*
nodeid
,
const
uint8
_t
*
id
)
KS_DECLARE
(
ks_status_t
)
ks_dht2_nodeid_init
(
ks_dht2_nodeid_t
*
nodeid
,
const
ks_dht2_nodeid_raw
_t
*
id
)
{
{
ks_assert
(
nodeid
);
ks_assert
(
nodeid
);
ks_assert
(
nodeid
->
pool
);
ks_assert
(
nodeid
->
pool
);
...
@@ -55,7 +55,7 @@ KS_DECLARE(ks_status_t) ks_dht2_nodeid_init(ks_dht2_nodeid_t *nodeid, const uint
...
@@ -55,7 +55,7 @@ KS_DECLARE(ks_status_t) ks_dht2_nodeid_init(ks_dht2_nodeid_t *nodeid, const uint
if
(
!
id
)
{
if
(
!
id
)
{
randombytes_buf
(
nodeid
->
id
,
KS_DHT_NODEID_LENGTH
);
randombytes_buf
(
nodeid
->
id
,
KS_DHT_NODEID_LENGTH
);
}
else
{
}
else
{
memcpy
(
nodeid
->
id
,
id
,
KS_DHT_NODEID_LENGTH
);
memcpy
(
nodeid
->
id
,
id
->
id
,
KS_DHT_NODEID_LENGTH
);
}
}
return
KS_STATUS_SUCCESS
;
return
KS_STATUS_SUCCESS
;
...
...
libs/libks/src/dht/ks_dht_nodeid.h
浏览文件 @
61e1545e
...
@@ -7,6 +7,11 @@ KS_BEGIN_EXTERN_C
...
@@ -7,6 +7,11 @@ KS_BEGIN_EXTERN_C
#define KS_DHT_NODEID_LENGTH 20
#define KS_DHT_NODEID_LENGTH 20
typedef
struct
ks_dht2_nodeid_raw_s
ks_dht2_nodeid_raw_t
;
struct
ks_dht2_nodeid_raw_s
{
uint8_t
id
[
KS_DHT_NODEID_LENGTH
];
};
typedef
struct
ks_dht2_nodeid_s
ks_dht2_nodeid_t
;
typedef
struct
ks_dht2_nodeid_s
ks_dht2_nodeid_t
;
struct
ks_dht2_nodeid_s
{
struct
ks_dht2_nodeid_s
{
ks_pool_t
*
pool
;
ks_pool_t
*
pool
;
...
@@ -17,7 +22,7 @@ KS_DECLARE(ks_status_t) ks_dht2_nodeid_alloc(ks_dht2_nodeid_t **nodeid, ks_pool_
...
@@ -17,7 +22,7 @@ KS_DECLARE(ks_status_t) ks_dht2_nodeid_alloc(ks_dht2_nodeid_t **nodeid, ks_pool_
KS_DECLARE
(
ks_status_t
)
ks_dht2_nodeid_prealloc
(
ks_dht2_nodeid_t
*
nodeid
,
ks_pool_t
*
pool
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_nodeid_prealloc
(
ks_dht2_nodeid_t
*
nodeid
,
ks_pool_t
*
pool
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_nodeid_free
(
ks_dht2_nodeid_t
*
nodeid
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_nodeid_free
(
ks_dht2_nodeid_t
*
nodeid
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_nodeid_init
(
ks_dht2_nodeid_t
*
nodeid
,
const
uint8
_t
*
id
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_nodeid_init
(
ks_dht2_nodeid_t
*
nodeid
,
const
ks_dht2_nodeid_raw
_t
*
id
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_nodeid_deinit
(
ks_dht2_nodeid_t
*
nodeid
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_nodeid_deinit
(
ks_dht2_nodeid_t
*
nodeid
);
KS_END_EXTERN_C
KS_END_EXTERN_C
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论