First sucessfull comunication

[mnenc] / mnencd.cpp

diff --git a/mnencd.cpp b/mnencd.cpp
index b419432..68be9a5 100644 (file)
--- a/mnencd.cpp
+++ b/mnencd.cpp
@@ -40,63 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <iostream>
 #include "mnenc.hpp"
 #include "password.hpp"
-
-std::string remove_char(std::string str, char c) {
-       std::string::size_type k = 0;
-       while((k=str.find(c,k))!=str.npos) {
-               str.erase(k, 1);
-       }
-       return str;
-}
-
-std::string remove_chars(std::string str) {
-       std::string chars = " \t\n\b\a-?+\\{[]}'*'";
-       for(int i = 0; i < (signed) chars.size(); i++) {
-               str = remove_char(str, chars[i]);
-       }
-       
-       return str;     
-}
-
-std::string make_filename(std::string user, std::string app) {
-       return remove_chars(app + user);
-}
-std::string get_password(std::string masterpasswd, std::string user, std::string app) {
-       mnenc menc = mnenc();
-       menc.genkey(masterpasswd);
-       std::string key = menc.get_key();
-       password pw = password("", "", key);
-       pw.from_file(make_filename(user, app));
-       return menc.decrypt(key, pw.get_enc());
-}
-
-void put_password(std::string masterpasswd, std::string passwd, std::string user, std::string app) {
-       mnenc menc = mnenc();
-       menc.genkey(masterpasswd);
-       std::string key = menc.get_key();
-       password pw = password(menc.encrypt(key, passwd ), "", key);
-       pw.to_file(make_filename(user, app));
-}
-
-std::string do_something(std::string str) {
-       //Nothing here yet
-       return "Blahonga";
-}
-
-std::string m_read() {
-       std::string str;
-       std::ifstream is("fife");
-       getline(is, str);
-       is.close();
-       return str;
-}
-
-void m_send(std::string message) {
-       std::ofstream os("fife");
-       os << message;
-       os.close();
-}
-
+#include "mnencd.hpp"
 
 int main(int argc, char** argv) {
        /* Our process ID and Session ID */
@@ -142,7 +86,9 @@ int main(int argc, char** argv) {
 
        /* The Big Loop */
        while (1) {
-               m_send(do_something(m_read()));
+               std::string request = m_read();
+               std::string reply = do_something(request);
+               m_send(reply);
                sleep(1); /* wait 1 second*/
        }
        unlink("fife");