C++ samples select Correct Adapter Type

Previously we were allowing the user to select between
IPv4 and IPv6 which is wrong since the stack is supposed
to make this decision by itself. This fixes IOT-621

Change-Id: If8f1c125f739696d33d6fef211a9a9033ec63f45
Signed-off-by: Omkar Hegde <omkar.m.hegde@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1771
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/resource/examples/devicediscoveryclient.cpp b/resource/examples/devicediscoveryclient.cpp
index dded9ae..25250d3 100644 (file)
--- a/resource/examples/devicediscoveryclient.cpp
+++ b/resource/examples/devicediscoveryclient.cpp
@@ -36,8 +36,7 @@ static void printUsage()
 {
     std::cout << "Usage devicediscoveryclient <0|1>" << std::endl;
     std::cout << "connectivityType: Default IP" << std::endl;
-    std::cout << "connectivityType 0: IPv4" << std::endl;
-    std::cout << "connectivityType 1: IPv6 (Currently not supported !)" << std::endl;
+    std::cout << "connectivityType 0: IP" << std::endl;
 }
 //Callback after device information is received
 void receivedPlatformInfo(const OCRepresentation& rep)
@@ -111,16 +110,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_ADAPTER_IP;
+                    std::cout << "Using IP."<< std::endl;
+                    connectivityType = CT_ADAPTER_IP;
                 }
                 else
                 {

diff --git a/resource/examples/fridgeclient.cpp b/resource/examples/fridgeclient.cpp
index f561f58..44ad16e 100644 (file)
--- a/resource/examples/fridgeclient.cpp
+++ b/resource/examples/fridgeclient.cpp
@@ -42,8 +42,7 @@ static void printUsage()
 {
     std::cout << "Usage: fridgeclient <0|1>" <<std::endl;
     std::cout << "connectivityType: Default IP" << std::endl;
-    std::cout << "connectivityType 0: IPv4" << std::endl;
-    std::cout << "connectivityType 1: IPv6 (Currently Not Supported)" << std::endl;
+    std::cout << "connectivityType 0: IP" << std::endl;
 }
 class ClientFridge
 {
@@ -286,16 +285,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
                 {

diff --git a/resource/examples/garageclient.cpp b/resource/examples/garageclient.cpp
index 6cb9ab3..5a5af3f 100644 (file)
--- a/resource/examples/garageclient.cpp
+++ b/resource/examples/garageclient.cpp
@@ -38,8 +38,7 @@ static void printUsage()
 {
     std::cout<<"Usage: garageclient <0|1> \n";
     std::cout<<"ConnectivityType: Default IP\n";
-    std::cout<<"ConnectivityType 0: IPv4 \n";
-    std::cout<<"ConnectivityType 1: IPv6 \n";
+    std::cout<<"ConnectivityType 0: IP \n";
 }
 
 class Garage
@@ -309,16 +308,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
                 {

diff --git a/resource/examples/groupserver.cpp b/resource/examples/groupserver.cpp
index 8e57517..fd32467 100644 (file)
--- 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)
 {
@@ -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
                 {

diff --git a/resource/examples/presenceclient.cpp b/resource/examples/presenceclient.cpp
index ff39bfb..3755b57 100644 (file)
--- a/resource/examples/presenceclient.cpp
+++ b/resource/examples/presenceclient.cpp
@@ -63,9 +63,8 @@ void printUsage()
               << std::endl;
     std::cout << "-t 6 : Discover Resources and Initiate Multicast Presence with two Filters"
             << std::endl;
-    std::cout<<"ConnectivityType: Default IPv4" << std::endl;
-    std::cout << "-c 0 : Send message with IPv4" << std::endl;
-    std::cout << "-c 1 : Send message with IPv6 (Currently Not Supported)" << std::endl;
+    std::cout<<"ConnectivityType: Default IP" << std::endl;
+    std::cout << "-c 0 : Send message with IP" << std::endl;
 }
 
 // Callback to presence
@@ -221,16 +220,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
                         {

diff --git a/resource/examples/roomclient.cpp b/resource/examples/roomclient.cpp
index 5f8acbf..2765dfe 100644 (file)
--- a/resource/examples/roomclient.cpp
+++ b/resource/examples/roomclient.cpp
@@ -45,8 +45,7 @@ static void printUsage()
 {
     std::cout << "Usage roomclient <0|1>" << std::endl;
     std::cout<<"connectivityType: Default" << std::endl;
-    std::cout << "connectivityType 0: IPv4" << std::endl;
-    std::cout << "connectivityType 0: IPv46 (Currently Not Supported)" << std::endl;
+    std::cout << "connectivityType 0: IP" << std::endl;
 }
 // Forward declaration
 void putRoomRepresentation(std::shared_ptr<OCResource> resource);
@@ -242,16 +241,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
                 {

diff --git a/resource/examples/simpleclientHQ.cpp b/resource/examples/simpleclientHQ.cpp
index 44c3b23..e4d2f0b 100644 (file)
--- a/resource/examples/simpleclientHQ.cpp
+++ b/resource/examples/simpleclientHQ.cpp
@@ -374,8 +374,7 @@ void PrintUsage()
     std::cout << "   ObserveType : 1 - Observe" << std::endl;
     std::cout << "   ObserveType : 2 - ObserveAll" << std::endl;
     std::cout << "   ConnectivityType: Default IP" << std::endl;
-    std::cout << "   ConnectivityType : 0 - IPv4"<< std::endl;
-    std::cout << "   ConnectivityType : 0 - IPv6 (Current Not Supported )"<< std::endl;
+    std::cout << "   ConnectivityType : 0 - IP"<< std::endl;
 }
 
 int main(int argc, char* argv[]) {
@@ -408,16 +407,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
                     {

diff --git a/resource/examples/simpleclientserver.cpp b/resource/examples/simpleclientserver.cpp
index 44b3fb5..7ed7576 100644 (file)
--- a/resource/examples/simpleclientserver.cpp
+++ b/resource/examples/simpleclientserver.cpp
@@ -37,8 +37,7 @@ static void printUsage()
 {
     std::cout<< "    Usage simpleclientserver <0|1>" << std::endl;
     std::cout<< "    ConnectivityType: Default IP" << std::endl;
-    std::cout << "   ConnectivityType : 0 - IPv4" << std::endl;
-    std::cout << "   ConnectivityType : 1 - IPv6 (Currently Not Supported)" << std::endl;
+    std::cout << "   ConnectivityType : 0 - IP" << std::endl;
 }
 
 class ClientWorker
@@ -316,16 +315,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
                 {