diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-05-22 20:57:33 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-05-22 20:57:33 +0900 |
| commit | 9d40c47799bbec12bb02f7579736fbc1fcc35c08 (patch) | |
| tree | 0ef02a9f17d6550667aa745829ff5146b1ccf6a6 /src/BtHandshakeMessage.cc | |
| parent | 9727b5b256bb12cff42e6aa230ba2020a933562f (diff) | |
| parent | 0b906f40f1204e79cb43af3867468ab02a371075 (diff) | |
Merge branch 'master' into dynamic-select-file
Diffstat (limited to 'src/BtHandshakeMessage.cc')
| -rw-r--r-- | src/BtHandshakeMessage.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/BtHandshakeMessage.cc b/src/BtHandshakeMessage.cc index 95f99e0d..ce6023e7 100644 --- a/src/BtHandshakeMessage.cc +++ b/src/BtHandshakeMessage.cc @@ -81,10 +81,10 @@ BtHandshakeMessage::create(const unsigned char* data, size_t dataLength) return msg; } -unsigned char* BtHandshakeMessage::createMessage() +std::vector<unsigned char> BtHandshakeMessage::createMessage() { - auto msg = new unsigned char[MESSAGE_LENGTH]; - auto dst = msg; + auto msg = std::vector<unsigned char>(MESSAGE_LENGTH); + auto dst = msg.data(); *dst++ = pstrlen_; dst = std::copy(std::begin(pstr_), std::end(pstr_), dst); dst = std::copy(std::begin(reserved_), std::end(reserved_), dst); @@ -93,8 +93,6 @@ unsigned char* BtHandshakeMessage::createMessage() return msg; } -size_t BtHandshakeMessage::getMessageLength() { return MESSAGE_LENGTH; } - std::string BtHandshakeMessage::toString() const { return fmt("%s peerId=%s, reserved=%s", NAME, |