修正一些错误定义
This commit is contained in:
@@ -18,7 +18,7 @@ namespace Transmission {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Transmit::dataArrives(unsigned char *data, size_t size) {
|
void Transmit::dataArrives(const unsigned char *data, size_t size) {
|
||||||
std::unique_lock<std::mutex> lock(dataMutex);
|
std::unique_lock<std::mutex> lock(dataMutex);
|
||||||
charBuff.put(data, 0, size);
|
charBuff.put(data, 0, size);
|
||||||
if (this->packSize < 0) {
|
if (this->packSize < 0) {
|
||||||
@@ -118,10 +118,10 @@ namespace Transmission {
|
|||||||
return ptr;
|
return ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Transmit::sendData(unsigned char *data, size_t size, int type) {
|
void Transmit::sendData(const unsigned char *data, size_t size, int type) {
|
||||||
DataPackets dataPackets;
|
DataPackets dataPackets;
|
||||||
dataPackets.set_type(type);
|
dataPackets.set_type(type);
|
||||||
std::string byteData(reinterpret_cast<char *>(data), size);
|
std::string byteData(reinterpret_cast<const char *>(data), size);
|
||||||
dataPackets.set_data(byteData);
|
dataPackets.set_data(byteData);
|
||||||
if (size < 64) {
|
if (size < 64) {
|
||||||
//小于64字节的数据包不压缩
|
//小于64字节的数据包不压缩
|
||||||
@@ -132,7 +132,7 @@ namespace Transmission {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Transmit::pushData(unsigned char *data, int32_t size) const {
|
void Transmit::pushData(const unsigned char *data, int32_t size) const {
|
||||||
::send(this->fd, (const char *) &size, sizeof(int32_t), 0);
|
::send(this->fd, (const char *) &size, sizeof(int32_t), 0);
|
||||||
::send(this->fd, (const char *) data, size, 0);
|
::send(this->fd, (const char *) data, size, 0);
|
||||||
::send(this->fd, (const char *) &DATA_STOP, sizeof(DATA_STOP), 0);
|
::send(this->fd, (const char *) &DATA_STOP, sizeof(DATA_STOP), 0);
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ namespace Transmission {
|
|||||||
void pushLzmaData(DataPackets &data);
|
void pushLzmaData(DataPackets &data);
|
||||||
|
|
||||||
/// 实际发送
|
/// 实际发送
|
||||||
virtual void pushData(unsigned char *data, int32_t size) const;
|
virtual void pushData(const unsigned char *data, int32_t size) const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
@@ -59,10 +59,10 @@ namespace Transmission {
|
|||||||
explicit Transmit(SOCKET fd, std::string ip);
|
explicit Transmit(SOCKET fd, std::string ip);
|
||||||
|
|
||||||
/// 收到来自网络的数据
|
/// 收到来自网络的数据
|
||||||
virtual void dataArrives(unsigned char *data, size_t size);
|
virtual void dataArrives(const unsigned char *data, size_t size);
|
||||||
|
|
||||||
/// 发送数据
|
/// 发送数据
|
||||||
virtual void sendData(unsigned char *data, size_t size, int type);
|
virtual void sendData(const unsigned char *data, size_t size, int type);
|
||||||
|
|
||||||
/// 数据包就绪
|
/// 数据包就绪
|
||||||
/// @param type 数据包类型
|
/// @param type 数据包类型
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ public:
|
|||||||
isExec = true;
|
isExec = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void pushData(unsigned char *data, int32_t size) const override {
|
void pushData(const unsigned char *data, int32_t size) const override {
|
||||||
::write(this->fd, &size, sizeof(int32_t));
|
::write(this->fd, &size, sizeof(int32_t));
|
||||||
::write(this->fd, data, size);
|
::write(this->fd, data, size);
|
||||||
::write(this->fd, &DATA_STOP, sizeof(DATA_STOP));
|
::write(this->fd, &DATA_STOP, sizeof(DATA_STOP));
|
||||||
|
|||||||
Reference in New Issue
Block a user