diff options
Diffstat (limited to 'database')
| -rw-r--r-- | database/sqlite/administration/lastlog.c | 14 | ||||
| -rw-r--r-- | database/sqlite/administration/useraccount.c | 13 |
2 files changed, 15 insertions, 12 deletions
diff --git a/database/sqlite/administration/lastlog.c b/database/sqlite/administration/lastlog.c index 8f2edbc..d5f4b61 100644 --- a/database/sqlite/administration/lastlog.c +++ b/database/sqlite/administration/lastlog.c @@ -92,15 +92,17 @@ xmlDoc *eDBadminGetLastlog(eurephiaCTX *ctx, xmlDoc *srch_xml, const char *sortk // Query the database, find the user defined in the user map res = sqlite_query_mapped(ctx, SQL_SELECT, - "SELECT llid, ll.certid, protocol, remotehost, remoteport, macaddr," - " vpnipaddr, vpnipmask, sessionstatus, sessionkey," + "SELECT llid, ll.certid, protocol, remotehost, remoteport," + " macaddr, ip4addr, ip6addr," + " sessionstatus, ll.sessionkey," " locdt(login), locdt(logout)," " session_duration, locdt(session_deleted)," - " bytes_sent, bytes_received, uicid, accessprofile," + " bytes_sent, bytes_received, uicid, ll.accessprofile," " access_descr, fw_profile, depth, lower(digest)," " common_name, organisation, email, username, ll.uid" " FROM openvpn_lastlog ll" - " LEFT JOIN openvpn_usercerts USING (uid, certid)" + " JOIN openvpn_vpnaddr_history ovh ON (ovh.sessionkey = ll.sessionkey)" + " LEFT JOIN openvpn_usercerts ouc ON (ouc.uid = ll.uid AND ouc.certid = ll.certid)" " LEFT JOIN openvpn_accesses USING (accessprofile)" " LEFT JOIN openvpn_users users ON( ll.uid = users.uid)" " LEFT JOIN openvpn_certificates cert ON (ll.certid = cert.certid)", @@ -134,8 +136,8 @@ xmlDoc *eDBadminGetLastlog(eurephiaCTX *ctx, xmlDoc *srch_xml, const char *sortk sqlite_xml_value(tmp1, XML_NODE, "remote_host", res, i, 3); sqlite_xml_value(tmp1, XML_NODE, "remote_port", res, i, 4); sqlite_xml_value(tmp1, XML_NODE, "vpn_macaddr", res, i, 5); - sqlite_xml_value(tmp1, XML_NODE, "vpn_ipaddr" , res, i, 6); - sqlite_xml_value(tmp1, XML_NODE, "vpn_netmask", res, i, 7); + sqlite_xml_value(tmp1, XML_NODE, "vpn_ipv4addr", res, i, 6); + sqlite_xml_value(tmp1, XML_NODE, "vpn_ipv6addr", res, i, 7); tmp1 = sqlite_xml_value(sess, XML_NODE, "username", res, i, 25); sqlite_xml_value(tmp1, XML_ATTR, "uid", res, i, 26); diff --git a/database/sqlite/administration/useraccount.c b/database/sqlite/administration/useraccount.c index 37303b7..db527ed 100644 --- a/database/sqlite/administration/useraccount.c +++ b/database/sqlite/administration/useraccount.c @@ -233,17 +233,18 @@ static xmlDoc *useracc_view(eurephiaCTX *ctx, unsigned int infoType, qres = sqlite_query(ctx, "SELECT llid, ll.certid,protocol,remotehost,remoteport,macaddr," - " vpnipaddr, vpnipmask, sessionstatus, sessionkey," + " ip4addr, ip6addr, sessionstatus, ll.sessionkey," " locdt(login), locdt(logout)," " session_duration, locdt(session_deleted)," - " bytes_sent, bytes_received, uicid, accessprofile," + " bytes_sent, bytes_received, uicid, ll.accessprofile," " access_descr, fw_profile, depth, lower(digest)," " common_name, organisation, email" " FROM openvpn_lastlog ll" - " LEFT JOIN openvpn_usercerts USING (uid, certid)" + " JOIN openvpn_vpnaddr_history ovh ON (ovh.sessionkey = ll.sessionkey)" + " LEFT JOIN openvpn_usercerts ouc ON (ouc.uid = ll.uid AND ouc.certid = ll.certid)" " LEFT JOIN openvpn_accesses USING (accessprofile)" " LEFT JOIN openvpn_certificates cert ON(ll.certid=cert.certid)" - " WHERE uid = '%i' ORDER BY login, logout", uid); + " WHERE ll.uid = '%i' ORDER BY login, logout", uid); if( sqlite_query_status(qres) != dbSUCCESS ) { eurephia_log(ctx, LOG_ERROR, 0, "Querying the lastlog failed"); @@ -279,8 +280,8 @@ static xmlDoc *useracc_view(eurephiaCTX *ctx, unsigned int infoType, sqlite_xml_value(tmp1, XML_NODE, "remote_host", qres, i, 3); sqlite_xml_value(tmp1, XML_NODE, "remote_port", qres, i, 4); sqlite_xml_value(tmp1, XML_NODE, "vpn_macaddr", qres, i, 5); - sqlite_xml_value(tmp1, XML_NODE, "vpn_ipaddr" , qres, i, 6); - sqlite_xml_value(tmp1, XML_NODE, "vpn_netmask", qres, i, 7); + sqlite_xml_value(tmp1, XML_NODE, "vpn_ipv4addr" , qres, i, 6); + sqlite_xml_value(tmp1, XML_NODE, "vpn_ipv6addr", qres, i, 7); tmp1 = xmlNewChild(sess, NULL, (xmlChar *) "certificate", NULL); assert( tmp1 != NULL ); |