Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
ZLMediaKit
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
张翔宇
ZLMediaKit
Commits
3062ea0e
Commit
3062ea0e
authored
May 07, 2022
by
ziyue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
初步支持ipv6: #576, #1406
parent
5e08e43e
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
10 行增加
和
10 行删除
+10
-10
3rdpart/ZLToolKit
+1
-1
server/WebApi.cpp
+1
-1
src/Rtp/RtpProcess.cpp
+1
-1
src/Rtp/RtpSender.cpp
+4
-4
src/Rtp/RtpServer.h
+1
-1
src/Rtsp/RtspPlayer.cpp
+2
-2
没有找到文件。
ZLToolKit
@
442f682b
Subproject commit
0d11a09d5e6d76dc9f91b796cd303edb4c9d573a
Subproject commit
442f682b1aebc67ee60a1c43718b8bf66e3c1667
server/WebApi.cpp
查看文件 @
3062ea0e
...
...
@@ -1056,7 +1056,7 @@ void installWebApi() {
}
RtpServer
::
Ptr
server
=
std
::
make_shared
<
RtpServer
>
();
server
->
start
(
allArgs
[
"port"
],
stream_id
,
allArgs
[
"enable_tcp"
].
as
<
bool
>
(),
"
0.0.0.0
"
,
server
->
start
(
allArgs
[
"port"
],
stream_id
,
allArgs
[
"enable_tcp"
].
as
<
bool
>
(),
"
::
"
,
allArgs
[
"re_use_port"
].
as
<
bool
>
(),
allArgs
[
"ssrc"
].
as
<
uint32_t
>
());
server
->
setOnDetach
([
stream_id
]()
{
//设置rtp超时移除事件
...
...
src/Rtp/RtpProcess.cpp
查看文件 @
3062ea0e
...
...
@@ -209,7 +209,7 @@ string RtpProcess::get_local_ip() {
if
(
_sock
)
{
return
_sock
->
get_local_ip
();
}
return
"
0.0.0.0
"
;
return
"
::
"
;
}
uint16_t
RtpProcess
::
get_local_port
()
{
...
...
src/Rtp/RtpSender.cpp
查看文件 @
3062ea0e
...
...
@@ -37,13 +37,13 @@ void RtpSender::startSend(const MediaSourceEvent::SendRtpArgs &args, const funct
}
else
{
auto
pr
=
std
::
make_pair
(
std
::
move
(
_socket
),
Socket
::
createSocket
(
_poller
,
false
));
//从端口池获取随机端口
makeSockPair
(
pr
,
"
0.0.0.0
"
,
true
);
makeSockPair
(
pr
,
"
::
"
,
true
);
_socket
=
std
::
move
(
pr
.
first
);
}
auto
poller
=
_poller
;
auto
local_port
=
_socket
->
get_local_port
();
WorkThreadPool
::
Instance
().
getPoller
()
->
async
([
cb
,
args
,
weak_self
,
poller
,
local_port
]()
{
struct
sockaddr
addr
;
struct
sockaddr
_storage
addr
;
//切换线程目的是为了dns解析放在后台线程执行
if
(
!
SockUtil
::
getDomainIP
(
args
.
dst_url
.
data
(),
args
.
dst_port
,
addr
))
{
poller
->
async
([
args
,
cb
,
local_port
]()
{
...
...
@@ -59,7 +59,7 @@ void RtpSender::startSend(const MediaSourceEvent::SendRtpArgs &args, const funct
cb
(
local_port
,
SockException
());
auto
strong_self
=
weak_self
.
lock
();
if
(
strong_self
)
{
strong_self
->
_socket
->
bindPeerAddr
(
&
addr
);
strong_self
->
_socket
->
bindPeerAddr
(
(
struct
sockaddr
*
)
&
addr
);
strong_self
->
onConnect
();
}
});
...
...
@@ -76,7 +76,7 @@ void RtpSender::startSend(const MediaSourceEvent::SendRtpArgs &args, const funct
}
else
{
cb
(
0
,
err
);
}
},
5.0
F
,
"0.0.0.0
"
,
args
.
src_port
);
},
5.0
F
,
"::
"
,
args
.
src_port
);
}
}
...
...
src/Rtp/RtpServer.h
查看文件 @
3062ea0e
...
...
@@ -40,7 +40,7 @@ public:
* @param re_use_port 是否设置socket为re_use属性
*/
void
start
(
uint16_t
local_port
,
const
std
::
string
&
stream_id
=
""
,
bool
enable_tcp
=
true
,
const
char
*
local_ip
=
"
0.0.0.0
"
,
bool
re_use_port
=
true
,
uint32_t
ssrc
=
0
);
const
char
*
local_ip
=
"
::
"
,
bool
re_use_port
=
true
,
uint32_t
ssrc
=
0
);
/**
* 获取绑定的本地端口
...
...
src/Rtsp/RtspPlayer.cpp
查看文件 @
3062ea0e
...
...
@@ -292,7 +292,7 @@ void RtspPlayer::handleResSETUP(const Parser &parser, unsigned int track_idx) {
//udp组播
auto
multiAddr
=
transport_map
[
"destination"
];
pRtpSockRef
=
createSocket
();
if
(
!
pRtpSockRef
->
bindUdpSock
(
rtp_port
,
"
0.0.0.0
"
))
{
if
(
!
pRtpSockRef
->
bindUdpSock
(
rtp_port
,
"
::
"
))
{
pRtpSockRef
.
reset
();
throw
std
::
runtime_error
(
"open udp sock err"
);
}
...
...
@@ -303,7 +303,7 @@ void RtspPlayer::handleResSETUP(const Parser &parser, unsigned int track_idx) {
//设置rtcp发送端口
pRtcpSockRef
=
createSocket
();
if
(
!
pRtcpSockRef
->
bindUdpSock
(
0
,
"
0.0.0.0
"
))
{
if
(
!
pRtcpSockRef
->
bindUdpSock
(
0
,
"
::
"
))
{
//分配端口失败
throw
runtime_error
(
"open udp socket failed"
);
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论