Mercurial > hg > anonet-resdb

changeset 947:1b0a312dcad0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge commit 'e336140e1beae2d0cefc9a0281f182224669a9c4'
author Nick <nick@somerandomnick.ano>
date Mon, 04 Jun 2012 13:27:43 +0000
parents f1d61f3c6417 (diff) 4242340b6e54 (current diff)
children 4ec8a1c7f73c
files
diffstat 53 files changed, 53 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/2012/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+Severus_Snape
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/420/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+d33vee8
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/992/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+wakawaka
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/d33vee8/ns/a.ns.d33vee8.ano	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+1.4.2.5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/d33vee8/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+d33vee8
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/hardchats/ns/a.ns.d3v11.ano	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/hardchats/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+dwaan
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/hippo/ns/a.ns.hippo.ano	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+1.12.12.202
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/hippo/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+hippo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/ideanode/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+Severus_Snape
--- a/db/dom/ano/wakawaka/ns/ns1.wakawaka.ano	Sun Mar 04 10:07:21 2012 +0000
+++ b/db/dom/ano/wakawaka/ns/ns1.wakawaka.ano	Mon Jun 04 13:27:43 2012 +0000
@@ -1,1 +1,1 @@
-1.0.111.1
+1.5.5.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/wk/ns/ns1.wakawaka.ano	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/wk/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+wakawaka
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/04/02/cidr	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+1.4.2.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/04/02/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+d33vee8
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/05/05/cidr	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+1.5.5.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/05/05/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+wakawaka
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/0C/0C/cidr	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+1.12.12.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/0C/0C/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+hippo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/C0/A8/cidr	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+1.192.168.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/C0/A8/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+Severus_Snape
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IdeaNode/@/.gitignore	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IdeaNode/@/default.key	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+7bc6a71c6e407ab6ad9edddf8347d7a7558286c62f0848e2d0e2e7982e21bf68
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IdeaNode/@/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+somerandomnick
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IdeaNode/@/path	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+/IdeaNode
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/WWW/@/.gitignore	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/WWW/@/default.key	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+afd015793b655c87b0a71f596593c1b6214c7d2835766b8502abdba4b437d014
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/WWW/@/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+wakawaka
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/WWW/@/path	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+/WWW
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/anonsec/@/.gitignore	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/anonsec/@/default.key	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+d557e8670d5a2f50c6e9e496294f0d7f540e6e4a76eda27f879cabb347ffb00f
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/anonsec/@/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+somerandomnick
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/anonsec/@/path	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+/anonsec
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cerberus/@/.gitignore	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cerberus/@/default.key	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+8d967666e3b00a17461deeb84b7c033cd32e9366c6b965d871b4dc469e408079
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cerberus/@/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+adorablelunatic
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/cerberus/@/path	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+/cerberus
--- a/db/udpmsg4/eagleits/@/.gitignore	Sun Mar 04 10:07:21 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-temp.keys
--- a/db/udpmsg4/eagleits/@/default.key	Sun Mar 04 10:07:21 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-d557e8670d5a2f50c6e9e496294f0d7f540e6e4a76eda27f879cabb347ffb00f
--- a/db/udpmsg4/eagleits/@/owner	Sun Mar 04 10:07:21 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-somerandomnick
--- a/db/udpmsg4/eagleits/@/path	Sun Mar 04 10:07:21 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/eagleits
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/juicyfruit/@/.gitignore	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/juicyfruit/@/default.key	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+f0e29dd68e5aaad31652a324764736fce5bb58e721da6a6fb38f04c958a3ba1a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/juicyfruit/@/owner	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+juicyfruit
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/juicyfruit/@/path	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+/juicyfruit
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/Severus_Snape/git	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+git://1.192.168.1/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/d33vee8/git	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+git://1.4.2.1/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/hippo/git	Mon Jun 04 13:27:43 2012 +0000
@@ -0,0 +1,1 @@
+git://1.12.12.199/
--- a/db/usr/wakawaka/git	Sun Mar 04 10:07:21 2012 +0000
+++ b/db/usr/wakawaka/git	Mon Jun 04 13:27:43 2012 +0000
@@ -1,1 +1,1 @@
-git://1.9.9.1/.git/
+git://1.5.5.1/.git/
--- a/doc/www.anonet2.org/public_pod/darknet_comparison.pod	Sun Mar 04 10:07:21 2012 +0000
+++ b/doc/www.anonet2.org/public_pod/darknet_comparison.pod	Mon Jun 04 13:27:43 2012 +0000
@@ -40,19 +40,19 @@
  Z<><tr>Z<><th>Centralized Critical InfrastructureZ<></th>Z<><td>wiki (includes resource database), client port, IRCZ<></td>Z<><td>noneZ<></td>Z<><td>wiki, IRCZ<></td>Z<><td>allZ<></td>Z<></tr>
  Z<><tr>Z<><th>Decentralized Critical InfrastructureZ<></th>Z<><td>routingZ<></td>Z<><td>allZ<></td>Z<><td>routing, resource databaseZ<></td>Z<><td>noneZ<></td>Z<></tr>
  Z<><tr>Z<><th>Current SizeZ<></th>Z<><td>10-15Z<></td>Z<><td>50-70Z<></td>Z<><td>60-90Z<></td>Z<><td>&lt;5Z<></td>Z<></tr>
