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
2015-06-19 13:51:40 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
750399ace42d0b3173747be986ef49c75e2f5db7
750399ac
1 parent
8cd68a1e
fix network device compare bug.
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
9 行增加
和
4 行删除
trunk/src/app/srs_app_utility.cpp
trunk/src/app/srs_app_utility.hpp
trunk/src/app/srs_app_utility.cpp
查看文件 @
750399a
...
...
@@ -1000,12 +1000,14 @@ void srs_update_network_devices()
// @see: read_net_dev() from https://github.com/sysstat/sysstat/blob/master/rd_stats.c#L786
// @remark, we use our algorithm, not sysstat.
char
fname
[
7
];
sscanf
(
buf
,
"%6[^:]:%llu %lu %lu %lu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu %lu %lu
\n
"
,
r
.
name
,
&
r
.
rbytes
,
&
r
.
rpackets
,
&
r
.
rerrs
,
&
r
.
rdrop
,
&
r
.
rfifo
,
&
r
.
rframe
,
&
r
.
rcompressed
,
&
r
.
rmulticast
,
f
name
,
&
r
.
rbytes
,
&
r
.
rpackets
,
&
r
.
rerrs
,
&
r
.
rdrop
,
&
r
.
rfifo
,
&
r
.
rframe
,
&
r
.
rcompressed
,
&
r
.
rmulticast
,
&
r
.
sbytes
,
&
r
.
spackets
,
&
r
.
serrs
,
&
r
.
sdrop
,
&
r
.
sfifo
,
&
r
.
scolls
,
&
r
.
scarrier
,
&
r
.
scompressed
);
r
.
name
[
sizeof
(
r
.
name
)
-
1
]
=
0
;
sscanf
(
fname
,
"%s"
,
r
.
name
)
;
_nb_srs_system_network_devices
=
i
+
1
;
srs_info
(
"scan network device ifname=%s, total=%d"
,
r
.
name
,
_nb_srs_system_network_devices
);
r
.
sample_time
=
srs_get_system_time_ms
();
r
.
ok
=
true
;
...
...
@@ -1026,6 +1028,8 @@ static std::map<std::string, bool> _srs_device_ifs;
bool
srs_net_device_is_internet
(
string
ifname
)
{
srs_info
(
"check ifname=%s"
,
ifname
.
c_str
());
if
(
_srs_device_ifs
.
find
(
ifname
)
==
_srs_device_ifs
.
end
())
{
return
false
;
}
...
...
@@ -1254,10 +1258,10 @@ void retrieve_local_ipv4_ips()
// set the device internet status.
if
(
!
srs_net_device_is_internet
(
inaddr
->
s_addr
))
{
srs_trace
(
"detect intranet address: %s
"
,
ip
.
c_str
()
);
srs_trace
(
"detect intranet address: %s
, ifname=%s"
,
ip
.
c_str
(),
cur
->
ifa_name
);
_srs_device_ifs
[
cur
->
ifa_name
]
=
false
;
}
else
{
srs_trace
(
"detect internet address: %s
"
,
ip
.
c_str
()
);
srs_trace
(
"detect internet address: %s
, ifname=%s"
,
ip
.
c_str
(),
cur
->
ifa_name
);
_srs_device_ifs
[
cur
->
ifa_name
]
=
true
;
}
}
...
...
trunk/src/app/srs_app_utility.hpp
查看文件 @
750399a
...
...
@@ -34,6 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string>
#include <sstream>
#include <arpa/inet.h>
#include <sys/resource.h>
#include <srs_app_st.hpp>
...
...
请
注册
或
登录
后发表评论