update

.gitignore

@@ -1,166 +1,34 @@
-# ---> Python
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-*.diff
-.pylint.*
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/#use-with-ide
-.pdm.toml
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-
 .pylint.err
-.pylint.log
+.pylint.out
+*.pyc
+*.pyo
+
+libs/
+*.egg-info
+*.log
+*.out
+*.bak
+
+.idea
+*~
+#*
+*.iml
+*.junk
+
+*.so
+*.log
+toxygen/build
+toxygen/dist
+*.spec
+dist
+toxygen/avatars
+toxygen/__pycache__
+/*.egg-info
+/*.egg
+html
+Toxygen.egg-info
+*.tox
+.cache
+*.db
+*~
+Makefile

.rsync.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+find * -name \*.py | xargs grep -l '[ 	]*$' | xargs sed -i -e 's/[	 ]*$//'
+rsync "$@" -vax  --include \*.py --exclude \*.log --exclude \*.out \
+	--exclude \*.egg-info --exclude libs --exclude dist  --exclude build \
+	--exclude \*.pyc --exclude .pyl\* --exclude \*~ --exclude \*.so \
+	./ ../tox_profile.git/|grep -v /$

README.md

@@ -7,7 +7,7 @@ Read and manipulate tox profile files. It started as a simple script from
 things that it finds.  Then can write what it found in JSON/YAML/REPR/PPRINT
 to a file. It can also test the nodes in a profile using ```nmap```.
 
-( There are somtimes problems with the json info dump of bytes keys:
+( There are sometimes problems with the json info dump of bytes keys:
 ```TypeError: Object of type bytes is not JSON serializable```)
 
 It can also download, select, or test nodes in a ```DHTnode.json``` file.
@@ -34,7 +34,7 @@ to a file.
 
 ```
 usage: tox_profile.py [-h]
-       [--command info|decrypt|nodes|edit]
+       [--command info|decrypt|nodes|edit|onions]
        [--info info|repr|yaml|json|pprint|nmap_dht|nmap_relay]
        [--indent INDENT]
        [--nodes select_tcp|select_udp|select_version|nmap_tcp|nmap_udp|download|check|clean]
@@ -222,10 +222,33 @@ Because it's written in Python it is easy to extend to, for example,
 supporting multidevices:
 <https://git.plastiras.org/emdee/tox_profile/wiki/MultiDevice-Announcements-POC>
 
+There are a couple of bash scripts to show usage:
+* tox_profile_examples.bash - simple example usage
+* tox_profile_test.bash - a real test runner that still needs documenting.
+
 ## Specification
 
 There is a copy of the Tox [spec](https://toktok.ltd/spec.html)
 in the repo - it is missing any description of the groups section.
 
+## Updates
+
+Although Tox works over Tor, we do not recommend its usage for
+anonymity as it leaks DNS requests due to a 6-year old known security
+issue: https://github.com/TokTok/c-toxcore/issues/469 unless your Tox
+client does hostname lookups before calling Tox (like
+[toxygen](https://git.plastiras.org/emdee/toxygen) does).
+Otherwise, do not use it for anonymous communication unless you have a
+TCP and UDP firewall in place.
+
+The Tox project does not follow semantic versioning so the project may
+break the underlying ctypes wrapper at any time; it's not possible to
+use Tox version numbers to tell what the API will be. The last git version
+this code was tested with is ``1623e3ee5c3a5837a92f959f289fcef18bfa9c959```
+of Feb 12 10:06:37 2024. In which case you'll have to go into the tox.py
+file in https://git.plastiras.org/emdee/toxygen_wrapper to fix it yourself.
+
+The uptodate version of this code is on https://git.plastiras.org/emdee/tox_profile
+
 Work on this project is suspended until the
 [MultiDevice](https://git.plastiras.org/emdee/tox_profile/wiki/MultiDevice-Announcements-POC) problem is solved. Fork me!

pyproject.toml

@@ -0,0 +1,48 @@
+[project]
+name = 'tox_profile'
+requires-python = ">= 3.7"
+description = "Read and manipulate tox profile files"
+keywords = ["tox", "tox_profile"]
+classifiers = [
+  # How mature is this project? Common values are
+  #   3 - Alpha
+  #   4 - Beta
+  #   5 - Production/Stable
+  "Development Status :: 4 - Beta",
+
+  # Indicate who your project is intended for
+  "Intended Audience :: Developers",
+
+  # Specify the Python versions you support here.
+  "Programming Language :: Python :: 3",
+  "License :: OSI Approved",
+  "Operating System :: POSIX :: BSD :: FreeBSD",
+  "Operating System :: POSIX :: Linux",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.7",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: Implementation :: CPython",
+]
+dynamic = ["version", "readme", "dependencies"] # cannot be dynamic ['license']
+
+[project.scripts]
+tox_profile = "tox_profile:iMain"
+
+[project.urls]
+repository = "https://git.plastiras.org/emdee/tox_profile"
+homepage = "https://git.plastiras.org/emdee/tox_profile"
+
+[build-system]
+requires = ["setuptools >= 61.0"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.dynamic]
+version = {attr = "tox_profile.__version__"} 
+readme = {file = ["README.md"]}
+dependencies = {file = ["requirements.txt"]}
+
+#[tool.setuptools.packages.find]
+#where = "src"

requirements.txt

@@ -0,0 +1,9 @@
+# the versions are the current ones tested - may work with earlier versions
+ruamel.yaml >= 0.18.5
+xmsgpack >= 1.0.7
+coloredlogs >= 15.0.1
+# optional
+# nmap
+# this is not on pypi yet - get it from
+# https://git.plastiras.org/emdee/toxygen_wrapper
+# toxygen_wrapper >= 1.0.0

setup.cfg

@@ -0,0 +1,55 @@
+[metadata]
+classifiers =
+    License :: OSI Approved
+    Intended Audience :: Web Developers
+    Operating System :: POSIX :: BSD :: FreeBSD
+    Operating System :: POSIX :: Linux
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: Implementation :: CPython
+description='Read and manipulate tox profile files'
+long_description='Read and manipulate tox profile files'
+url='https://git.plastiras.org/emdee/tox_profile/'
+keywords='ctypes Tox'
+ 
+[options]
+zip_safe = false
+python_requires = >=3.7
+include_package_data =
+    "*" = ["*.txt", "*.bash"]    
+
+[options.entry_points]
+console_scripts =
+    tox_profile = tox_profile.tox_profile:iMain
+
+[easy_install]
+zip_ok = false
+
+[flake8]
+jobs = 1
+max-line-length = 88
+ignore =
+    E111
+    E114
+    E128
+    E225
+    E261
+    E302
+    E305
+    E402
+    E501
+    E502
+    E541
+    E701
+    E702
+    E704
+    E722
+    E741
+    F508
+    F541
+    W503
+    W601

src/tox_profile/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = "1.0.0"

src/tox_profile/__main__.py

@@ -0,0 +1,5 @@
+import sys
+from tox_profile.tox_profile import iMain
+
+if __name__ == '__main__':
+    sys.exit(iMain(sys.argv[1:]))

src/tox_profile/tox_profile.py

@@ -19,6 +19,9 @@ commands, or the filename of the nodes file for the nodes command.
 --command edits
   edits fields in a Tox profile with --output to a file
 
+--command onions
+  cleans or checks a /etc/tor/torrc file with --output to a file
+
 """
 
 """
@@ -48,55 +51,71 @@ commands, or the filename of the nodes file for the nodes command.
        help               - print a summary of what fields can be edited
       section,num,key,val - edit the field section,num,key with val
 
+  --onions             experimental
+       config             - check your /etc/tor/torrc configuration
+       test               - test your /etc/tor/torrc configuration
 
 """
 
 # originally from:
 # https://stackoverflow.com/questions/30901873/what-format-are-tox-files-stored-in
 
-import sys
-import os
-import time
-import struct
-from socket import inet_ntop, AF_INET6, AF_INET
-import logging
 import argparse
-from pprint import pprint
-import shutil
 import json
-
+import logging
+import os
+import shutil
+import struct
+import sys
+import time
 import warnings
+from pprint import pprint
+from socket import AF_INET, AF_INET6, inet_ntop
+
 warnings.filterwarnings('ignore')
 
+from toxygen_wrapper.tests import support_testing as ts
+
 try:
     # https://pypi.org/project/msgpack/
     import msgpack
-except ImportError as e:
+except ImportError as e: # noqa
     msgpack = None
 try:
     import yaml
-except ImportError as e:
+except ImportError as e: # noqa
     yaml = None
+try:
+    import stem
+except ImportError as e: # noqa
+    stem = None
+try:
+    import nmap
+except ImportError as e: # noqa
+    nmap = None
 try:
     # https://pypi.org/project/coloredlogs/
     import coloredlogs
     if 'COLOREDLOGS_LEVEL_STYLES' not in os.environ:
         os.environ['COLOREDLOGS_LEVEL_STYLES'] = 'spam=22;debug=28;verbose=34;notice=220;warning=202;success=118,bold;error=124;critical=background=red'
-except ImportError as e:
+except ImportError as e: # noqa
     coloredlogs = False
+
+__version__ = "1.0.0"
+
 try:
     # https://git.plastiras.org/emdee/toxygen_wrapper
-    from wrapper.toxencryptsave import ToxEncryptSave
+    from toxygen_wrapper.toxencryptsave import ToxEncryptSave
-    from wrapper_tests.support_http import download_url, bAreWeConnected
+    from toxygen_wrapper.tests import support_testing as ts
-    from wrapper_tests.support_testing import sTorResolve
+    from toxygen_wrapper.tests.support_http import bAreWeConnected, download_url
-    from wrapper_tests import support_testing as ts
+    from toxygen_wrapper.tests.support_testing import sTorResolve
 except ImportError as e:
     print(f"Import Warning {e}")
     print("Download toxygen_wrapper to deal with encrypted tox files, from:")
     print("https://git.plastiras.org/emdee/toxygen_wrapper")
-    print("Just put the parent of the wrapper directory on your PYTHONPATH")
+    print("Just put the parent of the toxygen_wrapper directory on your PYTHONPATH")
     print("You also need to link your libtoxcore.so and libtoxav.so")
-    print("and libtoxencryptsave.so into wrapper/../libs/")
+    print("and libtoxencryptsave.so into toxygen_wrapper/../libs/")
     print("Link all 3 from libtoxcore.so if you have only libtoxcore.so")
     ToxEncryptSave = None
     download_url = None
@@ -106,7 +125,20 @@ except ImportError as e:
 
 LOG = logging.getLogger('TSF')
 
-# Fix for Windows
+def LOG_error(a): print('EROR> '+a)
+def LOG_warn(a): print('WARN> '+a)
+def LOG_info(a):
+    bVERBOSE = iLOG_LEVEL <= 20
+    if bVERBOSE: print('INFO> '+a)
+def LOG_debug(a):
+    bVERBOSE = iLOG_LEVEL <= 10-1
+    if bVERBOSE: print('DBUG> '+a)
+def LOG_trace(a):
+    bVERBOSE = iLOG_LEVEL < 10
+    if bVERBOSE: print('TRAC> '+a)
+
+__version__ = "0.1.0"
+# FixMe for Windows
 sDIR = os.environ.get('TMPDIR', '/tmp')
 sTOX_VERSION = "1000002018"
 sVER_MIN = "1000002013"
@@ -125,6 +157,7 @@ LOG.trace = trace
 global bOUT, aOUT, sENC
 aOUT = {}
 bOUT = b''
+lLABELS = []
 sENC = sys.getdefaultencoding() # 'utf-8'
 lNULLS = ['', '[]', 'null']
 lNONES = ['', '-',  'NONE']
@@ -140,6 +173,34 @@ DHT,.,DHTnode,
 TCP_RELAY,.,TCPnode,
 PATH_NODE,.,PATHnode,
 """
+# a dictionary of sets of lines
+lONION_CONFIG = {"hsconfig": [
+        '# Tox hidden service configuration.',
+        'HiddenServiceDir /var/lib/tor/tox-hsv3',
+        'HiddenServicePort 33446 127.0.0.1:33446',
+    ],
+     "vadr": [
+         'VirtualAddrNetworkIPv4 172.16.0.0/12',
+         'AutomapHostsSuffixes .exit,.onion',
+     ],
+     "mapaddress": []
+     }
+
+
+lONION_NODES = [
+    dict(maintainer="Tha_14",
+         public_key="8E8B63299B3D520FB377FE5100E65E3322F7AE5B20A0ACED2981769FC5B43725",
+         motd="Add me on Tox: F0AA7C8C55552E8593B2B77AC6FCA598A40D1F5F52A26C2322690A4BF1DFCB0DD8AEDD2822FF",
+         onions=[
+             "h5g52d26mmi67pzzln2uya5msfzjdewengefaj75diipeskoo252lnqd.onion:33446"],
+         ),
+    dict(motd="Emdee",
+         public_key= "EC8F7405F79F281569B6C66D9F03490973AB99BC9175C44FBEF4C3428A63B80D",
+         onions=[
+              "l2ct3xnuaiwwtoybtn46qp2av4ndxcguwupzyv6xrsmnwi647vvmwtqd.onion:33446",
+              ]
+      ),
+]
 
 #messenger.c
 MESSENGER_STATE_TYPE_NOSPAMKEYS = 1
@@ -225,7 +286,7 @@ Length  Contents
                4: 'Friend online'
                }
     slen = 1+32+1024+1+2+128+2+1007+1+2+1+3+4+8 # 2216
-    assert length % slen == 0
+    assert length % slen == 0, length
     lIN = []
     for i in range(length // slen):
         delta = i*slen
@@ -482,7 +543,7 @@ def lProcessDHTnodes(state, index, length, result, label="DHTnode"):
     return lIN
 
 def process_chunk(index, state, oArgs=None):
-    global bOUT, aOUT
+    global bOUT, aOUT, lLABELS
     global sENC
 
     length = struct.unpack_from("<I", state, index)[0]
@@ -503,6 +564,7 @@ def process_chunk(index, state, oArgs=None):
         LOG.trace(f"PROCESS_CHUNK {label} index={index} bOUT={len(bOUT)} delta={diff} length={length}")
 
     if data_type == MESSENGER_STATE_TYPE_NOSPAMKEYS:
+        lLABELS += [label]
         nospam = bin_to_hex(result[0:4])
         public_key = bin_to_hex(result[4:36])
         private_key = bin_to_hex(result[36:68])
@@ -531,6 +593,7 @@ def process_chunk(index, state, oArgs=None):
                 LOG.info(f"{label} {key} EDITED to {val}")
 
     elif data_type == MESSENGER_STATE_TYPE_DHT:
+        lLABELS += [label]
         LOG.debug(f"process_chunk {label} length={length}")
         if length > 4:
             lIN = lProcessDHTnodes(state, index, length, result, "DHTnode")
@@ -549,7 +612,8 @@ def process_chunk(index, state, oArgs=None):
                 LOG.info(f"{label} {key} EDITED to {val}")
 
     elif data_type == MESSENGER_STATE_TYPE_FRIENDS:
-        LOG.info(f"{label} {length // 2216} FRIENDS {length % 2216}")
+        lLABELS += [label]
+        LOG.info(f"{label} {length // 2216} friends mod={length % 2216}")
         if length > 0:
             lIN = lProcessFriends(state, index, length, result)
         else:
@@ -558,6 +622,7 @@ def process_chunk(index, state, oArgs=None):
         aOUT.update({label: lIN})
 
     elif data_type == MESSENGER_STATE_TYPE_NAME:
+        lLABELS += [label]
         name = str(result, sENC)
         LOG.info(f"{label} Nick_name = " +name)
         aIN = {"Nick_name": name}
@@ -570,6 +635,7 @@ def process_chunk(index, state, oArgs=None):
                 LOG.info(f"{label} {key} EDITED to {val}")
 
     elif data_type == MESSENGER_STATE_TYPE_STATUSMESSAGE:
+        lLABELS += [label]
         mess = str(result, sENC)
         LOG.info(f"{label} StatusMessage = " +mess)
         aIN = {"Status_message": mess}
@@ -582,6 +648,7 @@ def process_chunk(index, state, oArgs=None):
                 LOG.info(f"{label} {key} EDITED to {val}")
 
     elif data_type == MESSENGER_STATE_TYPE_STATUS:
+        lLABELS += [label]
         # 1  uint8_t status (0 = online, 1 = away, 2 = busy)
         dStatus = {0: 'online', 1: 'away', 2: 'busy'}
         status = struct.unpack_from(">b", state, index)[0]
@@ -597,6 +664,7 @@ def process_chunk(index, state, oArgs=None):
                 LOG.info(f"{label} {key} EDITED to {val}")
 
     elif data_type == MESSENGER_STATE_TYPE_GROUPS:
+        lLABELS += [label]
         if length > 0:
             lIN = lProcessGroups(state, index, length, result, label)
         else:
@@ -605,6 +673,7 @@ def process_chunk(index, state, oArgs=None):
         aOUT.update({label: lIN})
 
     elif data_type == MESSENGER_STATE_TYPE_TCP_RELAY:
+        lLABELS += [label]
         if length > 0:
             lIN = lProcessNodeInfo(state, index, length, result, "TCPnode")
             LOG.info(f"TYPE_TCP_RELAY {len(lIN)} nodes {length} length")
@@ -620,6 +689,7 @@ def process_chunk(index, state, oArgs=None):
                 LOG.info(f"{label} {key} EDITED to {val}")
 
     elif data_type == MESSENGER_STATE_TYPE_PATH_NODE:
+        lLABELS += [label]
         #define NUM_SAVED_PATH_NODES 8
         if not length % 8 == 0:
             # this should be an assert?
@@ -636,6 +706,7 @@ def process_chunk(index, state, oArgs=None):
                 LOG.info(f"{label} {key} EDITED to {val}")
 
     elif data_type == MESSENGER_STATE_TYPE_CONFERENCES:
+        lLABELS += [label]
         lIN = []
         if length > 0:
             LOG.debug(f"TODO process_chunk {label} bytes={length}")
@@ -646,10 +717,13 @@ def process_chunk(index, state, oArgs=None):
     elif data_type != MESSENGER_STATE_TYPE_END:
         LOG.error("UNRECOGNIZED datatype={datatype}")
         sys.exit(1)
-
     else:
         LOG.info("END") # That's all folks...
         # drop through
+        if len(lLABELS) == len(dSTATE_TYPE.keys()) - 1:
+            LOG.info(f"{len(lLABELS)} sections") # That's all folks...
+        else:
+            LOG.warn(f"{10 - len(lLABELS)} sections missing {lLABELS}") # That's all folks...
 
     # We repack as we read: or edit as we parse; simply edit result and length.
     # We'll add the results back to bOUT to see if we get what we started with.
@@ -752,16 +826,17 @@ def lNodesCheckNodes(json_nodes, oArgs, bClean=False):
     Checking NODES.json
     """
     lErrs = []
-    iErrs = 0
+    ierrs = 0
     nth = 0
     if bClean: lNew=[]
     # assert type(json_nodes) == dict
     bRUNNING_TOR = False
     if bHAVE_TOR:
-        iRet = os.system("netstat -nle4|grep -q :9050")
+        iret = os.system("netstat -nle4|grep -q :9050")
-        if iRet == 0:
+        if iret == 0:
             bRUNNING_TOR = True
 
+    lOnions = []
     for node in json_nodes:
         # new fields:
         if bClean:
@@ -773,20 +848,31 @@ def lNodesCheckNodes(json_nodes, oArgs, bClean=False):
                     new_node[key] = val
             if 'onions' not in new_node:
                 new_node['onions'] = []
+                for elt in lONION_NODES:
+                    if node['public_key'] == elt['public_key']:
+                        new_node['onions'].extend(elt['onions'])
+                        break
+                else:
+                    # add to nodes
+                    pass
+            else:
+                for keypair in node['onions']:
+                    s = keypair.split(':')[0]
+                    lOnions.append(s)
 
         for ipv in ['ipv4','ipv6']:
             for fam in ["status_tcp", "status_udp"]:
                 if node[ipv] in lNONES \
                   and node[fam] in [True, "true"]:
-                    LOG.warn(f"{ipv} {node[ipv]} in [-, 'NONE'] but node[{fam}] is true")
+                    LOG.debug(f"{ipv} {node[ipv]} but node[{fam}] is true")
             bLinux = os.path.exists('/proc')
             if bLinux and not os.path.exists(f"/proc/sys/net/{ipv}/"):
                 continue
             elif True:
                 if not node[ipv] in lNONES and ipv == 'ipv4':
                     # just ping for now
-                    iRet = os.system(f"ping -c 1 {node[ipv]} > /dev/null")
+                    iret = os.system(f"ping -c 1 {node[ipv]} > /dev/null")
-                    if iRet == 0:
+                    if iret == 0:
                         LOG.info(f"Pinged {node[ipv]}")
                     else:
                         LOG.warn(f"Failed ping {node[ipv]}")
@@ -806,16 +892,16 @@ def lNodesCheckNodes(json_nodes, oArgs, bClean=False):
 
         if node["version"] and node["version"] < "1000002013":
             lErrs += [nth]
-            LOG.error(f"vulnerable version {node['version']} < 1000002013")
+            LOG.error(f"{node['ipv4']}: vulnerable version {node['version']} < 1000002013")
         elif node["version"] and node["version"] < sVER_MIN:
-            LOG.warn(f"outdated version {node['version']} < {sVER_MIN}")
+            LOG.warn(f"{node['ipv4']}: outdated version {node['version']} < {sVER_MIN}")
 
         # Put the onion address in the location after the country code
         if len(node["location"]) not in [2, 65]:
-            LOG.warn(f"location {location} should be a 2 digit country code, or 'code onion'")
+            LOG.warn(f"{node['ipv4']}: location {node['location']} should be a 2 digit country code, or 'code onion'")
         elif len(node["location"]) == 65 and \
              not node["location"].endswith('.onion'):
-            LOG.warn(f"location {location} should be a 2 digit country code 'code onion'")
+            LOG.warn(f"{node['ipv4']}: location {node['location']} should be a 2 digit country code 'code onion'")
         elif len(node["location"]) == 65 and \
                 node["location"].endswith('.onion') and bHAVE_TOR:
             onion = node["location"][3:]
@@ -834,27 +920,42 @@ def lNodesCheckNodes(json_nodes, oArgs, bClean=False):
                     pass
                 else:
                     if s:
-                        LOG.info(f"Found an onion that resolves to {s}")
+                        LOG.info(f"{node['ipv4']}: Found an onion that resolves to {s}")
                     else:
-                        LOG.warn(f"Found an onion that resolves to {s}")
+                        LOG.warn(f"{node['ipv4']}: Found an onion that resolves to {s}")
 
         if node['last_ping'] and time.time() - node['last_ping'] > iOLD_SECS:
-            LOG.debug(f"node has not been pinged in more than 3 months")
+            LOG.debug(f"{node['ipv4']}: node has not pinged in more than 3 months")
 
         # suggestions YMMV
 
         if len(node['maintainer']) > 75 and len(node['motd']) < 75:
             pass
-            # look for onion LOG.debug(f"Maybe put a ToxID: in motd so people can contact you.")
+            # look for onion
-
+        if not node['motd']:
-        if bClean and not nth in lErrs:
+            # LOG.info(f"Maybe put a ToxID: in motd so people can contact you.")
+            pass
+        if bClean and nth not in lErrs:
             lNew += [new_node]
         nth += 1
 
     # fixme  look for /etc/tor/torrc but it may not be readable
     if bHAVE_TOR and os.path.exists('/etc/tor/torrc'):
+        # get from torrc
+        address_range = '172.16.1' # 127.192.0
         # print(sBLURB)
-        pass
+        LOG.info("Add this section to your /etc/tor/torrc")
+        for line in lONION_CONFIG['vadr']:
+            print(line)
+        if lOnions:
+            LOG.info("Add this section to your /etc/tor/torrc")
+            print('VirtualAddrNetwork {address_range}.0/10')
+            i = 1
+            for line in lOnions:
+                hosts = line.split(':')
+                print(f"MapAddress {hosts[0]} {address_range}.{i}")
+                i += 1
+
     if bClean:
         return lNew
     else:
@@ -867,7 +968,7 @@ def iNodesFileCheck(sProOrNodes, oArgs, bClean=False):
         with open(sProOrNodes, 'rt') as fl:
             json_all = json.loads(fl.read())
             json_nodes = json_all['nodes']
-    except Exception as e:
+    except Exception as e: # noqa
         LOG.exception(f"{oArgs.command} error reading {sProOrNodes}")
         return 1
 
@@ -882,17 +983,17 @@ def iNodesFileCheck(sProOrNodes, oArgs, bClean=False):
             aOut = dict(last_scan=json_all['last_scan'],
                         last_refresh=now,
                         nodes=al)
-            sOut = oArgs.output
+            sout = oArgs.output
             try:
-                LOG.debug(f"iNodesFileClean saving to {sOut}")
+                LOG.debug(f"iNodesFileClean saving to {sout}")
-                oStream = open(sOut, 'wt', encoding=sENC)
+                oStream = open(sout, 'wt', encoding=sENC)
                 json.dump(aOut, oStream, indent=oArgs.indent)
                 if oStream.write('\n') > 0: i = 0
-            except Exception as e:
+            except Exception as e: # noqa
-                LOG.exception(f"iNodesFileClean error dumping JSON to {sOUT}")
+                LOG.exception(f"iNodesFileClean error dumping JSON to {sout}")
                 return 3
 
-    except Exception as e:
+    except Exception as e: # noqa
         LOG.exception(f"iNodesFileCheck error checking JSON")
         i = -2
     else:
@@ -907,67 +1008,67 @@ def iNodesFileClean(sProOrNodes):
     return 0
     f = "DHTNodes.clean"
     if not oArgs.output:
-        sOut = os.path.join(sDIR, f)
+        sout = os.path.join(sDIR, f)
     else:
-        sOut = oArgs.output
+        sout = oArgs.output
 
     try:
-        LOG.debug(f"iNodesFileClean saving to {sOut}")
+        LOG.debug(f"iNodesFileClean saving to {sout}")
-        oStream = open(sOut, 'wt', encoding=sENC)
+        oStream = open(sout, 'wt', encoding=sENC)
         json.dump(aOUT, oStream, indent=oArgs.indent)
-        if oStream.write('\n') > 0: iRet = 0
+        if oStream.write('\n') > 0: iret = 0
-    except Exception as e:
+    except Exception as e: # noqa
-        LOG.exception(f"iNodesFileClean error dumping JSON to {sOUT}")
+        LOG.exception(f"iNodesFileClean error dumping JSON to {sout}")
         return 3
 
-    LOG.info(f"{oArgs.info}ing iRet={iRet} to {oArgs.output}")
+    LOG.info(f"{oArgs.info}ing iret={iret} to {oArgs.output}")
     return 0
 
 def iOsSystemNmapUdp(l, oArgs):
-    iErrs = 0
+    ierrs = 0
     for elt in l:
         cmd = f"sudo nmap -Pn -n -sU -p U:{elt['Port']} {elt['Ip']}"
         LOG.debug(f"{oArgs.info} {cmd} to {oArgs.output}")
-        iErrs += os.system(cmd +f" >> {oArgs.output} 2>&1")
+        ierrs += os.system(cmd +f" >> {oArgs.output} 2>&1")
-        if iErrs:
+        if ierrs:
-            LOG.warn(f"{oArgs.info} {iErrs} ERRORs to {oArgs.output}")
+            LOG.warn(f"{oArgs.info} {ierrs} ERRORs to {oArgs.output}")
         else:
             LOG.info(f"{oArgs.info} NO errors to {oArgs.output}")
             lRet = lParseNapOutput(oArgs.output)
             if lRet:
                 for sLine in lRet:
                     LOG.warn(f"{oArgs.nodes} {sLine}")
-            iErr = len(lRet)
+            ierr = len(lRet)
-        iErrs += iErr
+        ierrs += ierr
-    return iErrs
+    return ierrs
 
 def iOsSystemNmapTcp(l, oArgs):
-    iErrs = 0
+    ierrs = 0
     LOG.debug(f"{len(l)} nodes to {oArgs.output}")
     for elt in l:
         cmd = f"sudo nmap -Pn -n -sT -p T:{elt['Port']} {elt['Ip']}"
         LOG.debug(f"iOsSystemNmapTcp {cmd} to {oArgs.output}")
-        iErr += os.system(cmd +f" >> {oArgs.output} 2>&1")
+        ierr = os.system(cmd +f" >> {oArgs.output} 2>&1")
-        if iErr:
+        if ierr:
-            LOG.warn(f"iOsSystemNmapTcp {iErrs} ERRORs to {oArgs.output}")
+            LOG.warn(f"iOsSystemNmapTcp {ierrs} ERRORs to {oArgs.output}")
         else:
             lRet = lParseNapOutput(oArgs.output)
             if lRet:
                 for sLine in lRet:
                     LOG.warn(f"{oArgs.nodes} {sLine}")
-            iErr = len(lRet)
+            ierr = len(lRet)
-        iErrs += iErr
+        ierrs += ierr
-    return iErrs
+    return ierrs
 
-def vSetupLogging(loglevel=logging.DEBUG):
+def vSetupLogging(log_level=logging.DEBUG):
     global LOG
     if coloredlogs:
-        aKw = dict(level=loglevel,
+        aKw = dict(level=log_level,
                    logger=LOG,
                    fmt='%(name)s %(levelname)s %(message)s')
         coloredlogs.install(**aKw)
     else:
-        aKw = dict(level=loglevel,
+        aKw = dict(level=log_level,
                    format='%(name)s %(levelname)-4s %(message)s')
         logging.basicConfig(**aKw)
 
@@ -975,7 +1076,67 @@ def vSetupLogging(loglevel=logging.DEBUG):
     logging._defaultFormatter.default_time_format = '%m-%d %H:%M:%S'
     logging._defaultFormatter.default_msec_format = ''
 
-def iMain(sProOrNodes, oArgs):
+def iTestTorConfig(sProOrNodes, oArgs, bClean=False):
+    # add_onion
+    LOG.info(f"iTestTorConfig {sProOrNodes}")
+    lEtcTorrc = open(sProOrNodes, 'rt').readlines()
+    if bClean == False:
+        LOG.info(f"Add these lines to {sProOrNodes}")
+        for key,val in lONION_CONFIG.items():
+            for line in val:
+                if line.startswith('#'): continue
+                if line not in lEtcTorrc:
+                    print(line)
+    # add_mapaddress
+    if bClean == False:
+        LOG.info(f"Add these lines to {sProOrNodes}")
+        i=1
+        for elt in lONION_NODES:
+            for line in elt['onions']:
+                host,port = line.split(':')
+                print(f"MapAddress {host} 172.16.1.{i}")
+                i += 1
+
+    # add_bootstrap
+    return 0
+
+def iTestTorExits(sProOrNodes, oArgs, bClean=False):
+    LOG.info(f"iTestTorExits")
+#    import pdb; pdb.set_trace()
+    # sProOrNodes
+    try:
+        if hasattr(ts, 'oSTEM_CONTROLER') and ts.oSTEM_CONTROLER \
+           and ts.oSTEM_CONTROLER.is_set('ExcludeExitNodes'):
+               LOG_info(f"ExcludeExitNodes is set so we cant continue")
+               return 0
+        LOG_info(f"ExcludeExitNodes is not set so we can continue")
+        l = ts.lExitExcluder(iPort=9051)
+    except Exception as e:
+        LOG.error(f"ExcludeExitNodes errored {e}")
+        return 1
+
+    return 0
+
+def iTestTorTest(sProOrNodes, oArgs, bClean=False):
+    # test_onion
+    # check_mapaddress
+    # check_bootstrap
+    LOG.info(f"iTestTorTest {sProOrNodes}")
+    for elt in lONION_NODES:
+        for line in elt['onions']:
+            (host, port,) = line.split(':')
+            LOG.debug(f"iTestTorTest resolving {host}")
+            ip = ts.sTorResolve(host)
+            if ip: LOG.info(f"{host} resolved to {ip}")
+
+    # test debian
+    # http://5ekxbftvqg26oir5wle3p27ax3wksbxcecnm6oemju7bjra2pn26s3qd.onion/
+    return 0
+
+def iTestOnionNodes():
+    return 0
+
+def iMainFun(sProOrNodes, oArgs):
     global bOUT, aOUT, sENC
     global bSAVE
 
@@ -994,15 +1155,16 @@ def iMain(sProOrNodes, oArgs):
     LOG.debug(f"{oArgs.command} {len(bSAVE)} bytes")
 
     oStream = None
+    LOG.info(f"Running {oArgs.command}")
     if oArgs.command == 'decrypt':
         assert oArgs.output, "--output required for this command"
         oStream = open(oArgs.output, 'wb')
-        iRet = oStream.write(bSAVE)
+        iret = oStream.write(bSAVE)
-        LOG.info(f"Wrote {iRet} to {oArgs.output}")
+        LOG.info(f"Wrote {iret} to {oArgs.output}")
-        iRet = 0
+        iret = 0
 
     elif oArgs.command == 'nodes':
-        iRet = -1
+        iret = -1
         ep_sec = str(int(time.time()))
         json_head = '{"last_scan":' +ep_sec \
             +',"last_refresh":' +ep_sec \
@@ -1013,7 +1175,7 @@ def iMain(sProOrNodes, oArgs):
             with open(oArgs.output, 'wt') as oFd:
                 oFd.write(json_head)
             cmd = f"cat '{sProOrNodes}' | jq '.|with_entries(select(.key|match(\"nodes\"))).nodes[]|select(.status_tcp)|select(.ipv4|match(\".\"))' "
-            iRet = os.system(cmd +"| sed -e '2,$s/^{/,{/'" +f" >>{oArgs.output}")
+            iret = os.system(cmd +"| sed -e '2,$s/^{/,{/'" +f" >>{oArgs.output}")
             with open(oArgs.output, 'at') as oFd: oFd.write(']}\n')
 
         elif oArgs.nodes == 'select_udp':
@@ -1022,7 +1184,7 @@ def iMain(sProOrNodes, oArgs):
             with open(oArgs.output, 'wt') as oFd:
                 oFd.write(json_head)
             cmd = f"cat '{sProOrNodes}' | jq '.|with_entries(select(.key|match(\"nodes\"))).nodes[]|select(.status_udp)|select(.ipv4|match(\".\"))' "
-            iRet = os.system(cmd +"| sed -e '2,$s/^{/,{/'" +f" >>{oArgs.output}")
+            iret = os.system(cmd +"| sed -e '2,$s/^{/,{/'" +f" >>{oArgs.output}")
             with open(oArgs.output, 'at') as oFd: oFd.write(']}\n')
 
         elif oArgs.nodes == 'select_version':
@@ -1032,7 +1194,7 @@ def iMain(sProOrNodes, oArgs):
                 oFd.write(json_head)
             cmd = f"cat '{sProOrNodes}' | jq '.|with_entries(select(.key|match(\"nodes\"))).nodes[]|select(.status_udp)|select(.version|match(\"{sTOX_VERSION}\"))'"
 
-            iRet = os.system(cmd +"| sed -e '2,$s/^{/,{/'" +f" >>{oArgs.output}")
+            iret = os.system(cmd +"| sed -e '2,$s/^{/,{/'" +f" >>{oArgs.output}")
             with open(oArgs.output, 'at') as oFd:
                 oFd.write(']}\n')
 
@@ -1044,13 +1206,13 @@ def iMain(sProOrNodes, oArgs):
                 cmd = sBashFileNmapTcp()
                 cmd = f"sudo bash {cmd} < '{sProOrNodes}' >'{oArgs.output}' 2>&1"
                 LOG.debug(cmd)
-                iRet = os.system(cmd)
+                iret = os.system(cmd)
-                if iRet == 0:
+                if iret == 0:
                     lRet = lParseNapOutput(oArgs.output)
                     if lRet:
                         for sLine in lRet:
                             LOG.warn(f"{oArgs.nodes} {sLine}")
-                    iRet = len(lRet)
+                    iret = len(lRet)
 
         elif oArgs.nodes == 'nmap_udp':
             assert oArgs.output, "--output required for this command"
@@ -1061,13 +1223,13 @@ def iMain(sProOrNodes, oArgs):
             cmd = vBashFileNmapUdp()
             cmd = f"sudo bash {cmd} < '{sProOrNodes}'" +f" >'{oArgs.output}' 2>&1"
             LOG.debug(cmd)
-            iRet = os.system(cmd)
+            iret = os.system(cmd)
-            if iRet == 0:
+            if iret == 0:
                 lRet = lParseNapOutput(oArgs.output)
                 if lRet:
                     for sLine in lRet:
                         LOG.warn(f"{oArgs.nodes} {sLine}")
-                iRet = len(lRet)
+                iret = len(lRet)
 
         elif oArgs.nodes == 'download' and download_url:
             if not bAreWeConnected():
@@ -1076,7 +1238,7 @@ def iMain(sProOrNodes, oArgs):
             b = download_url(url)
             if not b:
                 LOG.warn("failed downloading list of nodes")
-                iRet = -1
+                iret = -1
             else:
                 if oArgs.output:
                     oStream = open(oArgs.output, 'wb')
@@ -1084,28 +1246,48 @@ def iMain(sProOrNodes, oArgs):
                 else:
                     oStream = sys.stdout
                     oStream.write(str(b, sENC))
-                iRet = 0
+                iret = 0
                 LOG.info(f"downloaded list of nodes to {oStream}")
 
         elif oArgs.nodes == 'check':
             i = iNodesFileCheck(sProOrNodes, oArgs, bClean=False)
-            iRet = i
+            iret = i
 
         elif oArgs.nodes == 'clean':
             assert oArgs.output, "--output required for this command"
             i = iNodesFileCheck(sProOrNodes, oArgs, bClean=True)
-            iRet = i
+            iret = i
 
-        if iRet > 0:
+        if iret > 0:
-            LOG.warn(f"{oArgs.nodes} iRet={iRet} to {oArgs.output}")
+            LOG.warn(f"{oArgs.nodes} iret={iret} to {oArgs.output}")
 
-        elif iRet == 0:
+        elif iret == 0:
-            LOG.info(f"{oArgs.nodes} iRet={iRet} to {oArgs.output}")
+            LOG.info(f"{oArgs.nodes} iret={iret} to {oArgs.output}")
+
+    elif oArgs.command == 'onions':
+
+        LOG.info(f"{oArgs.command} {oArgs.onions} {oArgs.output}")
+
+        if oArgs.onions == 'config':
+            i = iTestTorConfig(sProOrNodes, oArgs)
+            iret = i
+
+        elif oArgs.onions == 'test':
+            i = iTestTorTest(sProOrNodes, oArgs)
+            iret = i
+
+        elif oArgs.onions == 'exits':
+            i = iTestTorExits(sProOrNodes, oArgs)
+            iret = i
+        else:
+            RuntimeError(oArgs.onions)
 
     elif oArgs.command in ['info', 'edit']:
+
         if oArgs.command in ['edit']:
             assert oArgs.output, "--output required for this command"
             assert oArgs.edit != '', "--edit required for this command"
+
         elif oArgs.command == 'info':
             # assert oArgs.info != '', "--info required for this command"
             if oArgs.info in ['save', 'yaml', 'json', 'repr', 'pprint']:
@@ -1115,11 +1297,11 @@ def iMain(sProOrNodes, oArgs):
         assert bSAVE[:8] == bMARK, "Not a Tox profile"
         bOUT = bMARK
 
-        iErrs = 0
+        iret = 0
         process_chunk(len(bOUT), bSAVE, oArgs)
         if not bOUT:
             LOG.error(f"{oArgs.command} NO bOUT results")
-            iRet = 1
+            iret = 1
         else:
             oStream = None
             LOG.debug(f"command={oArgs.command} len bOUT={len(bOUT)} results")
@@ -1127,15 +1309,15 @@ def iMain(sProOrNodes, oArgs):
             if oArgs.command in ['edit'] or oArgs.info in ['save']:
                 LOG.debug(f"{oArgs.command} saving to {oArgs.output}")
                 oStream = open(oArgs.output, 'wb', encoding=None)
-                if oStream.write(bOUT) > 0: iRet = 0
+                if oStream.write(bOUT) > 0: iret = 0
-                LOG.info(f"{oArgs.info}ed iRet={iRet} to {oArgs.output}")
+                LOG.info(f"{oArgs.info}ed iret={iret} to {oArgs.output}")
             elif oArgs.info == 'info':
                 pass
-                iRet = 0
+                iret = 0
             elif oArgs.info == 'yaml':
                 if not yaml:
                     LOG.warn(f"{oArgs.command} no yaml support")
-                    iRet = -1
+                    iret = -1
                 else:
                     LOG.debug(f"{oArgs.command} saving to {oArgs.output}")
                     oStream = open(oArgs.output, 'wt', encoding=sENC)
@@ -1146,13 +1328,13 @@ def iMain(sProOrNodes, oArgs):
                         LOG.warn(f'WARN: {e}')
                     else:
                         oStream.write('\n')
-                        iRet = 0
+                        iret = 0
-                    LOG.info(f"{oArgs.info}ing iRet={iRet} to {oArgs.output}")
+                    LOG.info(f"{oArgs.info}ing iret={iret} to {oArgs.output}")
 
             elif oArgs.info == 'json':
                 if not yaml:
                     LOG.warn(f"{oArgs.command} no json support")
-                    iRet = -1
+                    iret = -1
                 else:
                     LOG.debug(f"{oArgs.command} saving to {oArgs.output}")
                     oStream = open(oArgs.output, 'wt', encoding=sENC)
@@ -1161,53 +1343,56 @@ def iMain(sProOrNodes, oArgs):
                     except:
                         LOG.warn("There are somtimes problems with the json info dump of bytes keys: ```TypeError: Object of type bytes is not JSON serializable```")
                     oStream.write('\n') > 0
-                    iRet = 0
+                    iret = 0
-                    LOG.info(f"{oArgs.info}ing iRet={iRet} to {oArgs.output}")
+                    LOG.info(f"{oArgs.info}ing iret={iret} to {oArgs.output}")
 
             elif oArgs.info == 'repr':
                 LOG.debug(f"{oArgs.command} saving to {oArgs.output}")
                 oStream = open(oArgs.output, 'wt', encoding=sENC)
-                if oStream.write(repr(bOUT)) > 0: iRet = 0
+                if oStream.write(repr(bOUT)) > 0: iret = 0
-                if oStream.write('\n') > 0: iRet = 0
+                if oStream.write('\n') > 0: iret = 0
-                LOG.info(f"{oArgs.info}ing iRet={iRet} to {oArgs.output}")
+                LOG.info(f"{oArgs.info}ing iret={iret} to {oArgs.output}")
 
             elif oArgs.info == 'pprint':
                 LOG.debug(f"{oArgs.command} saving to {oArgs.output}")
                 oStream = open(oArgs.output, 'wt', encoding=sENC)
                 pprint(aOUT, stream=oStream, indent=oArgs.indent, width=80)
-                iRet = 0
+                iret = 0
-                LOG.info(f"{oArgs.info}ing iRet={iRet} to {oArgs.output}")
+                LOG.info(f"{oArgs.info}ing iret={iret} to {oArgs.output}")
 
             elif oArgs.info == 'nmap_relay':
                 assert bHAVE_NMAP, "nmap is required for this command"
                 assert oArgs.output, "--output required for this command"
                 if aOUT["TCP_RELAY"]:
-                    iRet = iOsSystemNmapTcp(aOUT["TCP_RELAY"], oArgs)
+                    iret = iOsSystemNmapTcp(aOUT["TCP_RELAY"], oArgs)
                 else:
                     LOG.warn(f"{oArgs.info} no TCP_RELAY")
-                    iRet = 0
+                    iret = 0
 
             elif oArgs.info == 'nmap_dht':
                 assert bHAVE_NMAP, "nmap is required for this command"
                 assert oArgs.output, "--output required for this command"
                 if aOUT["DHT"]:
-                    iRet = iOsSystemNmapUdp(aOUT["DHT"], oArgs)
+                    iret = iOsSystemNmapUdp(aOUT["DHT"], oArgs)
                 else:
                     LOG.warn(f"{oArgs.info} no DHT")
-                    iRet = 0
+                    iret = 0
 
             elif oArgs.info == 'nmap_path':
                 assert bHAVE_NMAP, "nmap is required for this command"
                 assert oArgs.output, "--output required for this command"
                 if aOUT["PATH_NODE"]:
-                    iRet = iOsSystemNmapUdp(aOUT["PATH_NODE"], oArgs)
+                    iret = iOsSystemNmapUdp(aOUT["PATH_NODE"], oArgs)
                 else:
                     LOG.warn(f"{oArgs.info} no PATH_NODE")
-                    iRet = 0
+                    iret = 0
+
+    else:
+        LOG.warn(f"{oArgs.command} UNREGOGNIZED")
 
     if oStream and oStream != sys.stdout and oStream != sys.stderr:
         oStream.close()
-    return iRet
+    return iret
 
 def oMainArgparser(_=None):
     if not os.path.exists('/proc/sys/net/ipv6'):
@@ -1223,7 +1408,7 @@ def oMainArgparser(_=None):
     parser.add_argument('--output', type=str, default='',
                         help='Destination for info/decrypt - defaults to stderr')
     parser.add_argument('--command', type=str, default='info',
-                        choices=['info', 'decrypt', 'nodes', 'edit'],
+                        choices=['info', 'decrypt', 'nodes', 'edit', 'onions'],
                         help='Action command - default: info')
     #                         nargs='+',
     parser.add_argument('--edit', type=str, default='',
@@ -1250,9 +1435,14 @@ def oMainArgparser(_=None):
                         help='Action for nodes command (requires jq)')
     parser.add_argument('--download_nodes_url', type=str,
                         default='https://nodes.tox.chat/json')
+    parser.add_argument('--onions', type=str, default='',
+                        choices=['config', 'test'] if bHAVE_TOR else [],
+                        help='Action for onion command (requires tor)')
+
     parser.add_argument('--encoding', type=str, default=sENC)
     parser.add_argument('lprofile', type=str, nargs='+', default=None,
                         help='tox profile files - may be encrypted')
+    parser.add_argument('--log_level', type=int, default=10)
 
     parser.add_argument('--proxy_host', '--proxy-host', type=str,
                         default='',
@@ -1265,8 +1455,9 @@ def oMainArgparser(_=None):
 
     return parser
 
-if __name__ == '__main__':
+def iMain(lArgv=None):
-    lArgv = sys.argv[1:]
+    global iLOG_LEVEL
+    if lArgv is None: lArgv = sys.argv[1:]
     parser = oMainArgparser()
     oArgs = parser.parse_args(lArgv)
     if oArgs.command in ['edit'] and oArgs.edit == 'help':
@@ -1276,9 +1467,11 @@ if __name__ == '__main__':
         print('Supported Quads: section,num,key,type ' +sEDIT_HELP)
         sys.exit(0)
 
-    vSetupLogging()
+    vSetupLogging(oArgs.log_level)
+    iLOG_LEVEL = oArgs.log_level
     i = 0
     for sProOrNodes in oArgs.lprofile:
-        i = iMain(sProOrNodes, oArgs)
+        i = iMainFun(sProOrNodes, oArgs)
 
-    sys.exit(i)
+if __name__ == '__main__':
+    sys.exit(iMain(sys.argv[1:]))

tox_profile_examples.bash

@@ -0,0 +1,24 @@
+#!/bin/sh -e
+# -*- mode: sh; fill-column: 75; tab-width: 8; coding: utf-8-unix -*-
+
+# some examples of tox-profile usage
+
+export PYTHONPATH=/mnt/o/var/local/src/toxygen_wrapper.git
+TOX_HOME=$HOME/.config/tox
+NMAP_CMD='sudo -u debian-tor nmap'
+
+echo INFO: check the download json file
+python3 tox_profile.py --command nodes --nodes check \
+	$TOX_HOME/DHTnodes.json.new \
+	2>&1 | tee /tmp/DHTnodes.json.log
+
+echo INFO: get the tcp nodes/ports from the downloaded json file
+python3 tox_profile.py --command nodes --nodes select_tcp \
+	--output /tmp/DHTnodes.json.tcp \
+	$TOX_HOME/DHTnodes.json.new
+
+echo INFO: run ping/nmap on the tcp nodes/ports from the downloaded json file
+python3 tox_profile.py --command nodes --nodes nmap_tcp \
+	--nmap_cmd $NMAP_CMD \
+	--output /tmp/DHTnodes.json.tcp.out \
+	/tmp/DHTnodes.json.tcp

tox_profile_test.bash

@@ -0,0 +1,340 @@
+#!/bin/sh
+# -*- mode: sh; fill-column: 75; tab-width: 8; coding: utf-8-unix -*-
+
+# tox_profile.py has a lot of features so it needs test coverage
+
+PREFIX=/mnt/o/var/local
+ROLE=text
+DEBUG=1
+EXE=/var/local/bin/python3.bash
+WRAPPER=$PREFIX/src/toxygen_wrapper.git
+tox=$HOME/.config/tox/toxic_profile.tox
+[ -s $tox ] || exit 2
+target=$PREFIX/src/tox_profile/tox_profile.py
+
+OUT=/tmp/toxic_profile
+
+ps ax | grep -q tor && netstat -n4le | grep -q :9050
+[ $? -eq 0 ] && HAVE_TOR=1 || HAVE_TOR=0
+
+[ -f /usr/local/bin/usr_local_tput.bash ] && \
+    . /usr/local/bin/usr_local_tput.bash || {
+	DBUG() { echo DEBUG $* ; }
+	INFO() { echo INFO $* ; }
+	WARN() { echo WARN $* ; }
+	ERROR() { echo ERROR $* ; }
+    }
+
+if [ -z "$TOXCORE_LIBS" ] &&  [ ! -d libs ] ; then
+    mkdir libs
+    cd libs
+    # /lib/x86_64-linux-gnu/libtoxcore.so.2
+    for pro in qtox toxic ; do
+	if which $pro 2> /dev/null ; then
+	    DBUG linking to $pro libtoxcore
+ 	    lib=$( ldd `which $pro` | grep libtoxcore|sed -e 's/.* => //' -e 's/ .*//')
+	    [ -n "$lib" -a -f "$lib" ] || { WARN $Lib ; continue ; }
+	    INFO linking to $lib
+	    for elt in libtoxcore.so libtoxav.so libtoxencryptsave.so ; do
+		ln -s "$lib" "$elt"
+	    done
+	    export TOXCORE_LIBS=$PWD
+	    break
+	fi
+    done
+    cd ..
+elif [ -z "$TOXCORE_LIBS" ] &&  [ -d libs ] ; then
+    export TOXCORE_LIBS=$PWD/libs
+fi
+
+
+# set -- -e
+[ -s $target ] || exit 1
+
+[ -d $WRAPPER ] || {
+    ERROR wrapper is required https://git.plastiras.org/emdee/toxygen_wrapper
+    exit 3
+}
+export  PYTHONPATH=$WRAPPER
+
+json=$HOME/.config/tox/DHTnodes.json
+[ -s $json ] || exit 4
+
+which jq > /dev/null && HAVE_JQ=1 || HAVE_JQ=0
+which nmap > /dev/null && HAVE_NMAP=1 || HAVE_NMAP=0
+
+sudo rm -f $OUT.* /tmp/toxic_nodes.*
+
+test_jq () {
+    [ $# -eq 3 ] || {
+	ERROR test_jq '#' "$@"
+	return 3
+    }
+    in=$1
+    out=$2
+    err=$3
+    [ -s $in ] || {
+	ERROR $i test_jq null $in
+	return 4
+    }
+    jq . < $in >$out 2>$err || {
+	ERROR $i test_jq $json
+	return 5
+    }
+    grep error: $err && {
+	ERROR $i test_jq $json
+	return 6
+    }
+    [ -s $out ] || {
+	ERROR $i null $out
+	return 7
+    }
+    [ -s $err ] || rm -f $err
+    return 0
+}
+
+i=0
+[ "$HAVE_JQ" = 0 ] || \
+    test_jq $json /tmp/toxic_nodes.json /tmp/toxic_nodes.err || {
+	ERROR test_jq failed on $json
+	exit ${i}$?
+	}
+[ -f /tmp/toxic_nodes.json ] || cp -p $json /tmp/toxic_nodes.json
+json=/tmp/toxic_nodes.json
+
+i=1
+# required password
+INFO $i decrypt $OUT.bin
+$EXE $target --command decrypt --output $OUT.bin $tox || exit ${i}1
+[ -s $OUT.bin ] || exit ${i}2
+
+tox=$OUT.bin
+INFO $i info $tox
+$EXE $target --command info --info info $tox 2>$OUT.info || {
+    ERROR $i $EXE $target --command info --info info $tox
+    exit ${i}3
+}
+[ -s $OUT.info ] || exit ${i}4
+
+INFO $i $EXE $target --command info --info save --output $OUT.save $tox
+$EXE $target --command info --info save --output $OUT.save $tox 2>/dev/null ||  {
+    ERROR $?
+    exit ${i}5
+}
+
+[ -s $OUT.save ] || exit ${i}6
+
+i=2
+[ $# -ne 0 -a $1 -ne $i ] || \
+! INFO $i Info and editing || \
+for the_tox in $tox $OUT.save ; do
+    DBUG $i $the_tox
+    the_base=`echo $the_tox | sed -e 's/.save$//' -e 's/.tox$//'`
+    for elt in json yaml pprint repr ; do
+	if [ $elt = yaml -o $elt = json ] ; then
+	    # ModuleNotFoundError
+	    python3 -c "import $elt" 2>/dev/null || continue
+	fi
+	INFO $i $the_base.$elt
+	DBUG $EXE $target \
+	     --command info --info $elt \
+	     --output $the_base.$elt $the_tox '2>'$the_base.$elt.err
+	$EXE $target --command info --info $elt \
+	     --output $the_base.$elt $the_tox 2>$the_base.$elt.err || {
+	    tail $the_base.$elt.err
+	    if [ $elt != yaml -a $elt != json ] ; then
+		exit ${i}0
+	    else
+		WARN $elt
+	    fi
+	}
+	[ -s $the_base.$elt ] || {
+	    WARN no output  $the_base.$elt
+#	    exit ${i}1
+	}
+    done
+
+    DBUG     $EXE $target --command edit --edit help $the_tox
+    $EXE $target --command edit --edit help $the_tox 2>/dev/null  || exit ${i}2
+
+    # edit the status message
+    INFO $i $the_base.Status_message  'STATUSMESSAGE,.,Status_message,Toxxed on Toxic'
+    $EXE $target --command edit --edit 'STATUSMESSAGE,.,Status_message,Toxxed on Toxic' \
+	       --output $the_base.Status_message.tox $the_tox  2>&1|grep EDIT || exit ${i}3
+    [ -s $the_base.Status_message.tox ] || exit ${i}3
+    $EXE $target --command info $the_base.Status_message.tox 2>&1|grep Toxxed || exit ${i}4
+
+    # edit the nick_name
+    INFO $i $the_base.Nick_name  'NAME,.,Nick_name,FooBar'
+    $EXE $target --command edit --edit 'NAME,.,Nick_name,FooBar' \
+	       --output $the_base.Nick_name.tox $the_tox  2>&1|grep EDIT || exit ${i}5
+    [ -s $the_base.Nick_name.tox ] || exit ${i}5
+    $EXE $target --command info $the_base.Nick_name.tox 2>&1|grep FooBar || exit ${i}6
+
+    # set the DHTnodes to empty
+    INFO $i $the_base.noDHT  'DHT,.,DHTnode,'
+    $EXE $target --command edit --edit 'DHT,.,DHTnode,' \
+	       --output $the_base.noDHT.tox $the_tox  2>&1|grep EDIT || exit ${i}7
+    [ -s $the_base.noDHT.tox ] || exit ${i}7
+    $EXE $target --command info $the_base.noDHT.tox 2>&1 | grep 'NO DHT' || exit ${i}8
+
+done
+
+i=3
+[ "$#" -ne 0 -a "$1" != "$i" ] || \
+[ "$HAVE_JQ" = 0 ] || \
+! INFO $i Nodes || \
+for the_json in $json ; do
+    DBUG $i $the_json
+    the_base=`echo $the_json | sed -e 's/.json$//' -e 's/.tox$//'`
+    for nmap in clean check select_tcp select_udp select_version; do
+	$EXE $target --command nodes --nodes $nmap \
+	             --output $the_base.$nmap.json $the_json || {
+            WARN $i $the_json $nmap ${i}1
+            continue
+            }
+	[ -s $the_base.$nmap.json ] || {
+            WARN $i $the_json $nmap ${i}2
+            continue
+            }
+	[ $nmap = select_tcp ] && \
+	    grep '"status_tcp": false' $the_base.$nmap.json && {
+            WARN $i $the_json $nmap ${i}3
+            continue
+            }
+	[ $nmap = select_udp ] && \
+	    grep '"status_udp": false' $the_base.$nmap.json && {
+            WARN $i $the_json $nmap ${i}4
+            continue
+            }
+	test_jq $the_base.$nmap.json $the_base.$nmap.json.out /tmp/toxic_nodes.err || {
+	    retval=$?
+	    WARN $i $the_base.$nmap.json 3$?
+	}
+	INFO $i $the_base.$nmap
+    done
+done
+
+i=4
+## 
+[ $# -ne 0 -a "$1" -ne $i ] || \
+[ "$HAVE_TOR" = 0 ] || \
+[ ! -f /etc/tor/torrc ] || \
+! INFO $i Onions || \
+for the_tox in /etc/tor/torrc ; do
+    DBUG $i $the_tox
+    the_base=`echo $OUT.save | sed -e 's/.save$//' -e 's/.tox$//'`
+    #  exits
+    for slot in config test; do
+        if [ $slot = exits ] && ! netstat -nle4 | grep -q :9050 ; then
+           WARN Tor not running
+           continue
+        fi
+        INFO $target --command onions --onions $slot \
+             --output $the_base.$slot.out $the_tox
+        DBUG=1 $EXE $target --command onions --onions $slot \
+             --log_level 10 \
+             --output $the_base.$slot.out $the_tox|| {
+             WARN $i $?
+             continue
+        }
+	[ true -o -s $the_base.$slot.out ] || {
+	    WARN $i empty $the_base.$slot.out
+	    continue
+	}
+      done
+  done
+
+# ls -l $OUT.* /tmp/toxic_nodes.*
+
+# DEBUG=0 /usr/local/bin/proxy_ping_test.bash tor || exit 0
+ip route | grep ^def || exit 0
+
+i=5
+##
+the_tox=$tox
+[ $# -ne 0 -a "$1" != "$i" ] || \
+[ "$HAVE_JQ" = 0 ] || \
+[ "$HAVE_NMAP" = 0 ] || \
+! INFO $i Making dogfood || \
+for the_tox in $tox $OUT.save ; do
+    DBUG $i $the_tox
+    the_base=`echo $the_tox | sed -e 's/.save$//' -e 's/.tox$//'`
+    for nmap in nmap_relay nmap_dht nmap_path ; do
+#	[ $nmap = select_tcp ] && continue
+	if [ $nmap = nmap_dht ] && [ $HAVE_TOR = 1 ] ; then
+	    INFO skipping $nmap because HAVE_TOR
+	    continue
+	fi
+        INFO $i $the_base.$nmap
+	DBUG $target --command info --info $nmap \
+	     --output $the_base.$nmap.out $the_tox
+        $EXE $target --command info --info $nmap \
+	     --output $the_base.$nmap.out $the_tox 2>$the_base.$nmap.err || {
+	    # select_tcp may be empty and jq errors
+	    # exit ${i}1
+	    WARN $i $? $the_base.$nmap.err
+	    tail $the_base.$nmap.err
+	    continue
+	}
+	[ -s $the_base.$nmap.out ] || {
+	    WARN $i empty $the_base.$nmap.out
+	    continue
+	}
+    done
+done
+
+i=6
+##
+[ $# -ne 0 -a "$1" != "$i" ] || \
+[ "$HAVE_JQ" = 0 ] || \
+! INFO $i Eating dogfood || \
+for the_json in $json ; do
+    DBUG $i $the_json
+    the_base=`echo $the_json | sed -e 's/.save$//' -e 's/.json$//'`
+    for nmap in nmap_tcp nmap_udp ; do
+	if [ $nmap = nmap_udp ] && [ $HAVE_TOR = 1 ] ; then
+	    INFO skipping $nmap because HAVE_TOR
+	    continue
+	fi
+        INFO $i $target --command nodes --nodes $nmap --output $the_base.$nmap
+        $EXE $target --command nodes --nodes $nmap \
+	     --output $the_base.$nmap $the_json 2>$the_base.$nmap.err || {
+            WARN $i $the_json $nmap ${i}1
+            continue
+            }
+	[ -s  $the_base.$nmap ] || {
+            ERROR $i $the_json $nmap ${i}2
+            exit ${i}2
+            }
+    done
+done
+
+i=7
+DBUG $i
+$EXE $target --command nodes --nodes download \
+     --output /tmp/toxic_nodes.new $json || {
+	ERROR $i $EXE $target --command nodes --nodes download $json
+	exit ${i}1
+}
+[ -s /tmp/toxic_nodes.new ] || exit ${i}4
+INFO $i  downloaded  /tmp/toxic_nodes.new
+json=/tmp/toxic_nodes.new
+[ $# -ne 0 -a "$1" != "$i" ] || \
+	[ "$HAVE_JQ" = 0 ] || \
+	jq . < $json >/tmp/toxic_nodes.new.json 2>>/tmp/toxic_nodes.new.json.err || {
+	    ERROR $i jq $json
+	    exit ${i}2
+	}
+INFO $i  jq from /tmp/toxic_nodes.new.json
+
+[ $# -ne 0 -a "$1" != "$i" ] || \
+	[ "$HAVE_JQ" = 0 ] || \
+	grep error: /tmp/toxic_nodes.new.json.err && {
+	    ERROR $i jq $json
+	    exit ${i}3
+	}
+INFO $i  no errors in  /tmp/toxic_nodes.new.err
+
+
+exit 0