diff options
| author | Sachin Agrawal <sachin.agrawal@intel.com> | 2015-02-19 10:01:30 -0800 |
|---|---|---|
| committer | Sudarshan Prasad <sudarshan.prasad@intel.com> | 2015-02-19 23:19:34 +0000 |
| commit | ecaf6a8df05eaa08400ae39a48c7bfe8634c5891 (patch) | |
| tree | ecbf5949922926c33da90cfe57791ca95d816d3e /resource/src | |
| parent | ce28a756da6d78a83d4693966487f080e2a2144e (diff) | |
| download | iotivity-ecaf6a8df05eaa08400ae39a48c7bfe8634c5891.tar.gz iotivity-ecaf6a8df05eaa08400ae39a48c7bfe8634c5891.tar.bz2 iotivity-ecaf6a8df05eaa08400ae39a48c7bfe8634c5891.zip | |
Removed ocsocket
Removed obsolete ocsocket layer.
Moved OCDevAddr and helper functions to ocstack.
Note: OCDevAddr should be replaced in future (after CA merge).
Change-Id: I289232e12178fdc0c6ab1c5eeddc98c2f5e37531
Signed-off-by: Yuliya Kamatkova <yuliya.kamatkova@intel.com>
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/334
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Habteab Yemane <habteab.l.yemane@intel.com>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Diffstat (limited to 'resource/src')
| -rw-r--r-- | resource/src/InProcClientWrapper.cpp | 12 | ||||
| -rw-r--r-- | resource/src/SConscript | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/resource/src/InProcClientWrapper.cpp b/resource/src/InProcClientWrapper.cpp index 97fe351e6..339875c4e 100644 --- a/resource/src/InProcClientWrapper.cpp +++ b/resource/src/InProcClientWrapper.cpp @@ -699,14 +699,18 @@ namespace OC OCStackApplicationResult subscribePresenceCallback(void* ctx, OCDoHandle handle, OCClientResponse* clientResponse) { - char stringAddress[DEV_ADDR_SIZE_MAX]; ostringstream os; uint16_t port; + uint8_t a; + uint8_t b; + uint8_t c; + uint8_t d; - if(OCDevAddrToString(clientResponse->addr, stringAddress) == 0 && + if(OCDevAddrToIPv4Addr(clientResponse->addr, &a, &b, &c, &d) == 0 && OCDevAddrToPort(clientResponse->addr, &port) == 0) { - os<<stringAddress<<":"<<port; + os<<static_cast<int>(a)<<"."<<static_cast<int>(b)<<"."<<static_cast<int>(c) + <<"."<<static_cast<int>(d)<<":"<<static_cast<int>(port); ClientCallbackContext::SubscribePresenceContext* context = static_cast<ClientCallbackContext::SubscribePresenceContext*>(ctx); @@ -718,7 +722,7 @@ namespace OC } else { - oclog() << "subscribePresenceCallback(): OCDevAddrToString() or OCDevAddrToPort() " + oclog() << "subscribePresenceCallback(): OCDevAddrToIPv4Addr() or OCDevAddrToPort() " <<"failed"<< std::flush; } return OC_STACK_KEEP_TRANSACTION; diff --git a/resource/src/SConscript b/resource/src/SConscript index e1fe71216..e76c4e4d7 100644 --- a/resource/src/SConscript +++ b/resource/src/SConscript @@ -14,7 +14,6 @@ oclib_env = lib_env.Clone() oclib_env.AppendUnique(CPPPATH = [ '../include/', '../csdk/stack/include', - '../csdk/ocsocket/include', '../csdk/ocrandom/include', '../csdk/logger/include', '../oc_logger/include', |