diff --git a/aprsd/main.py b/aprsd/main.py index c281dce..38040ab 100644 --- a/aprsd/main.py +++ b/aprsd/main.py @@ -394,7 +394,7 @@ def resend_email(count, fromcall): # reverse lookup of a shortcut from_addr = shortcuts_inverted[from_addr] # asterisk indicates a resend - reply = "-" + from_addr + " * " + body + reply = "-" + from_addr + " * " + body.decode(errors='ignore') send_message(fromcall, reply) msgexists = True @@ -798,17 +798,22 @@ def server(loglevel, quiet, config_file): elif re.search("^-.*", message): LOG.debug("EMAIL") searchstring = "^" + CONFIG["ham"]["callsign"] + ".*" + LOG.debug("A") # only I can do email if re.search(searchstring, fromcall): + LOG.debug("B") # digits only, first one is number of emails to resend r = re.search("^-([0-9])[0-9]*$", message) if r is not None: + LOG.debug("C") resend_email(r.group(1), fromcall) # -user@address.com body of email elif re.search(r"^-([A-Za-z0-9_\-\.@]+) (.*)", message): + LOG.debug("D") # (same search again) a = re.search(r"^-([A-Za-z0-9_\-\.@]+) (.*)", message) if a is not None: + LOG.debug("E") to_addr = a.group(1) content = a.group(2) # send recipient link to aprs.fi map