external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

for bug #235, refine code order of c1s1 and c2s2

Browse source
This commit is contained in:
winlin 2014-11-29 17:05:54 +08:00
parent 646d6f6673
commit 6d49cddc9d
1 changed files with 128 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

256
trunk/src/rtmp/srs_protocol_handshake.cpp
View file

@ -833,6 +833,134 @@ namespace _srs_internal
} }
} }
// TODO: FIXME: move to the right position.
c1s1::c1s1()
{
payload = NULL;
}
c1s1::~c1s1()
{
srs_freep(payload);
/*
void c1s1::destroy_blocks()
{
if (schema == srs_schema_invalid) {
return;
}
if (schema == srs_schema0) {
block0.key.free();
block1.digest.free();
} else {
block0.digest.free();
block1.key.free();
}
}*/
}
srs_schema_type c1s1::schema()
{
srs_assert(payload != NULL);
return payload->schema();
}
char* c1s1::get_digest()
{
srs_assert(payload != NULL);
return payload->get_digest();
}
void c1s1::dump(char* _c1s1)
{
srs_assert(payload != NULL);
return payload->dump(this, _c1s1);
}
int c1s1::parse(char* _c1s1, srs_schema_type schema)
{
int ret = ERROR_SUCCESS;
if (schema != srs_schema0 && schema != srs_schema1) {
ret = ERROR_RTMP_CH_SCHEMA;
srs_error("parse c1 failed. invalid schema=%d, ret=%d", schema, ret);
return ret;
}
time = __srs_stream_read_4bytes(_c1s1);
version = __srs_stream_read_4bytes(_c1s1 + 4); // client c1 version
srs_freep(payload);
if (schema == srs_schema0) {
payload = new c1s1_strategy_schema0();
} else {
payload = new c1s1_strategy_schema1();
}
return payload->parse(_c1s1);
}
int c1s1::c1_create(srs_schema_type schema)
{
int ret = ERROR_SUCCESS;
if (schema != srs_schema0 && schema != srs_schema1) {
ret = ERROR_RTMP_CH_SCHEMA;
srs_error("create c1 failed. invalid schema=%d, ret=%d", schema, ret);
return ret;
}
// client c1 time and version
time = ::time(NULL);
version = 0x80000702; // client c1 version
// generate signature by schema
srs_freep(payload);
if (schema == srs_schema0) {
payload = new c1s1_strategy_schema0();
} else {
payload = new c1s1_strategy_schema1();
}
return payload->c1_create(this);
}
int c1s1::c1_validate_digest(bool& is_valid)
{
is_valid = false;
srs_assert(payload);
return payload->c1_validate_digest(this, is_valid);
}
int c1s1::s1_create(c1s1* c1)
{
int ret = ERROR_SUCCESS;
if (c1->schema() != srs_schema0 && c1->schema() != srs_schema1) {
ret = ERROR_RTMP_CH_SCHEMA;
srs_error("create s1 failed. invalid schema=%d, ret=%d", c1->schema(), ret);
return ret;
}
time = ::time(NULL);
version = 0x01000504; // server s1 version
srs_freep(payload);
if (c1->schema() == srs_schema0) {
payload = new c1s1_strategy_schema0();
} else {
payload = new c1s1_strategy_schema1();
}
return payload->s1_create(this);
}
int c1s1::s1_validate_digest(bool& is_valid)
{
is_valid = false;
srs_assert(payload);
return payload->s1_validate_digest(this, is_valid);
}
c2s2::c2s2() c2s2::c2s2()
{ {
srs_random_generate(random, 1504); srs_random_generate(random, 1504);
@ -953,134 +1081,6 @@ namespace _srs_internal
return ret; return ret;
} }
// TODO: FIXME: move to the right position.
c1s1::c1s1()
{
payload = NULL;
}
c1s1::~c1s1()
{
srs_freep(payload);
/*
void c1s1::destroy_blocks()
{
if (schema == srs_schema_invalid) {
return;
}
if (schema == srs_schema0) {
block0.key.free();
block1.digest.free();
} else {
block0.digest.free();
block1.key.free();
}
}*/
}
srs_schema_type c1s1::schema()
{
srs_assert(payload != NULL);
return payload->schema();
}
char* c1s1::get_digest()
{
srs_assert(payload != NULL);
return payload->get_digest();
}
void c1s1::dump(char* _c1s1)
{
srs_assert(payload != NULL);
return payload->dump(this, _c1s1);
}
int c1s1::parse(char* _c1s1, srs_schema_type schema)
{
int ret = ERROR_SUCCESS;
if (schema != srs_schema0 && schema != srs_schema1) {
ret = ERROR_RTMP_CH_SCHEMA;
srs_error("parse c1 failed. invalid schema=%d, ret=%d", schema, ret);
return ret;
}
time = __srs_stream_read_4bytes(_c1s1);
version = __srs_stream_read_4bytes(_c1s1 + 4); // client c1 version
srs_freep(payload);
if (schema == srs_schema0) {
payload = new c1s1_strategy_schema0();
} else {
payload = new c1s1_strategy_schema1();
}
return payload->parse(_c1s1);
}
int c1s1::c1_create(srs_schema_type schema)
{
int ret = ERROR_SUCCESS;
if (schema != srs_schema0 && schema != srs_schema1) {
ret = ERROR_RTMP_CH_SCHEMA;
srs_error("create c1 failed. invalid schema=%d, ret=%d", schema, ret);
return ret;
}
// client c1 time and version
time = ::time(NULL);
version = 0x80000702; // client c1 version
// generate signature by schema
srs_freep(payload);
if (schema == srs_schema0) {
payload = new c1s1_strategy_schema0();
} else {
payload = new c1s1_strategy_schema1();
}
return payload->c1_create(this);
}
int c1s1::c1_validate_digest(bool& is_valid)
{
is_valid = false;
srs_assert(payload);
return payload->c1_validate_digest(this, is_valid);
}
int c1s1::s1_validate_digest(bool& is_valid)
{
is_valid = false;
srs_assert(payload);
return payload->s1_validate_digest(this, is_valid);
}
int c1s1::s1_create(c1s1* c1)
{
int ret = ERROR_SUCCESS;
if (c1->schema() != srs_schema0 && c1->schema() != srs_schema1) {
ret = ERROR_RTMP_CH_SCHEMA;
srs_error("create s1 failed. invalid schema=%d, ret=%d", c1->schema(), ret);
return ret;
}
time = ::time(NULL);
version = 0x01000504; // server s1 version
srs_freep(payload);
if (c1->schema() == srs_schema0) {
payload = new c1s1_strategy_schema0();
} else {
payload = new c1s1_strategy_schema1();
}
return payload->s1_create(this);
}
} }
#endif #endif