external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity
1802 commits 13 branches 107 tags 375 MiB
Commit graph

1401 commits

Author SHA1 Message Date
winlin
e9e0cd757c fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201. 2014-08-19 10:59:59 +08:00
winlin
c24e68dd70 refine the stat, use one ok. 1.0.200 2014-08-18 14:39:42 +08:00
winlin
fc347a1c44 update configure, remove the bwtc, moved to research now. 2014-08-18 14:15:39 +08:00
winlin
f03fde37ea refine configre, add --with-stat to configure summary 2014-08-17 22:19:52 +08:00
winlin
6103b1c3ce refine options, add --with-stat. 0.9.199 2014-08-17 22:11:43 +08:00
winlin
3111870316 for bug #155, refine for osx, with ssl/http, disable statistics. 0.9.198. 2014-08-17 20:38:51 +08:00
winlin
554a9763db fix linux config openssl bug. 2014-08-17 19:43:53 +08:00
winlin
5e4dad210a build openssl for osx, for bug #155. 2014-08-17 19:12:12 +08:00
winlin
cf7504826b fix reload ingest bug, remove when disabled. 0.9.196 2014-08-16 19:59:14 +08:00
winlin
08bc34e0df refine wiki, cluster to forward. 2014-08-14 16:33:26 +08:00
winlin
b15ee26a48 fix the ssl dh key size assert error, key size maybe 127, not always 128. 0.9.195 2014-08-13 18:09:35 +08:00
winlin
67ab0fb5e0 add comments for openssl key generator assert. 2014-08-13 10:58:53 +08:00
winlin
aefcaa9683 refine code, add install root message 2014-08-12 11:06:00 +08:00
winlin
0cd2b13e2e add rtmfp tsvarea 2014-08-09 07:35:22 +08:00
winlin
b317abbaee refine openssl, add compute_key, for bug #148 2014-08-08 13:34:50 +08:00
winlin
d4c2aa1e8e add __openssl_compute_key to calc the shared key 2014-08-08 11:34:17 +08:00
winlin
7adbe7f456 fix utest build failed, sync with src changed. 2014-08-08 10:47:55 +08:00
winlin
ad2c996bd8 refine HMAC sha256 digest algorithm. 0.9.193 2014-08-08 09:57:36 +08:00
winlin
12ad95a5b8 refine HMAC sha256 digest algorithm. 0.9.193 2014-08-08 09:54:33 +08:00
winlin
156a9ed2a3 change to 0.9.192. 2014-08-07 14:43:03 +08:00
winlin
1ebaab2c6e fix #148, simplify the RTMP handshake key generation. 0.9.191. 2014-08-06 15:45:40 +08:00
winlin
a9d28122f4 refine code, refine the handshake, refine the log of source_id 2014-08-06 13:57:55 +08:00
winlin
5b28355a0b fix #147, support identify the srs edge. 0.9.190. 2014-08-06 09:57:30 +08:00
winlin
3532b61e3d open all utest macro 2014-08-05 09:16:45 +08:00
winlin
798f9139a4 add reload utest. 2014-08-05 09:16:25 +08:00
winlin
33bc8755ab refine code, add comments for ossrs.net monitor. 2014-08-04 10:50:28 +08:00
winlin
67403bdbf1 fix #79, fix the reload remove edge assert bug. 0.9.189. 2014-08-03 21:50:48 +08:00
winlin
ade2376da0 fix #57, use lock(acquire/release publish) to avoid duplicated publishing. 0.9.188. 2014-08-03 21:22:40 +08:00
winlin
6dd065bcc3 fix #85, fix the segment-dvr sequence header missing. 0.9.187. 2014-08-03 20:27:57 +08:00
winlin
5a95d594e7 fix #145, refine ffmpeg log, check abitrate for libaacplus. 0.9.186. 2014-08-03 13:06:37 +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
84450e1588 fix #138, fix http hooks bug, regression bug. 0.9.184. 2014-08-02 19:24:49 +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
79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178 2014-07-30 10:00:23 +08:00
winlin
792a6f944f refine utility of cpu, add comment for cpu percent 2014-07-28 13:51:54 +08:00
winlin
c16d3585a5 refine utility of cpu, add comment for cpu percent 2014-07-28 13:41:27 +08:00
winlin
e37f312f27 refine the code for ios build. add authors StevenLiu. 0.9.177 2014-07-27 21:56:44 +08:00
winlin
b198d17ab9 Merge pull request #135 from T-bagwell/master 
Support porting srs on MacOS OSX system Platform
 2014-07-27 21:07:37 +08:00
Steven Liu
b50ecd6dbe Support porting srs on MacOS OSX system Platform 
Add the OSX platform cross complie options into srs
 2014-07-27 19:32:12 +08:00
