ua1zbe
/
hbnet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

working tiny page

This commit is contained in:
KF7EEL 2021-10-13 14:08:09 -07:00
parent 7c5b505484
commit d84d15620f
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
data_gateway.py
View File

@ -251,6 +251,26 @@ def send_sms_que_req(CONFIG):
except requests.ConnectionError:
logger.error('Config server unreachable')
def send_sms_cmd(CONFIG, _rf_id, _cmd):
print('ssnd rmt cmd')
user_man_url = CONFIG['WEB_SERVICE']['URL']
shared_secret = str(sha256(CONFIG['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest())
sms_cmd_data = {
'sms_cmd': CONFIG['WEB_SERVICE']['THIS_SERVER_NAME'],
'secret':shared_secret,
'rf_id': _rf_id,
'cmd': _cmd
}
json_object = json.dumps(sms_cmd_data, indent = 4)
try:
req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
## resp = json.loads(req.text)
## print(resp)
## return resp['que']
except requests.ConnectionError:
logger.error('Config server unreachable')
@ -584,6 +604,9 @@ def process_sms(_rf_src, sms, call_type, system_name):
user_setting_write(int_id(_rf_src), 'APRS OFF', False, call_type)
elif '@BB' in sms:
dashboard_bb_write(get_alias(int_id(_rf_src), subscriber_ids), int_id(_rf_src), time(), re.sub('@BB|@BB ','',sms), system_name)
elif '?' in parse_sms[0]:
send_sms_cmd(CONFIG, int_id(_rf_src), sms)
elif '@' in parse_sms[0][1:] and '.' in parse_sms[0]: # and ' E-' in sms:
s = ' '
email_message = s.join(parse_sms[1:])#str(re.sub('.*@|.* E-', '', sms))

17
web/app.py
View File

@ -6825,6 +6825,23 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
)
sms_que_purge('DATA')
elif 'sms_cmd' in hblink_req:
if hblink_req['sms_cmd']:
print(hblink_req['cmd'][:1])
if hblink_req['cmd'][:1] == '?':
split_cmd = str(hblink_req['cmd']).split(' ')
tp = TinyPage.query.filter_by(query_term=str(split_cmd[0])[1:]).first()
print(tp.content)
sms_que_add('', '', 0, hblink_req['rf_id'], 'motorola', 'unit', hblink_req['sms_cmd'], '', tp.content)
response = jsonify(
out='yes'
## OBP=get_OBP(hblink_req['get_config'])
)
elif 'get_rules' in hblink_req:
if hblink_req['get_rules']: # == 'burn_list':