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

refine kernel buffer. complete the utest for buffer.

Browse source
This commit is contained in:
winlin 2014-06-07 22:23:17 +08:00
parent 8992e217a9
commit 94cf0c1069
15 changed files with 218 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_http.cpp
View file

@ -328,7 +328,7 @@ SrsHttpHandler* SrsHttpHandler::res_body(stringstream& ss, string body)
int SrsHttpHandler::res_flush(SrsSocket* skt, stringstream& ss)
{
return skt->write(ss.str().c_str(), ss.str().length(), NULL);
return skt->write((void*)ss.str().c_str(), ss.str().length(), NULL);
}
int SrsHttpHandler::res_options(SrsSocket* skt)

2
trunk/src/app/srs_app_http_client.cpp
View file

@ -83,7 +83,7 @@ int SrsHttpClient::post(SrsHttpUri* uri, string req, string& res)
SrsSocket skt(stfd);
std::string data = ss.str();
if ((ret = skt.write(data.c_str(), data.length(), NULL)) != ERROR_SUCCESS) {
if ((ret = skt.write((void*)data.c_str(), data.length(), NULL)) != ERROR_SUCCESS) {
// disconnect when error.
disconnect();

12
trunk/src/app/srs_app_socket.cpp
View file

@ -72,11 +72,11 @@ int64_t SrsSocket::get_send_bytes()
return send_bytes;
}
int SrsSocket::read(const void* buf, size_t size, ssize_t* nread)
int SrsSocket::read(void* buf, size_t size, ssize_t* nread)
{
int ret = ERROR_SUCCESS;
ssize_t nb_read = st_read(stfd, (void*)buf, size, recv_timeout);
ssize_t nb_read = st_read(stfd, buf, size, recv_timeout);
if (nread) {
*nread = nb_read;
}
@ -100,11 +100,11 @@ int SrsSocket::read(const void* buf, size_t size, ssize_t* nread)
return ret;
}
int SrsSocket::read_fully(const void* buf, size_t size, ssize_t* nread)
int SrsSocket::read_fully(void* buf, size_t size, ssize_t* nread)
{
int ret = ERROR_SUCCESS;
ssize_t nb_read = st_read_fully(stfd, (void*)buf, size, recv_timeout);
ssize_t nb_read = st_read_fully(stfd, buf, size, recv_timeout);
if (nread) {
*nread = nb_read;
}
@ -128,11 +128,11 @@ int SrsSocket::read_fully(const void* buf, size_t size, ssize_t* nread)
return ret;
}
int SrsSocket::write(const void* buf, size_t size, ssize_t* nwrite)
int SrsSocket::write(void* buf, size_t size, ssize_t* nwrite)
{
int ret = ERROR_SUCCESS;
ssize_t nb_write = st_write(stfd, (void*)buf, size, send_timeout);
ssize_t nb_write = st_write(stfd, buf, size, send_timeout);
if (nwrite) {
*nwrite = nb_write;
}

6
trunk/src/app/srs_app_socket.hpp
View file

@ -60,12 +60,12 @@ public:
/**
* @param nread, the actual read bytes, ignore if NULL.
*/
virtual int read(const void* buf, size_t size, ssize_t* nread);
virtual int read_fully(const void* buf, size_t size, ssize_t* nread);
virtual int read(void* buf, size_t size, ssize_t* nread);
virtual int read_fully(void* buf, size_t size, ssize_t* nread);
/**
* @param nwrite, the actual write bytes, ignore if NULL.
*/
virtual int write(const void* buf, size_t size, ssize_t* nwrite);
virtual int write(void* buf, size_t size, ssize_t* nwrite);
virtual int writev(const iovec *iov, int iov_size, ssize_t* nwrite);
};