summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2013-01-08 04:51:58 +0700
committermakefu <github@syntax-fehler.de>2013-01-08 04:51:58 +0700
commit53375eb994411bd6f37e8b4d807cd51c49e102da (patch)
tree37582d8c42d4ecf5157a83f6d0c2098c953c61e5
parentfb0de4a92f22c3242b8a0807aeafc2f23f63b302 (diff)
parentad376d1dab439f9d28bf7ff02bfa7afed7444037 (diff)
Merge branch 'master' of github.com:krebscode/painload
-rw-r--r--gold/affiliate/README.md9
-rwxr-xr-xretiolum/scripts/adv_graphgen/parse_tinc_stats.py7
2 files changed, 13 insertions, 3 deletions
diff --git a/gold/affiliate/README.md b/gold/affiliate/README.md
new file mode 100644
index 00000000..81a3d52c
--- /dev/null
+++ b/gold/affiliate/README.md
@@ -0,0 +1,9 @@
+# Installation
+
+# Firefox
+Step 1: [Install Greasemonkey](https://addons.mozilla.org/de/firefox/addon/greasemonkey/)
+Step 2: Click on affiliate.user.js
+
+# Chrome
+Step 1: download affiliate.user.js onto your desktop
+Step 2: Open chrome->tools->extensions and drag affiliate.user.js into chrome window
diff --git a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py
index 03a20214..76a3ffcd 100755
--- a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py
+++ b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py
@@ -171,11 +171,12 @@ def write_node(k,v):
for addr in v.get('internal-ip',['¯\\\\(°_o)/¯']):
node += "internal:"+addr+"\\l"
node +="\""
- if k in supernodes:
- node += ",fillcolor=steelblue1"
+
# warning if node only has one connection
- elif v['num_conns'] == 1:
+ if v['num_conns'] == 1:
node += ",fillcolor=red"
+ elif k in supernodes:
+ node += ",fillcolor=steelblue1"
#node +=",group=\""+v['external-ip'].replace(".","")+"\""
node += "]"
print node