From e3c2757481481201e4c96d80f37d10af54122542 Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Thu, 5 Mar 2020 11:17:58 -0500
Subject: [PATCH] Fixing issues from diffs
---
bindings/java/jni/auto_db_java.cpp | 5 +++--
.../src/org/sleuthkit/datamodel/SleuthkitCase.java | 8 ++++----
.../org/sleuthkit/datamodel/TimelineManager.java | 13 +++++++++----
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/bindings/java/jni/auto_db_java.cpp b/bindings/java/jni/auto_db_java.cpp
index c8ea89b22..92da611ea 100644
--- a/bindings/java/jni/auto_db_java.cpp
+++ b/bindings/java/jni/auto_db_java.cpp
@@ -739,6 +739,7 @@ if (!TSK_FS_ISDOT(name))
strncat(extension, "-slack", 6);
}
jstring slackNamej = m_jniEnv->NewStringUTF(name); // TODO free?
+ jstring slackExtJ = m_jniEnv->NewStringUTF(extension); // TODO free?
TSK_OFF_T slackSize = fs_attr->nrd.allocsize - fs_attr->nrd.initsize;
@@ -752,11 +753,11 @@ if (!TSK_FS_ISDOT(name))
TSK_DB_FILES_TYPE_SLACK,
type, idx, slackNamej,
fs_file->name->meta_addr, (uint64_t)fs_file->name->meta_seq,
- fs_file->name->type, meta_type, fs_file->name->flags, meta_flags,
+ TSK_FS_NAME_TYPE_REG, TSK_FS_META_TYPE_REG, fs_file->name->flags, meta_flags,
slackSize,
(unsigned long long)crtime, (unsigned long long)ctime, (unsigned long long) atime, (unsigned long long) mtime,
meta_mode, gid, uid, // md5TextPtr, known,
- pathj, extj);
+ pathj, slackExtJ);
int64_t slackObjId = (int64_t)objIdj;
if (slackObjId < 0) {
diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
index 0c58e52af..0bae69b9c 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
@@ -11125,13 +11125,13 @@ long addFileSystemFileJNI(long parentObjId,
statement.setShort(12, (short)dirFlags); // dir_flags
statement.setShort(13, (short)metaFlags); // meta_flags
statement.setLong(14, size < 0 ? 0 : size); // size
- if (ctime != null) {
- statement.setLong(15, ctime); // ctime
+ if (crtime != null) {
+ statement.setLong(15, crtime); // crtime
} else {
statement.setNull(15, java.sql.Types.BIGINT);
}
- if (crtime != null) {
- statement.setLong(16, crtime); // crtime
+ if (ctime != null) {
+ statement.setLong(16, ctime); // ctime
} else {
statement.setNull(16, java.sql.Types.BIGINT);
}
diff --git a/bindings/java/src/org/sleuthkit/datamodel/TimelineManager.java b/bindings/java/src/org/sleuthkit/datamodel/TimelineManager.java
index 5ddc48de9..661d4ff21 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/TimelineManager.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/TimelineManager.java
@@ -492,6 +492,8 @@ Collection<TimelineEvent> addEventsForNewFile(AbstractFile file, CaseDbConnectio
TimelineEventType.FILE_ACCESSED, file.getAtime(),
TimelineEventType.FILE_CHANGED, file.getCtime(),
TimelineEventType.FILE_MODIFIED, file.getMtime());
+ List<TimelineEventType> tempList = ImmutableList.of(TimelineEventType.FILE_MODIFIED,
+ TimelineEventType.FILE_ACCESSED, TimelineEventType.FILE_CREATED, TimelineEventType.FILE_CHANGED);
/*
* If there are no legitimate ( greater than zero ) time stamps skip the
@@ -509,10 +511,13 @@ Collection<TimelineEvent> addEventsForNewFile(AbstractFile file, CaseDbConnectio
long descriptionID = addEventDescription(file.getDataSourceObjectId(), fileObjId, null,
description, null, null, false, false, connection);
- for (Map.Entry<TimelineEventType, Long> timeEntry : timeMap.entrySet()) {
- Long time = timeEntry.getValue();
+ //for (Map.Entry<TimelineEventType, Long> timeEntry : timeMap.entrySet()) {
+ for (TimelineEventType type : tempList) {
+ //Map.Entry<TimelineEventType, Long> timeEntry = timeMap.get(type);
+ Long time = timeMap.get(type);
+ //Long time = timeEntry.getValue();
if (time > 0 && time < MAX_TIMESTAMP_TO_ADD) {// if the time is legitimate ( greater than zero and less then 12 years from current date) insert it
- TimelineEventType type = timeEntry.getKey();
+ //TimelineEventType type = timeEntry.getKey();
long eventID = addEventWithExistingDescription(time, type, descriptionID, connection);
/*
@@ -524,7 +529,7 @@ Collection<TimelineEvent> addEventsForNewFile(AbstractFile file, CaseDbConnectio
description, null, null, false, false));
} else {
if (time >= MAX_TIMESTAMP_TO_ADD) {
- logger.log(Level.WARNING, String.format("Date/Time discarded from Timeline for %s for file %s with Id %d", timeEntry.getKey().getDisplayName(), file.getParentPath() + file.getName(), file.getId()));
+ //logger.log(Level.WARNING, String.format("Date/Time discarded from Timeline for %s for file %s with Id %d", timeEntry.getKey().getDisplayName(), file.getParentPath() + file.getName(), file.getId()));
}
}
}
--
GitLab