Skip to content

add --send-host and --recv-host #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
missytake wants to merge 2 commits into
base: main
Choose a base branch
from
Open

add --send-host and --recv-host #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccf66af
add --send-host and --recv-host for no-dns setups
missytake Jan 13, 2026
168ffe0
use port 443 if --send_host/--recv-host are specified
missytake Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions cmping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import argparse
import os
import random
import secrets
import signal
import string
import threading
Expand All @@ -30,6 +31,16 @@ def main():
nargs="?",
help="chatmail relay domain (defaults to relay1 if not specified)",
)
parser.add_argument(
"--send-host",
action="store",
help="SMTP & IMAP host of sending relay",
)
parser.add_argument(
"--recv-host",
action="store",
help="SMTP & IMAP host of receiving relay",
)
parser.add_argument(
"-c",
dest="count",
Expand All @@ -50,6 +61,7 @@ def main():
args = parser.parse_args()
if not args.relay2:
args.relay2 = args.relay1
args.recv_host = args.send_host

pinger = perform_ping(args)
raise SystemExit(0 if pinger.received == pinger.sent else 1)
Expand All @@ -70,7 +82,7 @@ def _add_online(self, account):
account.start_io()
self.online.append(account)

def get_relay_account(self, domain):
def get_relay_account(self, domain, host):
for account in self.dc.get_all_accounts():
addr = account.get_config("configured_addr")
if addr is not None and addr.split("@")[1] == domain:
Expand All @@ -79,7 +91,17 @@ def get_relay_account(self, domain):
else:
print(f"# creating account on {domain}")
account = self.dc.add_account()
account.set_config_from_qr(f"dcaccount:{domain}")
if host:
ALPHANUMERIC = string.ascii_lowercase + string.digits
user = "".join(random.choices(ALPHANUMERIC, k=9))
password = "".join(
secrets.choice(ALPHANUMERIC)
for _ in range(20)
)
dclogin = f"dclogin:{user}@{domain}?v=1&p={password}&sh={host}&sp=443&ih={host}&ip=443&sc=3&ic=3"
account.set_config_from_qr(dclogin)
else:
account.set_config_from_qr(f"dcaccount:{domain}")

self._add_online(account)
return account
Expand All @@ -91,8 +113,8 @@ def perform_ping(args):
with Rpc(accounts_dir=accounts_dir) as rpc:
dc = DeltaChat(rpc)
maker = AccountMaker(dc)
sender = maker.get_relay_account(args.relay1)
receiver = maker.get_relay_account(args.relay2)
sender = maker.get_relay_account(args.relay1, args.send_host)
receiver = maker.get_relay_account(args.relay2, args.recv_host)
maker.wait_all_online()
_ = receiver.create_chat(sender)

Expand Down