Update snapshot(2017-12-14)

[platform/upstream/iotivity.git] / resource / examples / groupserver.cpp

diff --git a/resource/examples/groupserver.cpp b/resource/examples/groupserver.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 8e57517..f4b5e4d
--- a/resource/examples/groupserver.cpp
+++ b/resource/examples/groupserver.cpp
@@ -37,8 +37,7 @@ static void printUsage()
 {
     std::cout<<"Usage: groupclient <0|1>\n";
     std::cout<<"ConnectivityType: Default \n";
-    std::cout<<"ConnectivityType 0: IPv4\n";
-    std::cout<<"ConnectivityType 1: IPv6\n";
+    std::cout<<"ConnectivityType 0: IP\n";
 }
 void foundResource(std::shared_ptr< OCResource > resource)
 {
@@ -61,7 +60,7 @@ void foundResource(std::shared_ptr< OCResource > resource)
             cout << "\tResource Type : " << resource->getResourceTypes().front() << endl;
             if (resourceURI == "/a/light" || resourceURI == "/a/fan")
             {
-                OCResourceHandle foundResourceHandle;
+                OCResourceHandle foundResourceHandle = nullptr;
                 OCStackResult result = OCPlatform::registerResource(foundResourceHandle, resource);
                 cout << "\tresource registed!" << endl;
                 if (result == OC_STACK_OK)
@@ -100,16 +99,8 @@ int main(int argc, char* argv[])
             {
                 if(optionSelected == 0)
                 {
-                    std::cout << "Using IPv4."<< std::endl;
-                    connectivityType = CT_IP_USE_V4;
-                }
-                else if(optionSelected == 1)
-                {
-                    std::cout << "IPv6 is currently not supported."<< std::endl;
-                    printUsage();
-                    return -1;
-                    //TODO: printUsage to be removed when IPv6 is available.
-                    //connectivityType = CT_IP_USE_V6;
+                    std::cout << "Using IP."<< std::endl;
+                    connectivityType = CT_ADAPTER_IP;
                 }
                 else
                 {
@@ -121,7 +112,7 @@ int main(int argc, char* argv[])
                 std::cout << "Invalid connectivity type selected. Using default IP" << std::endl;
             }
         }
-        catch(exception& e)
+        catch(exception&)
         {
             std::cout << "Invalid input argument. Using IP as connectivity type" << std::endl;
         }