Browse Source

Minor omissions

* Missing UPnP namespace
* Public key pointer dereferencing for MSVC
* Redundant WIN32_LEAN_AND_MEAN found in Makefile.mingw as well
pull/294/head
Mikhail Titov 9 years ago
parent
commit
88db99e593
  1. 2
      Daemon.cpp
  2. 2
      SAM.cpp
  3. 1
      Win32/Win32Service.h

2
Daemon.cpp

@ -39,7 +39,7 @@ namespace i2p
std::unique_ptr<i2p::client::I2PControlService> m_I2PControlService; std::unique_ptr<i2p::client::I2PControlService> m_I2PControlService;
#ifdef USE_UPNP #ifdef USE_UPNP
UPnP m_UPnP; i2p::transport::UPnP m_UPnP;
#endif #endif
}; };

2
SAM.cpp

@ -450,7 +450,7 @@ namespace client
auto keys = i2p::data::PrivateKeys::CreateRandomKeys (); auto keys = i2p::data::PrivateKeys::CreateRandomKeys ();
#ifdef _MSC_VER #ifdef _MSC_VER
size_t len = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_DEST_REPLY, size_t len = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_DEST_REPLY,
keys.GetPublic ().ToBase64 ().c_str (), keys.ToBase64 ().c_str ()); keys.GetPublic ()->ToBase64 ().c_str (), keys.ToBase64 ().c_str ());
#else #else
size_t len = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_DEST_REPLY, size_t len = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_DEST_REPLY,
keys.GetPublic ()->ToBase64 ().c_str (), keys.ToBase64 ().c_str ()); keys.GetPublic ()->ToBase64 ().c_str (), keys.ToBase64 ().c_str ());

1
Win32/Win32Service.h

@ -2,7 +2,6 @@
#define WIN_32_SERVICE_H__ #define WIN_32_SERVICE_H__
#include <thread> #include <thread>
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>

Loading…
Cancel
Save