diff options
Diffstat (limited to 'database/sqlite/eurephiadb-sqlite.c')
| -rw-r--r-- | database/sqlite/eurephiadb-sqlite.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/database/sqlite/eurephiadb-sqlite.c b/database/sqlite/eurephiadb-sqlite.c index 6e2b52b..ef95cb5 100644 --- a/database/sqlite/eurephiadb-sqlite.c +++ b/database/sqlite/eurephiadb-sqlite.c @@ -498,7 +498,7 @@ int eDBregister_login(eurephiaCTX *ctx, eurephiaSESSION *skey, const int certid, "INSERT INTO openvpn_lastlog (uid, certid, " " protocol, remotehost, remoteport," " vpnipaddr, vpnipmask," - " sessionstatus, sesskey, login) " + " sessionstatus, sessionkey, login) " "VALUES (%i, %i, '%s','%s','%s','%s','%s', 1,'%s', CURRENT_TIMESTAMP)", uid, certid, proto, remipaddr, remport, vpnipaddr, vpnipmask, skey->sessionkey); if( res == NULL ) { @@ -526,7 +526,7 @@ int eDBregister_vpnmacaddr(eurephiaCTX *ctx, eurephiaSESSION *session, const cha res = sqlite_query(ctx, "UPDATE openvpn_lastlog SET sessionstatus = 2, macaddr = '%s' " - " WHERE sesskey = '%s' AND sessionstatus = 1", macaddr, session->sessionkey); + " WHERE sessionkey = '%s' AND sessionstatus = 1", macaddr, session->sessionkey); if( res == NULL ) { eurephia_log(ctx, LOG_CRITICAL, 0, "Could not update lastlog with new MAC address for session"); return 0; @@ -557,7 +557,7 @@ int eDBregister_logout(eurephiaCTX *ctx, eurephiaSESSION *skey, "UPDATE openvpn_lastlog " " SET sessionstatus = 3, logout = CURRENT_TIMESTAMP, " " bytes_sent = '%i', bytes_received = '%i' " - " WHERE sesskey = '%s' AND sessionstatus = 2", + " WHERE sessionkey = '%s' AND sessionstatus = 2", atoi_nullsafe(bytes_sent), atoi_nullsafe(bytes_received), skey->sessionkey); if( res == NULL ) { eurephia_log(ctx, LOG_CRITICAL, 0, "Could not update lastlog with logout information (%s)", @@ -611,7 +611,7 @@ int eDBcheck_sessionkey_uniqueness(eurephiaCTX *ctx, const char *seskey) { return 0; } - res = sqlite_query(ctx, "SELECT count(sesskey) = 0 FROM openvpn_lastlog WHERE sesskey = '%s'", seskey); + res = sqlite_query(ctx, "SELECT count(sessionkey) = 0 FROM openvpn_lastlog WHERE sessionkey = '%s'", seskey); if( res == NULL ) { eurephia_log(ctx, LOG_CRITICAL, 0, "eDBcheck_sessionkey_uniqness: Could not check uniqueness of sessionkey"); @@ -681,7 +681,7 @@ eurephiaVALUES *eDBload_sessiondata(eurephiaCTX *ctx, const char *sesskey) { sessvals = eCreate_value_space(ctx, 10); - res = sqlite_query(ctx, "SELECT datakey, dataval FROM openvpn_sessions WHERE sesskey = '%s'", + res = sqlite_query(ctx, "SELECT datakey, dataval FROM openvpn_sessions WHERE sessionkey = '%s'", sesskey); if( (res != NULL) || (sqlite_get_numtuples(res) > 0) ) { for( i = 0; i < sqlite_get_numtuples(res); i++ ) { @@ -716,7 +716,7 @@ int eDBstore_session_value(eurephiaCTX *ctx, eurephiaSESSION *session, int mode, switch( mode ) { case SESSVAL_NEW: res = sqlite_query(ctx, - "INSERT INTO openvpn_sessions (sesskey, datakey, dataval) " + "INSERT INTO openvpn_sessions (sessionkey, datakey, dataval) " "VALUES ('%s','%s','%s')", session->sessionkey, key, val); if( res == NULL ) { eurephia_log(ctx, LOG_CRITICAL, 0, @@ -729,7 +729,7 @@ int eDBstore_session_value(eurephiaCTX *ctx, eurephiaSESSION *session, int mode, case SESSVAL_UPDATE: res = sqlite_query(ctx, "UPDATE openvpn_sessions SET dataval = '%s' " - " WHERE sesskey = '%s' AND datakey = '%s'", val, session->sessionkey, key); + " WHERE sessionkey = '%s' AND datakey = '%s'", val, session->sessionkey, key); if( res == NULL ) { eurephia_log(ctx, LOG_CRITICAL, 0, "Could not update session variable: [%s] %s = %s ", session->sessionkey, key, val); @@ -738,7 +738,7 @@ int eDBstore_session_value(eurephiaCTX *ctx, eurephiaSESSION *session, int mode, break; case SESSVAL_DELETE: - res = sqlite_query(ctx, "DELETE FROM openvpn_sessions WHERE sesskey = '%s' AND datakey = '%s'", + res = sqlite_query(ctx, "DELETE FROM openvpn_sessions WHERE sessionkey = '%s' AND datakey = '%s'", session->sessionkey, key); if( res == NULL ) { eurephia_log(ctx, LOG_CRITICAL, 0, "Could not delete session variable: [%s] %s", @@ -766,7 +766,7 @@ int eDBdestroy_session(eurephiaCTX *ctx, const char *macaddr) // Find sessionkey from MAC address res = sqlite_query(ctx, - "SELECT sesskey " + "SELECT sessionkey " " FROM openvpn_sessions " " WHERE datakey = 'macaddr' AND dataval = '%'s'", macaddr); if( res == NULL ) { @@ -788,7 +788,7 @@ int eDBdestroy_session(eurephiaCTX *ctx, const char *macaddr) res = sqlite_query(ctx, "UPDATE openvpn_lastlog " " SET sessionstatus = 4, session_del = CURRENT_TIMESTAMP " - " WHERE sesskey = '%s' AND sessionstatus = 3", skey); + " WHERE sessionkey = '%s' AND sessionstatus = 3", skey); if( res == NULL ) { eurephia_log(ctx, LOG_CRITICAL, 0, "Could not update session status in lastlog (%s/%s))", skey, macaddr); @@ -798,7 +798,7 @@ int eDBdestroy_session(eurephiaCTX *ctx, const char *macaddr) sqlite_free_results(res); // Delete session variables - res = sqlite_query(ctx, "DELETE FROM openvpn_sessions WHERE sesskey = '%s'", skey); + res = sqlite_query(ctx, "DELETE FROM openvpn_sessions WHERE sessionkey = '%s'", skey); if( res == NULL ) { eurephia_log(ctx, LOG_CRITICAL, 0, "Could not delete session variables (%s/%s))", skey, macaddr); @@ -831,7 +831,7 @@ char *eDBget_fw_profile(eurephiaCTX *ctx, eurephiaSESSION *session) " FROM openvpn_lastlog " " JOIN openvpn_usercerts USING(certid, uid)" " JOIN openvpn_accesses USING(accessprofile)" - " WHERE sesskey = '%s'", session->sessionkey); + " WHERE sessionkey = '%s'", session->sessionkey); if( res == NULL ) { eurephia_log(ctx, LOG_CRITICAL, 0, "Could not retrieve firewall profile for session '%s'", session->sessionkey); |