Mercurial > hg > anonet-resdb

changeset 954:f95b4af563e6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge commit 'bf897c8381adc10fc59542f7dff58ce0dc1ab2dd'
author Nick <nick@somerandomnick.ano>
date Thu, 14 Jun 2012 17:33:14 +0000
parents b8ad676b3c0c (diff) 69a104eb11d6 (current diff)
children 3a4ae8f963d6
files
diffstat 21 files changed, 45 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/sevilNatas/as_script	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+# READ ME:
+# If AS# is taken it will return the desired AS#
+# else it will not return the desired AS#
+echo -e "Enter path to resdb:\c"
+read resdb
+cd $resdb
+echo -e "Enter desired AS#:\c"
+read asn
+ls db/as/ | grep "^$asn\$"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/sevilNatas/subnet_script	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+# READ ME:
+# If subnet is taken it will return the desired AS#
+# else it will not return the desired subnet
+echo -e "Enter path to resdb:\c"
+read resdb
+cd $resdb
+echo -e "Enter desired subnet:\c"
+read subnet
+cat db/ip/01/*/*/cidr | grep "^$subnet\$"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/10690/owner	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+lulzPrincess
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/hippo/ns/a.ns.hippo.ano	Thu Jun 14 17:33:14 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	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+hippo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/lulzprincess/ns/a.ns.lulzprincess.ano	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+1.0.69.153
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/lulzprincess/owner	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+lulzprincess
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/45/cidr	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+1.0.69.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/45/owner	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+lulzPrincess
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/0C/0C/cidr	Thu Jun 14 17:33:14 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	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+hippo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/kytv/@/.gitignore	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/kytv/@/default.key	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+aa0de618fb483ae23ab1fb06bba2dfe62359d142e64c22b940180f3ff38db775
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/kytv/@/owner	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+somerandomnick
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/kytv/@/path	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+/kytv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/hippo/git	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+git://1.12.12.199/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/lulzPrincess/email	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+lulzPrincess@lulzPrincess.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/lulzPrincess/git	Thu Jun 14 17:33:14 2012 +0000
@@ -0,0 +1,1 @@
+git://1.0.69.1/
--- a/doc/www.anonet2.org/public_pod/darknet_comparison.pod	Sun May 27 00:56:05 2012 +0000
+++ b/doc/www.anonet2.org/public_pod/darknet_comparison.pod	Thu Jun 14 17:33:14 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 May 27 00:56:05 2012 +0000
+++ b/doc/www.anonet2.org/public_pod/links.pod	Thu Jun 14 17:33:14 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 May 27 00:56:05 2012 +0000
+++ b/doc/www.powerfulproxy.com/public_html/do_it.php	Thu Jun 14 17:33:14 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;