[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] [torflow/master] Improve output for email.



commit 952fd84dd0ce034a7790e851e781d7b00c24e002
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date:   Sun Jan 30 00:46:38 2011 -0800

    Improve output for email.
    
    List badexit lines for approved-routers and torrc.
---
 NetworkScanners/ExitAuthority/snakeinspector.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/NetworkScanners/ExitAuthority/snakeinspector.py b/NetworkScanners/ExitAuthority/snakeinspector.py
index 47d2c2e..5eb9e0f 100755
--- a/NetworkScanners/ExitAuthority/snakeinspector.py
+++ b/NetworkScanners/ExitAuthority/snakeinspector.py
@@ -255,7 +255,12 @@ def main(argv):
         subject = rsn+" on "+socket.inet_ntoa(struct.pack(">I",r.exit_ip))+" ("+r.exit_name+")"
         text = ""
         try:
-          text += str(r) + "\n-----------------------------\n"
+          text += str(r)
+          text += "\n# torrc:\n"
+          text += "authdirbadexit "+socket.inet_ntoa(struct.pack(">I",r.exit_ip))+" # "+r.exit_name+"\n"
+          text += "\n# approved-routers\n"
+          text += "!badexit "+r.exit_node+" # "+r.exit_name+"\n"
+          text += + "\n------------------------------------------\n"
         except Exception, e:
           text += traceback.format_exc()
         # TODO: Attach files? Or is that too much.. Maybe serve