Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
771d79e3
提交
771d79e3
authored
7月 29, 2013
作者:
Seven Du
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'ws1' patch abyss to support websocket
上级
39ad7996
253880f5
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
1054 行增加
和
2 行删除
+1054
-2
Makefile
src/mod/xml_int/mod_xml_rpc/Makefile
+3
-1
mod_xml_rpc.c
src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
+174
-1
ws.c
src/mod/xml_int/mod_xml_rpc/ws.c
+773
-0
ws.h
src/mod/xml_int/mod_xml_rpc/ws.h
+104
-0
没有找到文件。
src/mod/xml_int/mod_xml_rpc/Makefile
浏览文件 @
771d79e3
...
@@ -60,10 +60,12 @@ $(XMLRPC_DIR)/src/xmlrpc_server_abyss.o\
...
@@ -60,10 +60,12 @@ $(XMLRPC_DIR)/src/xmlrpc_server_abyss.o\
$(XMLRPC_DIR)
/src/xmlrpc_server_cgi.o
\
$(XMLRPC_DIR)
/src/xmlrpc_server_cgi.o
\
$(XMLRPC_DIR)
/src/xmlrpc_string.o
\
$(XMLRPC_DIR)
/src/xmlrpc_string.o
\
$(XMLRPC_DIR)
/src/xmlrpc_struct.o
\
$(XMLRPC_DIR)
/src/xmlrpc_struct.o
\
$(XMLRPC_DIR)
/lib/expat/xmltok/xmltok.o
$(XMLRPC_DIR)
/lib/expat/xmltok/xmltok.o
\
ws.o
LOCAL_CFLAGS
=
-w
-I
$(XMLRPC_DIR)
/lib/expat/xmlparse
-I
$(XMLRPC_DIR)
/lib/expat/xmltok
-I
$(XMLRPC_DIR)
-I
$(XMLRPC_DIR)
/include
LOCAL_CFLAGS
=
-w
-I
$(XMLRPC_DIR)
/lib/expat/xmlparse
-I
$(XMLRPC_DIR)
/lib/expat/xmltok
-I
$(XMLRPC_DIR)
-I
$(XMLRPC_DIR)
/include
LOCAL_CFLAGS
+=
-I
$(XMLRPC_DIR)
/lib/abyss/src
-I
$(XMLRPC_DIR)
/lib/util/include
-D_THREAD
-D__EXTENSIONS__
LOCAL_CFLAGS
+=
-I
$(XMLRPC_DIR)
/lib/abyss/src
-I
$(XMLRPC_DIR)
/lib/util/include
-D_THREAD
-D__EXTENSIONS__
LOCAL_CFLAGS
+=
-I
.
-I
../../../../libs/sofia-sip/libsofia-sip-ua/su
include
$(BASE)/build/modmake.rules
include
$(BASE)/build/modmake.rules
...
...
src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
浏览文件 @
771d79e3
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
* Anthony Minessale II <anthm@freeswitch.org>
* Anthony Minessale II <anthm@freeswitch.org>
* John Wehle <john@feith.com>
* John Wehle <john@feith.com>
* Garmt Boekholt <garmt@cimico.com>
* Garmt Boekholt <garmt@cimico.com>
* Seven Du <dujinfang@gmail.com>
*
*
* mod_xml_rpc.c -- XML RPC
* mod_xml_rpc.c -- XML RPC
*
*
...
@@ -69,6 +70,7 @@
...
@@ -69,6 +70,7 @@
#include <../lib/abyss/src/token.h>
#include <../lib/abyss/src/token.h>
#include <../lib/abyss/src/http.h>
#include <../lib/abyss/src/http.h>
#include <../lib/abyss/src/session.h>
#include <../lib/abyss/src/session.h>
#include "ws.h"
SWITCH_MODULE_LOAD_FUNCTION
(
mod_xml_rpc_load
);
SWITCH_MODULE_LOAD_FUNCTION
(
mod_xml_rpc_load
);
SWITCH_MODULE_SHUTDOWN_FUNCTION
(
mod_xml_rpc_shutdown
);
SWITCH_MODULE_SHUTDOWN_FUNCTION
(
mod_xml_rpc_shutdown
);
...
@@ -87,6 +89,7 @@ static struct {
...
@@ -87,6 +89,7 @@ static struct {
switch_bool_t
virtual_host
;
switch_bool_t
virtual_host
;
TServer
abyssServer
;
TServer
abyssServer
;
xmlrpc_registry
*
registryP
;
xmlrpc_registry
*
registryP
;
switch_bool_t
enable_websocket
;
}
globals
;
}
globals
;
SWITCH_DECLARE_GLOBAL_STRING_FUNC
(
set_global_realm
,
globals
.
realm
);
SWITCH_DECLARE_GLOBAL_STRING_FUNC
(
set_global_realm
,
globals
.
realm
);
...
@@ -126,6 +129,8 @@ static switch_status_t do_config(void)
...
@@ -126,6 +129,8 @@ static switch_status_t do_config(void)
default_domain
=
val
;
default_domain
=
val
;
}
else
if
(
!
strcasecmp
(
var
,
"virtual-host"
))
{
}
else
if
(
!
strcasecmp
(
var
,
"virtual-host"
))
{
globals
.
virtual_host
=
switch_true
(
val
);
globals
.
virtual_host
=
switch_true
(
val
);
}
else
if
(
!
strcasecmp
(
var
,
"enable-websocket"
))
{
globals
.
enable_websocket
=
switch_true
(
val
);
}
}
}
}
}
}
...
@@ -541,11 +546,160 @@ static abyss_bool http_directory_auth(TSession *r, char *domain_name)
...
@@ -541,11 +546,160 @@ static abyss_bool http_directory_auth(TSession *r, char *domain_name)
return
rval
;
return
rval
;
}
}
void
stop_hook_event_handler
(
switch_event_t
*
event
)
{
char
*
json
;
wsh_t
*
wsh
=
(
TSession
*
)
event
->
bind_user_data
;
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_NOTICE
,
"got websocket::stophook, closing
\n
"
);
wsh
->
down
++
;
}
void
event_handler
(
switch_event_t
*
event
)
{
char
*
json
;
wsh_t
*
wsh
=
(
TSession
*
)
event
->
bind_user_data
;
switch_event_serialize_json
(
event
,
&
json
);
ws_write_frame
(
wsh
,
WSOC_TEXT
,
json
,
strlen
(
json
));
free
(
json
);
}
#define MAX_EVENT_BIND_SLOTS SWITCH_EVENT_ALL
abyss_bool
websocket_hook
(
TSession
*
r
)
{
wsh_t
wsh
;
int
ret
;
int
i
;
ws_opcode_t
opcode
;
uint8_t
*
data
;
switch_event_node_t
*
nodes
[
MAX_EVENT_BIND_SLOTS
];
int
node_count
=
0
;
char
*
p
;
char
*
key
=
TableFind
(
&
r
->
requestHeaderFields
,
"sec-websocket-key"
);
char
*
version
=
TableFind
(
&
r
->
requestHeaderFields
,
"sec-websocket-version"
);
char
*
proto
=
TableFind
(
&
r
->
requestHeaderFields
,
"sec-websocket-protocol"
);
char
*
upgrade
=
TableFind
(
&
r
->
requestHeaderFields
,
"connection"
);
if
(
!
key
||
!
version
||
!
proto
||
!
upgrade
)
return
FALSE
;
if
(
strncasecmp
(
upgrade
,
"Upgrade"
,
7
)
||
strncasecmp
(
proto
,
"websocket"
,
9
))
return
FALSE
;
for
(
i
=
0
;
i
<
r
->
requestHeaderFields
.
size
;
++
i
)
{
TTableItem
*
const
fieldP
=
&
r
->
requestHeaderFields
.
item
[
i
];
const
char
*
const
fieldValue
=
fieldP
->
value
;
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_INFO
,
"headers %s: %s
\n
"
,
fieldP
->
name
,
fieldValue
);
}
ret
=
ws_init
(
&
wsh
,
r
,
NULL
,
0
);
if
(
ret
!=
0
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"websocket error %d
\n
"
,
ret
);
return
FALSE
;
}
while
(
!
wsh
.
down
&&
!
wsh
.
handshake
)
{
ret
=
ws_handshake_kvp
(
&
wsh
,
key
,
version
,
proto
);
if
(
ret
<
0
)
wsh
.
down
=
1
;
}
if
(
ret
!=
0
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"handshake error %d
\n
"
,
ret
);
return
FALSE
;
}
if
(
switch_event_bind_removable
(
"websocket"
,
SWITCH_EVENT_CUSTOM
,
"websocket::stophook"
,
stop_hook_event_handler
,
&
wsh
,
&
nodes
[
node_count
++
])
!=
SWITCH_STATUS_SUCCESS
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Can't bind!
\n
"
);
node_count
--
;
}
while
(
!
wsh
.
down
)
{
int
bytes
=
ws_read_frame
(
&
wsh
,
&
opcode
,
&
data
);
if
(
bytes
<
0
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_INFO
,
"%d %s
\n
"
,
opcode
,
(
char
*
)
data
);
switch_yield
(
1000
);
continue
;
}
switch
(
opcode
)
{
case
WSOC_CLOSE
:
ws_close
(
&
wsh
,
1000
);
break
;
case
WSOC_CONTINUATION
:
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"continue
\n
"
);
continue
;
case
WSOC_TEXT
:
p
=
data
;
if
(
!
p
)
continue
;
if
(
!
strncasecmp
(
data
,
"event "
,
6
))
{
switch_event_types_t
type
;
char
*
subclass
;
if
(
node_count
==
MAX_EVENT_BIND_SLOTS
-
1
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"cannot subscribe more than %d events
\n
"
,
node_count
);
continue
;
}
p
+=
6
;
if
(
p
=
strchr
(
p
,
' '
))
p
++
;
if
(
!
strncasecmp
(
p
,
"json "
,
5
))
{
p
+=
5
;
}
else
if
(
!
strncasecmp
(
p
,
"xml "
,
4
))
{
p
+=
4
;
}
else
if
(
!
strncasecmp
(
p
,
"plain "
,
6
))
{
p
+=
6
;
}
if
(
!*
p
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_WARNING
,
"missing event type in [%s]
\n
"
,
data
);
break
;
}
else
{
}
if
(
subclass
=
strchr
(
p
,
' '
))
{
*
subclass
++
=
'\0'
;
if
(
!*
subclass
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"missing subclass
\n
"
);
continue
;
}
}
else
{
subclass
=
SWITCH_EVENT_SUBCLASS_ANY
;
}
if
(
switch_name_event
(
p
,
&
type
)
!=
SWITCH_STATUS_SUCCESS
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Unknown event %s
\n
"
,
p
);
continue
;
}
if
(
switch_event_bind_removable
(
"websocket"
,
type
,
subclass
,
event_handler
,
&
wsh
,
&
nodes
[
node_count
++
])
!=
SWITCH_STATUS_SUCCESS
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Can't bind!
\n
"
);
node_count
--
;
continue
;
}
else
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_INFO
,
"Bind %s
\n
"
,
data
);
}
}
break
;
default
:
break
;
}
}
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"wsh.down = %d, node_count = %d
\n
"
,
wsh
.
down
,
node_count
);
switch_yield
(
2000
);
while
(
--
node_count
>=
0
)
switch_event_unbind
(
&
nodes
[
node_count
]);
return
FALSE
;
}
abyss_bool
auth_hook
(
TSession
*
r
)
abyss_bool
auth_hook
(
TSession
*
r
)
{
{
char
*
domain_name
,
*
e
;
char
*
domain_name
,
*
e
;
abyss_bool
ret
=
FALSE
;
abyss_bool
ret
=
FALSE
;
if
(
globals
.
enable_websocket
&&
!
strncmp
(
r
->
requestInfo
.
uri
,
"/socket"
,
7
))
{
// Chrome has no Authorization support yet
// https://code.google.com/p/chromium/issues/detail?id=123862
return
websocket_hook
(
r
);
}
if
(
!
strncmp
(
r
->
requestInfo
.
uri
,
"/domains/"
,
9
))
{
if
(
!
strncmp
(
r
->
requestInfo
.
uri
,
"/domains/"
,
9
))
{
domain_name
=
strdup
(
r
->
requestInfo
.
uri
+
9
);
domain_name
=
strdup
(
r
->
requestInfo
.
uri
+
9
);
switch_assert
(
domain_name
);
switch_assert
(
domain_name
);
...
@@ -1059,7 +1213,8 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_xml_rpc_runtime)
...
@@ -1059,7 +1213,8 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_xml_rpc_runtime)
ServerAddHandler
(
&
globals
.
abyssServer
,
auth_hook
);
ServerAddHandler
(
&
globals
.
abyssServer
,
auth_hook
);
ServerSetKeepaliveTimeout
(
&
globals
.
abyssServer
,
5
);
ServerSetKeepaliveTimeout
(
&
globals
.
abyssServer
,
5
);
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_NOTICE
,
"Starting HTTP Port %d, DocRoot [%s]
\n
"
,
globals
.
port
,
SWITCH_GLOBAL_dirs
.
htdocs_dir
);
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_NOTICE
,
"Starting HTTP Port %d, DocRoot [%s]%s
\n
"
,
globals
.
port
,
SWITCH_GLOBAL_dirs
.
htdocs_dir
,
globals
.
enable_websocket
?
" with websocket."
:
""
);
ServerRun
(
&
globals
.
abyssServer
);
ServerRun
(
&
globals
.
abyssServer
);
switch_yield
(
1000000
);
switch_yield
(
1000000
);
...
@@ -1069,10 +1224,28 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_xml_rpc_runtime)
...
@@ -1069,10 +1224,28 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_xml_rpc_runtime)
return
SWITCH_STATUS_TERM
;
return
SWITCH_STATUS_TERM
;
}
}
void
stop_all_websockets
()
{
switch_event_t
*
event
;
if
(
switch_event_create_subclass
(
&
event
,
SWITCH_EVENT_CUSTOM
,
"websocket::stophook"
)
!=
SWITCH_STATUS_SUCCESS
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Failed to create event!
\n
"
);
}
switch_event_add_header_string
(
event
,
SWITCH_STACK_BOTTOM
,
"stop"
,
"now"
);
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_NOTICE
,
"stopping all websockets ...
\n
"
);
if
(
switch_event_fire
(
&
event
)
!=
SWITCH_STATUS_SUCCESS
)
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Failed to fire the event!
\n
"
);
switch_event_destroy
(
&
event
);
return
false
;
}
}
/* upon module unload */
/* upon module unload */
SWITCH_MODULE_SHUTDOWN_FUNCTION
(
mod_xml_rpc_shutdown
)
SWITCH_MODULE_SHUTDOWN_FUNCTION
(
mod_xml_rpc_shutdown
)
{
{
/* Cann't find a way to stop the websockets, use this for a workaround before finding the real one that works */
stop_all_websockets
();
/* this makes the worker thread (ServerRun) stop */
/* this makes the worker thread (ServerRun) stop */
ServerTerminate
(
&
globals
.
abyssServer
);
ServerTerminate
(
&
globals
.
abyssServer
);
...
...
src/mod/xml_int/mod_xml_rpc/ws.c
0 → 100644
浏览文件 @
771d79e3
差异被折叠。
点击展开。
src/mod/xml_int/mod_xml_rpc/ws.h
0 → 100644
浏览文件 @
771d79e3
#ifndef _WS_H
#define _WS_H
//#define WSS_STANDALONE 1
#define WEBSOCKET_GUID "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
#define B64BUFFLEN 1024
#include <sys/types.h>
#ifndef _MSC_VER
#include <arpa/inet.h>
#include <sys/wait.h>
#include <sys/socket.h>
#else
#pragma warning(disable:4996)
#endif
#include <string.h>
#include <unistd.h>
#include <string.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <errno.h>
//#include "sha1.h"
#include <openssl/ssl.h>
#include <sofia-sip/su_types.h>
#include <../lib/abyss/src/session.h>
#include <../lib/abyss/src/conn.h>
typedef
TSession
ws_tsession_t
;
struct
globals_s
{
const
SSL_METHOD
*
ssl_method
;
SSL_CTX
*
ssl_ctx
;
char
cert
[
512
];
char
key
[
512
];
};
// extern struct globals_s globals;
typedef
int
ws_socket_t
;
#define ws_sock_invalid -1
typedef
enum
{
WS_NONE
=
0
,
WS_NORMAL
=
1000
,
WS_PROTO_ERR
=
1002
,
WS_DATA_TOO_BIG
=
1009
}
ws_cause_t
;
typedef
enum
{
WSOC_CONTINUATION
=
0x0
,
WSOC_TEXT
=
0x1
,
WSOC_BINARY
=
0x2
,
WSOC_CLOSE
=
0x8
,
WSOC_PING
=
0x9
,
WSOC_PONG
=
0xA
}
ws_opcode_t
;
typedef
struct
wsh_s
{
ws_socket_t
sock
;
char
buffer
[
65536
];
char
wbuffer
[
65536
];
size_t
buflen
;
issize_t
datalen
;
issize_t
wdatalen
;
char
*
payload
;
issize_t
plen
;
issize_t
rplen
;
SSL
*
ssl
;
int
handshake
;
uint8_t
down
;
int
secure
;
uint8_t
close_sock
;
ws_tsession_t
*
tsession
;
}
wsh_t
;
issize_t
ws_send_buf
(
wsh_t
*
wsh
,
ws_opcode_t
oc
);
issize_t
ws_feed_buf
(
wsh_t
*
wsh
,
void
*
data
,
size_t
bytes
);
issize_t
ws_raw_read
(
wsh_t
*
wsh
,
void
*
data
,
size_t
bytes
);
issize_t
ws_raw_write
(
wsh_t
*
wsh
,
void
*
data
,
size_t
bytes
);
issize_t
ws_read_frame
(
wsh_t
*
wsh
,
ws_opcode_t
*
oc
,
uint8_t
**
data
);
issize_t
ws_write_frame
(
wsh_t
*
wsh
,
ws_opcode_t
oc
,
void
*
data
,
size_t
bytes
);
int
ws_init
(
wsh_t
*
wsh
,
ws_tsession_t
*
tsession
,
SSL_CTX
*
ssl_ctx
,
int
close_sock
);
issize_t
ws_close
(
wsh_t
*
wsh
,
int16_t
reason
);
void
ws_destroy
(
wsh_t
*
wsh
);
void
init_ssl
(
void
);
void
deinit_ssl
(
void
);
int
ws_handshake_kvp
(
wsh_t
*
wsh
,
char
*
key
,
char
*
version
,
char
*
proto
);
#ifndef _MSC_VER
static
inline
uint64_t
get_unaligned_uint64
(
const
void
*
p
)
{
const
struct
{
uint64_t
d
;
}
__attribute__
((
packed
))
*
pp
=
p
;
return
pp
->
d
;
}
#endif
#endif
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论