winlin
d27db215df
For #1176 , should not close fd when success.
2018-07-18 19:21:29 +08:00
Hui Zhang (huzhang2)
01ed485cf3
fix #1172 #1173 #1174 #1175
...
security scan report issue
2018-07-17 10:03:13 +08:00
winlin
0d78b908a7
Fix client tools resolve dns failed bug
2018-03-20 19:50:46 +08:00
winlin
ca1395a807
Change date from 2017 to 2018
2018-01-07 10:58:53 +08:00
winlin
922a8f3a5c
For #988 , refine code.
2018-01-01 22:45:22 +08:00
Thomas Dreibholz
feaae341b9
IPv6 support (for 3.0 release) ( #988 )
...
* IPv6 support, part 1.
* IPv6 support, part 2.
* Some more IPv6 work.
* Made functions for address:port paŕsing IPv6-capable.
* Fixed type (compile warning).
* Fixed formatting.
* Reverted option change.
* Replaced abort() by proper error handling.
* Also retrieving local IPv6 addresses now.
2018-01-01 22:43:58 +08:00
winlin
6eae93258a
For #913 , APP support complex error.
2018-01-01 19:39:57 +08:00
winlin
1bf99e8f3e
For #907 , Wrap ST, only use in service ST.
2017-05-30 09:05:02 +08:00
winlin
e3526c0cf6
For #820 , modules use service only.
2017-03-26 13:40:39 +08:00
winlin
ff822b55cd
For #820 , extract service module.
2017-03-26 10:16:21 +08:00
winlin
0a57a46016
Refine LICENSE
2017-03-25 21:29:29 +08:00
winlin
f32aab3d92
For #299 , refine code.
2017-03-25 17:21:39 +08:00
winlin
b16ab038ce
for #742 , refine the u_intxx_t to uintxx_t
2017-01-30 17:32:18 +08:00
winlin
3fe338d1c5
for #742 , use ms for application clock tbn.
2017-01-17 12:25:30 +08:00
winlin
1ed5118246
refine the spaces, no TABS
2017-01-16 15:47:26 +08:00
winlin
7ac932cfa0
update to 2013-2017
2016-12-16 11:57:25 +08:00
winlin
28080efec8
fix http reader bug, support infinite chunkted. 2.0.209
2016-01-13 12:44:51 +08:00
winlin
f1e7e9d933
support gmd. change work_dir. hourglass. add utilies.
2016-01-08 13:58:19 +08:00
winlin
d0c74fa7cd
update 2015 to 2016
2015-12-23 11:35:40 +08:00
winlin
ffef3905af
merge from srs2.
2015-12-11 11:35:56 +08:00
winlin
2830ee12c1
fix the on_hls.ts_url bug.
2015-12-11 11:29:10 +08:00
winlin
01c46bdbfd
rename org simle-rtmp-server to ossrs
2015-11-11 10:45:45 +08:00
winlin
1ffd5fd455
rename org simple-rtmp-server to ossrs
2015-11-11 10:37:50 +08:00
winlin
f0e39cc330
support show the summary of kafka metadata.
2015-10-23 14:42:04 +08:00
winlin
d8f18aee37
use the right int type for port.
2015-09-24 18:33:07 +08:00
winlin
1c7d5f1852
Merge branch '2.0release' into develop
2015-09-24 17:55:33 +08:00
winlin
353e3260b8
remove duplicated code
2015-09-24 17:55:27 +08:00
winlin
9ead08725d
use kernel utility int2str and float2str
2015-09-24 17:54:58 +08:00
winlin
f187a7deef
refine the startup logs.
2015-09-24 12:15:12 +08:00
winlin
168625dce2
rename rtmp amf0 to protocol amf0.
2015-09-22 09:05:21 +08:00
winlin
a4f51564db
rename kernel stream to buffer
2015-09-22 08:48:55 +08:00
winlin
b471c6e61c
refine code, use json integter rather than number.
2015-09-19 14:40:32 +08:00
winlin
3f7e69b617
json objects support dumps to string.
2015-09-19 12:27:31 +08:00
winlin
1fd83d9314
refine the order.
2015-09-17 13:36:02 +08:00
winlin
c4feb8f6ed
for #319 , raw api support update all globals.
2015-09-09 23:32:02 +08:00
winlin
c8466c36bd
for #319 , raw api support update the global RTMP chunk_size.
2015-09-01 21:27:04 +08:00
winlin
04bea781ca
use amf0 encode for json encode.
2015-08-28 15:11:11 +08:00
winlin
fe4cdceb15
always wait for process to terminated when SIGKILL.
2015-08-26 23:02:54 +08:00
winlin
66a26bdce8
move json from app to protocol
2015-08-21 16:20:19 +08:00
winlin
312366bba2
add srs_recvi_bytes for intranet bytes stat.
2015-06-19 14:38:05 +08:00
winlin
750399ace4
fix network device compare bug.
2015-06-19 13:51:40 +08:00
winlin
8cd68a1eb3
ignore any intranet bandwidth.
2015-06-19 11:59:41 +08:00
winlin
96f8f1f502
fix build bug.
2015-05-30 21:20:07 +08:00
winlin
0a87b567f6
fix the build failed bug.
2015-05-30 21:14:10 +08:00
winlin
860d68e6e7
for #374 , use fast stop for ingesters to stop many FFMPEG.
2015-05-30 11:25:33 +08:00
winlin
db57a519a9
for #374 , use SIGINT then SIGKILL to try to kill FFMPEG gracefullly.
2015-05-30 09:32:03 +08:00
winlin
68d835021e
refine code, move the kbps to protocol
2015-05-23 09:58:00 +08:00
winlin
6ca46e84bc
fix #397 , the USER_HZ maybe not 100. 2.0.165
2015-05-22 17:16:33 +08:00
winlin
b23e196f20
migarate from winlinvip to srs org, move the copyright to srs org.
2015-04-29 17:38:23 +08:00
winlin
115daa3cc1
migarate from winlinvip to srs org
2015-04-29 17:06:32 +08:00
winlin
e458305f81
add utc time format.
2015-04-03 16:42:32 +08:00
winlin
692b751da8
for #351 , support config the m3u8/ts path for hls. 2.0.149.
2015-03-30 12:44:04 +08:00
winlin
e818f36316
fix #360 , fix build bug for centos7.
2015-03-25 20:38:51 +08:00
winlin
b6feb0742f
fix #149 , RTMP/HTTP support bind to <[ip:]port>. 2.0.148
2015-03-23 23:13:57 +08:00
winlin
2f2aaf5ee4
for #155 , refine code, donot check network devices for osx.
2015-03-21 15:38:22 +08:00
winlin
33cca3e027
for #155 , add todo for osx. 2.0.146
2015-03-21 15:22:45 +08:00
winlin
c6817cc422
for #354 , remove the double underscore of macro.
2015-03-21 10:25:03 +08:00
winlin
f564c903ac
support got uptime and loadavg for osx. 2.0.145
2015-03-18 22:30:17 +08:00
winlin
8bf60895a9
refine the kbps of server.
2015-03-08 12:55:40 +08:00
winlin
569596c10d
update copyright, from 2013 to 2015
2014-12-31 20:32:09 +08:00
winlin
b4057916b6
add qt project file. fix cmake file for clion.
2014-11-30 16:06:37 +08:00
winlin
72ad6894ca
move the annexb decode utility to protocol.
2014-11-07 23:07:31 +08:00
winlin
57e8356221
fix #184 , support AnnexB in RTMP body for HLS. 2.0.2
2014-10-19 19:42:27 +08:00
winlin
bc6616bd1f
refine code according to inspect of clion. 0.9.219
2014-09-28 11:08:30 +08:00
winlin
002facb85b
refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215
2014-09-26 16:34:13 +08:00
zhengfl
c2ac11201b
amendment srs_verbose info in the get_peer_ip
2014-08-28 04:18:06 +08:00
winlin
c24e68dd70
refine the stat, use one ok. 1.0.200
2014-08-18 14:39:42 +08:00
winlin
08bc34e0df
refine wiki, cluster to forward.
2014-08-14 16:33:26 +08:00
winlin
d5ba529d32
fix #143 , fix retrieve sys stat bug for all linux. 0.9.185.
2014-08-03 10:42:01 +08:00
winlin
7b24788445
for bug #143 , build on centos5.
2014-08-02 22:18:39 +08:00
winlin
721acc350a
fix #142 , tcp stat slow bug, use /proc/net/sockstat instead, refer to 'ss -s'. 0.9.183.
2014-08-02 09:54:21 +08:00
winlin
d5f03200a7
revert tcp stat. need more refine. 0.9.182
2014-08-01 23:08:52 +08:00
winlin
f7fdbe6848
update get connections thread to sleep 10ms per 1000 connectios. 0.9.181
2014-08-01 22:52:40 +08:00
winlin
15d4993cc3
slowdown the cpu usage for srs to calc connections when too many connections. 0.9.180
2014-08-01 22:43:12 +08:00
winlin
6539ce69f4
fix #141 , support tun0(vpn network device) ip retrieve. 0.9.179.
2014-07-31 10:39:39 +08:00
winlin
f0ffdcc0ae
fix #141 , support tun0(vpn network device) ip retrieve. 0.9.179.
2014-07-31 10:37:34 +08:00
winlin
792a6f944f
refine utility of cpu, add comment for cpu percent
2014-07-28 13:51:54 +08:00
winlin
9c11001391
refine log for stats network and disk
2014-07-27 19:03:56 +08:00
winlin
4f4b15f500
refine the disk iops stat, get cpu info.
2014-07-27 17:46:31 +08:00
winlin
ef7a02e643
refine the disk io busy, can >1
2014-07-27 17:23:07 +08:00
winlin
df8414af63
api connections add udp, add disk iops. 0.9.176
2014-07-27 17:16:04 +08:00
winlin
b334021836
add config item for the stat disk device name
2014-07-27 16:52:00 +08:00
winlin
7c1dd97513
refine system stat, use fgets and sscanf.
2014-07-27 16:34:08 +08:00
winlin
a7a009212b
refine the cpu stat, use fgets and sscanf.
2014-07-27 16:21:11 +08:00
winlin
f53bfcea54
add udp stat to nb_conn_sys as nb_conn_sys_udp
2014-07-27 15:43:43 +08:00
winlin
e76036f40b
refine config heartbeat, add new stats. 0.9.175
2014-07-27 14:43:55 +08:00
winlin
02f7c85710
add total system in and out KBps disk stat. 0.9.174
2014-07-27 14:04:22 +08:00
winlin
d2f125b6d6
refine the cpu usage calc, add total_delta.
2014-07-27 12:47:31 +08:00
winlin
a645b403c8
add comments for utility, the USER_HZ for /proc/stat
2014-07-27 11:44:48 +08:00
winlin
8497b22d4a
complete the consts refine
2014-07-20 13:45:54 +08:00
winlin
736ec48c71
move some consts to kernel consts
2014-07-20 13:11:53 +08:00
winlin
073d900674
add consts to kernel
2014-07-20 13:04:48 +08:00
winlin
492665e166
refine tcp client connect, extract to utility srs_socket_connect. 0.9.141
2014-06-29 14:39:56 +08:00
winlin
b357504b1d
fix #109 : fix the system jump time, adjust system startup time. 0.9.135
2014-06-27 13:35:28 +08:00
winlin
f173345e15
support report summaries in heartbeat. 0.9.132
2014-06-23 15:44:49 +08:00
winlin
094d82bd06
add connections count to api summaries. 0.9.127
2014-06-19 18:49:05 +08:00
winlin
6ee2ba049b
add srs bytes and kbps to api summaries. 0.9.126
2014-06-19 15:28:05 +08:00
winlin
b0e4dc8085
refine network bytes of summaries, remove the lo data.
2014-06-18 16:21:33 +08:00
winlin
d0b08d0d51
add network bytes to api summaries. 0.9.125
2014-06-18 16:13:02 +08:00
winlin
7920348e5f
extract get_local_ip and get_peer_ip to app utility
2014-05-27 16:45:02 +08:00
