Fix build break

Signed-off-by: hyunho <hhstark.kang@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b79e033087e870cdc83c6004ae5fa2120eff553d..aa012fb1d0598328ce7e99dd0484da4300600688 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ PKG_CHECK_MODULES(VINE_DEPS REQUIRED vine)
 
 ADD_SUBDIRECTORY(cion)
 #ADD_SUBDIRECTORY(cion-service)
-#ADD_SUBDIRECTORY(vine_wrapper)
+ADD_SUBDIRECTORY(vine_wrapper)
 ADD_SUBDIRECTORY(vine_manager)
 
 IF(NOT DEFINED MINIMUM_BUILD)

diff --git a/cion/channel/server_channel.cc b/cion/channel/server_channel.cc
index 60b78dd4ae57e0328f10953f17d6ab60fea6e061..e866fc4a6df15d652345eb5851c65f399e60996a 100755 (executable)
--- a/cion/channel/server_channel.cc
+++ b/cion/channel/server_channel.cc
@@ -48,11 +48,11 @@ ServerChannel::Impl::Impl(ServerChannel* parent, std::string service_name,
 }
 
 void ServerChannel::Listen() {
-  impl_->listener_->RegisteObserver(this);
+  impl_->listener_->RegisterObserver(this);
 }
 
 void ServerChannel::Stop() {
-  impl_->listener_->UnregisteObserver(this);
+  impl_->listener_->UnregisterObserver(this);
 }
 
 void ServerChannel::Disconnect(PeerInfo peer) {

diff --git a/packaging/cion.spec b/packaging/cion.spec
index 55ef73dcd563f1db879983e4931661acfb6f66a6..cb07e23648c830de1adf9fb955ecaa422a0c26f1 100644 (file)
--- a/packaging/cion.spec
+++ b/packaging/cion.spec
@@ -231,10 +231,10 @@ install -m 0644 cion.zip %{buildroot}%{_datadir}/gcov/
 %manifest %{name}.manifest
 %license LICENSE
 %defattr(-,root,root,-)
-#%{_libdir}/libvine_wrapper.so.*
-#%{_includedir}/vine_wrapper/*.hh
-#%{_libdir}/libvine_wrapper.so
-#%{_libdir}/pkgconfig/vine_wrapper.pc
+%{_libdir}/libvine_wrapper.so.*
+%{_includedir}/vine_wrapper/*.hh
+%{_libdir}/libvine_wrapper.so
+%{_libdir}/pkgconfig/vine_wrapper.pc
 
 #################################################
 # unittests

diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index fff09a112a538624fa4678429cd7d21f32021973..3b4bb638800598f37bfc082bfa53805e33dc9d25 100644 (file)
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -1,10 +1,10 @@
-#AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../vine_wrapper VINE_WRAPPER_SOURCE)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../vine_wrapper VINE_WRAPPER_SOURCE)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCES)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/mock MOCK_SRCS)
 ADD_EXECUTABLE(${TARGET_CION_UNITTESTS}
     ${SOURCES}
     ${MOCK_SRCS}
-    #${VINE_WRAPPER_SOURCE}
+    ${VINE_WRAPPER_SOURCE}
 )
 
 TARGET_INCLUDE_DIRECTORIES(${TARGET_CION_UNITTESTS} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../)

diff --git a/vine_manager/CMakeLists.txt b/vine_manager/CMakeLists.txt
index 253a36dade09abf125413dbffac0cb6ac27bb8f6..e490cf6aed8e72c21d1fbe833c04504d7192fe24 100644 (file)
--- a/vine_manager/CMakeLists.txt
+++ b/vine_manager/CMakeLists.txt
@@ -4,7 +4,7 @@ ADD_LIBRARY(${TARGET_VINE_MANAGER} SHARED ${SOURCES})
 TARGET_INCLUDE_DIRECTORIES(${TARGET_VINE_MANAGER} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/)
 TARGET_INCLUDE_DIRECTORIES(${TARGET_VINE_MANAGER} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../)
 
-APPLY_PKG_CONFIG(${TARGET_VINE_MANAGER} PUBLIC DLOG_DEPS VINE_DEPS)
+APPLY_PKG_CONFIG(${TARGET_VINE_MANAGER} PUBLIC DLOG_DEPS VINE_DEPS GLIB_DEPS)
 
 SET_TARGET_PROPERTIES(${TARGET_VINE_MANAGER} PROPERTIES VERSION ${FULLVER})
 SET_TARGET_PROPERTIES(${TARGET_VINE_MANAGER} PROPERTIES SOVERSION ${MAJORVER})

diff --git a/vine_manager/vine_sender.cc b/vine_manager/vine_sender.cc
index 1e6e0ff45452d84c95e6fbeb7add7f3dad669fcf..81e5a63ce8a617c159580b0e71ac1b54ca59d0b0 100644 (file)
--- a/vine_manager/vine_sender.cc
+++ b/vine_manager/vine_sender.cc
@@ -34,9 +34,6 @@ VineSender::Impl::Impl() {
   port_ = 0;
 }
 
-VineSender::Impl::~Impl() {
-}
-
 void VineSender::SendDataAsync(std::vector<char> serialized_payload,
     channel::IDataInfo info, std::shared_ptr<PeerInfo> peer_info) {
 }

diff --git a/vine_wrapper/vine.hh b/vine_wrapper/vine.hh
index 5375db9e30707d0667e179a6e26d1727984c8e7b..bc672781a3ed6c7e77508134c47064c79e2f1fef 100644 (file)
--- a/vine_wrapper/vine.hh
+++ b/vine_wrapper/vine.hh
@@ -86,7 +86,7 @@ class Vine {
       vine_address_family_e address_family;
       pair<AddressFamily, string> ip_pair;
 
-      vine_service_get_ip(service_, &address_family, &ip);
+      //vine_service_get_ip(service_, &address_family, &ip);
 
       ip_pair.first = static_cast<AddressFamily>(address_family);
       ip_pair.second = string(ip);
@@ -337,7 +337,7 @@ class Vine {
     }
 
     void Listen() {
-      vine_dp_listen(dp_);
+      //vine_dp_listen(dp_);
     }
 
     void SetAddressFamily(VineService::AddressFamily addr_family) {
@@ -366,13 +366,13 @@ class Vine {
       vine_dp_unset_accepted_cb(dp_);
     }
 
-    void Connect(vine_dp_connected_cb cb, void* user_data) {
+    /*void Connect(vine_dp_connected_cb cb, void* user_data) {
       vine_dp_connect(dp_, cb, user_data);
     }
 
     void Join(vine_dp_joined_cb cb, void* user_data) {
       vine_dp_join(dp_, cb, user_data);
-    }
+    }*/
 
     void SetTerminatedCallback(vine_dp_terminated_cb cb, void* user_data) {
       vine_dp_set_terminated_cb(dp_, cb, user_data);