summaryrefslogtreecommitdiff
path: root/src/DHTInteractionCommand.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2015-06-21 18:04:30 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2015-06-21 19:29:54 +0900
commit318c804504e32b7a0bbdbb35336d2e918000d80a (patch)
treefad396aee04c44a29ee79b33e1675db2275146c0 /src/DHTInteractionCommand.cc
parent8ba9b0474747185708a25943fb6d2f97b3d9b17f (diff)
Use user-defined literal for k, m, and g (powers of 1024)
Diffstat (limited to 'src/DHTInteractionCommand.cc')
-rw-r--r--src/DHTInteractionCommand.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/DHTInteractionCommand.cc b/src/DHTInteractionCommand.cc
index f39c4803..732ba29e 100644
--- a/src/DHTInteractionCommand.cc
+++ b/src/DHTInteractionCommand.cc
@@ -100,10 +100,10 @@ bool DHTInteractionCommand::execute()
std::string remoteAddr;
uint16_t remotePort;
- unsigned char data[64*1024];
+ std::array<unsigned char, 64_k> data;
try {
while(1) {
- ssize_t length = connection_->receiveMessage(data, sizeof(data),
+ ssize_t length = connection_->receiveMessage(data.data(), data.size(),
remoteAddr, remotePort);
if(length <= 0) {
break;
@@ -111,11 +111,11 @@ bool DHTInteractionCommand::execute()
if(data[0] == 'd') {
// udp tracker response does not start with 'd', so assume
// this message belongs to DHT. nothrow.
- receiver_->receiveMessage(remoteAddr, remotePort, data, length);
+ receiver_->receiveMessage(remoteAddr, remotePort, data.data(), length);
} else {
// this may be udp tracker response. nothrow.
- udpTrackerClient_->receiveReply(data, length, remoteAddr, remotePort,
- global::wallclock());
+ udpTrackerClient_->receiveReply(data.data(), length, remoteAddr,
+ remotePort, global::wallclock());
}
}
} catch(RecoverableException& e) {
@@ -126,7 +126,7 @@ bool DHTInteractionCommand::execute()
dispatcher_->sendMessages();
while(!udpTrackerClient_->getPendingRequests().empty()) {
// no throw
- ssize_t length = udpTrackerClient_->createRequest(data, sizeof(data),
+ ssize_t length = udpTrackerClient_->createRequest(data.data(), data.size(),
remoteAddr, remotePort,
global::wallclock());
if(length == -1) {
@@ -134,7 +134,7 @@ bool DHTInteractionCommand::execute()
}
try {
// throw
- connection_->sendMessage(data, length, remoteAddr, remotePort);
+ connection_->sendMessage(data.data(), length, remoteAddr, remotePort);
udpTrackerClient_->requestSent(global::wallclock());
} catch(RecoverableException& e) {
A2_LOG_INFO_EX("Exception thrown while sending UDP tracker request.", e);