- Z<><tr>Z<><th>Average Monthly GrowthZ<></th>Z<><td>~0%Z<></td>Z<><td>~15%Z<></td>Z<><td>&lt;5%%Z<></td>Z<><td>~0%Z<></td>Z<></tr>
- Z<><tr>Z<><th>Activity LevelZ<></th>Z<><td>lowZ<></td>Z<><td>medium-highZ<></td>Z<><td>low-mediumZ<></td>Z<><td>noneZ<></td>Z<></tr>
+ Z<><tr>Z<><th>Average Monthly GrowthZ<></th>Z<><td>~0%Z<></td>Z<><td>~0%Z<></td>Z<><td>~0%Z<></td>Z<><td>0%Z<></td>Z<></tr>
+ Z<><tr>Z<><th>Activity LevelZ<></th>Z<><td>lowZ<></td>Z<><td>low-highZ<></td>Z<><td>low-mediumZ<></td>Z<><td>noneZ<></td>Z<></tr>
  Z<><tr>Z<><th>Interdarknet ConnectivityZ<></th>Z<><td>censored access to AnoNet2 (must use AnoNet2 DNS), censored access to dn42 (must use AnoNet2 DNS)Z<></td>Z<><td>full routing to most of AnoNet1, full routing to part of dn42, full routing to VAnetZ<></td>Z<><td>censored access to AnoNet (1&amp;2, must use SRN's DNS), censored access to VAnet (must use SRN's DNS)Z<></td>Z<><td>full routing to part of AnoNet1, full routing to AnoNet2, full routing to part of dn42Z<></td>Z<></tr>
  Z<><tr>Z<><th>DNS CoverageZ<></th>Z<><td>AnoNet1Z<></td>Z<><td>AnoNet (1&amp;2), dn42, VAnet, IcannNetZ<></td>Z<><td>dn42, IcannNetZ<></td>Z<><td>AnoNet (1&amp;2), dn42, VAnet, IcannNetZ<></td>Z<></tr>
  Z<><tr>Z<><th>Proxy CoverageZ<></th>Z<><td>AnoNet1Z<></td>Z<><td>AnoNet (1&amp;2), IcannNetZ<></td>Z<><td>noneZ<></td>Z<><td>noneZ<></td>Z<></tr>
- Z<><tr>Z<><th>Web-Based Proxy CoverageZ<></th>Z<><td>noneZ<></td>Z<><td>AnoNet (1&amp;2), IcannNetZ<></td>Z<><td>noneZ<></td>Z<><td>noneZ<></td>Z<></tr>
+ Z<><tr>Z<><th>Web-Based Proxy CoverageZ<></th>Z<><td>noneZ<></td>Z<><td>AnoNet (1&amp;2), IcannNetZ<></td>Z<><td>AnoNetZ<></td>Z<><td>noneZ<></td>Z<></tr>
  Z<><tr>Z<><th>Peering PrerequisitesZ<></th>Z<><td>OpenVPN, BGP daemon, sustained IRC participation for over a month, and a miracleZ<></td>Z<><td>OpenVPN or tinc or L<quicktun|http://wiki.ucis.nl/QuickTun>, BGP daemon or static routingZ<></td>Z<><td>OpenVPN or tinc or L<quicktun|http://wiki.ucis.nl/QuickTun>, BGP daemon or static routing, and an available subnet, and a big-block owner that will not change the ownership of your subnet to someone elseZ<></td>Z<><td>depends on individual PoP policyZ<></td>Z<></tr>
  Z<><tr>Z<><th colspan='5'>ServicesZ<></th>Z<></tr>
  Z<><tr>Z<><td>&nbspZ<></td>Z<><th>AnoNet1Z<></th>Z<><th>AnoNet2Z<></th>Z<><th>dn42Z<></th>Z<><th>VAnetZ<></th>Z<></tr>
  Z<><tr>Z<><th>RoutingZ<></th>Z<><td>decentralizedZ<></td>Z<><td>decentralizedZ<></td>Z<><td>decentralizedZ<></td>Z<><td>centralizedZ<></td>
  Z<><tr>Z<><th>Resource DatabaseZ<></th>Z<><td>centralized (part of wiki)Z<></td>Z<><td>decentralized (part of git-based resdb)Z<></td>Z<><td>decentralized (part of monotone-based registry)Z<></td>Z<><td>centralized (ask Borg)Z<></td>Z<></tr>
  Z<><tr>Z<><th>DocumentationZ<></th>Z<><td>centralized (crzydmnd's wiki)Z<></td>Z<><td>decentralized (part of git-based resdb, and many wikis)Z<></td>Z<><td>centralized (helios's wiki)Z<></td>Z<><td>centralized (vanet.org)Z<></td>Z<></tr>
