diff options
| -rw-r--r-- | database/eurephiadb-driver_template.c | 44 | ||||
| -rw-r--r-- | database/sqlite/eurephiadb-sqlite.c | 44 | ||||
| -rw-r--r-- | database/sqlite/sqlite.c | 2 | ||||
| -rw-r--r-- | eurephia.c | 24 | ||||
| -rw-r--r-- | eurephia_getsym.c | 4 | ||||
| -rw-r--r-- | eurephia_values.c | 6 | ||||
| -rw-r--r-- | eurephiadb.c | 2 | ||||
| -rw-r--r-- | eurephiadb_session.c | 33 | ||||
| -rw-r--r-- | eurephiafw.c | 6 | ||||
| -rw-r--r-- | firewall/iptables/efw_iptables.c | 12 |
10 files changed, 88 insertions, 89 deletions
diff --git a/database/eurephiadb-driver_template.c b/database/eurephiadb-driver_template.c index f640ee8..9e75d33 100644 --- a/database/eurephiadb-driver_template.c +++ b/database/eurephiadb-driver_template.c @@ -124,7 +124,7 @@ int eDBconnect(eurephiaCTX *ctx, const int argc, const char **argv) * You are free to use whatever parameter syntax you would like to use. */ - DEBUG(ctx, 10, "Function call: eDBconnect(ctx, %i, '...')", argc, dbame); + DEBUG(ctx, 20, "Function call: eDBconnect(ctx, %i, '...')", argc, dbame); // Connect to the database dbc = (eDBconn *) malloc(sizeof(eDBconn)+2); @@ -178,7 +178,7 @@ void eDBdisconnect(eurephiaCTX *ctx) { eDBconn *dbc = NULL; - DEBUG(ctx, 10, "Function call: eDBdisconnect(ctx)"); + DEBUG(ctx, 20, "Function call: eDBdisconnect(ctx)"); if( ctx->dbc == NULL ) { eurephia_log(ctx, LOG_WARNING, 0, "Database not open, cannot close database."); @@ -209,7 +209,7 @@ int eDBauth_TLS(eurephiaCTX *ctx, const char *org, const char *cname, const char int certid = 0; char *blid = NULL; - DEBUG(ctx, 10, "Function call: eDBauth_TLS(ctx, '%s', '%s', '%s', '%s', %s)", + DEBUG(ctx, 20, "Function call: eDBauth_TLS(ctx, '%s', '%s', '%s', '%s', %s)", org, cname, email, digest, depth); // Check if certificate is valid, and not too many attempts has been tried with the given certificate @@ -251,7 +251,7 @@ int eDBauth_TLS(eurephiaCTX *ctx, const char *org, const char *cname, const char eurephia_log(ctx, LOG_FATAL, 0, "Could not look up certificate information"); } - DEBUG(ctx, 10, "Result function call: eDBauth_TLS(ctx, '%s', '%s', '%s', '%s', %s) - %i", + DEBUG(ctx, 20, "Result function call: eDBauth_TLS(ctx, '%s', '%s', '%s', '%s', %s) - %i", org, cname, email, digest, depth, certid); return certid; @@ -264,7 +264,7 @@ int eDBauth_user(eurephiaCTX *ctx, const int certid, const char *username, const char *crpwd = NULL, *activated = NULL, *deactivated = NULL, *blid_uname = NULL, *blid_cert; int uicid = 0, uid = 0, pwdok = 0; - DEBUG(ctx, 10, "Function call: eDBauth_user(ctx, %i, '%s','xxxxxxxx')", certid, username); + DEBUG(ctx, 20, "Function call: eDBauth_user(ctx, %i, '%s','xxxxxxxx')", certid, username); // Generate SHA1 hash of password, used for password auth @@ -334,7 +334,7 @@ int eDBauth_user(eurephiaCTX *ctx, const int certid, const char *username, const } /* FREE SQL RESULT */ - DEBUG(ctx, 10, "Result function call: eDBauth_user(ctx, %i, '%s','xxxxxxxx') - %i", + DEBUG(ctx, 20, "Result function call: eDBauth_user(ctx, %i, '%s','xxxxxxxx') - %i", certid, username, uicid); return uicid; @@ -345,7 +345,7 @@ int eDBget_uid(eurephiaCTX *ctx, const int certid, const char *username) { int ret = 0; - DEBUG(ctx, 10, "Function call: eDBget_uid(ctx, %i, '%s')", certid, username); + DEBUG(ctx, 20, "Function call: eDBget_uid(ctx, %i, '%s')", certid, username); /* WORK TO DO -- DO SQL: "SELECT uid " @@ -372,7 +372,7 @@ int eDBblacklist_check(eurephiaCTX *ctx, const int type, const char *val) int atpexceed = -1, blacklisted = 0; char *atpid = NULL, *blid = NULL; - DEBUG(ctx, 10, "Function call: eDBblacklist_check(ctx, '%s', '%s')", + DEBUG(ctx, 20, "Function call: eDBblacklist_check(ctx, '%s', '%s')", eDBattempt_types[type].descr, val); /* WORK TO DO -- DO SQL: @@ -436,7 +436,7 @@ int eDBblacklist_check(eurephiaCTX *ctx, const int type, const char *val) } free_nullsafe(blid); - DEBUG(ctx, 10, "Result - function call: eDBblacklist_check(ctx, '%s', '%s') - %i", + DEBUG(ctx, 20, "Result - function call: eDBblacklist_check(ctx, '%s', '%s') - %i", eDBattempt_types[type].descr, val, blacklisted); return blacklisted; @@ -448,7 +448,7 @@ void eDBregister_attempt(eurephiaCTX *ctx, int type, int mode, const char *value char *id = NULL, *atmpt_block = NULL, *blid = NULL; int attempts = 0; - DEBUG(ctx, 10, "Function call: eDBregister_attempt(ctx, %s, %s, '%s')", + DEBUG(ctx, 20, "Function call: eDBregister_attempt(ctx, %s, %s, '%s')", eDBattempt_types[type].colname, (mode == ATTEMPT_RESET ? "ATTEMPT_RESET" : "ATTEMPT_REGISTER"), value); @@ -550,7 +550,7 @@ int eDBregister_login(eurephiaCTX *ctx, eurephiaSESSION *skey, const int certid, const char *proto, const char *remipaddr, const char *remport, const char *vpnipaddr, const char *vpnipmask) { - DEBUG(ctx, 10, "Function call: eDBregister_login(ctx, '%s', %i, %i, '%s','%s','%s','%s','%s')", + DEBUG(ctx, 20, "Function call: eDBregister_login(ctx, '%s', %i, %i, '%s','%s','%s','%s','%s')", skey->sessionkey, certid, uid, proto, remipaddr, remport, vpnipaddr, vpnipmask); if( skey->sessionstatus != SESSION_NEW ) { @@ -579,7 +579,7 @@ int eDBregister_login(eurephiaCTX *ctx, eurephiaSESSION *skey, const int certid, int eDBregister_vpnmacaddr(eurephiaCTX *ctx, eurephiaSESSION *session, const char *macaddr) { - DEBUG(ctx, 10, "Function call: eDBregister_vpnmacaddr(ctx, '%s', '%s')", + DEBUG(ctx, 20, "Function call: eDBregister_vpnmacaddr(ctx, '%s', '%s')", session->sessionkey, macaddr); if( macaddr == NULL ) { @@ -623,7 +623,7 @@ int eDBregister_vpnmacaddr(eurephiaCTX *ctx, eurephiaSESSION *session, const cha int eDBregister_logout(eurephiaCTX *ctx, eurephiaSESSION *skey, const char *bytes_sent, const char *bytes_received, const char *duration) { - DEBUG(ctx, 10, "Function call: eDBregister_logout(ctx, '%s', %s, %s)", + DEBUG(ctx, 20, "Function call: eDBregister_logout(ctx, '%s', %s, %s)", skey->sessionkey, bytes_sent, bytes_received); /* WORK TO DO -- DO SQL: @@ -651,7 +651,7 @@ int eDBregister_logout(eurephiaCTX *ctx, eurephiaSESSION *skey, char *eDBget_sessionkey_seed(eurephiaCTX *ctx, const char *sessionseed) { char *skey = NULL; - DEBUG(ctx, 10, "eDBget_sessionkey(ctx, '%s')", sessionseed); + DEBUG(ctx, 20, "eDBget_sessionkey(ctx, '%s')", sessionseed); if( sessionseed == NULL ) { eurephia_log(ctx, LOG_FATAL, 1, @@ -711,7 +711,7 @@ char *eDBget_sessionkey_macaddr(eurephiaCTX *ctx, const char *macaddr) { int eDBcheck_sessionkey_uniqueness(eurephiaCTX *ctx, const char *seskey) { int uniq = 0; - DEBUG(ctx, 10, "eDBcheck_sessionkey_uniqueness(ctx, '%s')", seskey); + DEBUG(ctx, 20, "eDBcheck_sessionkey_uniqueness(ctx, '%s')", seskey); if( seskey == NULL ) { eurephia_log(ctx, LOG_FATAL, 1, "eDBcheck_sessionkey_uniqness: Invalid session key given"); @@ -736,7 +736,7 @@ int eDBcheck_sessionkey_uniqueness(eurephiaCTX *ctx, const char *seskey) { // register a link between a short-term session seed and a long-term session key int eDBregister_sessionkey(eurephiaCTX *ctx, const char *seed, const char *seskey) { - DEBUG(ctx, 10, "eDBregister_sessionkey(ctx, '%s', '%s')", seed, seskey); + DEBUG(ctx, 20, "eDBregister_sessionkey(ctx, '%s', '%s')", seed, seskey); if( (seed == NULL) || (seskey == NULL) ) { eurephia_log(ctx, LOG_FATAL, 1, "eDBregister_sessionkey: Invalid session seed or session key given"); @@ -759,7 +759,7 @@ int eDBregister_sessionkey(eurephiaCTX *ctx, const char *seed, const char *seske // remove a session seed/session key link from openvpn_sessionkeys int eDBremove_sessionkey(eurephiaCTX *ctx, const char *seskey) { - DEBUG(ctx, 10, "eDBremove_sessionkey(ctx, '%s')", seskey); + DEBUG(ctx, 20, "eDBremove_sessionkey(ctx, '%s')", seskey); if( seskey == NULL ) { eurephia_log(ctx, LOG_FATAL, 1, "eDBremove_sessionkey: Invalid session key given"); @@ -788,7 +788,7 @@ eurephiaVALUES *eDBload_sessiondata(eurephiaCTX *ctx, const char *sesskey) { return NULL; } - DEBUG(ctx, 10, "Function call: eDBload_sessiondata(ctx, '%s')", sesskey); + DEBUG(ctx, 20, "Function call: eDBload_sessiondata(ctx, '%s')", sesskey); sessvals = eCreate_value_space(ctx, 10); @@ -817,12 +817,12 @@ int eDBstore_session_value(eurephiaCTX *ctx, eurephiaSESSION *session, int mode, { if( session == NULL ) { - DEBUG(ctx, 10, + DEBUG(ctx, 20, "Function call failed to eDBstore_session_value(ctx, ...): Non-existing session key"); return 0; } - DEBUG(ctx, 10, "Function call: eDBstore_session_value(ctx, '%s', %i, '%s', '%s')", + DEBUG(ctx, 20, "Function call: eDBstore_session_value(ctx, '%s', %i, '%s', '%s')", session->sessionkey, mode, key, val); switch( mode ) { @@ -880,7 +880,7 @@ int eDBstore_session_value(eurephiaCTX *ctx, eurephiaSESSION *session, int mode, // Delete session information from openvpn_sessions and update openvpn_lastlog with status int eDBdestroy_session(eurephiaCTX *ctx, eurephiaSESSION *session) { - DEBUG(ctx, 10, "Function call: eDBdestroy_session(ctx, '%s')", session->sessionkey); + DEBUG(ctx, 20, "Function call: eDBdestroy_session(ctx, '%s')", session->sessionkey); if( (session == NULL) || (session->sessionkey == NULL) ) { eurephia_log(ctx, LOG_ERROR, 1, "No active session given to be destroyed"); @@ -925,7 +925,7 @@ char *eDBget_firewall_profile(eurephiaCTX *ctx, eurephiaSESSION *session) { char *ret = NULL; - DEBUG(ctx, 10, "Function call: eDBget_firewall_profile(ctx, {session}'%s')", + DEBUG(ctx, 20, "Function call: eDBget_firewall_profile(ctx, {session}'%s')", session->sessionkey); /* WORK TO DO -- DO SQL: diff --git a/database/sqlite/eurephiadb-sqlite.c b/database/sqlite/eurephiadb-sqlite.c index bdfbea5..03cff02 100644 --- a/database/sqlite/eurephiadb-sqlite.c +++ b/database/sqlite/eurephiadb-sqlite.c @@ -102,7 +102,7 @@ int eDBconnect(eurephiaCTX *ctx, const int argc, const char **argv) dbresult *res = NULL; int rc; - DEBUG(ctx, 10, "Function call: eDBconnect(ctx, %i, '%s')", argc, argv[0]); + DEBUG(ctx, 20, "Function call: eDBconnect(ctx, %i, '%s')", argc, argv[0]); if( (argc != 1) || (argv[0] == NULL) || (strlen(argv[0]) < 1) ) { eurephia_log(ctx, LOG_PANIC, 0, "Wrong parameters to dblink-sqlite. Cannot open database."); @@ -154,7 +154,7 @@ void eDBdisconnect(eurephiaCTX *ctx) { eDBconn *dbc = NULL; - DEBUG(ctx, 10, "Function call: eDBdisconnect(ctx)"); + DEBUG(ctx, 20, "Function call: eDBdisconnect(ctx)"); if( ctx->dbc == NULL ) { eurephia_log(ctx, LOG_WARNING, 0, "Database not open, cannot close database."); @@ -185,7 +185,7 @@ int eDBauth_TLS(eurephiaCTX *ctx, const char *org, const char *cname, const char int certid = 0; char *blid = NULL; - DEBUG(ctx, 10, "Function call: eDBauth_TLS(ctx, '%s', '%s', '%s', '%s', %s)", + DEBUG(ctx, 20, "Function call: eDBauth_TLS(ctx, '%s', '%s', '%s', '%s', %s)", org, cname, email, digest, depth); // Check if certificate is valid, and not too many attempts has been tried with the given certificate @@ -226,7 +226,7 @@ int eDBauth_TLS(eurephiaCTX *ctx, const char *org, const char *cname, const char eurephia_log(ctx, LOG_FATAL, 0, "Could not look up certificate information"); } - DEBUG(ctx, 10, "Result function call: eDBauth_TLS(ctx, '%s', '%s', '%s', '%s', %s) - %i", + DEBUG(ctx, 20, "Result function call: eDBauth_TLS(ctx, '%s', '%s', '%s', '%s', %s) - %i", org, cname, email, digest, depth, certid); return certid; @@ -240,7 +240,7 @@ int eDBauth_user(eurephiaCTX *ctx, const int certid, const char *username, const char *crpwd = NULL, *activated = NULL, *deactivated = NULL, *blid_uname = NULL, *blid_cert; int uicid = 0, uid = 0, pwdok = 0; - DEBUG(ctx, 10, "Function call: eDBauth_user(ctx, %i, '%s','xxxxxxxx')", certid, username); + DEBUG(ctx, 20, "Function call: eDBauth_user(ctx, %i, '%s','xxxxxxxx')", certid, username); // Generate SHA1 hash of password, used for password auth @@ -305,7 +305,7 @@ int eDBauth_user(eurephiaCTX *ctx, const int certid, const char *username, const } sqlite_free_results(res); - DEBUG(ctx, 10, "Result function call: eDBauth_user(ctx, %i, '%s','xxxxxxxx') - %i", + DEBUG(ctx, 20, "Result function call: eDBauth_user(ctx, %i, '%s','xxxxxxxx') - %i", certid, username, uicid); return uicid; @@ -317,7 +317,7 @@ int eDBget_uid(eurephiaCTX *ctx, const int certid, const char *username) dbresult *res = NULL; int ret = 0; - DEBUG(ctx, 10, "Function call: eDBget_uid(ctx, %i, '%s')", certid, username); + DEBUG(ctx, 20, "Function call: eDBget_uid(ctx, %i, '%s')", certid, username); res = sqlite_query(ctx, "SELECT uid " @@ -344,7 +344,7 @@ int eDBblacklist_check(eurephiaCTX *ctx, const int type, const char *val) int atpexceed = -1, blacklisted = 0; char *atpid = NULL, *blid = NULL; - DEBUG(ctx, 10, "Function call: eDBblacklist_check(ctx, '%s', '%s')", + DEBUG(ctx, 20, "Function call: eDBblacklist_check(ctx, '%s', '%s')", eDBattempt_types[type].descr, val); blr = sqlite_query(ctx, "SELECT blid FROM openvpn_blacklist WHERE %s = '%q'", @@ -404,7 +404,7 @@ int eDBblacklist_check(eurephiaCTX *ctx, const int type, const char *val) } free_nullsafe(blid); - DEBUG(ctx, 10, "Result - function call: eDBblacklist_check(ctx, '%s', '%s') - %i", + DEBUG(ctx, 20, "Result - function call: eDBblacklist_check(ctx, '%s', '%s') - %i", eDBattempt_types[type].descr, val, blacklisted); return blacklisted; @@ -416,7 +416,7 @@ void eDBregister_attempt(eurephiaCTX *ctx, int type, int mode, const char *value char *id = NULL, *atmpt_block = NULL, *blid = NULL; int attempts = 0; - DEBUG(ctx, 10, "Function call: eDBregister_attempt(ctx, %s, %s, '%s')", + DEBUG(ctx, 20, "Function call: eDBregister_attempt(ctx, %s, %s, '%s')", eDBattempt_types[type].colname, (mode == ATTEMPT_RESET ? "ATTEMPT_RESET" : "ATTEMPT_REGISTER"), value); @@ -504,7 +504,7 @@ int eDBregister_login(eurephiaCTX *ctx, eurephiaSESSION *skey, const int certid, { dbresult *res = NULL; - DEBUG(ctx, 10, "Function call: eDBregister_login(ctx, '%s', %i, %i, '%s','%s','%s','%s','%s')", + DEBUG(ctx, 20, "Function call: eDBregister_login(ctx, '%s', %i, %i, '%s','%s','%s','%s','%s')", skey->sessionkey, certid, uid, proto, remipaddr, remport, vpnipaddr, vpnipmask); if( skey->sessionstatus != SESSION_NEW ) { @@ -533,7 +533,7 @@ int eDBregister_vpnmacaddr(eurephiaCTX *ctx, eurephiaSESSION *session, const cha { dbresult *res = NULL; - DEBUG(ctx, 10, "Function call: eDBregister_vpnmacaddr(ctx, '%s', '%s')", + DEBUG(ctx, 20, "Function call: eDBregister_vpnmacaddr(ctx, '%s', '%s')", session->sessionkey, macaddr); if( macaddr == NULL ) { @@ -577,7 +577,7 @@ int eDBregister_logout(eurephiaCTX *ctx, eurephiaSESSION *skey, { dbresult *res = NULL; - DEBUG(ctx, 10, "Function call: eDBregister_logout(ctx, '%s', %s, %s)", + DEBUG(ctx, 20, "Function call: eDBregister_logout(ctx, '%s', %s, %s)", skey->sessionkey, bytes_sent, bytes_received); res = sqlite_query(ctx, @@ -604,7 +604,7 @@ char *eDBget_sessionkey_seed(eurephiaCTX *ctx, const char *sessionseed) { dbresult *res = NULL; char *skey = NULL; - DEBUG(ctx, 10, "eDBget_sessionkey(ctx, '%s')", sessionseed); + DEBUG(ctx, 20, "eDBget_sessionkey(ctx, '%s')", sessionseed); if( sessionseed == NULL ) { eurephia_log(ctx, LOG_FATAL, 1, @@ -661,7 +661,7 @@ int eDBcheck_sessionkey_uniqueness(eurephiaCTX *ctx, const char *seskey) { dbresult *res; int uniq = 0; - DEBUG(ctx, 10, "eDBcheck_sessionkey_uniqueness(ctx, '%s')", seskey); + DEBUG(ctx, 20, "eDBcheck_sessionkey_uniqueness(ctx, '%s')", seskey); if( seskey == NULL ) { eurephia_log(ctx, LOG_FATAL, 1, "eDBcheck_sessionkey_uniqness: Invalid session key given"); @@ -686,7 +686,7 @@ int eDBcheck_sessionkey_uniqueness(eurephiaCTX *ctx, const char *seskey) { int eDBregister_sessionkey(eurephiaCTX *ctx, const char *seed, const char *seskey) { dbresult *res; - DEBUG(ctx, 10, "eDBregister_sessionkey(ctx, '%s', '%s')", seed, seskey); + DEBUG(ctx, 20, "eDBregister_sessionkey(ctx, '%s', '%s')", seed, seskey); if( (seed == NULL) || (seskey == NULL) ) { eurephia_log(ctx, LOG_FATAL, 1, "eDBregister_sessionkey: Invalid session seed or session key given"); @@ -709,7 +709,7 @@ int eDBregister_sessionkey(eurephiaCTX *ctx, const char *seed, const char *seske int eDBremove_sessionkey(eurephiaCTX *ctx, const char *seskey) { dbresult *res; - DEBUG(ctx, 10, "eDBremove_sessionkey(ctx, '%s')", seskey); + DEBUG(ctx, 20, "eDBremove_sessionkey(ctx, '%s')", seskey); if( seskey == NULL ) { eurephia_log(ctx, LOG_FATAL, 1, "eDBremove_sessionkey: Invalid session key given"); @@ -736,7 +736,7 @@ eurephiaVALUES *eDBload_sessiondata(eurephiaCTX *ctx, const char *sesskey) { return NULL; } - DEBUG(ctx, 10, "Function call: eDBload_sessiondata(ctx, '%s')", sesskey); + DEBUG(ctx, 20, "Function call: eDBload_sessiondata(ctx, '%s')", sesskey); sessvals = eCreate_value_space(ctx, 10); @@ -764,12 +764,12 @@ int eDBstore_session_value(eurephiaCTX *ctx, eurephiaSESSION *session, int mode, dbresult *res = NULL; if( session == NULL ) { - DEBUG(ctx, 10, + DEBUG(ctx, 20, "Function call failed to eDBstore_session_value(ctx, ...): Non-existing session key"); return 0; } - DEBUG(ctx, 10, "Function call: eDBstore_session_value(ctx, '%s', %i, '%s', '%s')", + DEBUG(ctx, 20, "Function call: eDBstore_session_value(ctx, '%s', %i, '%s', '%s')", session->sessionkey, mode, key, val); switch( mode ) { @@ -822,7 +822,7 @@ int eDBstore_session_value(eurephiaCTX *ctx, eurephiaSESSION *session, int mode, int eDBdestroy_session(eurephiaCTX *ctx, eurephiaSESSION *session) { dbresult *res = NULL; - DEBUG(ctx, 10, "Function call: eDBdestroy_session(ctx, '%s')", session->sessionkey); + DEBUG(ctx, 20, "Function call: eDBdestroy_session(ctx, '%s')", session->sessionkey); if( (session == NULL) || (session->sessionkey == NULL) ) { eurephia_log(ctx, LOG_ERROR, 1, "No active session given to be destroyed"); @@ -863,7 +863,7 @@ char *eDBget_firewall_profile(eurephiaCTX *ctx, eurephiaSESSION *session) char *ret = NULL; dbresult *res = NULL; - DEBUG(ctx, 10, "Function call: eDBget_firewall_profile(ctx, {session}'%s')", + DEBUG(ctx, 20, "Function call: eDBget_firewall_profile(ctx, {session}'%s')", session->sessionkey); res = sqlite_query(ctx, diff --git a/database/sqlite/sqlite.c b/database/sqlite/sqlite.c index 1a97793..85b41de 100644 --- a/database/sqlite/sqlite.c +++ b/database/sqlite/sqlite.c @@ -218,7 +218,7 @@ dbresult *sqlite_query(eurephiaCTX *ctx, char *fmt, ... ) { sql = sqlite3_vmprintf(fmt, ap); va_end(ap); - DEBUG(ctx, 11, "Doing SQL Query: %s", sql); + DEBUG(ctx, 25, "Doing SQL Query: %s", sql); rc = sqlite3_exec( (sqlite3 *) dbc->dbhandle, sql, _cb_parse_result, 0, &errMsg ); if( rc != SQLITE_OK ) { eurephia_log(ctx, LOG_ERROR, 0, "SQL Error: %s", errMsg); @@ -59,7 +59,7 @@ const char *get_env(eurephiaCTX *ctx, int logmasking, const char *envp[], const do_mask = logmasking; #endif if( ctx != NULL ) { - DEBUG(ctx, 23, "Function call: get_env(envp, '%s') == '%s'", + DEBUG(ctx, 30, "Function call: get_env(envp, '%s') == '%s'", key, (do_mask == 0 ? cp + 1 : "xxxxxxxxxxxxxx")); } #endif @@ -69,7 +69,7 @@ const char *get_env(eurephiaCTX *ctx, int logmasking, const char *envp[], const } } if( ctx != NULL ) { - DEBUG(ctx, 23, "Function call: get_env(envp, '%s') -- environment variable not found", + DEBUG(ctx, 15, "Function call: get_env(envp, '%s') -- environment variable not found", key); } va_end(ap); @@ -251,7 +251,7 @@ int eurephia_tlsverify(eurephiaCTX *ctx, const char **env, const char *depth) char *tls_digest, *tls_id; certinfo *ci = NULL; - DEBUG(ctx, 21, "** Function call: eurephia_tlsverify(...)"); + DEBUG(ctx, 10, "** Function call: eurephia_tlsverify(...)"); // Check if IP address is blacklisted ipaddr = (char *) get_env(ctx, 0, env, "untrusted_ip"); @@ -282,7 +282,7 @@ int eurephia_tlsverify(eurephiaCTX *ctx, const char **env, const char *depth) // Reset attempt counter for certificate if it is okey eDBregister_attempt(ctx, attempt_CERTIFICATE, ATTEMPT_RESET, tls_digest); } - DEBUG(ctx, 21, "** Function result: eurephia_tlsverify(...) == %i", result > 0); + DEBUG(ctx, 10, "** Function result: eurephia_tlsverify(...) == %i", result > 0); return (result > 0); } @@ -295,7 +295,7 @@ int eurephia_userauth(eurephiaCTX *ctx, const char **env) char *tls_digest, *tls_id, *username, *passwd; certinfo *ci = NULL; - DEBUG(ctx, 21, "** Function call: eurephia_userauth(...)"); + DEBUG(ctx, 10, "** Function call: eurephia_userauth(...)"); // Check if IP address is blacklisted @@ -351,7 +351,7 @@ int eurephia_userauth(eurephiaCTX *ctx, const char **env) eDBregister_attempt(ctx, attempt_CERTIFICATE, ATTEMPT_RESET, tls_digest); eDBregister_attempt(ctx, attempt_USERNAME, ATTEMPT_RESET, username); } - DEBUG(ctx, 21, "** Function result: eurephia_userauth(...) = %i", (result>0)); + DEBUG(ctx, 10, "** Function result: eurephia_userauth(...) = %i", (result>0)); return (result > 0); } @@ -362,7 +362,7 @@ int eurephia_connect(eurephiaCTX *ctx, const char **env) { int certid = 0, uid = 0, ret = 0; certinfo *ci = NULL; - DEBUG(ctx, 21, "** Function call: eurephia_connect(...)"); + DEBUG(ctx, 10, "** Function call: eurephia_connect(...)"); // Fetch needed info digest = get_env(ctx, 0, env, "tls_digest_0"); @@ -396,7 +396,7 @@ int eurephia_connect(eurephiaCTX *ctx, const char **env) { ret = eDBregister_login(ctx, session, certid, uid, proto, remipaddr, remport, vpnipaddr, vpnipmask); eDBfree_session(ctx, session); - DEBUG(ctx, 21, "** Function result: eurephia_connect(...) = %i", ret); + DEBUG(ctx, 10, "** Function result: eurephia_connect(...) = %i", ret); return ret; } @@ -407,7 +407,7 @@ int eurephia_disconnect(eurephiaCTX *ctx, const char **env) { const char *bytes_sent, *bytes_rec, *duration; int ret = 0; - DEBUG(ctx, 21, "** Function call: eurephia_disconnect(...)"); + DEBUG(ctx, 10, "** Function call: eurephia_disconnect(...)"); // Fetch needed info digest = get_env(ctx, 0, env, "tls_digest_0"); @@ -431,7 +431,7 @@ int eurephia_disconnect(eurephiaCTX *ctx, const char **env) { ret = eDBregister_logout(ctx, session, bytes_sent, bytes_rec, duration); eDBfree_session(ctx, session); - DEBUG(ctx, 21, "** Function result: eurephia_disconnect(...) = %i", ret); + DEBUG(ctx, 10, "** Function result: eurephia_disconnect(...) = %i", ret); return ret; } @@ -442,7 +442,7 @@ int eurephia_learn_address(eurephiaCTX *ctx, const char *mode, const char *macad char *fwprofile = NULL, *fwdest = NULL; int ret = 0, fw_enabled = 0; - DEBUG(ctx, 21, "** Function call: eurephia_learn_address(ctx, '%s', '%s', ...)", + DEBUG(ctx, 10, "** Function call: eurephia_learn_address(ctx, '%s', '%s', ...)", mode, macaddr); // Get firewall information @@ -508,7 +508,7 @@ int eurephia_learn_address(eurephiaCTX *ctx, const char *mode, const char *macad } exit: - DEBUG(ctx, 21, "** Function result: eurephia_learn_address(ctx, '%s', '%s', ...) = %i", + DEBUG(ctx, 10, "** Function result: eurephia_learn_address(ctx, '%s', '%s', ...) = %i", mode, macaddr, ret); return ret; diff --git a/eurephia_getsym.c b/eurephia_getsym.c index 2eb2efb..e12221f 100644 --- a/eurephia_getsym.c +++ b/eurephia_getsym.c @@ -33,10 +33,10 @@ void *eGetSym(eurephiaCTX *ctx, void *dlh, const char *symnam) return NULL; } - DEBUG(ctx, 13, "Locating eDBlink function '%s'", symnam); + DEBUG(ctx, 30, "Locating eDBlink function '%s'", symnam); func = dlsym(dlh, symnam); if( func == NULL ) { - eurephia_log(ctx, LOG_FATAL, 1, "Could not find needed '%s' function in eDBlink driver", symnam); + eurephia_log(ctx, LOG_PANIC, 0, "Could not find needed '%s' function in eDBlink driver", symnam); ctx->fatal_error = 1; } return func; diff --git a/eurephia_values.c b/eurephia_values.c index 01f72f6..0b47374 100644 --- a/eurephia_values.c +++ b/eurephia_values.c @@ -57,7 +57,7 @@ eurephiaVALUES *eCreate_value_space(eurephiaCTX *ctx, int evgid) { eurephiaVALUES *ptr = NULL; - DEBUG(ctx, 12, "Function call: eCreate_value_space(ctx, %i)", evgid); + DEBUG(ctx, 32, "Function call: eCreate_value_space(ctx, %i)", evgid); ptr = (eurephiaVALUES *) malloc(sizeof(eurephiaVALUES) + 2); if( ptr == NULL ) { @@ -75,7 +75,7 @@ void eAdd_value(eurephiaCTX *ctx, eurephiaVALUES *vls, const char *key, const ch eurephiaVALUES *ptr = NULL, *ptr2 = NULL; int vid = 0; - DEBUG(ctx, 12, "Function call: eAdd_value(ctx, vls(%i), '%s', '%s')", + DEBUG(ctx, 31, "Function call: eAdd_value(ctx, vls(%i), '%s', '%s')", (vls != NULL ? vls->evid : -1), key, val); // Allocate buffer and safe values @@ -109,7 +109,7 @@ void do_free_vals(eurephiaVALUES *vls) { } void eFree_values_func(eurephiaCTX *ctx, eurephiaVALUES *vls) { - DEBUG(ctx, 12, "Function call: eFree_values(ctx, vls(%i))", + DEBUG(ctx, 31, "Function call: eFree_values(ctx, vls(%i))", (vls != NULL ? vls->evid : -1)); if( (vls == NULL) ) { diff --git a/eurephiadb.c b/eurephiadb.c index 3e895b3..6bc63cc 100644 --- a/eurephiadb.c +++ b/eurephiadb.c @@ -41,7 +41,7 @@ int eDBlink_close(eurephiaCTX *ctx) return 1; } - DEBUG(ctx, 2, "Unloading eurephiaDB driver"); + eurephia_log(ctx, LOG_INFO, 3, "Unloading eurephiaDB driver"); if( ctx->eurephia_driver != NULL ) { dlclose(ctx->eurephia_driver); ctx->eurephia_driver = NULL; diff --git a/eurephiadb_session.c b/eurephiadb_session.c index 3819d83..927f3ff 100644 --- a/eurephiadb_session.c +++ b/eurephiadb_session.c @@ -58,7 +58,7 @@ int eDBset_session_value(eurephiaCTX *ctx, eurephiaSESSION *session, const char return 0; } - DEBUG(ctx, 10, "Function call: eDBset_session_value(ctx, '%s','%s','%s')", + DEBUG(ctx, 30, "Function call: eDBset_session_value(ctx, '%s','%s','%s')", session->sessionkey, key, val); // Create a new session value buffer if it does not exist @@ -73,20 +73,20 @@ int eDBset_session_value(eurephiaCTX *ctx, eurephiaSESSION *session, const char // Check if the session value exists already. If it does update it, or else add it svals = eGet_valuestruct(session->sessvals, key); if( (svals == NULL) && (val != NULL) ) { - DEBUG(ctx, 23, "eDBset_session_value ... New session value: %s = '%s'", key, val); + DEBUG(ctx, 32, "eDBset_session_value ... New session value: %s = '%s'", key, val); // Add a new session value if( eDBstore_session_value(ctx, session, SESSVAL_NEW, key, val) ) { - DEBUG(ctx, 23, "eDBset_session_value ... Adding value to value stack: %s = '%s'", + DEBUG(ctx, 32, "eDBset_session_value ... Adding value to value stack: %s = '%s'", key, val); // Add value to the stack eAdd_value(ctx, session->sessvals, key, val); - DEBUG(ctx, 11, "Registered session variable to session '%s': %s = %s", + DEBUG(ctx, 32, "Registered session variable to session '%s': %s = %s", session->sessionkey, key, val); } } else if( svals != NULL ) { if( (val != NULL) && (strcmp(svals->val, val) == 0) ) { - DEBUG(ctx, 11, "Session value not changed('%s','%s','%s)", + DEBUG(ctx, 32, "Session value not changed('%s','%s','%s)", session->sessionkey, key, val); return 1; } @@ -94,11 +94,11 @@ int eDBset_session_value(eurephiaCTX *ctx, eurephiaSESSION *session, const char if( eDBstore_session_value(ctx, session,(val != NULL ? SESSVAL_UPDATE : SESSVAL_DELETE), key,val)){ free_nullsafe(svals->val); svals->val = strdup_nullsafe(val); - DEBUG(ctx, 11, "Session variable updated in session '%s': %s = %s", + DEBUG(ctx, 32, "Session variable updated in session '%s': %s = %s", session->sessionkey, key, val); } } else if( (svals == NULL) && (val == NULL ) ) { - DEBUG(ctx, 11, "Ignoring saving new session value '%s' == NULL", key); + DEBUG(ctx, 32, "Ignoring saving new session value '%s' == NULL", key); } return 1; } @@ -111,7 +111,7 @@ int get_randstring(eurephiaCTX *ctx, char *rndstr, int len) { do { if( !rand_init ) { if( !RAND_load_file("/dev/urandom", 64) ) { - DEBUG(ctx, 5, "Could not load random data from /dev/urandom"); + eurehpia_log(ctx, LOG_FATAL, 0, "Could not load random data from /dev/urandom"); return 0; } rand_init = 1; @@ -123,7 +123,7 @@ int get_randstring(eurephiaCTX *ctx, char *rndstr, int len) { sleep(1); rand_init = 0; } while( attempts++ < 11 ); - DEBUG(ctx, 5, "RAND_pseudo_bytes() could not generate enough random data"); + eurephia_log(ctx, LOG_FATAL, 0, "RAND_pseudo_bytes() could not generate enough random data"); return 0; } @@ -142,7 +142,7 @@ eurephiaSESSION *eDBopen_session_seed(eurephiaCTX *ctx, const char *digest, uint8_t sha_res[SHA512_HASH_SIZE]; int totlen = 0, i = 0; - DEBUG(ctx, 10, "Function call: eDBopen_session_seed(ctx, '%s', '%s', '%s', '%s', '%s', '%s', '%s')", + DEBUG(ctx, 12, "Function call: eDBopen_session_seed(ctx, '%s', '%s', '%s', '%s', '%s', '%s', '%s')", digest, cname, username, vpnipaddr, vpnipmask, remipaddr, remport); new_session = (eurephiaSESSION *) malloc(sizeof(eurephiaSESSION) + 2); @@ -192,7 +192,7 @@ eurephiaSESSION *eDBopen_session_seed(eurephiaCTX *ctx, const char *digest, memset(&sha, 0, sizeof(SHA512Context)); memset(&sha_res, 0, sizeof(sha_res)); - DEBUG(ctx, 12, "Using session seed '%s'", seed); + DEBUG(ctx, 13, "Using session seed '%s'", seed); // Try to retrieve the sessionkey from the database, based on the session seed new_session->sessionkey = eDBget_sessionkey_seed(ctx, seed); @@ -203,7 +203,7 @@ eurephiaSESSION *eDBopen_session_seed(eurephiaCTX *ctx, const char *digest, char *skeydata = NULL; int loop = 0, uniqcheck = 0; - DEBUG(ctx, 12, "Unknown session seed, creating new session key"); + DEBUG(ctx, 13, "Unknown session seed, creating new session key"); // Loop until we get a unique sessionkey - don't loop more than 10 times skeydata = (char *) malloc((totlen*2)+4); @@ -298,7 +298,7 @@ eurephiaSESSION *eDBopen_session_seed(eurephiaCTX *ctx, const char *digest, new_session->sessionstatus = SESSION_NEW; } else { new_session->sessionstatus = SESSION_EXISTING; - DEBUG(ctx, 12, "Session seed found, using sessionkey '%s'", new_session->sessionkey); + DEBUG(ctx, 13, "Session seed found, using sessionkey '%s'", new_session->sessionkey); } free_nullsafe(seed); free_nullsafe(seeddata); @@ -314,7 +314,7 @@ eurephiaSESSION *eDBopen_session_seed(eurephiaCTX *ctx, const char *digest, eurephiaSESSION *eDBopen_session_macaddr(eurephiaCTX *ctx, const char *macaddr) { eurephiaSESSION *new_session = NULL; - DEBUG(ctx, 10, "Function call: eDBopen_session_mac(ctx, '%s')", macaddr); + DEBUG(ctx, 12, "Function call: eDBopen_session_mac(ctx, '%s')", macaddr); new_session = (eurephiaSESSION *) malloc(sizeof(eurephiaSESSION) + 2); if( new_session == NULL ) { @@ -331,6 +331,7 @@ eurephiaSESSION *eDBopen_session_macaddr(eurephiaCTX *ctx, const char *macaddr) free_nullsafe(new_session); return NULL; } + DEBUG(ctx, 13, "Session seed found, using sessionkey '%s'", new_session->sessionkey); // Load session values from the database new_session->sessvals = eDBload_sessiondata(ctx, new_session->sessionkey); @@ -345,10 +346,8 @@ void eDBfree_session_func(eurephiaCTX *ctx, eurephiaSESSION *session) { if( session == NULL ) { return; } - DEBUG(ctx, 20, "Function call: eDBfree_session(ctx, '%s')", session->sessionkey); + DEBUG(ctx, 12, "Function call: eDBfree_session(ctx, '%s')", session->sessionkey); eFree_values(ctx, session->sessvals); free_nullsafe(session->sessionkey); free_nullsafe(session); } - - diff --git a/eurephiafw.c b/eurephiafw.c index 01272e9..ee4949b 100644 --- a/eurephiafw.c +++ b/eurephiafw.c @@ -44,7 +44,7 @@ int eFW_unload(eurephiaCTX *ctx) { } if( ctx->eurephia_fw_intf != NULL ) { - DEBUG(ctx, 2, "Unloading eurephia firewall interface"); + eurephia_log(ctx, LOG_INFO, 3, "Unloading eurephia firewall interface"); dlclose(ctx->eurephia_fw_intf); ctx->eurephia_fw_intf = NULL; return 0; @@ -179,7 +179,7 @@ void eFW_StartFirewall(eurephiaCTX *ctx) { "Error while emptying messages from queue: %s", strerror(errno)); } else { - DEBUG(ctx, 22, "Removed message on queue: %s", buf); + DEBUG(ctx, 28, "Removed message on queue: %s", buf); } } } @@ -193,7 +193,7 @@ void eFW_StartFirewall(eurephiaCTX *ctx) { sem_post(ctx->fwcfg->thrdata.semp_master); // Waiting for the FW module to get ready - DEBUG(ctx, 20, "eFW master is ready, waiting for the eFW worker to get ready"); + DEBUG(ctx, 28, "eFW master is ready, waiting for the eFW worker to get ready"); sem_wait(ctx->fwcfg->thrdata.semp_worker); eurephia_log(ctx, LOG_INFO, 2, "eFW interface initialised."); diff --git a/firewall/iptables/efw_iptables.c b/firewall/iptables/efw_iptables.c index 343df9a..9faad54 100644 --- a/firewall/iptables/efw_iptables.c +++ b/firewall/iptables/efw_iptables.c @@ -51,9 +51,9 @@ void eFW_RunFirewall(void *fwargs) { unsigned int prio; char buf[EFW_MSG_SIZE+2]; - DEBUG(ctx, 22, "eFW_RunFirewall: Waiting for eFW master to get ready"); + DEBUG(ctx, 28, "eFW_RunFirewall: Waiting for eFW master to get ready"); sem_wait(cfg->semp_master); - DEBUG(ctx, 22, "eFW_RunFirewall: Telling eFW master that the worker process is ready"); + DEBUG(ctx, 28, "eFW_RunFirewall: Telling eFW master that the worker process is ready"); sem_post(cfg->semp_worker); if( cfg->fw_command == NULL ) { @@ -76,7 +76,7 @@ void eFW_RunFirewall(void *fwargs) { if( !quit ) { int res = 0; - DEBUG(ctx, 23, "eFW_RunFirewall: Received '%s'", buf); + DEBUG(ctx, 20, "eFW_RunFirewall: Received '%s'", buf); res = process_input(ctx, cfg->fw_command, buf); if( ! res ) { @@ -102,7 +102,7 @@ int process_input(eurephiaCTX *ctx, const char *fwcmd, const char *input) { orig_msg = strdup_nullsafe(input); msg = orig_msg; - DEBUG(ctx, 23, "eFW_RunFirewall::process_input(ctx, '%s')", msg); + DEBUG(ctx, 36, "eFW_RunFirewall::process_input(ctx, '%s')", msg); // // Simple parsing of the input string @@ -148,7 +148,7 @@ int process_input(eurephiaCTX *ctx, const char *fwcmd, const char *input) { iptables_args[8] = jump; iptables_args[9] = NULL; - eurephia_log(ctx, LOG_INFO, 2, "eFW_RunFirewall - updating iptables rules " + eurephia_log(ctx, LOG_INFO, 3, "eFW_RunFirewall - updating iptables rules " "==> mode: %s macaddr: '%s' destchain: '%s' jump: '%s'", (mode[1] == 'A' ? "ADD":"DELETE"), macaddr, destchain, jump); break; @@ -157,7 +157,7 @@ int process_input(eurephiaCTX *ctx, const char *fwcmd, const char *input) { destchain = msg; iptables_args[2] = destchain; - eurephia_log(ctx, LOG_INFO, 2, "eFW_RunFirewall - updating iptables rules " + eurephia_log(ctx, LOG_INFO, 3, "eFW_RunFirewall - updating iptables rules " "==> mode: FLUSH destchain: '%s'", destchain); break; |