GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for socket using 'byte_t' type.

Browse Source
This commit is contained in:
Vincent Richard 2014-01-16 19:17:50 +01:00
parent ef892af655
commit 2a8e8f65d6
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/vmime/platforms/windows/windowsSocket.cpp
View File

@ -31,6 +31,7 @@
#include "vmime/platforms/windows/windowsSocket.hpp" #include "vmime/platforms/windows/windowsSocket.hpp"
#include "vmime/utility/stringUtils.hpp"
#include "vmime/exception.hpp" #include "vmime/exception.hpp"
#include <ws2tcpip.h> #include <ws2tcpip.h>
@ -239,11 +240,11 @@ size_t windowsSocket::getBlockSize() const
void windowsSocket::receive(vmime::string& buffer) void windowsSocket::receive(vmime::string& buffer)
{ {
const size_t size = receiveRaw(m_buffer, sizeof(m_buffer)); const size_t size = receiveRaw(m_buffer, sizeof(m_buffer));
buffer = vmime::string(m_buffer, size); buffer = utility::stringUtils::makeStringFromBytes(m_buffer, size);
} }
size_t windowsSocket::receiveRaw(char* buffer, const size_t count) size_t windowsSocket::receiveRaw(byte_t* buffer, const size_t count)
{ {
m_status &= ~STATUS_WOULDBLOCK; m_status &= ~STATUS_WOULDBLOCK;
@ -275,7 +276,7 @@ size_t windowsSocket::receiveRaw(char* buffer, const size_t count)
} }
// Read available data // Read available data
int ret = ::recv(m_desc, buffer, count, 0); int ret = ::recv(m_desc, reinterpret_cast <char*>(buffer), count, 0);
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {
@ -317,7 +318,7 @@ void windowsSocket::send(const char* str)
} }
void windowsSocket::sendRaw(const char* buffer, const size_t count) void windowsSocket::sendRaw(const byte_t* buffer, const size_t count)
{ {
m_status &= ~STATUS_WOULDBLOCK; m_status &= ~STATUS_WOULDBLOCK;
@ -325,7 +326,7 @@ void windowsSocket::sendRaw(const char* buffer, const size_t count)
while (size > 0) while (size > 0)
{ {
const int ret = ::send(m_desc, buffer, size, 0); const int ret = ::send(m_desc, reinterpret_cast <const char*>(buffer), size, 0);
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {
@ -350,11 +351,11 @@ void windowsSocket::sendRaw(const char* buffer, const size_t count)
} }
size_t windowsSocket::sendRawNonBlocking(const char* buffer, const size_t count) size_t windowsSocket::sendRawNonBlocking(const byte_t* buffer, const size_t count)
{ {
m_status &= ~STATUS_WOULDBLOCK; m_status &= ~STATUS_WOULDBLOCK;
const int ret = ::send(m_desc, buffer, count, 0); const int ret = ::send(m_desc, reinterpret_cast <const char*>(buffer), count, 0);
if (ret == SOCKET_ERROR) if (ret == SOCKET_ERROR)
{ {

11
src/vmime/platforms/windows/windowsSocket.hpp
View File

@ -55,11 +55,12 @@ public:
void disconnect(); void disconnect();
void receive(vmime::string& buffer); void receive(vmime::string& buffer);
size_t receiveRaw(char* buffer, const size_t count); size_t receiveRaw(byte_t* buffer, const size_t count);
void send(const vmime::string& buffer); void send(const vmime::string& buffer);
void sendRaw(const char* buffer, const size_t count); void send(const char* str);
size_t sendRawNonBlocking(const char* buffer, const size_t count); void sendRaw(const byte_t* buffer, const size_t count);
size_t sendRawNonBlocking(const byte_t* buffer, const size_t count);
size_t getBlockSize() const; size_t getBlockSize() const;
@ -85,7 +86,7 @@ private:
shared_ptr <vmime::net::timeoutHandler> m_timeoutHandler; shared_ptr <vmime::net::timeoutHandler> m_timeoutHandler;
char m_buffer[65536]; byte_t m_buffer[65536];
SOCKET m_desc; SOCKET m_desc;
unsigned int m_status; unsigned int m_status;