- Z<><tr>Z<><th>ChatroomZ<></th>Z<><td>centralized (single IRCnet)Z<></td>Z<><td>decentralized (ad-hoc relaying between IRC and Jabber chatrooms, and a L<UDPMSG4|http://www.powerfulproxy.com/do_it.php/http/www.srw.ano/udpmsg4> cloud)Z<></td>Z<><td>semicentralized (single IRCnet, with a Jabber chatroom relay, and a L<UDPMSG4|http://www.powerfulproxy.com/do_it.php/http/www.srw.ano/udpmsg4> relay)Z<></td>Z<><td>temporarily decentralized (shared with AnoNet2)Z<></td>Z<></tr>
+ Z<><tr>Z<><th>ChatroomZ<></th>Z<><td>centralized (single IRCnet)Z<></td>Z<><td>decentralized (the public udpmsg4 chat cloud)Z<></td>Z<><td>centralized (single IRCnet)Z<></td>Z<><td>centralized (KwaakNet)Z<></td>Z<></tr>
  Z<><tr>Z<><th>DNSZ<></th>Z<><td>centralized (from wiki), several official "rootservers"Z<></td>Z<><td>decentralized (from resdb), each user fields his own, public nameservers available for the lazyZ<></td>Z<><td>decentralized (from registry), multiple competing deploymentsZ<></td>Z<><td>centralized (from svn), centralized official deploymentZ<></td>Z<></tr>
  Z<><tr>Z<><th>BitTorrent Trackers/IndexersZ<></th>Z<><td>none?Z<></td>Z<><td>1 centralized and 1 decentralized (git-based)Z<></td>Z<><td>1 centralizedZ<></td>Z<><td>1 centralizedZ<></td>Z<></tr>
 Z<></table>
--- a/doc/www.anonet2.org/public_pod/links.pod	Sun Mar 04 10:07:21 2012 +0000
+++ b/doc/www.anonet2.org/public_pod/links.pod	Mon Jun 04 13:27:43 2012 +0000
@@ -4,6 +4,8 @@
 
 This is a collection of links that you may find interesting:
 
+20120524 - L<New York Legislation Would Ban Anonymous Online Speech|http://www.wired.com/threatlevel/2012/05/anonymous-online-speech-ban/>
+
 20120114 - L<Leaked DHS PDF Shows List of Media Sites they Monitor|http://www.cyberwarnews.info/2012/01/14/leaked-dhs-pdf-shows-list-of-media-sites-they-monitor/>
 
 20120103 - L<It Is Now Illegal To Visit A Foreign Website In Belarus|http://thenextweb.com/insider/2012/01/02/it-is-now-illegal-to-access-any-foreign-website-in-the-republic-of-belarus/>
--- a/doc/www.powerfulproxy.com/public_html/do_it.php	Sun Mar 04 10:07:21 2012 +0000
+++ b/doc/www.powerfulproxy.com/public_html/do_it.php	Mon Jun 04 13:27:43 2012 +0000
@@ -77,9 +77,8 @@
 			header('Location: '.$redirurl);
 		}
 	}
-} else {
-	if (in_array(strtok($info['content_type'], ';'), $REWRITE_CONTENT_TYPES)) $data = preg_replace(array_keys($REWRITE_PATTERNS), array_values($REWRITE_PATTERNS), $data, -1, $count);
 }
+if (in_array(strtok($info['content_type'], ';'), $REWRITE_CONTENT_TYPES)) $data = preg_replace(array_keys($REWRITE_PATTERNS), array_values($REWRITE_PATTERNS), $data, -1, $count);
 
 header('Content-Length: '.strlen($data));
 echo $data;
--- a/gitd	Sun Mar 04 10:07:21 2012 +0000
+++ b/gitd	Mon Jun 04 13:27:43 2012 +0000
@@ -1,4 +1,4 @@
 #!/bin/sh
 repodir="$(dirname $0)"
 touch "$repodir"/.git/git-daemon-export-ok
-exec git daemon --listen="$(cat "$repodir"/conf/gitd_ip)" --base-path="$(cat "$repodir"/conf/gitd_basepath)"
+exec git daemon --listen="$(cat "$repodir"/conf/gitd_ip)" --base-path="$(cat "$repodir"/conf/gitd_basepath)" --reuseaddr