Skip to content

Commit

Permalink
1.8.8 update, reverting scanner changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Fribbels committed Dec 26, 2022
1 parent 0c4d567 commit 741ea1d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 14 deletions.
4 changes: 2 additions & 2 deletions app/js/lib/updater.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { ipcRenderer } = require('electron');
global.ipcRenderer = ipcRenderer;
const currentVersion = "1.8.7";
const currentVersion = "1.8.8";

global.TEST = false;

Expand Down Expand Up @@ -34,7 +34,7 @@ module.exports = {

`
<h2>
New in v1.8.7
New in v1.8.7 - 1.8.8
</h2>
<ul class="newFeatures">
<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>
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": "Fribbels",
"url": "https://github.com/fribbels/Fribbels-Epic-7-Optimizer"
},
"version": "1.8.7",
"version": "1.8.8",
"description": "Epic 7 Gear Optimizer",
"main": "./main.prod.js",
"scripts": {
Expand Down
26 changes: 15 additions & 11 deletions data/py/scanner.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def try_buffer(currAck):
print(hexStr);
print('&');

def check_packet(packet):
def check_packet(packet, index):
if IP in packet:
if Raw in packet and packet[Raw].load:
currAck = packet.ack
Expand All @@ -53,21 +53,25 @@ def check_packet(packet):
# if 'F' in packet[TCP].flags:
# try_buffer(currAck)

def terminate():
os._exit(0)
def thread_sniff(i, index):
try:
sniff(iface=i, prn=lambda x: check_packet(x, index), filter="tcp and ( port 3333 )", session=TCPSession)
except:
pass

def thread_sniff():
index = 0
for i in list(conf.ifaces.data.values()):
try:
# EpicSeven traffic was confirmed to travel over tcp port 3333 via Wireshark
# Omitting sniff() iface parameter to force all interfaces to be sniffed.
# This may lead to more processing but prevents needing to specify an network interface manually in some cases.
sniff(prn=lambda x: check_packet(x), filter="tcp and ( port 3333 )", session=TCPSession)
x = threading.Thread(target=thread_sniff, args=(i, index,))
x.daemon = True;
x.start()

index = index + 1
except:
pass

x = threading.Thread(target=thread_sniff)
x.daemon = True;
x.start()
def terminate():
os._exit(0)

t = threading.Timer(3600.0, terminate)
t.start()
Expand Down

0 comments on commit 741ea1d

Please sign in to comment.