scifijunkie/pwnagotchi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refracture code

Browse Source
This commit is contained in:
dadav 2019-10-16 09:41:47 +02:00
parent ebeb22081b
commit 5987f93009
1 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pwnagotchi/plugins/default/bt-tether.py
View File

@ -447,23 +447,27 @@ def on_ui_update(ui):
if bt.is_connected() and bt.is_paired(): if bt.is_connected() and bt.is_paired():
logging.debug('BT-TETHER: Already connected and paired') logging.debug('BT-TETHER: Already connected and paired')
ui.set('bluetooth', 'CON') ui.set('bluetooth', 'CON')
return else:
logging.debug('BT-TETHER: Try to connect to mac') logging.debug('BT-TETHER: Try to connect to mac')
if bt.connect(): if bt.connect():
logging.debug('BT-TETHER: Successfuly connected') logging.info('BT-TETHER: Successfuly connected')
btnap_iface = IfaceWrapper('bnep0') else:
logging.error('BT-TETHER: Could not connect')
ui.set('bluetooth', 'NF')
return
btnap_iface = IfaceWrapper('bnep0')
logging.debug('BT-TETHER: Check interface') logging.debug('BT-TETHER: Check interface')
if btnap_iface.exists(): if btnap_iface.exists():
logging.debug('BT-TETHER: Interface found') logging.debug('BT-TETHER: Interface found')
# check ip # check ip
addr = f"{OPTIONS['ip']}/{OPTIONS['netmask']}" addr = f"{OPTIONS['ip']}/{OPTIONS['netmask']}"
logging.debug('BT-TETHER: Try to set ADDR to interface') logging.debug('BT-TETHER: Try to set ADDR to interface')
if not btnap_iface.set_addr(addr): if not btnap_iface.set_addr(addr):
ui.set('bluetooth', 'ERR1') ui.set('bluetooth', 'ERR1')
logging.error("Could not set ip of bnep0 to %s", addr) logging.error("BT-TETHER: Could not set ip of bnep0 to %s", addr)
return return
else: else:
logging.debug('BT-TETHER: Set ADDR to interface') logging.debug('BT-TETHER: Set ADDR to interface')
@ -476,14 +480,14 @@ def on_ui_update(ui):
with open('/etc/resolv.conf', 'r+') as resolv: with open('/etc/resolv.conf', 'r+') as resolv:
nameserver = resolv.read() nameserver = resolv.read()
if 'nameserver 9.9.9.9' not in nameserver: if 'nameserver 9.9.9.9' not in nameserver:
logging.info('BT-TETHER: Added nameserver')
resolv.seek(0) resolv.seek(0)
resolv.write(nameserver + 'nameserver 9.9.9.9\n') resolv.write(nameserver + 'nameserver 9.9.9.9\n')
ui.set('bluetooth', 'CON') ui.set('bluetooth', 'CON')
else: else:
logging.error('BT-TETHER: bnep0 not found')
ui.set('bluetooth', 'ERR2') ui.set('bluetooth', 'ERR2')
else:
ui.set('bluetooth', 'NF')
def on_ui_setup(ui): def on_ui_setup(ui):