winlin
37ceadd865 sync the conf file 2014-07-27 19:11:51 +08:00
winlin
9c11001391 refine log for stats network and disk 2014-07-27 19:03:56 +08:00
winlin
6f700f3f40 rename network_device_index to network 2014-07-27 18:40:32 +08:00
winlin
f4ea48adcb rename network_device_index to network 2014-07-27 18:39:20 +08:00
winlin
b8ae5c63fc add disk io test command 2014-07-27 18:05:54 +08:00
winlin
42464cbe1f add disk io test command 2014-07-27 17:59:19 +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
abef029610 refine full conf 2014-07-27 15:04:31 +08:00
winlin
e5e0c4a68d refine the utest, add stats 2014-07-27 15:00:52 +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
d0bc0884d1 refine rtmp client, add comments for the dumps_packets() 2014-07-27 11:57:08 +08:00
winlin
a645b403c8 add comments for utility, the USER_HZ for /proc/stat 2014-07-27 11:44:48 +08:00
winlin
6d9d9ee3c5 updte forwarder comments 2014-07-26 20:17:03 +08:00
winlin
6ee9ea341a refine code, rename SrsSocket to SrsStSocket 2014-07-26 20:08:37 +08:00
winlin
b19d2e8e2d refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp 2014-07-26 20:07:12 +08:00
winlin
13abb0d768 complete config utest. 0.9.173 2014-07-26 19:57:32 +08:00
winlin
a35d403651 add utest for config check 2014-07-26 17:14:14 +08:00
winlin
fbddfbc8a3 fix #134, not fix for the shrink to clear the queue. 2014-07-26 16:35:12 +08:00
winlin
b10d95205a fix #134, not fix for the shrink to clear the queue. 2014-07-26 16:32:28 +08:00
winlin
30ebba0673 add config check utest 2014-07-26 15:54:40 +08:00
winlin
ebf9e560b1 refine the max connections, compare the system ulimit max open files, error when exeed limit 2014-07-26 15:34:45 +08:00
winlin
5f7ff37e64 fix the utest mock config bug 2014-07-26 15:03:07 +08:00
winlin
9f2da4e095 refine log, can be used when _srs_config is NULL. 2014-07-26 14:58:33 +08:00
winlin
7241fa8744 fix #126, srs_publiser add warnings. refine config utest. 2014-07-26 14:43:37 +08:00
winlin
b17c736f3f fix #124, gop cache support disable video in publishing. 0.9.171. 2014-07-26 12:22:39 +08:00
winlin
50cd1d2360 refine the config 2014-07-25 11:05:54 +08:00
winlin
7865b0e935 refine config, check chunk size. 2014-07-25 11:04:13 +08:00
winlin
630bdf0c80 refine config, check the value of http api/stream. 2014-07-25 10:54:36 +08:00
winlin
7207c2f435 refine config, check all config item name. 2014-07-25 10:44:04 +08:00
winlin
1c27f3b913 refine config, warning when feature disabled. 2014-07-25 09:38:48 +08:00
winlin
f562a98602 add configure options --log-verbose/info/trace to compile log macros. 0.9.169 2014-07-23 14:37:54 +08:00
winlin
fd8c4989f5 add todo fixme for log verbose and info 2014-07-23 11:24:32 +08:00
winlin
91d2296836 fix #121, srs_info detail log compile failed. 0.9.168. 2014-07-23 11:21:35 +08:00
winlin
2e58fac5eb fix #122: edge forwarder(push to origin) assert failed, init client when connect to server. 0.9.167 2014-07-23 10:53:25 +08:00
winlin
b56e7ef7ab complete main utest for config 2014-07-22 11:14:51 +08:00
winlin
2c9e16a9e7 add utest for config vhosts, transcode/dvr/hls 2014-07-22 11:01:20 +08:00
winlin
d612597a8f refine log of edge push/pull 2014-07-21 15:30:44 +08:00
winlin
77236920b6 add config utest, for default vhost 2014-07-21 12:13:01 +08:00
winlin
f1b1dc0c64 add utest for config full.conf, fix the chunk-size bug 2014-07-21 10:50:08 +08:00
winlin
21f49a9875 add basic utest for config service 2014-07-20 17:44:20 +08:00
winlin
6e8c4df4b1 refine error codes. 2014-07-20 17:32:34 +08:00
winlin
0db2e6b8e9 fix the empty config error 2014-07-20 17:08:47 +08:00
winlin
75bfe2af78 refine the LF,CR 2014-07-20 16:19:26 +08:00
winlin
8cd9be4fce add comments for LF,CR 2014-07-20 16:18:26 +08:00
winlin
c65a6b5d63 fix the conf_line bug of parse config directive. 2014-07-20 16:16:29 +08:00
winlin
86ad39f001 finish basic utest for config 2014-07-20 15:53:19 +08:00
winlin
9b6c22644d add basic utest for config directive 2014-07-20 15:27:05 +08:00