Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
ed8e4dc6
提交
ed8e4dc6
authored
12月 01, 2016
作者:
Shane Bryldt
提交者:
Mike Jerris
1月 25, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-9775: Renamed registries, added query registry with ping callback, unit test updated
上级
e9fdd9c9
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
149 行增加
和
20 行删除
+149
-20
ks_dht-int.h
libs/libks/src/dht/ks_dht-int.h
+3
-1
ks_dht.c
libs/libks/src/dht/ks_dht.c
+124
-12
ks_dht.h
libs/libks/src/dht/ks_dht.h
+4
-2
ks_dht_message.c
libs/libks/src/dht/ks_dht_message.c
+3
-0
ks_dht_message.h
libs/libks/src/dht/ks_dht_message.h
+2
-0
testdht2.c
libs/libks/test/testdht2.c
+13
-5
没有找到文件。
libs/libks/src/dht/ks_dht-int.h
浏览文件 @
ed8e4dc6
...
@@ -9,7 +9,9 @@ KS_BEGIN_EXTERN_C
...
@@ -9,7 +9,9 @@ KS_BEGIN_EXTERN_C
KS_DECLARE
(
ks_status_t
)
ks_dht2_idle
(
ks_dht2_t
*
dht
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_idle
(
ks_dht2_t
*
dht
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_process
(
ks_dht2_t
*
dht
,
ks_sockaddr_t
*
raddr
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_process
(
ks_dht2_t
*
dht
,
ks_sockaddr_t
*
raddr
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_process_query
(
ks_dht2_t
*
dht
,
ks_sockaddr_t
*
raddr
,
ks_dht2_message_t
*
message
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_process_query_ping
(
ks_dht2_t
*
dht
,
ks_sockaddr_t
*
raddr
,
ks_dht2_message_t
*
message
);
KS_END_EXTERN_C
KS_END_EXTERN_C
#endif
/* KS_DHT_INT_H */
#endif
/* KS_DHT_INT_H */
...
...
libs/libks/src/dht/ks_dht.c
浏览文件 @
ed8e4dc6
...
@@ -70,8 +70,12 @@ KS_DECLARE(ks_status_t) ks_dht2_init(ks_dht2_t *dht, const uint8_t *nodeid)
...
@@ -70,8 +70,12 @@ KS_DECLARE(ks_status_t) ks_dht2_init(ks_dht2_t *dht, const uint8_t *nodeid)
return
KS_STATUS_FAIL
;
return
KS_STATUS_FAIL
;
}
}
ks_hash_create
(
&
dht
->
registry_y
,
KS_HASH_MODE_DEFAULT
,
KS_HASH_FLAG_RWLOCK
|
KS_HASH_FLAG_DUP_CHECK
,
dht
->
pool
);
ks_hash_create
(
&
dht
->
registry_type
,
KS_HASH_MODE_DEFAULT
,
KS_HASH_FLAG_RWLOCK
|
KS_HASH_FLAG_DUP_CHECK
,
dht
->
pool
);
// @todo ks_hash_insert the q/r/e callbacks into y registry
ks_dht2_register_type
(
dht
,
"q"
,
ks_dht2_process_query
);
// @todo ks_hash_insert the r/e callbacks into type registry
ks_hash_create
(
&
dht
->
registry_query
,
KS_HASH_MODE_DEFAULT
,
KS_HASH_FLAG_RWLOCK
|
KS_HASH_FLAG_DUP_CHECK
,
dht
->
pool
);
ks_dht2_register_query
(
dht
,
"ping"
,
ks_dht2_process_query_ping
);
dht
->
bind_ipv4
=
KS_FALSE
;
dht
->
bind_ipv4
=
KS_FALSE
;
dht
->
bind_ipv6
=
KS_FALSE
;
dht
->
bind_ipv6
=
KS_FALSE
;
...
@@ -116,9 +120,13 @@ KS_DECLARE(ks_status_t) ks_dht2_deinit(ks_dht2_t *dht)
...
@@ -116,9 +120,13 @@ KS_DECLARE(ks_status_t) ks_dht2_deinit(ks_dht2_t *dht)
dht
->
bind_ipv4
=
KS_FALSE
;
dht
->
bind_ipv4
=
KS_FALSE
;
dht
->
bind_ipv6
=
KS_FALSE
;
dht
->
bind_ipv6
=
KS_FALSE
;
if
(
dht
->
registry_y
)
{
if
(
dht
->
registry_type
)
{
ks_hash_destroy
(
&
dht
->
registry_y
);
ks_hash_destroy
(
&
dht
->
registry_type
);
dht
->
registry_y
=
NULL
;
dht
->
registry_type
=
NULL
;
}
if
(
dht
->
registry_query
)
{
ks_hash_destroy
(
&
dht
->
registry_query
);
dht
->
registry_query
=
NULL
;
}
}
ks_dht2_nodeid_deinit
(
&
dht
->
nodeid
);
ks_dht2_nodeid_deinit
(
&
dht
->
nodeid
);
...
@@ -129,13 +137,25 @@ KS_DECLARE(ks_status_t) ks_dht2_deinit(ks_dht2_t *dht)
...
@@ -129,13 +137,25 @@ KS_DECLARE(ks_status_t) ks_dht2_deinit(ks_dht2_t *dht)
/**
/**
*
*
*/
*/
KS_DECLARE
(
ks_status_t
)
ks_dht2_register_
y
(
ks_dht2_t
*
dht
,
const
char
*
value
,
ks_dht2_registry_callback_t
callback
)
KS_DECLARE
(
ks_status_t
)
ks_dht2_register_
type
(
ks_dht2_t
*
dht
,
const
char
*
value
,
ks_dht2_registry_callback_t
callback
)
{
{
ks_assert
(
dht
);
ks_assert
(
dht
);
ks_assert
(
value
);
ks_assert
(
value
);
ks_assert
(
callback
);
ks_assert
(
callback
);
return
ks_hash_insert
(
dht
->
registry_y
,
(
void
*
)
value
,
(
void
*
)(
intptr_t
)
callback
)
?
KS_STATUS_SUCCESS
:
KS_STATUS_FAIL
;
return
ks_hash_insert
(
dht
->
registry_type
,
(
void
*
)
value
,
(
void
*
)(
intptr_t
)
callback
)
?
KS_STATUS_SUCCESS
:
KS_STATUS_FAIL
;
}
/**
*
*/
KS_DECLARE
(
ks_status_t
)
ks_dht2_register_query
(
ks_dht2_t
*
dht
,
const
char
*
value
,
ks_dht2_registry_callback_t
callback
)
{
ks_assert
(
dht
);
ks_assert
(
value
);
ks_assert
(
callback
);
return
ks_hash_insert
(
dht
->
registry_query
,
(
void
*
)
value
,
(
void
*
)(
intptr_t
)
callback
)
?
KS_STATUS_SUCCESS
:
KS_STATUS_FAIL
;
}
}
/**
/**
...
@@ -151,10 +171,7 @@ KS_DECLARE(ks_status_t) ks_dht2_bind(ks_dht2_t *dht, const ks_sockaddr_t *addr)
...
@@ -151,10 +171,7 @@ KS_DECLARE(ks_status_t) ks_dht2_bind(ks_dht2_t *dht, const ks_sockaddr_t *addr)
ks_assert
(
addr
);
ks_assert
(
addr
);
ks_assert
(
addr
->
family
==
AF_INET
||
addr
->
family
==
AF_INET6
);
ks_assert
(
addr
->
family
==
AF_INET
||
addr
->
family
==
AF_INET6
);
ks_assert
(
addr
->
port
);
ks_assert
(
addr
->
port
);
//if (!addr->port) {
// addr->port = KS_DHT_DEFAULT_PORT;
//}
dht
->
bind_ipv4
|=
addr
->
family
==
AF_INET
;
dht
->
bind_ipv4
|=
addr
->
family
==
AF_INET
;
dht
->
bind_ipv6
|=
addr
->
family
==
AF_INET6
;
dht
->
bind_ipv6
|=
addr
->
family
==
AF_INET6
;
...
@@ -281,7 +298,7 @@ KS_DECLARE(ks_status_t) ks_dht2_process(ks_dht2_t *dht, ks_sockaddr_t *raddr)
...
@@ -281,7 +298,7 @@ KS_DECLARE(ks_status_t) ks_dht2_process(ks_dht2_t *dht, ks_sockaddr_t *raddr)
return
KS_STATUS_FAIL
;
return
KS_STATUS_FAIL
;
}
}
if
(
!
(
callback
=
(
ks_dht2_registry_callback_t
)(
intptr_t
)
ks_hash_search
(
dht
->
registry_
y
,
message
.
type
,
KS_UNLOCKED
)))
{
if
(
!
(
callback
=
(
ks_dht2_registry_callback_t
)(
intptr_t
)
ks_hash_search
(
dht
->
registry_
type
,
message
.
type
,
KS_UNLOCKED
)))
{
ks_log
(
KS_LOG_DEBUG
,
"Message type '%s' is not registered
\n
"
,
message
.
type
);
ks_log
(
KS_LOG_DEBUG
,
"Message type '%s' is not registered
\n
"
,
message
.
type
);
}
else
{
}
else
{
ret
=
callback
(
dht
,
raddr
,
&
message
);
ret
=
callback
(
dht
,
raddr
,
&
message
);
...
@@ -292,6 +309,101 @@ KS_DECLARE(ks_status_t) ks_dht2_process(ks_dht2_t *dht, ks_sockaddr_t *raddr)
...
@@ -292,6 +309,101 @@ KS_DECLARE(ks_status_t) ks_dht2_process(ks_dht2_t *dht, ks_sockaddr_t *raddr)
return
ret
;
return
ret
;
}
}
/**
*
*/
KS_DECLARE
(
ks_status_t
)
ks_dht2_process_query
(
ks_dht2_t
*
dht
,
ks_sockaddr_t
*
raddr
,
ks_dht2_message_t
*
message
)
{
struct
bencode
*
q
;
struct
bencode
*
a
;
const
char
*
qv
;
ks_size_t
qv_len
;
char
query
[
KS_DHT_MESSAGE_QUERY_MAX_SIZE
];
ks_dht2_registry_callback_t
callback
;
ks_status_t
ret
=
KS_STATUS_FAIL
;
ks_assert
(
dht
);
ks_assert
(
raddr
);
ks_assert
(
message
);
q
=
ben_dict_get_by_str
(
message
->
data
,
"q"
);
if
(
!
q
)
{
ks_log
(
KS_LOG_DEBUG
,
"Message missing required key 'q'
\n
"
);
return
KS_STATUS_FAIL
;
}
qv
=
ben_str_val
(
q
);
qv_len
=
ben_str_len
(
q
);
if
(
qv_len
>=
KS_DHT_MESSAGE_QUERY_MAX_SIZE
)
{
ks_log
(
KS_LOG_DEBUG
,
"Message 'q' value has an unexpectedly large size of %d
\n
"
,
qv_len
);
return
KS_STATUS_FAIL
;
}
memcpy
(
query
,
qv
,
qv_len
);
query
[
qv_len
]
=
'\0'
;
ks_log
(
KS_LOG_DEBUG
,
"Message query is '%s'
\n
"
,
query
);
a
=
ben_dict_get_by_str
(
message
->
data
,
"a"
);
if
(
!
a
)
{
ks_log
(
KS_LOG_DEBUG
,
"Message missing required key 'a'
\n
"
);
return
KS_STATUS_FAIL
;
}
message
->
args
=
a
;
if
(
!
(
callback
=
(
ks_dht2_registry_callback_t
)(
intptr_t
)
ks_hash_search
(
dht
->
registry_query
,
query
,
KS_UNLOCKED
)))
{
ks_log
(
KS_LOG_DEBUG
,
"Message query '%s' is not registered
\n
"
,
query
);
}
else
{
ret
=
callback
(
dht
,
raddr
,
message
);
}
return
ret
;
}
/**
*
*/
KS_DECLARE
(
ks_status_t
)
ks_dht2_process_query_ping
(
ks_dht2_t
*
dht
,
ks_sockaddr_t
*
raddr
,
ks_dht2_message_t
*
message
)
{
struct
bencode
*
id
;
const
char
*
idv
;
ks_size_t
idv_len
;
ks_dht2_nodeid_t
nid
;
ks_assert
(
dht
);
ks_assert
(
raddr
);
ks_assert
(
message
);
ks_assert
(
message
->
args
);
id
=
ben_dict_get_by_str
(
message
->
args
,
"id"
);
if
(
!
id
)
{
ks_log
(
KS_LOG_DEBUG
,
"Message args missing required key 'id'
\n
"
);
return
KS_STATUS_FAIL
;
}
idv
=
ben_str_val
(
id
);
idv_len
=
ben_str_len
(
id
);
if
(
idv_len
!=
KS_DHT_NODEID_LENGTH
)
{
ks_log
(
KS_LOG_DEBUG
,
"Message args 'id' value has an unexpected size of %d
\n
"
,
idv_len
);
return
KS_STATUS_FAIL
;
}
if
(
ks_dht2_nodeid_prealloc
(
&
nid
,
dht
->
pool
)
!=
KS_STATUS_SUCCESS
)
{
return
KS_STATUS_FAIL
;
}
if
(
ks_dht2_nodeid_init
(
&
nid
,
(
const
uint8_t
*
)
idv
)
!=
KS_STATUS_SUCCESS
)
{
return
KS_STATUS_FAIL
;
}
//ks_log(KS_LOG_DEBUG, "Message query ping id is '%s'\n", id->id);
ks_log
(
KS_LOG_DEBUG
,
"Mesage query ping is valid
\n
"
);
ks_dht2_nodeid_deinit
(
&
nid
);
return
KS_STATUS_SUCCESS
;
}
/* For Emacs:
/* For Emacs:
* Local Variables:
* Local Variables:
* mode:c
* mode:c
...
...
libs/libks/src/dht/ks_dht.h
浏览文件 @
ed8e4dc6
...
@@ -21,7 +21,8 @@ struct ks_dht2_s {
...
@@ -21,7 +21,8 @@ struct ks_dht2_s {
ks_dht2_nodeid_t
nodeid
;
ks_dht2_nodeid_t
nodeid
;
ks_hash_t
*
registry_y
;
ks_hash_t
*
registry_type
;
ks_hash_t
*
registry_query
;
ks_bool_t
bind_ipv4
;
ks_bool_t
bind_ipv4
;
ks_bool_t
bind_ipv6
;
ks_bool_t
bind_ipv6
;
...
@@ -51,7 +52,8 @@ KS_DECLARE(ks_status_t) ks_dht2_bind(ks_dht2_t *dht, const ks_sockaddr_t *addr);
...
@@ -51,7 +52,8 @@ KS_DECLARE(ks_status_t) ks_dht2_bind(ks_dht2_t *dht, const ks_sockaddr_t *addr);
KS_DECLARE
(
ks_status_t
)
ks_dht2_pulse
(
ks_dht2_t
*
dht
,
int32_t
timeout
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_pulse
(
ks_dht2_t
*
dht
,
int32_t
timeout
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_register_y
(
ks_dht2_t
*
dht
,
const
char
*
value
,
ks_dht2_registry_callback_t
callback
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_register_type
(
ks_dht2_t
*
dht
,
const
char
*
value
,
ks_dht2_registry_callback_t
callback
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_register_query
(
ks_dht2_t
*
dht
,
const
char
*
value
,
ks_dht2_registry_callback_t
callback
);
KS_END_EXTERN_C
KS_END_EXTERN_C
...
...
libs/libks/src/dht/ks_dht_message.c
浏览文件 @
ed8e4dc6
...
@@ -59,6 +59,8 @@ KS_DECLARE(ks_status_t) ks_dht2_message_init(ks_dht2_message_t *message, const u
...
@@ -59,6 +59,8 @@ KS_DECLARE(ks_status_t) ks_dht2_message_init(ks_dht2_message_t *message, const u
ks_assert
(
message
->
pool
);
ks_assert
(
message
->
pool
);
ks_assert
(
buffer
);
ks_assert
(
buffer
);
message
->
args
=
NULL
;
message
->
data
=
ben_decode
((
const
void
*
)
buffer
,
buffer_length
);
message
->
data
=
ben_decode
((
const
void
*
)
buffer
,
buffer_length
);
if
(
!
message
->
data
)
{
if
(
!
message
->
data
)
{
ks_log
(
KS_LOG_DEBUG
,
"Message cannot be decoded
\n
"
);
ks_log
(
KS_LOG_DEBUG
,
"Message cannot be decoded
\n
"
);
...
@@ -117,6 +119,7 @@ KS_DECLARE(ks_status_t) ks_dht2_message_deinit(ks_dht2_message_t *message)
...
@@ -117,6 +119,7 @@ KS_DECLARE(ks_status_t) ks_dht2_message_deinit(ks_dht2_message_t *message)
{
{
ks_assert
(
message
);
ks_assert
(
message
);
message
->
args
=
NULL
;
message
->
type
[
0
]
=
'\0'
;
message
->
type
[
0
]
=
'\0'
;
message
->
transactionid_length
=
0
;
message
->
transactionid_length
=
0
;
if
(
message
->
data
)
{
if
(
message
->
data
)
{
...
...
libs/libks/src/dht/ks_dht_message.h
浏览文件 @
ed8e4dc6
...
@@ -7,6 +7,7 @@ KS_BEGIN_EXTERN_C
...
@@ -7,6 +7,7 @@ KS_BEGIN_EXTERN_C
#define KS_DHT_MESSAGE_TRANSACTIONID_MAX_SIZE 20
#define KS_DHT_MESSAGE_TRANSACTIONID_MAX_SIZE 20
#define KS_DHT_MESSAGE_TYPE_MAX_SIZE 20
#define KS_DHT_MESSAGE_TYPE_MAX_SIZE 20
#define KS_DHT_MESSAGE_QUERY_MAX_SIZE 20
typedef
struct
ks_dht2_message_s
ks_dht2_message_t
;
typedef
struct
ks_dht2_message_s
ks_dht2_message_t
;
struct
ks_dht2_message_s
{
struct
ks_dht2_message_s
{
...
@@ -15,6 +16,7 @@ struct ks_dht2_message_s {
...
@@ -15,6 +16,7 @@ struct ks_dht2_message_s {
uint8_t
transactionid
[
KS_DHT_MESSAGE_TRANSACTIONID_MAX_SIZE
];
uint8_t
transactionid
[
KS_DHT_MESSAGE_TRANSACTIONID_MAX_SIZE
];
ks_size_t
transactionid_length
;
ks_size_t
transactionid_length
;
char
type
[
KS_DHT_MESSAGE_TYPE_MAX_SIZE
];
char
type
[
KS_DHT_MESSAGE_TYPE_MAX_SIZE
];
struct
bencode
*
args
;
};
};
KS_DECLARE
(
ks_status_t
)
ks_dht2_message_alloc
(
ks_dht2_message_t
**
message
,
ks_pool_t
*
pool
);
KS_DECLARE
(
ks_status_t
)
ks_dht2_message_alloc
(
ks_dht2_message_t
**
message
,
ks_pool_t
*
pool
);
...
...
libs/libks/test/testdht2.c
浏览文件 @
ed8e4dc6
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
#include <../dht/ks_dht_endpoint-int.h>
#include <../dht/ks_dht_endpoint-int.h>
#include <tap.h>
#include <tap.h>
#define TEST_DHT1_REGISTER_
Y
_BUFFER "d1:ad2:id20:12345678901234567890e1:q4:ping1:t2:421:y1:ze"
#define TEST_DHT1_REGISTER_
TYPE
_BUFFER "d1:ad2:id20:12345678901234567890e1:q4:ping1:t2:421:y1:ze"
#define TEST_DHT1_PROCESS_BUFFER "d1:ad2:id20:12345678901234567890e1:q4:ping1:t2:421:y1:qe"
#define TEST_DHT1_PROCESS_
QUERY_PING_
BUFFER "d1:ad2:id20:12345678901234567890e1:q4:ping1:t2:421:y1:qe"
ks_status_t
dht_z_callback
(
ks_dht2_t
*
dht
,
ks_sockaddr_t
*
raddr
,
ks_dht2_message_t
*
message
)
ks_status_t
dht_z_callback
(
ks_dht2_t
*
dht
,
ks_sockaddr_t
*
raddr
,
ks_dht2_message_t
*
message
)
{
{
...
@@ -59,7 +59,7 @@ int main() {
...
@@ -59,7 +59,7 @@ int main() {
err
=
ks_dht2_init
(
&
dht2
,
NULL
);
err
=
ks_dht2_init
(
&
dht2
,
NULL
);
ok
(
err
==
KS_STATUS_SUCCESS
);
ok
(
err
==
KS_STATUS_SUCCESS
);
ks_dht2_register_
y
(
dht1
,
"z"
,
dht_z_callback
);
ks_dht2_register_
type
(
dht1
,
"z"
,
dht_z_callback
);
if
(
have_v4
)
{
if
(
have_v4
)
{
err
=
ks_addr_set
(
&
addr
,
v4
,
KS_DHT_DEFAULT_PORT
,
AF_INET
);
err
=
ks_addr_set
(
&
addr
,
v4
,
KS_DHT_DEFAULT_PORT
,
AF_INET
);
...
@@ -91,8 +91,16 @@ int main() {
...
@@ -91,8 +91,16 @@ int main() {
ok
(
err
==
KS_STATUS_SUCCESS
);
ok
(
err
==
KS_STATUS_SUCCESS
);
}
}
buflen
=
strlen
(
TEST_DHT1_REGISTER_Y_BUFFER
);
buflen
=
strlen
(
TEST_DHT1_REGISTER_TYPE_BUFFER
);
memcpy
(
dht1
->
recv_buffer
,
TEST_DHT1_REGISTER_Y_BUFFER
,
buflen
);
memcpy
(
dht1
->
recv_buffer
,
TEST_DHT1_REGISTER_TYPE_BUFFER
,
buflen
);
dht1
->
recv_buffer_length
=
buflen
;
err
=
ks_dht2_process
(
dht1
,
&
raddr
);
ok
(
err
==
KS_STATUS_SUCCESS
);
buflen
=
strlen
(
TEST_DHT1_PROCESS_QUERY_PING_BUFFER
);
memcpy
(
dht1
->
recv_buffer
,
TEST_DHT1_PROCESS_QUERY_PING_BUFFER
,
buflen
);
dht1
->
recv_buffer_length
=
buflen
;
dht1
->
recv_buffer_length
=
buflen
;
err
=
ks_dht2_process
(
dht1
,
&
raddr
);
err
=
ks_dht2_process
(
dht1
,
&
raddr
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论