diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-04-24 16:48:48 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-04-24 16:48:48 -0700 |
| commit | 0f808e11df8646e82eb3e178896dc8d88f8d79d3 (patch) | |
| tree | a09e8c27911f73e65ab2ec0ef0068d143d89a72c /node/IncomingPacket.cpp | |
| parent | 1a65a79e57521a0d20d6a2c6d18ab8cf169fcd50 (diff) | |
| parent | ce09e363dc95d801e8707a29a0d585089d6c3d09 (diff) | |
| download | infinitytier-0f808e11df8646e82eb3e178896dc8d88f8d79d3.tar.gz infinitytier-0f808e11df8646e82eb3e178896dc8d88f8d79d3.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/IncomingPacket.cpp')
| -rw-r--r-- | node/IncomingPacket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp index 5397d51c..a8d564bb 100644 --- a/node/IncomingPacket.cpp +++ b/node/IncomingPacket.cpp @@ -685,7 +685,7 @@ bool IncomingPacket::_doNETWORK_CONFIG_REQUEST(const RuntimeEnvironment *RR,cons outp.append(pid); outp.append(nwid); outp.append((uint16_t)netconfStr.length()); - outp.append(netconfStr.data(),netconfStr.length()); + outp.append(netconfStr.data(),(unsigned int)netconfStr.length()); outp.compress(); if (outp.size() > ZT_PROTO_MAX_PACKET_LENGTH) { TRACE("NETWORK_CONFIG_REQUEST failed: internal error: netconf size %u is too large",(unsigned int)netconfStr.length()); |