cln: Move code around, cleanup structure

diff --git a/Makefile b/Makefile
index 50554a085f77680a6991bd28c6d91c9685b65f3b..d39af3e6fcacd9ca225c243fc6f10abc904c9449 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,8 @@ SRC_DIR=src
 OBJ_DIR=obj
 DEP_DIR=dep
 
-FS_SRC=$(filter-out ${SRC_DIR}/mysql--disabled.cpp,$(wildcard ${SRC_DIR}/*.cpp))
+FS_SRC=$(wildcard ${SRC_DIR}/*.cpp) $(wildcard ${SRC_DIR}/io/*.cpp) $(wildcard ${SRC_DIR}/crypto/*.cpp) $(wildcard ${SRC_DIR}/db/*.cpp)
+
 FS_BIN=$(wildcard ${SRC_DIR}/app/*.cpp)
 FS_LIBS=$(wildcard lib/*/)
 FS_OBJ=$(FS_SRC:${SRC_DIR}/%.cpp=${OBJ_DIR}/%.lo)
@@ -103,7 +104,7 @@ bin/cassiopeia: libs ${FS_OBJ} ${OBJ_DIR}/apps/client.lo
        ${MKDIR} $(shell dirname $@) &&  ${LD} ${LDFLAGS} -lmysqlclient -o $@ ${FS_OBJ} ${OBJ_DIR}/apps/client.lo
 
 bin/cassiopeia-signer: libs ${FS_OBJ} ${OBJ_DIR}/apps/signer.lo
-       ${MKDIR} $(shell dirname $@) &&  ${LD} ${LDFLAGS} -o $@ $(filter-out ${OBJ_DIR}/mysql.lo,${FS_OBJ}) ${OBJ_DIR}/apps/signer.lo
+       ${MKDIR} $(shell dirname $@) &&  ${LD} ${LDFLAGS} -o $@ $(filter-out ${OBJ_DIR}/db/mysql.lo,${FS_OBJ}) ${OBJ_DIR}/apps/signer.lo
 
 ${DEP_DIR}/%.d: ${SRC_DIR}/%.cpp
        ${MKDIR} $(shell dirname $@) && $(CXX_DEP) $(CXXFLAGS) -M -MF $@ $<

diff --git a/src/apps/client.cpp b/src/apps/client.cpp
index 9e85c95e598a4e7c7bb7037898440a2cc29b1848..2f0480f7f8a59669f019d717b48022df580ed40a 100644 (file)
--- a/src/apps/client.cpp
+++ b/src/apps/client.cpp
@@ -6,14 +6,14 @@
 #include <streambuf>
 #include <unordered_map>
 
-#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 "util.h"
-#include "bios.h"
-#include "slipBio.h"
-#include "remoteSigner.h"
-#include "sslUtil.h"
+#include "io/bios.h"
+#include "io/slipBio.h"
 #include "config.h"
 
 #ifdef NO_DAEMON

diff --git a/src/apps/signer.cpp b/src/apps/signer.cpp
index 6dddf027aa1b6ef0078f6d77b4a9ac9f3109bb74..dc9e702c54a7d6cc917d4ce962866a44a99ac0af 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

diff --git a/src/config.cpp b/src/config.cpp
index 2eb1f491c3bc42ca41e35eefbb183c42e644409d..a518db568863ba5a5d6f775269bc717e8104a2ff 100644 (file)
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -4,7 +4,7 @@
 #include <dirent.h>
 #include <unordered_map>
 
-#include "sslUtil.h"
+#include "crypto/sslUtil.h"
 
 std::string keyDir;
 std::unordered_map<std::string, Profile> profiles;

diff --git a/src/X509.cpp b/src/crypto/X509.cpp
similarity index 100%
rename from src/X509.cpp
rename to src/crypto/X509.cpp

diff --git a/src/X509.h b/src/crypto/X509.h
similarity index 95%
rename from src/X509.h
rename to src/crypto/X509.h
index 79aabc1f2333516937f89c786527a79a335bc654..04079994918f146901a6a0e44d6759a555e6ca70 100644 (file)
--- a/src/X509.h
+++ b/src/crypto/X509.h
@@ -5,8 +5,8 @@
 
 #include <openssl/ssl.h>
 
-#include "database.h"
-#include "sslUtil.h"
+#include "db/database.h"
+#include "crypto/sslUtil.h"
 
 class X509Req {
 private:

diff --git a/src/remoteSigner.cpp b/src/crypto/remoteSigner.cpp
similarity index 100%
rename from src/remoteSigner.cpp
rename to src/crypto/remoteSigner.cpp

diff --git a/src/remoteSigner.h b/src/crypto/remoteSigner.h
similarity index 85%
rename from src/remoteSigner.h
rename to src/crypto/remoteSigner.h
index 333265cfd3d450840d8f0db0e45685ba1377a256..09331bbacd9cff5567fce1ef7d8b3b9be298d0a7 100644 (file)
--- a/src/remoteSigner.h
+++ b/src/crypto/remoteSigner.h
@@ -2,11 +2,11 @@
 #include <memory>
 #include <openssl/ssl.h>
 
-#include "database.h"
-#include "signer.h"
-#include "bios.h"
-#include "opensslBIO.h"
-#include "record.h"
+#include "db/database.h"
+#include "crypto/signer.h"
+#include "io/bios.h"
+#include "io/opensslBIO.h"
+#include "io/record.h"
 
 
 class RemoteSigner : public Signer {

diff --git a/src/signer.h b/src/crypto/signer.h
similarity index 83%
rename from src/signer.h
rename to src/crypto/signer.h
index 0d671355b58481e50cb99d848467d4998acb1486..d9ab74ee3c15a271201d048a62637c9635efb4a7 100644 (file)
--- a/src/signer.h
+++ b/src/crypto/signer.h
@@ -2,8 +2,8 @@
 
 #include <memory>
 
-#include "database.h"
-#include "sslUtil.h"
+#include "db/database.h"
+#include "crypto/sslUtil.h"
 
 class Signer {
 public:

diff --git a/src/simpleOpensslSigner.cpp b/src/crypto/simpleOpensslSigner.cpp
similarity index 100%
rename from src/simpleOpensslSigner.cpp
rename to src/crypto/simpleOpensslSigner.cpp

diff --git a/src/simpleOpensslSigner.h b/src/crypto/simpleOpensslSigner.h
similarity index 85%
rename from src/simpleOpensslSigner.h
rename to src/crypto/simpleOpensslSigner.h
index f8e87298a872110ef51f888c440cb426cefe7a85..11e95dd7807c68d4926060686302fefe8d10ca14 100644 (file)
--- a/src/simpleOpensslSigner.h
+++ b/src/crypto/simpleOpensslSigner.h
@@ -2,9 +2,9 @@
 
 #include <openssl/ssl.h>
 
-#include "database.h"
-#include "sslUtil.h"
-#include "signer.h"
+#include "db/database.h"
+#include "crypto/sslUtil.h"
+#include "crypto/signer.h"
 
 class SimpleOpensslSigner : public Signer {
 private:

diff --git a/src/sslUtil.cpp b/src/crypto/sslUtil.cpp
similarity index 100%
rename from src/sslUtil.cpp
rename to src/crypto/sslUtil.cpp

diff --git a/src/sslUtil.h b/src/crypto/sslUtil.h
similarity index 100%
rename from src/sslUtil.h
rename to src/crypto/sslUtil.h

diff --git a/src/database.cpp b/src/db/database.cpp
similarity index 100%
rename from src/database.cpp
rename to src/db/database.cpp

diff --git a/src/database.h b/src/db/database.h
similarity index 100%
rename from src/database.h
rename to src/db/database.h

diff --git a/src/mysql.cpp b/src/db/mysql.cpp
similarity index 100%
rename from src/mysql.cpp
rename to src/db/mysql.cpp

diff --git a/src/mysql.h b/src/db/mysql.h
similarity index 100%
rename from src/mysql.h
rename to src/db/mysql.h

diff --git a/src/bios.cpp b/src/io/bios.cpp
similarity index 100%
rename from src/bios.cpp
rename to src/io/bios.cpp

diff --git a/src/bios.h b/src/io/bios.h
similarity index 100%
rename from src/bios.h
rename to src/io/bios.h

diff --git a/src/opensslBIO.cpp b/src/io/opensslBIO.cpp
similarity index 100%
rename from src/opensslBIO.cpp
rename to src/io/opensslBIO.cpp

diff --git a/src/opensslBIO.h b/src/io/opensslBIO.h
similarity index 100%
rename from src/opensslBIO.h
rename to src/io/opensslBIO.h

diff --git a/src/record.cpp b/src/io/record.cpp
similarity index 100%
rename from src/record.cpp
rename to src/io/record.cpp

diff --git a/src/record.h b/src/io/record.h
similarity index 100%
rename from src/record.h
rename to src/io/record.h

diff --git a/src/recordHandler.cpp b/src/io/recordHandler.cpp
similarity index 95%
rename from src/recordHandler.cpp
rename to src/io/recordHandler.cpp
index ed453535d846b9b653d9a8cf3a8cff8dfe2938a5..93990b0c1d6f447d2696140c97f7f09bb7bc019b 100644 (file)
--- a/src/recordHandler.cpp
+++ b/src/io/recordHandler.cpp
@@ -1,11 +1,4 @@
-#include "recordHandler.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <termios.h>
-#include <unistd.h>
+#include "io/recordHandler.h"
 
 #include <iostream>
 #include <fstream>
@@ -14,13 +7,15 @@
 
 #include <openssl/ssl.h>
 
-#include "database.h"
-#include "record.h"
-#include "opensslBIO.h"
-#include "remoteSigner.h"
-#include "simpleOpensslSigner.h"
-#include "sslUtil.h"
-#include "slipBio.h"
+#include "io/record.h"
+#include "io/opensslBIO.h"
+#include "io/slipBio.h"
+
+#include "db/database.h"
+#include "crypto/remoteSigner.h"
+#include "crypto/sslUtil.h"
+
+#include "crypto/simpleOpensslSigner.h"
 
 extern std::vector<Profile> profiles;
 extern std::unordered_map<std::string, std::shared_ptr<CAConfig>> CAs;

diff --git a/src/recordHandler.h b/src/io/recordHandler.h
similarity index 92%
rename from src/recordHandler.h
rename to src/io/recordHandler.h
index e9b1e20bdd74c0591e9fa28e8f0ea12c805d5be6..be5a98816f087f7b88e081fc41ebd49fe59360a6 100644 (file)
--- a/src/recordHandler.h
+++ b/src/io/recordHandler.h
@@ -6,8 +6,8 @@
 #include <openssl/ssl.h>
 #include <openssl/bio.h>
 
-#include "record.h"
-#include "signer.h"
+#include "crypto/signer.h"
+#include "io/record.h"
 
 class RecordHandler {
 public:

diff --git a/src/slipBio.cpp b/src/io/slipBio.cpp
similarity index 99%
rename from src/slipBio.cpp
rename to src/io/slipBio.cpp
index e1739ed65e0cf61002628518925b5d13379bed7d..1a7ba04b6a9040a7b3bba3b53f2c0c2804d8fcdc 100644 (file)
--- a/src/slipBio.cpp
+++ b/src/io/slipBio.cpp
@@ -232,6 +232,5 @@ bool SlipBIO::unmask() {
     decodePos = j;
     rawPos = j;
     decodeTarget = j;
-
     return 0;
 }

diff --git a/src/slipBio.h b/src/io/slipBio.h
similarity index 100%
rename from src/slipBio.h
rename to src/io/slipBio.h

diff --git a/src/util.cpp b/src/util.cpp
index 36f2261d62e9852477c15b2a034f091b26def049..f04c4ae036bd9833a971c3d64993f2310296deb8 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -4,7 +4,7 @@
 
 #include <fstream>
 
-void writeFile( std::string name, std::string content ) {
+void writeFile( const std::string& name, const std::string& content ) {
     std::ofstream file;
 
     file.open( name );
@@ -20,7 +20,7 @@ std::string readFile( const std::string& name ) {
     return res;
 }
 
-std::string writeBackFile( std::string serial, std::string cert, std::string keydir ) {
+std::string writeBackFile( const std::string& serial, const std::string& cert, const std::string& keydir ) {
     std::string filename = keydir;
     mkdir( filename.c_str(), 0755 );
     filename += "/crt";

diff --git a/src/util.h b/src/util.h
index 367d245d785418897c61f30f0072be0fa947c5af..55bb57876fa59b05b5cc9caa36c998e9b1a3956a 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-void writeFile( std::string name, std::string content );
-std::string readFile( std::string name );
+void writeFile( const std::string& name, const std::string& content );
+std::string readFile( const std::string& name );
 
-std::string writeBackFile( std::string serial, std::string cert, std::string keydir );
+std::string writeBackFile( const std::string& serial, const std::string& cert, const std::string& keydir );

diff --git a/test/Makefile b/test/Makefile
index 803ba65a337e19c9804a668017dfdf360340f4cb..114e9ee51bfed51a16822407dfe41927f4466d5c 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -78,7 +78,7 @@ collissiondetect:
 cassiopeia-test: bin/cassiopeia-test
 
 bin/cassiopeia-test: libs ${FS_OBJ}
-       ${MKDIR} $(shell dirname $@) && ${LD} ${LDFLAGS} -o $@ ${FS_OBJ} $(filter-out %/main.o,$(wildcard ../obj/*.o))
+       ${MKDIR} $(shell dirname $@) && ${LD} ${LDFLAGS} -o $@ ${FS_OBJ} $(filter-out ../obj/apps/%,$(wildcard ../obj/*.o) $(wildcard ../obj/*/*.o))
 
 ${DEP_DIR}/%.d: ${SRC_DIR}/%.cpp
        ${MKDIR} $(shell dirname $@) && $(CXX_DEP) $(CXXFLAGS) -M -MF $@ $<

diff --git a/test/src/X509Req.cpp b/test/src/X509Req.cpp
index 750d7fcc99fd3a0f79741a36d24d73348dad07f5..f1dc3fce320045e558828ebcefc02f12ed7e8fb1 100644 (file)
--- a/test/src/X509Req.cpp
+++ b/test/src/X509Req.cpp
@@ -1,12 +1,11 @@
-#include <iostream>
-
 #include <boost/test/unit_test.hpp>
 
 #include <openssl/err.h>
 
-#include "X509.h"
 #include "util.h"
 
+#include "crypto/X509.h"
+
 BOOST_AUTO_TEST_SUITE( TestX509Req )
 
 BOOST_AUTO_TEST_CASE( CSR ) {

diff --git a/test/src/bioWrapper.cpp b/test/src/bioWrapper.cpp
index a2706f8bab7ca4a45b84cf8800621c6ed29b0876..aaf3ecc67939fdd740d5124534eb8df8106015bb 100644 (file)
--- a/test/src/bioWrapper.cpp
+++ b/test/src/bioWrapper.cpp
@@ -1,9 +1,7 @@
-#include <iostream>
-
 #include <boost/test/unit_test.hpp>
 
-#include "bios.h"
-#include "opensslBIO.h"
+#include "io/bios.h"
+#include "io/opensslBIO.h"
 
 class OpensslBIO1 : public OpensslBIO {
 public:
@@ -21,17 +19,20 @@ int OpensslBIO1::write( const char* buf, int num ) {
     ( void ) buf;
     return 0;
 }
+
 int OpensslBIO1::read( char* buf, int size ) {
     state = size * 3;
     ( void ) buf;
     return 0;
 }
+
 long OpensslBIO1::ctrl( int cmod, long arg1, void* arg2 ) {
     state = cmod * 7;
     ( void ) arg1;
     ( void ) arg2;
     return 0;
 }
+
 const char* OpensslBIO1::getName() {
     return "dummyBIO";
 }

diff --git a/test/src/slipBioTest.cpp b/test/src/slipBioTest.cpp
index eef8fbbcb0370a844948427419a7352a7b048f5f..d579eb383cba9caecae8810b8a9bd01c2ef1941d 100644 (file)
--- a/test/src/slipBioTest.cpp
+++ b/test/src/slipBioTest.cpp
@@ -6,9 +6,9 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 
-#include "bios.h"
-#include "opensslBIO.h"
-#include "slipBio.h"
+#include "io/bios.h"
+#include "io/opensslBIO.h"
+#include "io/slipBio.h"
 
 class OpensslBIOVector : public OpensslBIO {
 private: