Simplify network.cpp to transmit only strings.

2011-08-05 19:44:34 -04:00
parent bffc099754
commit 1b3443befd
10 changed files with 211 additions and 197 deletions
@@ -3,63 +3,68 @@

 #include "ae.hpp"
 #include <string>
+#include <string.h>

 using namespace std;

-class CryptoException {
-public:
-  string text;
-  CryptoException( string s_text ) : text( s_text ) {};
-};
+long int myatoi( char *str );

-class Base64Key {
-private:
-  unsigned char key[ 16 ];
+namespace Crypto {
+  class CryptoException {
+  public:
+    string text;
+    CryptoException( string s_text ) : text( s_text ) {};
+  };

-public:
-  Base64Key(); /* random key */
-  Base64Key( string printable_key );
-  string printable_key( void );
-  unsigned char *data( void ) { return key; }
-};
+  class Base64Key {
+  private:
+    unsigned char key[ 16 ];

-class Nonce {
-private:
-  char bytes[ 12 ];
+  public:
+    Base64Key(); /* random key */
+    Base64Key( string printable_key );
+    string printable_key( void );
+    unsigned char *data( void ) { return key; }
+  };

-public:
-  Nonce( uint64_t val );
-  Nonce( char *s_bytes, size_t len );
+  class Nonce {
+  private:
+    char bytes[ 12 ];

-  string cpp_str( void ) { return string( (char *)( bytes + 4 ), 8 ); }
-  char *data( void ) { return bytes; }
-  uint64_t val( void );
-};
-
-class Message {
-public:
-  Nonce nonce;
-  string text;
-
-  Message( char *nonce_bytes, size_t nonce_len,
-	   char *text_bytes, size_t text_len );
-  Message( Nonce s_nonce, string s_text );
-};
-
-class Session {
-private:
-  Base64Key key;
-  ae_ctx *ctx;
-
-public:
-  Session( Base64Key s_key );
-  ~Session();
-
-  string encrypt( Message plaintext );
-  Message decrypt( string ciphertext );
-
-  Session( const Session & );
-  Session & operator=( const Session & );
-};
+  public:
+    Nonce( uint64_t val );
+    Nonce( char *s_bytes, size_t len );
+    
+    string cpp_str( void ) { return string( (char *)( bytes + 4 ), 8 ); }
+    char *data( void ) { return bytes; }
+    uint64_t val( void );
+  };
+  
+  class Message {
+  public:
+    Nonce nonce;
+    string text;
+    
+    Message( char *nonce_bytes, size_t nonce_len,
+	     char *text_bytes, size_t text_len );
+    Message( Nonce s_nonce, string s_text );
+  };
+  
+  class Session {
+  private:
+    Base64Key key;
+    ae_ctx *ctx;
+    
+  public:
+    Session( Base64Key s_key );
+    ~Session();
+    
+    string encrypt( Message plaintext );
+    Message decrypt( string ciphertext );
+    
+    Session( const Session & );
+    Session & operator=( const Session & );
+  };
+}

 #endif