Modified additional field

[platform/upstream/iotivity.git] / service / easy-setup / mediator / richsdk / inc / ESSCCommon.h

diff --git a/service/easy-setup/mediator/richsdk/inc/ESSCCommon.h b/service/easy-setup/mediator/richsdk/inc/ESSCCommon.h
index ff298c2..d52cd26 100644 (file)
--- a/service/easy-setup/mediator/richsdk/inc/ESSCCommon.h
+++ b/service/easy-setup/mediator/richsdk/inc/ESSCCommon.h
@@ -68,9 +68,10 @@ using namespace std;
 #define SC_RSRVD_ES_VENDOR_DEPLOY_ENVIRONMENT   "x.com.samsung.deployenv"
 #define SC_RSRVD_ES_VENDOR_IATT                 "x.com.samsung.iatt"
 #define SC_RSRVD_ES_VENDOR_CANDIDATEAPS         "x.com.samsung.candidateaps"
-#define SC_RSRVD_ES_VENDOR_SSID                 "x.com.samsung.ssid"
-#define SC_RSRVD_ES_VENDOR_PASSPHRASE           "x.com.samsung.passphrase"
-#define SC_RSRVD_ES_VENDOR_CANDIDATE_CHANNEL    "x.com.samsung.channel"
+#define SC_RSRVD_ES_VENDOR_CANDIDATE_SSID       "ssid"
+#define SC_RSRVD_ES_VENDOR_CANDIDATE_PASSPHRASE "passphrase"
+#define SC_RSRVD_ES_VENDOR_CANDIDATE_CHANNEL    "channel"
+#define SC_RSRVD_ES_VENDOR_CANDIDATE_BSSID      "bssid"
 
 namespace OIC
 {
@@ -416,10 +417,10 @@ namespace OIC
                 for (int i=0;i<numCandidateAP;i++)
                 {
                             OCRepresentation candidateListInfo;
-                            candidateListInfo.setValue(SC_RSRVD_ES_VENDOR_BSSID, candidateInfo[i].bssid);
+                            candidateListInfo.setValue(SC_RSRVD_ES_VENDOR_CANDIDATE_BSSID, candidateInfo[i].bssid);
                             candidateListInfo.setValue(SC_RSRVD_ES_VENDOR_CANDIDATE_CHANNEL, candidateInfo[i].channel);
-                            candidateListInfo.setValue(SC_RSRVD_ES_VENDOR_PASSPHRASE, candidateInfo[i].passphrase);
-                            candidateListInfo.setValue(SC_RSRVD_ES_VENDOR_SSID, candidateInfo[i].ssid);
+                            candidateListInfo.setValue(SC_RSRVD_ES_VENDOR_CANDIDATE_PASSPHRASE, candidateInfo[i].passphrase);
+                            candidateListInfo.setValue(SC_RSRVD_ES_VENDOR_CANDIDATE_SSID, candidateInfo[i].ssid);
                             candidateAPList.push_back(candidateListInfo);
                 }
                 m_rep.setValue(SC_RSRVD_ES_VENDOR_CANDIDATEAPS, candidateAPList);
@@ -442,22 +443,22 @@ namespace OIC
                     {
                         OC::OCRepresentation rep = *it;
                         SCCandidateAPInfo candidateInfotemp;
-                        if (rep.hasAttribute(SC_RSRVD_ES_VENDOR_SSID))
+                        if (rep.hasAttribute(SC_RSRVD_ES_VENDOR_CANDIDATE_SSID))
                         {
-                            candidateInfotemp.ssid=rep.getValue<std::string>(SC_RSRVD_ES_VENDOR_SSID);
+                            candidateInfotemp.ssid=rep.getValue<std::string>(SC_RSRVD_ES_VENDOR_CANDIDATE_SSID);
                         }
-                        if (rep.hasAttribute(SC_RSRVD_ES_VENDOR_PASSPHRASE))
+                        if (rep.hasAttribute(SC_RSRVD_ES_VENDOR_CANDIDATE_PASSPHRASE))
                         {
-                            candidateInfotemp.passphrase=rep.getValue<std::string>(SC_RSRVD_ES_VENDOR_PASSPHRASE);
+                            candidateInfotemp.passphrase=rep.getValue<std::string>(SC_RSRVD_ES_VENDOR_CANDIDATE_PASSPHRASE);
                         }
                         if (rep.hasAttribute(SC_RSRVD_ES_VENDOR_CANDIDATE_CHANNEL))
                         {
                             candidateInfotemp.channel=rep.getValue<int>(SC_RSRVD_ES_VENDOR_CANDIDATE_CHANNEL);
 
                         }
-                        if (rep.hasAttribute(SC_RSRVD_ES_VENDOR_BSSID))
+                        if (rep.hasAttribute(SC_RSRVD_ES_VENDOR_CANDIDATE_BSSID))
                         {
-                            candidateInfotemp.bssid=rep.getValue<std::string>(SC_RSRVD_ES_VENDOR_BSSID);
+                            candidateInfotemp.bssid=rep.getValue<std::string>(SC_RSRVD_ES_VENDOR_CANDIDATE_BSSID);
                         }
                         postcandidateInfo.push_back(candidateInfotemp);
                     }
@@ -944,22 +945,22 @@ namespace OIC
                             {
                                 OC::OCRepresentation rep = *it;
                                 SCCandidateAPInfo candidateInfotemp;
-                                if(rep.hasAttribute(SC_RSRVD_ES_VENDOR_SSID))
+                                if(rep.hasAttribute(SC_RSRVD_ES_VENDOR_CANDIDATE_SSID))
                                 {
-                                    candidateInfotemp.ssid=rep.getValue<std::string>(SC_RSRVD_ES_VENDOR_SSID);
+                                    candidateInfotemp.ssid=rep.getValue<std::string>(SC_RSRVD_ES_VENDOR_CANDIDATE_SSID);
                                 }
-                                if(rep.hasAttribute(SC_RSRVD_ES_VENDOR_PASSPHRASE))
+                                if(rep.hasAttribute(SC_RSRVD_ES_VENDOR_CANDIDATE_PASSPHRASE))
                                 {
-                                    candidateInfotemp.passphrase=rep.getValue<std::string>(SC_RSRVD_ES_VENDOR_PASSPHRASE);
+                                    candidateInfotemp.passphrase=rep.getValue<std::string>(SC_RSRVD_ES_VENDOR_CANDIDATE_PASSPHRASE);
                                 }
                                 if(rep.hasAttribute(SC_RSRVD_ES_VENDOR_CANDIDATE_CHANNEL))
                                 {
                                     candidateInfotemp.channel=rep.getValue<int>(SC_RSRVD_ES_VENDOR_CANDIDATE_CHANNEL);
 
                                 }
-                                if(rep.hasAttribute(SC_RSRVD_ES_VENDOR_BSSID))
+                                if(rep.hasAttribute(SC_RSRVD_ES_VENDOR_CANDIDATE_BSSID))
                                 {
-                                    candidateInfotemp.bssid=rep.getValue<std::string>(SC_RSRVD_ES_VENDOR_BSSID);
+                                    candidateInfotemp.bssid=rep.getValue<std::string>(SC_RSRVD_ES_VENDOR_CANDIDATE_BSSID);
                                 }
                                 postcandidateInfo.push_back(candidateInfotemp);
                             }