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
2013-10-25 17:22:52 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
24a54a40e8079eaedee586ef9ac7defd988649cd
24a54a40
1 parent
53a668e3
refine code, add prefix srs
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
24 行增加
和
24 行删除
trunk/src/core/srs_core_complex_handshake.cpp
trunk/src/core/srs_core_complex_handshake.cpp
查看文件 @
24a54a4
...
...
@@ -466,19 +466,19 @@ enum srs_schema_type {
srs_schema_invalid
=
2
,
};
void
__time_copy_to
(
char
*&
pp
,
int32_t
time
)
void
__
srs_
time_copy_to
(
char
*&
pp
,
int32_t
time
)
{
// 4bytes time
*
(
int32_t
*
)
pp
=
time
;
pp
+=
4
;
}
void
__version_copy_to
(
char
*&
pp
,
int32_t
version
)
void
__
srs_
version_copy_to
(
char
*&
pp
,
int32_t
version
)
{
// 4bytes version
*
(
int32_t
*
)
pp
=
version
;
pp
+=
4
;
}
void
__key_copy_to
(
char
*&
pp
,
key_block
*
key
)
void
__
srs_
key_copy_to
(
char
*&
pp
,
key_block
*
key
)
{
// 764bytes key block
if
(
key
->
random0_size
>
0
)
{
...
...
@@ -497,7 +497,7 @@ void __key_copy_to(char*& pp, key_block* key)
*
(
int32_t
*
)
pp
=
key
->
offset
;
pp
+=
4
;
}
void
__digest_copy_to
(
char
*&
pp
,
digest_block
*
digest
,
bool
with_digest
)
void
__
srs_
digest_copy_to
(
char
*&
pp
,
digest_block
*
digest
,
bool
with_digest
)
{
// 732bytes digest block without the 32bytes digest-data
// nbytes digest block part1
...
...
@@ -525,15 +525,15 @@ void __digest_copy_to(char*& pp, digest_block* digest, bool with_digest)
/**
* copy whole c1s1 to bytes.
*/
void
schema0_copy_to
(
char
*
bytes
,
bool
with_digest
,
void
s
rs_s
chema0_copy_to
(
char
*
bytes
,
bool
with_digest
,
int32_t
time
,
int32_t
version
,
key_block
*
key
,
digest_block
*
digest
)
{
char
*
pp
=
bytes
;
__time_copy_to
(
pp
,
time
);
__version_copy_to
(
pp
,
version
);
__key_copy_to
(
pp
,
key
);
__digest_copy_to
(
pp
,
digest
,
with_digest
);
__srs_time_copy_to
(
pp
,
time
);
__srs_version_copy_to
(
pp
,
version
);
__srs_key_copy_to
(
pp
,
key
);
__srs_digest_copy_to
(
pp
,
digest
,
with_digest
);
if
(
with_digest
)
{
srs_assert
(
pp
-
bytes
==
1536
);
...
...
@@ -541,15 +541,15 @@ void schema0_copy_to(char* bytes, bool with_digest,
srs_assert
(
pp
-
bytes
==
1536
-
32
);
}
}
void
schema1_copy_to
(
char
*
bytes
,
bool
with_digest
,
void
s
rs_s
chema1_copy_to
(
char
*
bytes
,
bool
with_digest
,
int32_t
time
,
int32_t
version
,
digest_block
*
digest
,
key_block
*
key
)
{
char
*
pp
=
bytes
;
__time_copy_to
(
pp
,
time
);
__version_copy_to
(
pp
,
version
);
__digest_copy_to
(
pp
,
digest
,
with_digest
);
__key_copy_to
(
pp
,
key
);
__srs_time_copy_to
(
pp
,
time
);
__srs_version_copy_to
(
pp
,
version
);
__srs_digest_copy_to
(
pp
,
digest
,
with_digest
);
__srs_key_copy_to
(
pp
,
key
);
if
(
with_digest
)
{
srs_assert
(
pp
-
bytes
==
1536
);
...
...
@@ -563,11 +563,11 @@ void schema1_copy_to(char* bytes, bool with_digest,
* digest-data: 32bytes
* c1s1-part2: (1536-n-32)bytes (digest-part2)
*/
char
*
bytes_join_schema0
(
int32_t
time
,
int32_t
version
,
key_block
*
key
,
digest_block
*
digest
)
char
*
srs_
bytes_join_schema0
(
int32_t
time
,
int32_t
version
,
key_block
*
key
,
digest_block
*
digest
)
{
char
*
bytes
=
new
char
[
1536
-
32
];
schema0_copy_to
(
bytes
,
false
,
time
,
version
,
key
,
digest
);
s
rs_s
chema0_copy_to
(
bytes
,
false
,
time
,
version
,
key
,
digest
);
return
bytes
;
}
...
...
@@ -577,11 +577,11 @@ char* bytes_join_schema0(int32_t time, int32_t version, key_block* key, digest_b
* digest-data: 32bytes
* c1s1-part2: (1536-n-32)bytes (digest-part2 and key)
*/
char
*
bytes_join_schema1
(
int32_t
time
,
int32_t
version
,
digest_block
*
digest
,
key_block
*
key
)
char
*
srs_
bytes_join_schema1
(
int32_t
time
,
int32_t
version
,
digest_block
*
digest
,
key_block
*
key
)
{
char
*
bytes
=
new
char
[
1536
-
32
];
schema1_copy_to
(
bytes
,
false
,
time
,
version
,
digest
,
key
);
s
rs_s
chema1_copy_to
(
bytes
,
false
,
time
,
version
,
digest
,
key
);
return
bytes
;
}
...
...
@@ -813,9 +813,9 @@ void c1s1::dump(char* _c1s1)
srs_assert
(
schema
!=
srs_schema_invalid
);
if
(
schema
==
srs_schema0
)
{
schema0_copy_to
(
_c1s1
,
true
,
time
,
version
,
&
block0
.
key
,
&
block1
.
digest
);
s
rs_s
chema0_copy_to
(
_c1s1
,
true
,
time
,
version
,
&
block0
.
key
,
&
block1
.
digest
);
}
else
{
schema1_copy_to
(
_c1s1
,
true
,
time
,
version
,
&
block0
.
digest
,
&
block1
.
key
);
s
rs_s
chema1_copy_to
(
_c1s1
,
true
,
time
,
version
,
&
block0
.
digest
,
&
block1
.
key
);
}
}
...
...
@@ -998,9 +998,9 @@ int c1s1::calc_s1_digest(char*& digest)
char
*
c1s1_joined_bytes
=
NULL
;
if
(
schema
==
srs_schema0
)
{
c1s1_joined_bytes
=
bytes_join_schema0
(
time
,
version
,
&
block0
.
key
,
&
block1
.
digest
);
c1s1_joined_bytes
=
srs_
bytes_join_schema0
(
time
,
version
,
&
block0
.
key
,
&
block1
.
digest
);
}
else
{
c1s1_joined_bytes
=
bytes_join_schema1
(
time
,
version
,
&
block0
.
digest
,
&
block1
.
key
);
c1s1_joined_bytes
=
srs_
bytes_join_schema1
(
time
,
version
,
&
block0
.
digest
,
&
block1
.
key
);
}
srs_assert
(
c1s1_joined_bytes
!=
NULL
);
...
...
@@ -1025,9 +1025,9 @@ int c1s1::calc_c1_digest(char*& digest)
char
*
c1s1_joined_bytes
=
NULL
;
if
(
schema
==
srs_schema0
)
{
c1s1_joined_bytes
=
bytes_join_schema0
(
time
,
version
,
&
block0
.
key
,
&
block1
.
digest
);
c1s1_joined_bytes
=
srs_
bytes_join_schema0
(
time
,
version
,
&
block0
.
key
,
&
block1
.
digest
);
}
else
{
c1s1_joined_bytes
=
bytes_join_schema1
(
time
,
version
,
&
block0
.
digest
,
&
block1
.
key
);
c1s1_joined_bytes
=
srs_
bytes_join_schema1
(
time
,
version
,
&
block0
.
digest
,
&
block1
.
key
);
}
srs_assert
(
c1s1_joined_bytes
!=
NULL
);
...
...
请
注册
或
登录
后发表评论