fmt: Whitespace

[cassiopeia.git] / src / apps / signer.cpp

diff --git a/src/apps/signer.cpp b/src/apps/signer.cpp
index 1e1a5894fc59e6da66384ab1c714c7a3196100dd..b607b9cd949152b8b13affce75fb96bb0f91614e 100644 (file)
--- a/src/apps/signer.cpp
+++ b/src/apps/signer.cpp
@@ -2,16 +2,16 @@
 #include <fstream>
 #include <streambuf>
 
-#include "database.h"
-#include "mysql.h"
-#include "simpleOpensslSigner.h"
+#include "db/database.h"
+#include "db/mysql.h"
+#include "crypto/simpleOpensslSigner.h"
+#include "crypto/remoteSigner.h"
+#include "crypto/sslUtil.h"
+#include "io/bios.h"
+#include "io/slipBio.h"
+#include "io/recordHandler.h"
 #include "util.h"
-#include "bios.h"
-#include "slipBio.h"
-#include "remoteSigner.h"
-#include "sslUtil.h"
 #include "config.h"
-#include "recordHandler.h"
 
 #ifdef NO_DAEMON
 #define DAEMON false
@@ -19,10 +19,7 @@
 #define DAEMON true
 #endif
 
-int handlermain( int argc, const char* argv[] );
-
 extern std::string serialPath;
-extern std::vector<Profile> profiles;
 
 int main( int argc, const char* argv[] ) {
     ( void ) argc;
@@ -30,12 +27,11 @@ int main( int argc, const char* argv[] ) {
 
     std::string path;
 
-    if( DAEMON ) {
-        path = "/etc/cacert/cassiopeia/cassiopeia.conf";
-    } else {
-        path = "config.txt";
-    }
-
+#ifdef NDEBUG
+    path = "/etc/cacert/cassiopeia/cassiopeia.conf";
+#else
+    path = "config.txt";
+#endif
 
     if( parseConfig( path ) != 0 ) {
         return -1;
@@ -50,16 +46,18 @@ int main( int argc, const char* argv[] ) {
 
     std::shared_ptr<BIO> conn = openSerial( serialPath );
     std::shared_ptr<BIO> slip1( BIO_new( toBio<SlipBIO>() ), BIO_free );
-    ( ( SlipBIO* )slip1->ptr )->setTarget( std::shared_ptr<OpensslBIO>( new OpensslBIOWrapper( conn ) ) );
+    static_cast<SlipBIO*>( slip1->ptr )->setTarget( std::shared_ptr<OpensslBIO>( new OpensslBIOWrapper( conn ) ) );
 
-    try {
-        DefaultRecordHandler* dh = new DefaultRecordHandler( std::shared_ptr<Signer>( new SimpleOpensslSigner( profiles[5] ) ), slip1 );
+    DefaultRecordHandler* dh = new DefaultRecordHandler( std::shared_ptr<Signer>( new SimpleOpensslSigner( ) ), slip1 );
 
-        while( true ) {
+    while( true ) {
+        try {
             dh->handle();
+            //} catch( const std::exception &ch ) {
+            //std::cout << "Real exception: " << typeid(ch).name() << ", " << ch.what() << std::endl;
+        } catch( char const* ch ) {
+            std::cout << "Exception: " << ch << std::endl;
         }
-    } catch( char const* ch ) {
-        std::cout << "Exception: " << ch << std::endl;
     }
 
     return -1;