Merge branch 'master' of https://github.com/eibbors/reavetard

Conflicts: src/cli.coffee src/reavetard.coffee src/wifi.coffee test/wifi.coffee overhauled scan + targeting and laid out attack mode foundation
eibbors · Jul 8, 2012 · d988a7e · d988a7e
2 parents f4004d8 + 13a091e
commit d988a7e
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 83 deletions.
diff --git a/lib/cli.js b/lib/cli.js
diff --git a/lib/db.js b/lib/db.js
diff --git a/lib/reavetard.js b/lib/reavetard.js
@@ -28,28 +28,51 @@
       scan: scan,
       ignoreFCS: true
     });
+    process.on('exit', function() {
+      return w.stop();
+    });
+    cli._c.on('^C', function() {
+      w.stop();
+      cli._c.display('reset');
+      return process.exit();
+    });
     w.on('ap', function(station) {
-      return rdb.checkHistory(station.bssid, function(err, rows) {
-        var k, v, _ref, _ref2;
-        if (err) console.error(err);
-        if (rows.length > 0) {
-          _ref = rows[0];
-          for (k in _ref) {
-            v = _ref[k];
-            if ((_ref2 = station[k]) == null) station[k] = v;
+      return rdb.checkSurvey(station.bssid, function(err, rows) {
+        var device, k, v;
+        if (!err && rows.length > 0) {
+          device = {
+            name: rows[0].device_name,
+            manufacturer: rows[0].manufacturer,
+            model: rows[0].model_name,
+            number: rows[0].model_number
+          };
+          for (k in device) {
+            v = device[k];
+            if (v !== '') station.device = device;
           }
-          station.session = rdb.loadSession(station.bssid);
-          if (station.attempts >= 11000 || station.session.phase === 2) {
-            stations.complete.push(station);
-            return logStation(station, 'C');
+        }
+        return rdb.checkHistory(station.bssid, function(err, rows) {
+          var k, v, _ref, _ref2;
+          if (err) console.error(errd);
+          if (rows.length > 0) {
+            _ref = rows[0];
+            for (k in _ref) {
+              v = _ref[k];
+              if ((_ref2 = station[k]) == null) station[k] = v;
+            }
+            station.session = rdb.loadSession(station.bssid);
+            if (station.attempts >= 11000 || station.session.phase === 2) {
+              stations.complete.push(station);
+              return cli.washHit(station, 'C');
+            } else {
+              stations.inProgress.push(station);
+              return cli.washHit(station, 'W');
+            }
           } else {
-            stations.inProgress.push(station);
-            return logStation(station, 'W');
+            stations.noHistory.push(station);
+            return cli.washHit(station, 'N');
           }
-        } else {
-          stations.noHistory.push(station);
-          return logStation(station, 'N');
-        }
+        });
       });
     });
     w.on('exit', function() {

diff --git a/lib/wifi.js b/lib/wifi.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reavetard",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "CoffeeScript modules that provide AP rotation support and a host of data management and general usability enhancements for Reaver-WPS Cracker and its partner in crime, Wash-WPS Scanner",
   "main": "index.js",
   "dependencies": {