hemna/aprsd
1
0
Fork 0
mirror of https://github.com/craigerl/aprsd.git synced 2025-02-03 09:44:15 -05:00
Code Issues Projects Releases Wiki Activity

Added port and fixed telnet user

Browse Source 
This patch adds the port to the aprs: section of the config.yml
as well as fixes a possible issue with the user telnet auth command
where the user is a string and the port is an int.  python can't
concatonate a string with an int.
This commit is contained in:
Walter A. Boring IV 2018-11-29 09:20:15 -05:00
parent 5e383dbee8
commit 81d01c3bc6
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
aprsd/main.py
View File

@ -89,11 +89,12 @@ args = parser.parse_args()
def setup_connection(): def setup_connection():
global tn global tn
host = CONFIG['aprs']['host'] host = CONFIG['aprs']['host']
LOG.debug("Setting up telnet connection to '%s'" % host) port = CONFIG['aprs']['port']
LOG.debug("Setting up telnet connection to '%s:%s'" % (host, port))
try: try:
tn = telnetlib.Telnet(host, 14580) tn = telnetlib.Telnet(host, port)
except Exception, e: except Exception, e:
LOG.critical("Telnet session failed.\n", e) LOG.exception("Telnet session failed.")
sys.exit(-1) sys.exit(-1)
@ -430,6 +431,7 @@ def parse_config(args):
check_option(config, 'aprs', 'login') check_option(config, 'aprs', 'login')
check_option(config, 'aprs', 'password') check_option(config, 'aprs', 'password')
check_option(config, 'aprs', 'host') check_option(config, 'aprs', 'host')
check_option(config, 'aprs', 'port')
check_option(config, 'imap', 'host') check_option(config, 'imap', 'host')
check_option(config, 'imap', 'login') check_option(config, 'imap', 'login')
check_option(config, 'imap', 'password') check_option(config, 'imap', 'password')
@ -453,7 +455,7 @@ def main(args=args):
user = CONFIG['aprs']['login'] user = CONFIG['aprs']['login']
password = CONFIG['aprs']['password'] password = CONFIG['aprs']['password']
LOG.info("LOGIN to APRSD with user '%s'" % user) LOG.info("LOGIN to APRSD with user '%s'" % user)
tn.write("user " + user + " pass " + password + " vers aprsd 0.99\n" ) tn.write("user %s pass %s vers aprsd 0.99\n" % (user, password) )
time.sleep(2) time.sleep(2)
check_email_thread() # start email reader thread check_email_thread() # start email reader thread

1
aprsd/utils.py
View File

@ -14,6 +14,7 @@ aprs:
login: someusername login: someusername
password: password password: password
host: noam.aprs2.net host: noam.aprs2.net
port: 14580
shortcuts: shortcuts:
'aa': '5551239999@vtext.com' 'aa': '5551239999@vtext.com'