{
namespace Service
{
-#define HOSTING_LOG_TAG PCF("Hosting")
-#define OIC_HOSTING_LOG(level, tag, ...) OCLogv((level), (HOSTING_LOG_TAG), __VA_ARGS__)
+
+void OIC_HOSTING_LOG(LogLevel level, const char * format, ...)
+{
+ if (!format)
+ {
+ return;
+ }
+ char buffer[MAX_LOG_V_BUFFER_SIZE] = {};
+ va_list args;
+ va_start(args, format);
+ vsnprintf(buffer, sizeof buffer - 1, format, args);
+ va_end(args);
+ OCLog(level, PCF("Hosting"), buffer);
+}
HostingObject::HostingObject()
: remoteObject(nullptr), mirroredServer(nullptr),
namespace Service
{
-#define HOSTING_TAG "/hosting"
-#define HOSTING_TAG_SIZE ((size_t)8)
-#define HOSTING_LOG_TAG PCF("Hosting")
-#define OIC_HOSTING_LOG(level, tag, ...) OCLogv((level), (HOSTING_LOG_TAG), __VA_ARGS__)
-
namespace
{
+ std::string HOSTING_TAG = "/hosting";
+ size_t HOSTING_TAG_SIZE = (size_t)HOSTING_TAG.size();
std::string MULTICAST_PRESENCE_ADDRESS = std::string("coap://") + OC_MULTICAST_PREFIX;
std::string HOSTING_RESOURSE_TYPE = "Resource.Hosting";
}
#include "octypes.h"
#include "logger.h"
#include "ResourceHosting.h"
-
-namespace
-{
- #define OC_TRANSPORT CT_ADAPTER_IP
- #define HOSTING_TAG PCF("Hosting")
- #define OIC_HOSTING_LOG(level, tag, ...) OCLogv((level), (HOSTING_TAG), __VA_ARGS__)
- OIC::Service::ResourceHosting * rhInstance = OIC::Service::ResourceHosting::getInstance();
-}
+#include "HostingObject.h"
OCStackResult OICStartCoordinate()
{
+ using namespace OIC::Service;
OCStackResult retResult = OC_STACK_OK;
try
{
- rhInstance->startHosting();
- }catch(OIC::Service::PlatformException &e)
+ ResourceHosting::getInstance()->startHosting();
+ }catch(PlatformException &e)
{
- OIC_HOSTING_LOG(DEBUG, "[OICStartCoordinate] platformException, reason:%s", e.what());
+ OIC_HOSTING_LOG(DEBUG,
+ "[OICStartCoordinate] platformException, reason:%s", e.what());
retResult = OC_STACK_ERROR;
throw;
- }catch(OIC::Service::InvalidParameterException &e)
+ }catch(InvalidParameterException &e)
{
OIC_HOSTING_LOG(DEBUG,
"[OICStartCoordinate] InvalidParameterException, reason:%s", e.what());
throw;
}catch(...)
{
- OIC_HOSTING_LOG(DEBUG, "[OICStartCoordinate] Unknown Exception", "");
+ OIC_HOSTING_LOG(DEBUG, "[OICStartCoordinate] Unknown Exception");
retResult = OC_STACK_ERROR;
}
OCStackResult OICStopCoordinate()
{
OCStackResult retResult = OC_STACK_OK;
- rhInstance->stopHosting();
+ OIC::Service::ResourceHosting::getInstance()->stopHosting();
return retResult;
}