Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-07-31 10:37:34 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f0ffdcc0ae026f0e913101eebd1189518a5d3101
f0ffdcc0
1 parent
b5e5dad8
fix #141, support tun0(vpn network device) ip retrieve. 0.9.179.
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
9 行增加
和
1 行删除
README.md
trunk/src/app/srs_app_utility.cpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
f0ffdcc
...
...
@@ -207,6 +207,7 @@ Supported operating systems and hardware:
*
2013-10-17, Created.
<br/>
## History
*
v1.0, 2014-07-31, fix
[
#141
](
https://github.com/winlinvip/simple-rtmp-server/issues/141
)
, support tun0(vpn network device) ip retrieve. 0.9.179.
*
v1.0, 2014-07-27, support build on OSX(Darwin). 0.9.177
*
v1.0, 2014-07-27, api connections add udp, add disk iops. 0.9.176
*
v1.0, 2014-07-26, complete config utest. 0.9.173
...
...
trunk/src/app/srs_app_utility.cpp
查看文件 @
f0ffdcc
...
...
@@ -930,6 +930,13 @@ void retrieve_local_ipv4_ips()
while
(
p
!=
NULL
)
{
sockaddr
*
addr
=
p
->
ifa_addr
;
// ignore the tun0 network device,
// which addr is NULL.
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/141
if
(
!
addr
)
{
continue
;
}
// retrieve ipv4 addr
if
(
addr
->
sa_family
==
AF_INET
)
{
in_addr
*
inaddr
=
&
((
sockaddr_in
*
)
addr
)
->
sin_addr
;
...
...
trunk/src/core/srs_core.hpp
查看文件 @
f0ffdcc
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "17
8
"
#define VERSION_REVISION "17
9
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论