infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Backward-compatible for recent DB changes. 

git-svn-id: file:///home/svn/framework3/trunk@14177 4d416f70-5f16-0410-b530-b9f4589650da
unstable
Matt Weeks 2011-11-07 00:17:09 +00:00
parent 9dccd49662
commit b1bb0ae729
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/gui/msfgui.jar
View File

Binary file not shown.

21
external/source/gui/msfguijava/src/msfgui/MsfTable.java vendored
View File

@ -97,9 +97,15 @@ public class MsfTable extends javax.swing.JTable {
if(!force && !DraggableTabbedPane.isVisible(this))
return; //Don't re-add if not visible
try {
HashMap arg = new HashMap(10);
arg.put("workspace", MsfguiApp.workspace);
arg.put("offset", offset);
Object arg;
if(rpcConn.type.equals("XML") && (dbTable.equals("events") || dbTable.equals("loots"))){
arg = MsfguiApp.workspace;
} else {
HashMap argM = new HashMap(10);
argM.put("workspace", MsfguiApp.workspace);
argM.put("offset", offset);
arg = argM;
}
List data = (List) ((Map)rpcConn.execute("db."+dbTable, arg)).get(dbTable);
if(data == null)
return;
@ -110,8 +116,13 @@ public class MsfTable extends javax.swing.JTable {
Object[] row = new Object[dbNames.length];
for (int i = 0; i < dbNames.length; i++){
row[i] = ((Map) dataObj).get(dbNames[i]);
if(dbNames[i].endsWith("_at"))
row[i] = new java.util.Date(Long.parseLong(row[i].toString()) * 1000);
try{
if(dbNames[i].endsWith("_at"))
row[i] = new java.util.Date(Long.parseLong(row[i].toString()) * 1000);
}catch(NumberFormatException nfex){
//don't do anything
}
}
mod.addRow(row);
}