external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

for #354, remove the double underscore functions and variables.

Browse source
This commit is contained in:
winlin 2015-03-21 11:55:28 +08:00
parent 7065db192c
commit bbac2348db
31 changed files with 280 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

24
trunk/src/protocol/srs_rtmp_amf0.cpp
View file

@ -194,13 +194,13 @@ bool SrsAmf0Any::is_object_eof()
return marker == RTMP_AMF0_ObjectEnd;
}
void __srs_fill_level_spaces(stringstream& ss, int level)
void srs_fill_level_spaces(stringstream& ss, int level)
{
for (int i = 0; i < level; i++) {
ss << " ";
}
}
void __srs_amf0_do_print(SrsAmf0Any* any, stringstream& ss, int level)
void srs_amf0_do_print(SrsAmf0Any* any, stringstream& ss, int level)
{
if (any->is_boolean()) {
ss << "Boolean " << (any->to_boolean()? "true":"false") << endl;
@ -217,36 +217,36 @@ void __srs_amf0_do_print(SrsAmf0Any* any, stringstream& ss, int level)
SrsAmf0EcmaArray* obj = any->to_ecma_array();
ss << "EcmaArray " << "(" << obj->count() << " items)" << endl;
for (int i = 0; i < obj->count(); i++) {
__srs_fill_level_spaces(ss, level + 1);
srs_fill_level_spaces(ss, level + 1);
ss << "Elem '" << obj->key_at(i) << "' ";
if (obj->value_at(i)->is_complex_object()) {
__srs_amf0_do_print(obj->value_at(i), ss, level + 1);
srs_amf0_do_print(obj->value_at(i), ss, level + 1);
} else {
__srs_amf0_do_print(obj->value_at(i), ss, 0);
srs_amf0_do_print(obj->value_at(i), ss, 0);
}
}
} else if (any->is_strict_array()) {
SrsAmf0StrictArray* obj = any->to_strict_array();
ss << "StrictArray " << "(" << obj->count() << " items)" << endl;
for (int i = 0; i < obj->count(); i++) {
__srs_fill_level_spaces(ss, level + 1);
srs_fill_level_spaces(ss, level + 1);
ss << "Elem ";
if (obj->at(i)->is_complex_object()) {
__srs_amf0_do_print(obj->at(i), ss, level + 1);
srs_amf0_do_print(obj->at(i), ss, level + 1);
} else {
__srs_amf0_do_print(obj->at(i), ss, 0);
srs_amf0_do_print(obj->at(i), ss, 0);
}
}
} else if (any->is_object()) {
SrsAmf0Object* obj = any->to_object();
ss << "Object " << "(" << obj->count() << " items)" << endl;
for (int i = 0; i < obj->count(); i++) {
__srs_fill_level_spaces(ss, level + 1);
srs_fill_level_spaces(ss, level + 1);
ss << "Property '" << obj->key_at(i) << "' ";
if (obj->value_at(i)->is_complex_object()) {
__srs_amf0_do_print(obj->value_at(i), ss, level + 1);
srs_amf0_do_print(obj->value_at(i), ss, level + 1);
} else {
__srs_amf0_do_print(obj->value_at(i), ss, 0);
srs_amf0_do_print(obj->value_at(i), ss, 0);
}
}
} else {
@ -260,7 +260,7 @@ char* SrsAmf0Any::human_print(char** pdata, int* psize)
ss.precision(1);
__srs_amf0_do_print(this, ss, 0);
srs_amf0_do_print(this, ss, 0);
string str = ss.str();
if (str.empty()) {

6
trunk/src/protocol/srs_rtmp_buffer.cpp
View file

@ -144,11 +144,11 @@ int SrsFastBuffer::grow(ISrsBufferReader* reader, int required_size)
// the free space of buffer,
// buffer = consumed_bytes + exists_bytes + free_space.
int nb_free_space = buffer + nb_buffer - end;
int nb_free_space = (int)(buffer + nb_buffer - end);
// resize the space when no left space.
if (nb_free_space < required_size) {
// the bytes already in buffer
int nb_exists_bytes = end - p;
int nb_exists_bytes = (int)(end - p);
srs_assert(nb_exists_bytes >= 0);
srs_verbose("move fast buffer %d bytes", nb_exists_bytes);
@ -166,7 +166,7 @@ int SrsFastBuffer::grow(ISrsBufferReader* reader, int required_size)
}
// check whether enough free space in buffer.
nb_free_space = buffer + nb_buffer - end;
nb_free_space = (int)(buffer + nb_buffer - end);
if (nb_free_space < required_size) {
ret = ERROR_READER_BUFFER_OVERFLOW;
srs_error("buffer overflow, required=%d, max=%d, left=%d, ret=%d",

34
trunk/src/protocol/srs_rtmp_handshake.cpp
View file

@ -40,7 +40,7 @@ using namespace _srs_internal;
// for openssl_HMACsha256
#include <openssl/evp.h>
#include <openssl/hmac.h>
// for __openssl_generate_key
// for openssl_generate_key
#include <openssl/dh.h>
namespace _srs_internal
@ -70,7 +70,7 @@ namespace _srs_internal
0x93, 0xB8, 0xE6, 0x36, 0xCF, 0xEB, 0x31, 0xAE
}; // 62
int __openssl_HMACsha256(HMAC_CTX* ctx, const void* data, int data_size, void* digest, unsigned int* digest_size)
int do_openssl_HMACsha256(HMAC_CTX* ctx, const void* data, int data_size, void* digest, unsigned int* digest_size)
{
int ret = ERROR_SUCCESS;
@ -97,14 +97,14 @@ namespace _srs_internal
unsigned int digest_size = 0;
unsigned char* __key = (unsigned char*)key;
unsigned char* __digest = (unsigned char*)digest;
unsigned char* temp_key = (unsigned char*)key;
unsigned char* temp_digest = (unsigned char*)digest;
if (key == NULL) {
// use data to digest.
// @see ./crypto/sha/sha256t.c
// @see ./crypto/evp/digest.c
if (EVP_Digest(data, data_size, __digest, &digest_size, EVP_sha256(), NULL) < 0)
if (EVP_Digest(data, data_size, temp_digest, &digest_size, EVP_sha256(), NULL) < 0)
{
ret = ERROR_OpenSslSha256EvpDigest;
return ret;
@ -116,12 +116,12 @@ namespace _srs_internal
// @remark, if no key, use EVP_Digest to digest,
// for instance, in python, hashlib.sha256(data).digest().
HMAC_CTX_init(&ctx);
if (HMAC_Init_ex(&ctx, __key, key_size, EVP_sha256(), NULL) < 0) {
if (HMAC_Init_ex(&ctx, temp_key, key_size, EVP_sha256(), NULL) < 0) {
ret = ERROR_OpenSslSha256Init;
return ret;
}
ret = __openssl_HMACsha256(&ctx, data, data_size, __digest, &digest_size);
ret = do_openssl_HMACsha256(&ctx, data, data_size, temp_digest, &digest_size);
HMAC_CTX_cleanup(&ctx);
if (ret != ERROR_SUCCESS) {
@ -590,7 +590,7 @@ namespace _srs_internal
return ret;
}
c1_digest = new char[__SRS_OpensslHashSize];
c1_digest = new char[SRS_OpensslHashSize];
if ((ret = openssl_HMACsha256(SrsGenuineFPKey, 30, c1s1_joined_bytes, 1536 - 32, c1_digest)) != ERROR_SUCCESS) {
srs_freep(c1_digest);
srs_error("calc digest for c1 failed. ret=%d", ret);
@ -618,7 +618,7 @@ namespace _srs_internal
return ret;
}
s1_digest = new char[__SRS_OpensslHashSize];
s1_digest = new char[SRS_OpensslHashSize];
if ((ret = openssl_HMACsha256(SrsGenuineFMSKey, 36, c1s1_joined_bytes, 1536 - 32, s1_digest)) != ERROR_SUCCESS) {
srs_freep(s1_digest);
srs_error("calc digest for s1 failed. ret=%d", ret);
@ -995,14 +995,14 @@ namespace _srs_internal
{
int ret = ERROR_SUCCESS;
char temp_key[__SRS_OpensslHashSize];
char temp_key[SRS_OpensslHashSize];
if ((ret = openssl_HMACsha256(SrsGenuineFPKey, 62, s1->get_digest(), 32, temp_key)) != ERROR_SUCCESS) {
srs_error("create c2 temp key failed. ret=%d", ret);
return ret;
}
srs_verbose("generate c2 temp key success.");
char _digest[__SRS_OpensslHashSize];
char _digest[SRS_OpensslHashSize];
if ((ret = openssl_HMACsha256(temp_key, 32, random, 1504, _digest)) != ERROR_SUCCESS) {
srs_error("create c2 digest failed. ret=%d", ret);
return ret;
@ -1019,14 +1019,14 @@ namespace _srs_internal
is_valid = false;
int ret = ERROR_SUCCESS;
char temp_key[__SRS_OpensslHashSize];
char temp_key[SRS_OpensslHashSize];
if ((ret = openssl_HMACsha256(SrsGenuineFPKey, 62, s1->get_digest(), 32, temp_key)) != ERROR_SUCCESS) {
srs_error("create c2 temp key failed. ret=%d", ret);
return ret;
}
srs_verbose("generate c2 temp key success.");
char _digest[__SRS_OpensslHashSize];
char _digest[SRS_OpensslHashSize];
if ((ret = openssl_HMACsha256(temp_key, 32, random, 1504, _digest)) != ERROR_SUCCESS) {
srs_error("create c2 digest failed. ret=%d", ret);
return ret;
@ -1042,14 +1042,14 @@ namespace _srs_internal
{
int ret = ERROR_SUCCESS;
char temp_key[__SRS_OpensslHashSize];
char temp_key[SRS_OpensslHashSize];
if ((ret = openssl_HMACsha256(SrsGenuineFMSKey, 68, c1->get_digest(), 32, temp_key)) != ERROR_SUCCESS) {
srs_error("create s2 temp key failed. ret=%d", ret);
return ret;
}
srs_verbose("generate s2 temp key success.");
char _digest[__SRS_OpensslHashSize];
char _digest[SRS_OpensslHashSize];
if ((ret = openssl_HMACsha256(temp_key, 32, random, 1504, _digest)) != ERROR_SUCCESS) {
srs_error("create s2 digest failed. ret=%d", ret);
return ret;
@ -1066,14 +1066,14 @@ namespace _srs_internal
is_valid = false;
int ret = ERROR_SUCCESS;
char temp_key[__SRS_OpensslHashSize];
char temp_key[SRS_OpensslHashSize];
if ((ret = openssl_HMACsha256(SrsGenuineFMSKey, 68, c1->get_digest(), 32, temp_key)) != ERROR_SUCCESS) {
srs_error("create s2 temp key failed. ret=%d", ret);
return ret;
}
srs_verbose("generate s2 temp key success.");
char _digest[__SRS_OpensslHashSize];
char _digest[SRS_OpensslHashSize];
if ((ret = openssl_HMACsha256(temp_key, 32, random, 1504, _digest)) != ERROR_SUCCESS) {
srs_error("create s2 digest failed. ret=%d", ret);
return ret;

2
trunk/src/protocol/srs_rtmp_handshake.hpp
View file

@ -43,7 +43,7 @@ class SrsStream;
namespace _srs_internal
{
// the digest key generate size.
#define __SRS_OpensslHashSize 512
#define SRS_OpensslHashSize 512
extern u_int8_t SrsGenuineFMSKey[];
extern u_int8_t SrsGenuineFPKey[];
int openssl_HMACsha256(const void* key, int key_size, const void* data, int data_size, void* digest);

6
trunk/src/protocol/srs_rtmp_stack.cpp
View file

@ -385,14 +385,14 @@ SrsCommonMessage::~SrsCommonMessage()
srs_freep(payload);
}
SrsSharedPtrMessage::__SrsSharedPtr::__SrsSharedPtr()
SrsSharedPtrMessage::SrsSharedPtrPayload::SrsSharedPtrPayload()
{
payload = NULL;
size = 0;
shared_count = 0;
}
SrsSharedPtrMessage::__SrsSharedPtr::~__SrsSharedPtr()
SrsSharedPtrMessage::SrsSharedPtrPayload::~SrsSharedPtrPayload()
{
srs_freep(payload);
}
@ -442,7 +442,7 @@ int SrsSharedPtrMessage::create(SrsMessageHeader* pheader, char* payload, int si
return ret;
}
ptr = new __SrsSharedPtr();
ptr = new SrsSharedPtrPayload();
// direct attach the data.
if (pheader) {

8
trunk/src/protocol/srs_rtmp_stack.hpp
View file

@ -251,7 +251,7 @@ public:
*/
char* payload;
private:
class __SrsSharedPtr
class SrsSharedPtrPayload
{
public:
// shared message header.
@ -264,10 +264,10 @@ private:
// the reference count
int shared_count;
public:
__SrsSharedPtr();
virtual ~__SrsSharedPtr();
SrsSharedPtrPayload();
virtual ~SrsSharedPtrPayload();
};
__SrsSharedPtr* ptr;
SrsSharedPtrPayload* ptr;
public:
SrsSharedPtrMessage();
virtual ~SrsSharedPtrMessage();

4
trunk/src/protocol/srs_rtmp_utility.cpp
View file

@ -288,7 +288,7 @@ int srs_chunk_header_c3(
return p - cache;
}
int __srs_rtmp_create_msg(char type, u_int32_t timestamp, char* data, int size, int stream_id, SrsSharedPtrMessage** ppmsg)
int srs_do_rtmp_create_msg(char type, u_int32_t timestamp, char* data, int size, int stream_id, SrsSharedPtrMessage** ppmsg)
{
int ret = ERROR_SUCCESS;
@ -338,7 +338,7 @@ int srs_rtmp_create_msg(char type, u_int32_t timestamp, char* data, int size, in
int ret = ERROR_SUCCESS;
// only when failed, we must free the data.
if ((ret = __srs_rtmp_create_msg(type, timestamp, data, size, stream_id, ppmsg)) != ERROR_SUCCESS) {
if ((ret = srs_do_rtmp_create_msg(type, timestamp, data, size, stream_id, ppmsg)) != ERROR_SUCCESS) {
srs_freep(data);
return ret;
}

6
trunk/src/protocol/srs_rtsp_stack.cpp
View file

@ -772,7 +772,7 @@ SrsRtspOptionsResponse::~SrsRtspOptionsResponse()
int SrsRtspOptionsResponse::encode_header(stringstream& ss)
{
SrsRtspMethod __methods[] = {
SrsRtspMethod rtsp_methods[] = {
SrsRtspMethodDescribe,
SrsRtspMethodAnnounce,
SrsRtspMethodGetParameter,
@ -789,9 +789,9 @@ int SrsRtspOptionsResponse::encode_header(stringstream& ss)
ss << SRS_RTSP_TOKEN_PUBLIC << ":" << SRS_RTSP_SP;
bool appended = false;
int nb_methods = (int)(sizeof(__methods) / sizeof(SrsRtspMethod));
int nb_methods = (int)(sizeof(rtsp_methods) / sizeof(SrsRtspMethod));
for (int i = 0; i < nb_methods; i++) {
SrsRtspMethod method = __methods[i];
SrsRtspMethod method = rtsp_methods[i];
if (((int)methods & (int)method) != (int)method) {
continue;
}