From 011bb0e94b1924bdf85d8997026f1a1178f779c2 Mon Sep 17 00:00:00 2001
From: antisnatchor <antisnatchor@gmail.com>
Date: Wed, 21 Nov 2012 06:26:15 +0000
Subject: [PATCH] Refactored WebSocket polling timeout config value.

---
 config.yaml                          | 2 +-
 core/main/client/websocket.js        | 4 ++--
 core/main/handlers/modules/beefjs.rb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config.yaml b/config.yaml
index 29d68f633..585d0ef9a 100644
--- a/config.yaml
+++ b/config.yaml
@@ -35,7 +35,7 @@ beef:
           secure: true # use WebSocketSecure work only on https domain and whit https support enabled in BeEF
           port: 61985 # WS: good success rate through proxies
           secure_port: 61986 # WSS
-          alive_timer: 1000 # poll BeEF every second
+          ws_poll_timeout: 1000 # poll BeEF every second
 
         # Imitate a specified web server (default root page, 404 default error page, 'Server' HTTP response header)
         web_server_imitation:
diff --git a/core/main/client/websocket.js b/core/main/client/websocket.js
index 2b5edcab4..74754db6f 100644
--- a/core/main/client/websocket.js
+++ b/core/main/client/websocket.js
@@ -11,7 +11,7 @@
 beef.websocket = {
 
     socket:null,
-    alive_timer:<%= @websocket_timer %>,
+    ws_poll_timeout:<%= @ws_poll_timeout %>,
 
     init:function () {
         var webSocketServer = beef.net.host;
@@ -69,7 +69,7 @@ beef.websocket = {
     alive: function (){
         beef.websocket.send('{"alive":"'+beef.session.get_hook_session_id()+'"}');
 //        console.log("sent alive");
-        setTimeout("beef.websocket.alive()", beef.websocket.alive_timer);
+        setTimeout("beef.websocket.alive()", beef.websocket.ws_poll_timeout);
 
     }
 };
diff --git a/core/main/handlers/modules/beefjs.rb b/core/main/handlers/modules/beefjs.rb
index d3b87672d..23fca1321 100644
--- a/core/main/handlers/modules/beefjs.rb
+++ b/core/main/handlers/modules/beefjs.rb
@@ -84,7 +84,7 @@ module BeEF
             if config.get("beef.http.websocket.enable")
               hook_session_config['websocket_secure'] = config.get("beef.http.websocket.secure")
               hook_session_config['websocket_port'] = config.get("beef.http.websocket.port")
-              hook_session_config['websocket_timer'] = config.get("beef.http.websocket.alive_timer")
+              hook_session_config['ws_poll_timeout'] = config.get("beef.http.websocket.ws_poll_timeout")
               hook_session_config['websocket_sec_port']= config.get("beef.http.websocket.secure_port")
             end