From 88fb8a217de9a92a66c8469628876cd13466bc7f Mon Sep 17 00:00:00 2001 From: Meeh Date: Mon, 27 Oct 2014 22:53:01 +0100 Subject: [PATCH] Fix for build error in msvc12 --- SAM.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/SAM.cpp b/SAM.cpp index 4b96fd26..45bb515f 100644 --- a/SAM.cpp +++ b/SAM.cpp @@ -1,5 +1,8 @@ #include #include +#ifdef _MSC_VER +#include +#endif #include #include "base64.h" #include "Identity.h" @@ -255,7 +258,11 @@ namespace client size_t l = m_Session->localDestination->GetPrivateKeys ().ToBuffer (buf, 1024); size_t l1 = i2p::data::ByteStreamToBase64 (buf, l, priv, 1024); priv[l1] = 0; +#ifdef _MSC_VER + size_t l2 = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_SESSION_CREATE_REPLY_OK, priv); +#else size_t l2 = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_SESSION_CREATE_REPLY_OK, priv); +#endif SendMessageReply (m_Buffer, l2, false); } @@ -326,7 +333,11 @@ namespace client else { LogPrint ("SAM name destination not found"); +#ifdef _MSC_VER + size_t len = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_NAMING_REPLY_KEY_NOT_FOUND, (ident.ToBase32 () + ".b32.i2p").c_str ()); +#else size_t len = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_NAMING_REPLY_KEY_NOT_FOUND, (ident.ToBase32 () + ".b32.i2p").c_str ()); +#endif SendMessageReply (m_Buffer, len, false); } } @@ -373,7 +384,11 @@ namespace client l = localDestination->GetIdentity ().ToBuffer (buf, 1024); l1 = i2p::data::ByteStreamToBase64 (buf, l, pub, 1024); pub[l1] = 0; +#ifdef _MSC_VER + size_t len = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_DEST_REPLY, pub, priv); +#else size_t len = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_DEST_REPLY, pub, priv); +#endif SendMessageReply (m_Buffer, len, true); } else @@ -404,7 +419,11 @@ namespace client } else { +#ifdef _MSC_VER + size_t len = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_NAMING_REPLY_INVALID_KEY, name.c_str()); +#else size_t len = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_NAMING_REPLY_INVALID_KEY, name.c_str()); +#endif SendMessageReply (m_Buffer, len, false); } } @@ -417,7 +436,11 @@ namespace client size_t l = identity.ToBuffer (buf, 1024); size_t l1 = i2p::data::ByteStreamToBase64 (buf, l, pub, 1024); pub[l1] = 0; +#ifdef _MSC_VER + size_t l2 = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_NAMING_REPLY, pub); +#else size_t l2 = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_NAMING_REPLY, pub); +#endif SendMessageReply (m_Buffer, l2, false); }