Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
74e14f0d
提交
74e14f0d
authored
5月 10, 2010
作者:
Mathieu Parent
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Skinny: fix the build
上级
8806bb2d
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
47 行增加
和
47 行删除
+47
-47
skinny_protocol.c
src/mod/endpoints/mod_skinny/skinny_protocol.c
+25
-25
skinny_protocol.h
src/mod/endpoints/mod_skinny/skinny_protocol.h
+22
-22
没有找到文件。
src/mod/endpoints/mod_skinny/skinny_protocol.c
浏览文件 @
74e14f0d
...
@@ -265,15 +265,15 @@ switch_status_t skinny_device_event(listener_t *listener, switch_event_t **ev, s
...
@@ -265,15 +265,15 @@ switch_status_t skinny_device_event(listener_t *listener, switch_event_t **ev, s
}
}
/*****************************************************************************/
/*****************************************************************************/
switch_status_t
skinny_send_call_info
(
switch_core_session_t
*
session
,
listener_t
*
listener
,
uint32_t
line_instance
)
switch_status_t
skinny_se
ssion_se
nd_call_info
(
switch_core_session_t
*
session
,
listener_t
*
listener
,
uint32_t
line_instance
)
{
{
private_t
*
tech_pvt
;
private_t
*
tech_pvt
;
switch_channel_t
*
channel
;
switch_channel_t
*
channel
;
char
*
calling_party_name
;
c
onst
c
har
*
calling_party_name
;
char
*
calling_party_number
;
c
onst
c
har
*
calling_party_number
;
char
*
called_party_name
;
c
onst
c
har
*
called_party_name
;
char
*
called_party_number
;
c
onst
c
har
*
called_party_number
;
uint32_t
call_type
=
0
;
uint32_t
call_type
=
0
;
channel
=
switch_core_session_get_channel
(
session
);
channel
=
switch_core_session_get_channel
(
session
);
...
@@ -304,7 +304,7 @@ switch_status_t skinny_send_call_info(switch_core_session_t *session, listener_t
...
@@ -304,7 +304,7 @@ switch_status_t skinny_send_call_info(switch_core_session_t *session, listener_t
}
else
{
}
else
{
call_type
=
SKINNY_INBOUND_CALL
;
call_type
=
SKINNY_INBOUND_CALL
;
}
}
send_call_info
(
listener
,
s
kinny_s
end_call_info
(
listener
,
calling_party_name
,
/* char calling_party_name[40], */
calling_party_name
,
/* char calling_party_name[40], */
calling_party_number
,
/* char calling_party[24], */
calling_party_number
,
/* char calling_party[24], */
called_party_name
,
/* char called_party_name[40], */
called_party_name
,
/* char called_party_name[40], */
...
@@ -411,7 +411,7 @@ int skinny_ring_lines_callback(void *pArg, int argc, char **argv, char **columnN
...
@@ -411,7 +411,7 @@ int skinny_ring_lines_callback(void *pArg, int argc, char **argv, char **columnN
send_display_pri_notify
(
listener
,
10
/* message_timeout */
,
5
/* priority */
,
tmp
);
send_display_pri_notify
(
listener
,
10
/* message_timeout */
,
5
/* priority */
,
tmp
);
switch_safe_free
(
tmp
);
switch_safe_free
(
tmp
);
}
}
skinny_send_call_info
(
helper
->
tech_pvt
->
session
,
listener
,
line_instance
);
skinny_se
ssion_se
nd_call_info
(
helper
->
tech_pvt
->
session
,
listener
,
line_instance
);
send_set_lamp
(
listener
,
SKINNY_BUTTON_LINE
,
line_instance
,
SKINNY_LAMP_BLINK
);
send_set_lamp
(
listener
,
SKINNY_BUTTON_LINE
,
line_instance
,
SKINNY_LAMP_BLINK
);
send_set_ringer
(
listener
,
SKINNY_RING_INSIDE
,
SKINNY_RING_FOREVER
,
0
,
helper
->
tech_pvt
->
call_id
);
send_set_ringer
(
listener
,
SKINNY_RING_INSIDE
,
SKINNY_RING_FOREVER
,
0
,
helper
->
tech_pvt
->
call_id
);
}
}
...
@@ -667,7 +667,7 @@ int skinny_session_process_dest_callback(void *pArg, int argc, char **argv, char
...
@@ -667,7 +667,7 @@ int skinny_session_process_dest_callback(void *pArg, int argc, char **argv, char
send_select_soft_keys
(
listener
,
line_instance
,
helper
->
tech_pvt
->
call_id
,
10
,
0xffff
);
send_select_soft_keys
(
listener
,
line_instance
,
helper
->
tech_pvt
->
call_id
,
10
,
0xffff
);
send_display_prompt_status
(
listener
,
0
,
"
\200\037
"
,
send_display_prompt_status
(
listener
,
0
,
"
\200\037
"
,
line_instance
,
helper
->
tech_pvt
->
call_id
);
line_instance
,
helper
->
tech_pvt
->
call_id
);
skinny_send_call_info
(
helper
->
tech_pvt
->
session
,
listener
,
line_instance
);
skinny_se
ssion_se
nd_call_info
(
helper
->
tech_pvt
->
session
,
listener
,
line_instance
);
}
}
}
}
return
0
;
return
0
;
...
@@ -725,7 +725,7 @@ switch_status_t skinny_session_process_dest(switch_core_session_t *session, list
...
@@ -725,7 +725,7 @@ switch_status_t skinny_session_process_dest(switch_core_session_t *session, list
tech_pvt
->
caller_profile
->
context
=
switch_core_strdup
(
tech_pvt
->
caller_profile
->
pool
,
listener
->
profile
->
context
);
tech_pvt
->
caller_profile
->
context
=
switch_core_strdup
(
tech_pvt
->
caller_profile
->
pool
,
listener
->
profile
->
context
);
send_dialed_number
(
listener
,
tech_pvt
->
caller_profile
->
destination_number
,
line_instance
,
tech_pvt
->
call_id
);
send_dialed_number
(
listener
,
tech_pvt
->
caller_profile
->
destination_number
,
line_instance
,
tech_pvt
->
call_id
);
skinny_line_set_state
(
listener
,
line_instance
,
tech_pvt
->
call_id
,
SKINNY_PROCEED
);
skinny_line_set_state
(
listener
,
line_instance
,
tech_pvt
->
call_id
,
SKINNY_PROCEED
);
skinny_send_call_info
(
session
,
listener
,
line_instance
);
skinny_se
ssion_se
nd_call_info
(
session
,
listener
,
line_instance
);
skinny_session_start_media
(
session
,
listener
,
line_instance
);
skinny_session_start_media
(
session
,
listener
,
line_instance
);
...
@@ -762,7 +762,7 @@ switch_status_t skinny_session_ring_out(switch_core_session_t *session, listener
...
@@ -762,7 +762,7 @@ switch_status_t skinny_session_ring_out(switch_core_session_t *session, listener
SKINNY_KEY_SET_RING_OUT
,
0xffff
);
SKINNY_KEY_SET_RING_OUT
,
0xffff
);
send_display_prompt_status
(
listener
,
0
,
"
\200\026
"
,
send_display_prompt_status
(
listener
,
0
,
"
\200\026
"
,
line_instance
,
tech_pvt
->
call_id
);
line_instance
,
tech_pvt
->
call_id
);
skinny_send_call_info
(
session
,
listener
,
line_instance
);
skinny_se
ssion_se
nd_call_info
(
session
,
listener
,
line_instance
);
return
SWITCH_STATUS_SUCCESS
;
return
SWITCH_STATUS_SUCCESS
;
}
}
...
@@ -876,7 +876,7 @@ switch_status_t skinny_session_start_media(switch_core_session_t *session, liste
...
@@ -876,7 +876,7 @@ switch_status_t skinny_session_start_media(switch_core_session_t *session, liste
"
\200\030
"
,
"
\200\030
"
,
line_instance
,
line_instance
,
tech_pvt
->
call_id
);
tech_pvt
->
call_id
);
skinny_send_call_info
(
session
,
listener
,
line_instance
);
skinny_se
ssion_se
nd_call_info
(
session
,
listener
,
line_instance
);
return
SWITCH_STATUS_SUCCESS
;
return
SWITCH_STATUS_SUCCESS
;
}
}
...
@@ -902,7 +902,7 @@ switch_status_t skinny_session_hold_line(switch_core_session_t *session, listene
...
@@ -902,7 +902,7 @@ switch_status_t skinny_session_hold_line(switch_core_session_t *session, listene
send_select_soft_keys
(
listener
,
line_instance
,
tech_pvt
->
call_id
,
SKINNY_KEY_SET_ON_HOLD
,
0xffff
);
send_select_soft_keys
(
listener
,
line_instance
,
tech_pvt
->
call_id
,
SKINNY_KEY_SET_ON_HOLD
,
0xffff
);
send_display_prompt_status
(
listener
,
0
,
"
\200\003
"
,
send_display_prompt_status
(
listener
,
0
,
"
\200\003
"
,
line_instance
,
tech_pvt
->
call_id
);
line_instance
,
tech_pvt
->
call_id
);
skinny_send_call_info
(
tech_pvt
->
session
,
listener
,
line_instance
);
skinny_se
ssion_se
nd_call_info
(
tech_pvt
->
session
,
listener
,
line_instance
);
send_set_speaker_mode
(
listener
,
SKINNY_SPEAKER_OFF
);
send_set_speaker_mode
(
listener
,
SKINNY_SPEAKER_OFF
);
send_set_ringer
(
listener
,
SKINNY_RING_OFF
,
SKINNY_RING_FOREVER
,
0
,
tech_pvt
->
call_id
);
send_set_ringer
(
listener
,
SKINNY_RING_OFF
,
SKINNY_RING_FOREVER
,
0
,
tech_pvt
->
call_id
);
...
@@ -1384,24 +1384,24 @@ switch_status_t send_stop_media_transmission(listener_t *listener,
...
@@ -1384,24 +1384,24 @@ switch_status_t send_stop_media_transmission(listener_t *listener,
return
skinny_send_reply
(
listener
,
message
);
return
skinny_send_reply
(
listener
,
message
);
}
}
switch_status_t
send_call_info
(
listener_t
*
listener
,
switch_status_t
s
kinny_s
end_call_info
(
listener_t
*
listener
,
c
har
calling_party_name
[
40
]
,
c
onst
char
*
calling_party_name
,
c
har
calling_party
[
24
]
,
c
onst
char
*
calling_party
,
c
har
called_party_name
[
40
]
,
c
onst
char
*
called_party_name
,
c
har
called_party
[
24
]
,
c
onst
char
*
called_party
,
uint32_t
line_instance
,
uint32_t
line_instance
,
uint32_t
call_id
,
uint32_t
call_id
,
uint32_t
call_type
,
uint32_t
call_type
,
c
har
original_called_party_name
[
40
]
,
c
onst
char
*
original_called_party_name
,
c
har
original_called_party
[
24
]
,
c
onst
char
*
original_called_party
,
c
har
last_redirecting_party_name
[
40
]
,
c
onst
char
*
last_redirecting_party_name
,
c
har
last_redirecting_party
[
24
]
,
c
onst
char
*
last_redirecting_party
,
uint32_t
original_called_party_redirect_reason
,
uint32_t
original_called_party_redirect_reason
,
uint32_t
last_redirecting_reason
,
uint32_t
last_redirecting_reason
,
c
har
calling_party_voice_mailbox
[
24
]
,
c
onst
char
*
calling_party_voice_mailbox
,
c
har
called_party_voice_mailbox
[
24
]
,
c
onst
char
*
called_party_voice_mailbox
,
c
har
original_called_party_voice_mailbox
[
24
]
,
c
onst
char
*
original_called_party_voice_mailbox
,
c
har
last_redirecting_voice_mailbox
[
24
]
,
c
onst
char
*
last_redirecting_voice_mailbox
,
uint32_t
call_instance
,
uint32_t
call_instance
,
uint32_t
call_security_status
,
uint32_t
call_security_status
,
uint32_t
party_pi_restriction_bits
)
uint32_t
party_pi_restriction_bits
)
...
...
src/mod/endpoints/mod_skinny/skinny_protocol.h
浏览文件 @
74e14f0d
...
@@ -638,7 +638,7 @@ switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req)
...
@@ -638,7 +638,7 @@ switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req)
switch_status_t
skinny_device_event
(
listener_t
*
listener
,
switch_event_t
**
ev
,
switch_event_types_t
event_id
,
const
char
*
subclass_name
);
switch_status_t
skinny_device_event
(
listener_t
*
listener
,
switch_event_t
**
ev
,
switch_event_types_t
event_id
,
const
char
*
subclass_name
);
switch_status_t
skinny_send_call_info
(
switch_core_session_t
*
session
,
listener_t
*
listener
,
uint32_t
line_instance
);
switch_status_t
skinny_se
ssion_se
nd_call_info
(
switch_core_session_t
*
session
,
listener_t
*
listener
,
uint32_t
line_instance
);
switch_status_t
skinny_session_walk_lines
(
skinny_profile_t
*
profile
,
char
*
channel_uuid
,
switch_core_db_callback_func_t
callback
,
void
*
data
);
switch_status_t
skinny_session_walk_lines
(
skinny_profile_t
*
profile
,
char
*
channel_uuid
,
switch_core_db_callback_func_t
callback
,
void
*
data
);
switch_call_cause_t
skinny_ring_lines
(
private_t
*
tech_pvt
);
switch_call_cause_t
skinny_ring_lines
(
private_t
*
tech_pvt
);
...
@@ -703,27 +703,27 @@ switch_status_t send_stop_media_transmission(listener_t *listener,
...
@@ -703,27 +703,27 @@ switch_status_t send_stop_media_transmission(listener_t *listener,
uint32_t
conference_id
,
uint32_t
conference_id
,
uint32_t
pass_thru_party_id
,
uint32_t
pass_thru_party_id
,
uint32_t
conference_id2
);
uint32_t
conference_id2
);
switch_status_t
send_call_info
(
listener_t
*
listener
,
switch_status_t
s
kinny_s
end_call_info
(
listener_t
*
listener
,
char
calling_party_name
[
40
]
,
const
char
*
calling_party_name
,
char
calling_party
[
24
]
,
const
char
*
calling_party
,
char
called_party_name
[
40
]
,
const
char
*
called_party_name
,
char
called_party
[
24
]
,
const
char
*
called_party
,
uint32_t
line_instance
,
uint32_t
line_instance
,
uint32_t
call_id
,
uint32_t
call_id
,
uint32_t
call_type
,
uint32_t
call_type
,
char
original_called_party_name
[
40
]
,
const
char
*
original_called_party_name
,
char
original_called_party
[
24
]
,
const
char
*
original_called_party
,
char
last_redirecting_party_name
[
40
]
,
const
char
*
last_redirecting_party_name
,
char
last_redirecting_party
[
24
]
,
const
char
*
last_redirecting_party
,
uint32_t
original_called_party_redirect_reason
,
uint32_t
original_called_party_redirect_reason
,
uint32_t
last_redirecting_reason
,
uint32_t
last_redirecting_reason
,
char
calling_party_voice_mailbox
[
24
]
,
const
char
*
calling_party_voice_mailbox
,
char
called_party_voice_mailbox
[
24
]
,
const
char
*
called_party_voice_mailbox
,
char
original_called_party_voice_mailbox
[
24
]
,
const
char
*
original_called_party_voice_mailbox
,
char
last_redirecting_voice_mailbox
[
24
]
,
const
char
*
last_redirecting_voice_mailbox
,
uint32_t
call_instance
,
uint32_t
call_instance
,
uint32_t
call_security_status
,
uint32_t
call_security_status
,
uint32_t
party_pi_restriction_bits
);
uint32_t
party_pi_restriction_bits
);
switch_status_t
send_define_time_date
(
listener_t
*
listener
,
switch_status_t
send_define_time_date
(
listener_t
*
listener
,
uint32_t
year
,
uint32_t
year
,
uint32_t
month
,
uint32_t
month
,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论