dnrops
/
metasploit-framework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only poll for sessions/jobs once a connection comes in. 

git-svn-id: file:///home/svn/framework3/trunk@14198 4d416f70-5f16-0410-b530-b9f4589650da
This commit is contained in:
Matt Weeks 2011-11-09 03:13:29 +00:00
parent a88f954640
commit fb6e828a30
3 changed files with 8 additions and 7 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.

10
external/source/gui/msfguijava/src/msfgui/MainFrame.java vendored
View File

@ -34,7 +34,7 @@ public class MainFrame extends FrameView {
public HashMap sessionWindowMap;
public RpcConnection rpcConn;
private SwingWorker sessionsPollTimer;
private SwingWorker sessionsPollTimer = null;
private SessionsTable sessionsTableModel;
private JPopupMenu jobPopupMenu, shellPopupMenu, meterpreterPopupMenu, sessionPopupMenu;
private String clickedJob;
@ -112,10 +112,9 @@ public class MainFrame extends FrameView {
});
//Set up GUI, RPC connection, and recent modules
connectRpc(); // Connect to RPC daemon
setupSessionsPollTimer();
setupPopupMenus();
if(rpcConn != null)
getModules();
handleNewRpcConnection();
MsfguiApp.fileChooser = new JFileChooser();
getFrame().addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent we) {
@ -401,7 +400,8 @@ nameloop: for (int i = 0; i < names.length; i++) {
}
/** Makes a menu tree with expandList for exploits and auxiliary. Also start jobs/sessions watcher. */
public void getModules() {
public void handleNewRpcConnection() {
setupSessionsPollTimer();
searchWin = new SearchWindow(rpcConn);
MsfguiApp.addRecentModules(rpcConn, this);
getContext().getActionMap(this).get("moduleTask").actionPerformed(new java.awt.event.ActionEvent(this,1234,""));
@ -1248,7 +1248,7 @@ nameloop: for (int i = 0; i < names.length; i++) {
private void connectRpcMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_connectRpcMenuItemActionPerformed
connectRpc();
if(rpcConn != null)
getModules();
handleNewRpcConnection();
}//GEN-LAST:event_connectRpcMenuItemActionPerformed
private void clearHistoryItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_clearHistoryItemActionPerformed

5
external/source/gui/msfguijava/src/msfgui/RpcConnection.java vendored
View File

@ -232,7 +232,8 @@ public abstract class RpcConnection {
}
if(! (ex instanceof MsfException)){
if(! MsfguiApp.shuttingDown || !ex.getLocalizedMessage().toLowerCase().contains("broken pipe")){
ex.printStackTrace();
if(!(ex instanceof java.net.ConnectException))
ex.printStackTrace();
throw new MsfException("Error in call: "+ex.getLocalizedMessage(), ex);
}
}
@ -327,7 +328,7 @@ public abstract class RpcConnection {
@Override
protected void succeeded(RpcConnection myRpcConn) {
mainFrame.rpcConn = myRpcConn;
mainFrame.getModules();
mainFrame.handleNewRpcConnection();
}
};
}