Skip to content

Commit 741ea1d

Browse files
author
Fribbels
committed
1.8.8 update, reverting scanner changes
1 parent 0c4d567 commit 741ea1d

3 files changed

Lines changed: 18 additions & 14 deletions

File tree

app/js/lib/updater.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const { ipcRenderer } = require('electron');
22
global.ipcRenderer = ipcRenderer;
3-
const currentVersion = "1.8.7";
3+
const currentVersion = "1.8.8";
44

55
global.TEST = false;
66

@@ -34,7 +34,7 @@ module.exports = {
3434

3535
`
3636
<h2>
37-
New in v1.8.7
37+
New in v1.8.7 - 1.8.8
3838
</h2>
3939
<ul class="newFeatures">
4040
<li>Added inventory item finder. Set your inventory width in settings, and click the target icon on items to locate them in your inventory. Scan your inventory first for accurate results.</li>

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"name": "Fribbels",
66
"url": "https://github.com/fribbels/Fribbels-Epic-7-Optimizer"
77
},
8-
"version": "1.8.7",
8+
"version": "1.8.8",
99
"description": "Epic 7 Gear Optimizer",
1010
"main": "./main.prod.js",
1111
"scripts": {

data/py/scanner.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def try_buffer(currAck):
2626
print(hexStr);
2727
print('&');
2828

29-
def check_packet(packet):
29+
def check_packet(packet, index):
3030
if IP in packet:
3131
if Raw in packet and packet[Raw].load:
3232
currAck = packet.ack
@@ -53,21 +53,25 @@ def check_packet(packet):
5353
# if 'F' in packet[TCP].flags:
5454
# try_buffer(currAck)
5555

56-
def terminate():
57-
os._exit(0)
56+
def thread_sniff(i, index):
57+
try:
58+
sniff(iface=i, prn=lambda x: check_packet(x, index), filter="tcp and ( port 3333 )", session=TCPSession)
59+
except:
60+
pass
5861

59-
def thread_sniff():
62+
index = 0
63+
for i in list(conf.ifaces.data.values()):
6064
try:
61-
# EpicSeven traffic was confirmed to travel over tcp port 3333 via Wireshark
62-
# Omitting sniff() iface parameter to force all interfaces to be sniffed.
63-
# This may lead to more processing but prevents needing to specify an network interface manually in some cases.
64-
sniff(prn=lambda x: check_packet(x), filter="tcp and ( port 3333 )", session=TCPSession)
65+
x = threading.Thread(target=thread_sniff, args=(i, index,))
66+
x.daemon = True;
67+
x.start()
68+
69+
index = index + 1
6570
except:
6671
pass
6772

68-
x = threading.Thread(target=thread_sniff)
69-
x.daemon = True;
70-
x.start()
73+
def terminate():
74+
os._exit(0)
7175

7276
t = threading.Timer(3600.0, terminate)
7377
t.start()

0 commit comments

Comments
 (0)