Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
911948c8
提交
911948c8
authored
6月 24, 2013
作者:
Chris Rienzo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mod_rayo: remove reply from send function - everything is send only now
上级
1ed5e3e3
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
49 行增加
和
103 行删除
+49
-103
mod_rayo.c
src/mod/event_handlers/mod_rayo/mod_rayo.c
+40
-66
mod_rayo.h
src/mod/event_handlers/mod_rayo/mod_rayo.h
+3
-3
rayo_prompt_component.c
src/mod/event_handlers/mod_rayo/rayo_prompt_component.c
+6
-34
没有找到文件。
src/mod/event_handlers/mod_rayo/mod_rayo.c
浏览文件 @
911948c8
差异被折叠。
点击展开。
src/mod/event_handlers/mod_rayo/mod_rayo.h
浏览文件 @
911948c8
...
@@ -59,7 +59,7 @@ struct rayo_message {
...
@@ -59,7 +59,7 @@ struct rayo_message {
};
};
typedef
void
(
*
rayo_actor_cleanup_fn
)(
struct
rayo_actor
*
);
typedef
void
(
*
rayo_actor_cleanup_fn
)(
struct
rayo_actor
*
);
typedef
struct
rayo_message
*
(
*
rayo_actor_send_fn
)(
struct
rayo_actor
*
,
struct
rayo_actor
*
,
struct
rayo_message
*
,
const
char
*
file
,
int
line
);
typedef
void
(
*
rayo_actor_send_fn
)(
struct
rayo_actor
*
,
struct
rayo_actor
*
,
struct
rayo_message
*
,
const
char
*
file
,
int
line
);
/**
/**
* Type of actor
* Type of actor
...
@@ -133,8 +133,8 @@ extern iks *rayo_message_remove_payload(struct rayo_message *msg);
...
@@ -133,8 +133,8 @@ extern iks *rayo_message_remove_payload(struct rayo_message *msg);
extern
struct
rayo_actor
*
rayo_actor_locate
(
const
char
*
jid
,
const
char
*
file
,
int
line
);
extern
struct
rayo_actor
*
rayo_actor_locate
(
const
char
*
jid
,
const
char
*
file
,
int
line
);
extern
struct
rayo_actor
*
rayo_actor_locate_by_id
(
const
char
*
id
,
const
char
*
file
,
int
line
);
extern
struct
rayo_actor
*
rayo_actor_locate_by_id
(
const
char
*
id
,
const
char
*
file
,
int
line
);
extern
int
rayo_actor_seq_next
(
struct
rayo_actor
*
actor
);
extern
int
rayo_actor_seq_next
(
struct
rayo_actor
*
actor
);
extern
struct
rayo_message
*
rayo_actor_send
(
struct
rayo_actor
*
from
,
struct
rayo_actor
*
to
,
struct
rayo_message
*
msg
,
const
char
*
file
,
int
line
);
extern
void
rayo_actor_send
(
struct
rayo_actor
*
from
,
struct
rayo_actor
*
to
,
struct
rayo_message
*
msg
,
const
char
*
file
,
int
line
);
extern
struct
rayo_message
*
rayo_actor_send_by_jid
(
struct
rayo_actor
*
from
,
const
char
*
jid
,
struct
rayo_message
*
msg
,
const
char
*
file
,
int
line
);
extern
void
rayo_actor_send_by_jid
(
struct
rayo_actor
*
from
,
const
char
*
jid
,
struct
rayo_message
*
msg
,
const
char
*
file
,
int
line
);
extern
void
rayo_actor_rdlock
(
struct
rayo_actor
*
actor
,
const
char
*
file
,
int
line
);
extern
void
rayo_actor_rdlock
(
struct
rayo_actor
*
actor
,
const
char
*
file
,
int
line
);
extern
void
rayo_actor_unlock
(
struct
rayo_actor
*
actor
,
const
char
*
file
,
int
line
);
extern
void
rayo_actor_unlock
(
struct
rayo_actor
*
actor
,
const
char
*
file
,
int
line
);
extern
void
rayo_actor_destroy
(
struct
rayo_actor
*
actor
,
const
char
*
file
,
int
line
);
extern
void
rayo_actor_destroy
(
struct
rayo_actor
*
actor
,
const
char
*
file
,
int
line
);
...
...
src/mod/event_handlers/mod_rayo/rayo_prompt_component.c
浏览文件 @
911948c8
...
@@ -91,7 +91,6 @@ static const char *prompt_component_state_to_string(enum prompt_component_state
...
@@ -91,7 +91,6 @@ static const char *prompt_component_state_to_string(enum prompt_component_state
*/
*/
static
void
rayo_component_send_stop
(
struct
rayo_actor
*
from
,
struct
rayo_actor
*
to
)
static
void
rayo_component_send_stop
(
struct
rayo_actor
*
from
,
struct
rayo_actor
*
to
)
{
{
struct
rayo_message
*
reply
;
iks
*
stop
=
iks_new
(
"iq"
);
iks
*
stop
=
iks_new
(
"iq"
);
iks
*
x
;
iks
*
x
;
iks_insert_attrib
(
stop
,
"from"
,
RAYO_JID
(
from
));
iks_insert_attrib
(
stop
,
"from"
,
RAYO_JID
(
from
));
...
@@ -100,11 +99,7 @@ static void rayo_component_send_stop(struct rayo_actor *from, struct rayo_actor
...
@@ -100,11 +99,7 @@ static void rayo_component_send_stop(struct rayo_actor *from, struct rayo_actor
iks_insert_attrib_printf
(
stop
,
"id"
,
"mod_rayo-%d"
,
RAYO_SEQ_NEXT
(
from
));
iks_insert_attrib_printf
(
stop
,
"id"
,
"mod_rayo-%d"
,
RAYO_SEQ_NEXT
(
from
));
x
=
iks_insert
(
stop
,
"stop"
);
x
=
iks_insert
(
stop
,
"stop"
);
iks_insert_attrib
(
x
,
"xmlns"
,
RAYO_EXT_NS
);
iks_insert_attrib
(
x
,
"xmlns"
,
RAYO_EXT_NS
);
reply
=
RAYO_SEND
(
from
,
to
,
rayo_message_create
(
stop
));
RAYO_SEND
(
from
,
to
,
rayo_message_create
(
stop
));
if
(
reply
)
{
/* don't care */
rayo_message_destroy
(
reply
);
}
}
}
/**
/**
...
@@ -112,7 +107,6 @@ static void rayo_component_send_stop(struct rayo_actor *from, struct rayo_actor
...
@@ -112,7 +107,6 @@ static void rayo_component_send_stop(struct rayo_actor *from, struct rayo_actor
*/
*/
static
void
start_input
(
struct
prompt_component
*
prompt
,
int
start_timers
,
int
barge_event
)
static
void
start_input
(
struct
prompt_component
*
prompt
,
int
start_timers
,
int
barge_event
)
{
{
struct
rayo_message
*
reply
;
iks
*
iq
=
iks_new
(
"iq"
);
iks
*
iq
=
iks_new
(
"iq"
);
iks
*
input
=
iks_find
(
PROMPT_COMPONENT
(
prompt
)
->
iq
,
"prompt"
);
iks
*
input
=
iks_find
(
PROMPT_COMPONENT
(
prompt
)
->
iq
,
"prompt"
);
input
=
iks_find
(
input
,
"input"
);
input
=
iks_find
(
input
,
"input"
);
...
@@ -124,11 +118,7 @@ static void start_input(struct prompt_component *prompt, int start_timers, int b
...
@@ -124,11 +118,7 @@ static void start_input(struct prompt_component *prompt, int start_timers, int b
iks_insert_attrib
(
input
,
"start-timers"
,
start_timers
?
"true"
:
"false"
);
iks_insert_attrib
(
input
,
"start-timers"
,
start_timers
?
"true"
:
"false"
);
iks_insert_attrib
(
input
,
"barge-event"
,
barge_event
?
"true"
:
"false"
);
iks_insert_attrib
(
input
,
"barge-event"
,
barge_event
?
"true"
:
"false"
);
iks_insert_node
(
iq
,
input
);
iks_insert_node
(
iq
,
input
);
reply
=
RAYO_SEND
(
prompt
,
RAYO_COMPONENT
(
prompt
)
->
parent
,
rayo_message_create
(
iq
));
RAYO_SEND
(
prompt
,
RAYO_COMPONENT
(
prompt
)
->
parent
,
rayo_message_create
(
iq
));
if
(
reply
)
{
/* handle response */
RAYO_SEND
(
RAYO_COMPONENT
(
prompt
)
->
parent
,
prompt
,
reply
);
}
}
}
/**
/**
...
@@ -136,7 +126,6 @@ static void start_input(struct prompt_component *prompt, int start_timers, int b
...
@@ -136,7 +126,6 @@ static void start_input(struct prompt_component *prompt, int start_timers, int b
*/
*/
static
void
start_input_timers
(
struct
prompt_component
*
prompt
)
static
void
start_input_timers
(
struct
prompt_component
*
prompt
)
{
{
struct
rayo_message
*
reply
;
iks
*
x
;
iks
*
x
;
iks
*
iq
=
iks_new
(
"iq"
);
iks
*
iq
=
iks_new
(
"iq"
);
iks_insert_attrib
(
iq
,
"from"
,
RAYO_JID
(
prompt
));
iks_insert_attrib
(
iq
,
"from"
,
RAYO_JID
(
prompt
));
...
@@ -145,11 +134,7 @@ static void start_input_timers(struct prompt_component *prompt)
...
@@ -145,11 +134,7 @@ static void start_input_timers(struct prompt_component *prompt)
iks_insert_attrib_printf
(
iq
,
"id"
,
"mod_rayo-%d"
,
RAYO_SEQ_NEXT
(
prompt
));
iks_insert_attrib_printf
(
iq
,
"id"
,
"mod_rayo-%d"
,
RAYO_SEQ_NEXT
(
prompt
));
x
=
iks_insert
(
iq
,
"start-timers"
);
x
=
iks_insert
(
iq
,
"start-timers"
);
iks_insert_attrib
(
x
,
"xmlns"
,
RAYO_INPUT_NS
);
iks_insert_attrib
(
x
,
"xmlns"
,
RAYO_INPUT_NS
);
reply
=
RAYO_SEND
(
prompt
,
prompt
->
input
,
rayo_message_create
(
iq
));
RAYO_SEND
(
prompt
,
prompt
->
input
,
rayo_message_create
(
iq
));
if
(
reply
)
{
/* process reply */
RAYO_SEND
(
prompt
->
input
,
prompt
,
reply
);
}
}
}
/**
/**
...
@@ -501,7 +486,6 @@ static iks *start_call_prompt_component(struct rayo_actor *client, struct rayo_a
...
@@ -501,7 +486,6 @@ static iks *start_call_prompt_component(struct rayo_actor *client, struct rayo_a
iks
*
prompt
=
iks_find
(
iq
,
"prompt"
);
iks
*
prompt
=
iks_find
(
iq
,
"prompt"
);
iks
*
input
;
iks
*
input
;
iks
*
output
;
iks
*
output
;
struct
rayo_message
*
reply
=
NULL
;
iks
*
cmd
;
iks
*
cmd
;
if
(
!
VALIDATE_RAYO_PROMPT
(
prompt
))
{
if
(
!
VALIDATE_RAYO_PROMPT
(
prompt
))
{
...
@@ -540,11 +524,7 @@ static iks *start_call_prompt_component(struct rayo_actor *client, struct rayo_a
...
@@ -540,11 +524,7 @@ static iks *start_call_prompt_component(struct rayo_actor *client, struct rayo_a
iks_insert_attrib
(
cmd
,
"type"
,
"set"
);
iks_insert_attrib
(
cmd
,
"type"
,
"set"
);
output
=
iks_copy_within
(
output
,
iks_stack
(
cmd
));
output
=
iks_copy_within
(
output
,
iks_stack
(
cmd
));
iks_insert_node
(
cmd
,
output
);
iks_insert_node
(
cmd
,
output
);
reply
=
RAYO_SEND
(
prompt_component
,
call
,
rayo_message_create
(
cmd
));
RAYO_SEND
(
prompt_component
,
call
,
rayo_message_create
(
cmd
));
if
(
reply
)
{
/* handle response */
RAYO_SEND
(
call
,
prompt_component
,
reply
);
}
return
NULL
;
return
NULL
;
}
}
...
@@ -607,17 +587,10 @@ static iks *forward_output_component_request(struct rayo_actor *client, struct r
...
@@ -607,17 +587,10 @@ static iks *forward_output_component_request(struct rayo_actor *client, struct r
case
PCS_START_INPUT_OUTPUT
:
case
PCS_START_INPUT_OUTPUT
:
case
PCS_INPUT_OUTPUT
:
{
case
PCS_INPUT_OUTPUT
:
{
/* forward request to output component */
/* forward request to output component */
struct
rayo_message
*
reply
;
iks_insert_attrib
(
iq
,
"from"
,
RAYO_JID
(
prompt
));
iks_insert_attrib
(
iq
,
"from"
,
RAYO_JID
(
prompt
));
iks_insert_attrib
(
iq
,
"to"
,
RAYO_JID
(
PROMPT_COMPONENT
(
prompt
)
->
output
));
iks_insert_attrib
(
iq
,
"to"
,
RAYO_JID
(
PROMPT_COMPONENT
(
prompt
)
->
output
));
reply
=
RAYO_SEND
(
prompt
,
PROMPT_COMPONENT
(
prompt
)
->
output
,
rayo_message_create_dup
(
iq
));
RAYO_SEND
(
prompt
,
PROMPT_COMPONENT
(
prompt
)
->
output
,
rayo_message_create_dup
(
iq
));
return
NULL
;
/* return reply to client */
iq
=
rayo_message_remove_payload
(
reply
);
rayo_message_destroy
(
reply
);
iks_insert_attrib
(
iq
,
"from"
,
RAYO_JID
(
prompt
));
iks_insert_attrib
(
iq
,
"to"
,
RAYO_JID
(
client
));
return
iq
;
}
}
case
PCS_START_INPUT_TIMERS
:
case
PCS_START_INPUT_TIMERS
:
case
PCS_START_OUTPUT
:
case
PCS_START_OUTPUT
:
...
@@ -632,7 +605,6 @@ static iks *forward_output_component_request(struct rayo_actor *client, struct r
...
@@ -632,7 +605,6 @@ static iks *forward_output_component_request(struct rayo_actor *client, struct r
case
PCS_DONE
:
case
PCS_DONE
:
return
iks_new_error_detailed
(
iq
,
STANZA_ERROR_UNEXPECTED_REQUEST
,
"output is finished"
);
return
iks_new_error_detailed
(
iq
,
STANZA_ERROR_UNEXPECTED_REQUEST
,
"output is finished"
);
}
}
return
NULL
;
return
NULL
;
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论