Skip to content

Commit

Permalink
add keyword XCORE for coredump to identify the version. 2.0.207
Browse files Browse the repository at this point in the history
  • Loading branch information
winlinvip committed Jan 5, 2016
1 parent dc38ae1 commit 8155e97
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ Remark:

## History

* v2.0, 2016-01-05, add keyword XCORE for coredump to identify the version. 2.0.207
* <strong>v2.0, 2015-12-23, [2.0 alpha3(2.0.205)][r2.0a3] released. 89544 lines.</strong>
* v2.0, 2015-12-22, for [#509][bug #509] always alloc big object at heap. 2.0.205
* v2.0, 2015-12-22, for [#418][bug #418] ignore null connect props to make RED5 happy. 2.0.204
Expand Down
5 changes: 4 additions & 1 deletion trunk/src/app/srs_app_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ using namespace std;

using namespace _srs_internal;

// the version to identify the core.
const char* _srs_version = "XCORE-"RTMP_SIG_SRS_SERVER;

#define SRS_WIKI_URL_LOG "https://github.com/ossrs/srs/wiki/v1_CN_SrsLog"

// when user config an invalid value, macros to perfer true or false.
Expand Down Expand Up @@ -1360,7 +1363,7 @@ int SrsConfig::parse_options(int argc, char** argv)
}

// first hello message.
srs_trace(RTMP_SIG_SRS_SERVER);
srs_trace(_srs_version);

if (config_file.empty()) {
ret = ERROR_SYSTEM_CONFIG_INVALID;
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/core/srs_core.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 206
#define VERSION_REVISION 207

// generated by configure, only macros.
#include <srs_auto_headers.hpp>
Expand Down
2 changes: 2 additions & 0 deletions trunk/src/main/srs_main_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ ISrsThreadContext* _srs_context = new SrsThreadContext();
// app module.
SrsConfig* _srs_config = new SrsConfig();
SrsServer* _srs_server = new SrsServer();
// version of srs, which can grep keyword "XCORE"
extern const char* _srs_version;

/**
* show the features by macro, the actual macro values.
Expand Down

0 comments on commit 8155e97

Please sign in to comment.