Added more fields to the global field mapping table

Had to also extend the FIELD_* assignments to allow two
new fields to be mapped

1 files changed, 37 insertions, 30 deletions

diff --git a/database/eurephiadb_mapping.h b/database/eurephiadb_mapping.h
index c04fbc8..4ce16f8 100644
--- a/database/eurephiadb_mapping.h
+++ b/database/eurephiadb_mapping.h
@@ -46,36 +46,40 @@ extern const char *SESSION_STATUS[];
 #define TABLE_BLACKLIST      0x06
 #define TABLE_EUREPHIAADMACC 0x07
 
-#define FIELD_NONE        0x000000
-#define FIELD_RECID       0x000001  // Primary keys
-#define FIELD_UID         0x000002
-#define FIELD_CERTID      0x000004
-#define FIELD_UNAME       0x000008
-#define FIELD_ACTIVATED   0x000010
-#define FIELD_DEACTIVATED 0x000020
-#define FIELD_LASTACCESS  0x000040
-
-#define FIELD_CERTDEPTH   0x000080
-#define FIELD_CNAME       0x000100
-#define FIELD_EMAIL       0x000200
-#define FIELD_ORG         0x000400
-#define FIELD_REGISTERED  0x000800
-
-#define FIELD_REMOTEIP    0x001000
-#define FIELD_VPNIP       0x002000
-#define FIELD_ATTEMPTS    0x004000
-#define FIELD_LASTATTEMPT 0x008000
-
-#define FIELD_SESSTATUS   0x010000
-#define FIELD_LOGIN       0x020000
-#define FIELD_LOGOUT      0x040000
-#define FIELD_PASSWD      0x080000
-#define FIELD_CERTDIGEST  0x100000
-
-#define FIELD_ACCPROFILE  0x200000
-
-#define FIELD_INTERFACE   0x400000
-#define FIELD_ACCESSLVL   0x800000
+#define FIELD_NONE        0x0000000
+#define FIELD_RECID       0x0000001  // Primary keys
+#define FIELD_UID         0x0000002
+#define FIELD_CERTID      0x0000004
+#define FIELD_UNAME       0x0000008
+#define FIELD_ACTIVATED   0x0000010
+#define FIELD_DEACTIVATED 0x0000020
+#define FIELD_LASTACCESS  0x0000040
+
+#define FIELD_CERTDEPTH   0x0000080
+#define FIELD_CNAME       0x0000100
+#define FIELD_EMAIL       0x0000200
+#define FIELD_ORG         0x0000400
+#define FIELD_REGISTERED  0x0000800
+
+#define FIELD_REMOTEIP    0x0001000
+#define FIELD_VPNIP       0x0002000
+#define FIELD_ATTEMPTS    0x0004000
+#define FIELD_LASTATTEMPT 0x0008000
+
+#define FIELD_SESSTATUS   0x0010000
+#define FIELD_LOGIN       0x0020000
+#define FIELD_LOGOUT      0x0040000
+#define FIELD_PASSWD      0x0080000
+#define FIELD_CERTDIGEST  0x0100000
+
+#define FIELD_ACCPROFILE  0x0200000
+
+#define FIELD_INTERFACE   0x0400000
+#define FIELD_ACCESSLVL   0x0800000
+
+#define FIELD_MACADDR     0x1000000
+#define FIELD_UICID       0x2000000
+
 
 #ifdef EUREPHIADB_MAPPING_C
 
@@ -109,6 +113,9 @@ static eDBfieldMap eTblMap_lastlog[] = {
         {TABLE_LASTLOG, NULL, FIELD_LOGIN,       ft_DATETIME, "login"},
         {TABLE_LASTLOG, NULL, FIELD_LOGOUT,      ft_DATETIME, "logout"},
         {TABLE_LASTLOG, NULL, FIELD_RECID,       ft_INT,      "id"},
+        {TABLE_LASTLOG, NULL, FIELD_UNAME,       ft_STRING,   "username",      NULL, NULL},
+        {TABLE_LASTLOG, NULL, FIELD_MACADDR,     ft_STRING,   "macaddr",       NULL, NULL},
+        {TABLE_LASTLOG, NULL, FIELD_UICID,       ft_STRING,   "uicid",         NULL, NULL},
         {0, NULL, 0, ft_UNDEF, NULL}
 };