Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
85c986c8
提交
85c986c8
authored
8月 02, 2013
作者:
Nathan Neulinger
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mod_skinny: add minimal handling of MeetMe button to send to a conference creation extension
上级
dc853212
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
19 行增加
和
3 行删除
+19
-3
internal.xml
...od/endpoints/mod_skinny/conf/skinny_profiles/internal.xml
+1
-0
mod_skinny.c
src/mod/endpoints/mod_skinny/mod_skinny.c
+9
-0
mod_skinny.h
src/mod/endpoints/mod_skinny/mod_skinny.h
+1
-0
skinny_api.c
src/mod/endpoints/mod_skinny/skinny_api.c
+1
-0
skinny_server.c
src/mod/endpoints/mod_skinny/skinny_server.c
+5
-1
skinny_tables.c
src/mod/endpoints/mod_skinny/skinny_tables.c
+1
-1
skinny_tables.h
src/mod/endpoints/mod_skinny/skinny_tables.h
+1
-1
没有找到文件。
src/mod/endpoints/mod_skinny/conf/skinny_profiles/internal.xml
浏览文件 @
85c986c8
...
...
@@ -14,6 +14,7 @@
<param
name=
"auto-restart"
value=
"true"
/>
<param
name=
"ext-voicemail"
value=
"vmain"
/>
<param
name=
"ext-redial"
value=
"redial"
/>
<!-- <param name="ext-meetme" value="conference"/> -->
</settings>
<soft-key-set-sets>
<soft-key-set-set
name=
"default"
>
...
...
src/mod/endpoints/mod_skinny/mod_skinny.c
浏览文件 @
85c986c8
...
...
@@ -171,6 +171,7 @@ switch_status_t skinny_profile_dump(const skinny_profile_t *profile, switch_stre
stream
->
write_function
(
stream
,
"Listener-Threads
\t
%d
\n
"
,
profile
->
listener_threads
);
stream
->
write_function
(
stream
,
"Ext-Voicemail
\t
%s
\n
"
,
profile
->
ext_voicemail
);
stream
->
write_function
(
stream
,
"Ext-Redial
\t
%s
\n
"
,
profile
->
ext_redial
);
stream
->
write_function
(
stream
,
"Ext-MeetMe
\t
%s
\n
"
,
profile
->
ext_meetme
);
stream
->
write_function
(
stream
,
"%s
\n
"
,
line
);
return
SWITCH_STATUS_SUCCESS
;
...
...
@@ -1864,6 +1865,10 @@ switch_status_t skinny_profile_set(skinny_profile_t *profile, const char *var, c
if
(
!
profile
->
ext_redial
||
strcmp
(
val
,
profile
->
ext_redial
))
{
profile
->
ext_redial
=
switch_core_strdup
(
profile
->
pool
,
val
);
}
}
else
if
(
!
strcasecmp
(
var
,
"ext-meetme"
))
{
if
(
!
profile
->
ext_meetme
||
strcmp
(
val
,
profile
->
ext_meetme
))
{
profile
->
ext_meetme
=
switch_core_strdup
(
profile
->
pool
,
val
);
}
}
else
{
return
SWITCH_STATUS_FALSE
;
}
...
...
@@ -1956,6 +1961,10 @@ static switch_status_t load_skinny_config(void)
skinny_profile_set
(
profile
,
"ext-redial"
,
"redial"
);
}
if
(
!
profile
->
ext_meetme
)
{
skinny_profile_set
(
profile
,
"ext-meetme"
,
"conference"
);
}
if
(
profile
->
port
==
0
)
{
profile
->
port
=
2000
;
}
...
...
src/mod/endpoints/mod_skinny/mod_skinny.h
浏览文件 @
85c986c8
...
...
@@ -117,6 +117,7 @@ struct skinny_profile {
/* extensions */
char
*
ext_voicemail
;
char
*
ext_redial
;
char
*
ext_meetme
;
/* db */
char
*
dbname
;
char
*
odbc_dsn
;
...
...
src/mod/endpoints/mod_skinny/skinny_api.c
浏览文件 @
85c986c8
...
...
@@ -233,6 +233,7 @@ static switch_status_t skinny_api_list_settings(const char *line, const char *cu
switch_console_push_match
(
&
my_matches
,
"auto-restart"
);
switch_console_push_match
(
&
my_matches
,
"ext-voicemail"
);
switch_console_push_match
(
&
my_matches
,
"ext-redial"
);
switch_console_push_match
(
&
my_matches
,
"ext-meetme"
);
if
(
my_matches
)
{
*
matches
=
my_matches
;
...
...
src/mod/endpoints/mod_skinny/skinny_server.c
浏览文件 @
85c986c8
...
...
@@ -76,7 +76,7 @@ uint32_t soft_key_template_default_events[] = {
SOFTKEY_CONF
,
SOFTKEY_PARK
,
SOFTKEY_JOIN
,
SOFTKEY_MEETME
CONF
,
SOFTKEY_MEETME
,
SOFTKEY_CALLPICKUP
,
SOFTKEY_GRPCALLPICKUP
,
SOFTKEY_DND
,
...
...
@@ -1928,6 +1928,10 @@ switch_status_t skinny_handle_soft_key_event_message(listener_t *listener, skinn
}
}
break
;
case
SOFTKEY_MEETME
:
skinny_create_incoming_session
(
listener
,
&
line_instance
,
&
session
);
skinny_session_process_dest
(
session
,
listener
,
line_instance
,
listener
->
profile
->
ext_meetme
,
'\0'
,
0
);
break
;
default:
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_WARNING
,
"Unknown SoftKeyEvent type: %d.
\n
"
,
request
->
data
.
soft_key_event
.
event
);
...
...
src/mod/endpoints/mod_skinny/skinny_tables.c
浏览文件 @
85c986c8
...
...
@@ -239,7 +239,7 @@ SKINNY_DECLARE_STR2ID(skinny_str2button, SKINNY_BUTTONS, -1)
{
SOFTKEY_CONF
,
"SoftkeyConf"
},
{
SOFTKEY_PARK
,
"SoftkeyPark"
},
{
SOFTKEY_JOIN
,
"SoftkeyJoin"
},
{
SOFTKEY_MEETME
CONF
,
"SoftkeyMeetmeconfrm
"
},
{
SOFTKEY_MEETME
,
"SoftkeyMeetme
"
},
{
SOFTKEY_CALLPICKUP
,
"SoftkeyCallpickup"
},
{
SOFTKEY_GRPCALLPICKUP
,
"SoftkeyGrpcallpickup"
},
{
SOFTKEY_DND
,
"SoftkeyDnd"
},
...
...
src/mod/endpoints/mod_skinny/skinny_tables.h
浏览文件 @
85c986c8
...
...
@@ -192,7 +192,7 @@ enum skinny_soft_key_event {
SOFTKEY_CONF
=
0x0D
,
SOFTKEY_PARK
=
0x0E
,
SOFTKEY_JOIN
=
0x0F
,
SOFTKEY_MEETME
CONF
=
0x10
,
SOFTKEY_MEETME
=
0x10
,
SOFTKEY_CALLPICKUP
=
0x11
,
SOFTKEY_GRPCALLPICKUP
=
0x12
,
SOFTKEY_DND
=
0x13
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论