Menu
▾
▴
grapevine-cvs-commits — Notifications of CVS commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(126) |
Nov
(168) |
Dec
(142) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(118) |
Feb
(90) |
Mar
(49) |
Apr
(108) |
May
(47) |
Jun
(45) |
Jul
(48) |
Aug
(9) |
Sep
(45) |
Oct
(58) |
Nov
(64) |
Dec
(47) |
| 2003 |
Jan
(16) |
Feb
(48) |
Mar
(80) |
Apr
(35) |
May
(31) |
Jun
(37) |
Jul
(18) |
Aug
(26) |
Sep
|
Oct
|
Nov
(24) |
Dec
(9) |
| 2004 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: blackh <gra...@li...> - 2003-08-16 08:07:08
|
blackh Sat Aug 16 00:51:37 2003 EDT
Modified files:
/website left.inc
Log:
Make it a little clearer that the code doesn't do much yet.
Index: website/left.inc
diff -u website/left.inc:1.32 website/left.inc:1.33
--- website/left.inc:1.32 Sat Jun 14 04:44:42 2003
+++ website/left.inc Sat Aug 16 00:51:37 2003
@@ -1,9 +1,10 @@
- <!-- $Id: left.inc,v 1.32 2003/06/14 11:44:42 blackh Exp $ -->
+ <!-- $Id: left.inc,v 1.33 2003/08/16 07:51:37 blackh Exp $ -->
<div align="right"><img src="/grapevine-logo.png" alt="The Grapevine Project" width="150" height="178" /></div>
<table cellspacing="0" cellpadding="0" border="1" width="90%" align="center">
<tr>
<td align="center"><span class="c1"><font size="-2">Help us develop!
<br/>Install your very own shiny new Grapevine node today.
+ <br/>(Please note that it doesn't do much yet.)
<br/>[<a target="_top" href="http://sourceforge.net/project/shownotes.php?release_id=165399">README</a>]
[<a target="_top" href="http://sourceforge.net/project/showfiles.php?group_id=32439">Download</a>]</td></font></span>
</tr>
@@ -39,4 +40,4 @@
src="http://sourceforge.net/sflogo.php?group_id=32439"
alt="SourceForge Logo" /></a>
<br />
- <!-- EOF: $Id: left.inc,v 1.32 2003/06/14 11:44:42 blackh Exp $ -->
+ <!-- EOF: $Id: left.inc,v 1.33 2003/08/16 07:51:37 blackh Exp $ -->
|
|
From: blackh <gra...@li...> - 2003-08-16 08:03:15
|
blackh Sat Aug 16 01:03:15 2003 EDT
Modified files:
/grapevine README
Log:
Index: grapevine/README
diff -u grapevine/README:1.11 grapevine/README:1.12
--- grapevine/README:1.11 Thu May 1 16:11:19 2003
+++ grapevine/README Sat Aug 16 01:03:14 2003
@@ -1,4 +1,4 @@
-$Id: README,v 1.11 2003/05/01 23:11:19 blackh Exp $
+$Id: README,v 1.12 2003/08/16 08:03:14 blackh Exp $
------------------------------------------------------------------------------
Stephen Blackheath 02 May 2003 http://www.grapevineproject.org/
@@ -31,6 +31,21 @@
* It operates reliably and efficiently, even though the network is composed
of unreliable nodes.
* It can scale to global size.
+
+
+HOW DO I USE IT?
+
+First, install the software. Then, to use The Grapevine, point your web
+browser at
+
+ http://localhost:5669/
+
+Configuration is system-specific, but it involves editing a file called
+grapevine-config.xml (in /etc on Unix), and re-starting the Grapevine daemon.
+
+If you want to access the local web interface from other hosts in your
+network, you will need to add them as allowed addresses in
+grapevine-config.xml and re-start the daemon.
CAN I USE IT WITH A DIAL-UP CONNECTION?
|
|
From: blackh <gra...@li...> - 2003-08-14 22:48:28
|
blackh Thu Aug 14 15:27:24 2003 EDT
Modified files:
/grapevine WARNING
Log:
Grapevine announce list.
Index: grapevine/WARNING
diff -u grapevine/WARNING:1.7 grapevine/WARNING:1.8
--- grapevine/WARNING:1.7 Thu Aug 14 14:58:20 2003
+++ grapevine/WARNING Thu Aug 14 15:27:24 2003
@@ -1,4 +1,4 @@
-$Id: WARNING,v 1.7 2003/08/14 21:58:20 blackh Exp $
+$Id: WARNING,v 1.8 2003/08/14 22:27:24 blackh Exp $
------------------------------------------------------------------------------
Stephen Blackheath 15 August 2003 http://www.grapevineproject.org/
@@ -38,8 +38,8 @@
Unless you are on a security mailing list and patch your system when
necessary, you are at risk.
-If you are helping us test, then please check our website regularly for
-announcements, and consider joining one of our mailing lists.
+If you are helping us test, then please consider joining the
+grapevine-announce mailing list.
LEGAL RISKS
|
|
From: blackh <gra...@li...> - 2003-08-14 22:32:17
|
blackh Thu Aug 14 14:58:20 2003 EDT
Modified files:
/grapevine WARNING
Log:
Mention ACCOPS in WARNING.
Index: grapevine/WARNING
diff -u grapevine/WARNING:1.6 grapevine/WARNING:1.7
--- grapevine/WARNING:1.6 Fri May 2 00:18:47 2003
+++ grapevine/WARNING Thu Aug 14 14:58:20 2003
@@ -1,10 +1,10 @@
-$Id: WARNING,v 1.6 2003/05/02 07:18:47 blackh Exp $
+$Id: WARNING,v 1.7 2003/08/14 21:58:20 blackh Exp $
------------------------------------------------------------------------------
-Stephen Blackheath 27 March 2003 http://www.grapevineproject.org/
+Stephen Blackheath 15 August 2003 http://www.grapevineproject.org/
-The README document contains some VERY GOOD REASONS to use this software.
+The README document contains some very good reasons to use this software.
But here we must give you some reasons not to...
@@ -61,12 +61,22 @@
prosecuted.
** THE USE OF THIS SOFTWARE MAY BE ILLEGAL IN YOUR COUNTRY. YOU HAVE BEEN
-WARNED. **
+WARNED. **
We sincerely hope that we have proven our honesty rather than put you off, and
that you will give us the help we need to make this project a success.
+
+PROPOSED AMERICAN 'ACCOPS' LAW
+
+ http://www.eff.org/IP/P2P/CONYER_069.txt
+
+The Grapevine fairly certain to be "enabling software" under the proposed
+American ACCOPS law (Chapter 89 of title 18, United States Code). Under this
+law, it is illegal to offer such software for download without conspicuously
+warning that it is "enabling software".
+
+
Please type "yes" if you have understood these risks and you want to install
the Grapevine Project software.
-
|
|
From: blackh <gra...@li...> - 2003-08-14 22:26:36
|
blackh Thu Aug 14 14:59:49 2003 EDT
Modified files:
/website index.php
Log:
Add note about ACCOPS law.
Index: website/index.php
diff -u website/index.php:1.66 website/index.php:1.67
--- website/index.php:1.66 Wed Jul 30 16:06:14 2003
+++ website/index.php Thu Aug 14 14:59:49 2003
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- $Id: index.php,v 1.66 2003/07/30 23:06:14 blackh Exp $ -->
+<!-- $Id: index.php,v 1.67 2003/08/14 21:59:49 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
@@ -21,7 +21,7 @@
<div id="rightCol">
<?php include("title.inc"); ?><br />
- by <a href="mailto:st...@bl...">Stephen Blackheath</a> - Updated 31 Jul 2003<br />
+ by <a href="mailto:st...@bl...">Stephen Blackheath</a> - Updated 15 Aug 2003<br />
<p>We are creating an anonymizing storage network - a network that resembles the World
Wide Web, but is capable of allowing people to publish and retrieve information without
fear of censorship or surveillance.</p>
@@ -73,6 +73,19 @@
<hr width="100%" size="1" />
<h3>News</h3>
+
+ <p><b>15 Aug 2003 - ACCOPS law</b></p>
+
+ <p>It seems the proposed new ACCOPS law (click <a href="http://www.eff.org/IP/P2P/CONYER_069.txt">here</a> for text of law) in the USA is making a sort of attempt to crack down on
+ software like the Grapevine. <i>Enabling software</i> is defined as <i>"software that,
+ when installed on the user's computer, enables 3rd parties to store data on that
+ computer, or use that computer to search other computers' contents over the Internet."</i></p>
+ <p>By this (excessively broad) definition, the Grapevine is fairly certain to be enabling software.</p>
+ <p>The law doesn't ban such software, but says it is illegal to "knowingly offer enabling
+ software" for download if they do not "clearly and conspicuously warn any person
+ downloading that software, before it is downloaded, that it is enabling software and
+ could create a security and privacy risk for the user's computer".
+ I have certainly done this.</p>
<p><b>14 Jun 2003 - Version 1.0.5 released / Network up and running again / Network plots</b></p>
<p>I have made some significant performance improvements to the Grapevine executable,
|
|
From: blackh <gra...@li...> - 2003-08-11 10:32:03
|
blackh Mon Aug 11 03:32:03 2003 EDT
Modified files:
/grapevine/raisen evt.xml
/grapevine/raisen/grapevine discovery.xml join-interface.xml
route.dtd route.xml
transaction-routing.xml transaction.dtd
Log:
More work on routing.
Index: grapevine/raisen/grapevine/transaction.dtd
diff -u grapevine/raisen/grapevine/transaction.dtd:1.1 grapevine/raisen/grapevine/transaction.dtd:1.2
--- grapevine/raisen/grapevine/transaction.dtd:1.1 Sat Nov 9 05:18:49 2002
+++ grapevine/raisen/grapevine/transaction.dtd Mon Aug 11 03:32:03 2003
@@ -1,7 +1,11 @@
-<!-- $Id: transaction.dtd,v 1.1 2002/11/09 13:18:49 blackh Exp $ -->
+<!-- $Id: transaction.dtd,v 1.2 2003/08/11 10:32:03 blackh Exp $ -->
<!-- Send a reply message to the requesting node of a transaction. -->
<!ELEMENT grapevine.transaction.reply-with ANY>
<!ATTLIST grapevine.transaction.reply-with
id CDATA #IMPLIED>
+ <!-- A notification that is fired when a transaction is terminated. -->
+<!ELEMENT evt.transaction-terminated EMPTY>
+<!ATTLIST evt.transaction-terminated
+ id CDATA #IMPLIED>
|
|
From: blackh <gra...@li...> - 2003-08-08 06:05:44
|
blackh Thu Aug 7 23:05:44 2003 EDT
Modified files:
/grapevine Makefile.in configure
/grapevine/cpp Makefile.in RuleState.cpp
/grapevine/cpp/lib Makefile.in
/grapevine/fec Makefile.in
Log:
Fix heinous performance bug.
|
|
From: blackh <gra...@li...> - 2003-08-07 22:49:18
|
blackh Thu Aug 7 15:49:17 2003 EDT
Modified files:
/grapevine/raisen/test preprocessor.xml
Log:
Bring preprocessor test up-to-date.
Index: grapevine/raisen/test/preprocessor.xml
diff -u grapevine/raisen/test/preprocessor.xml:1.1 grapevine/raisen/test/preprocessor.xml:1.2
--- grapevine/raisen/test/preprocessor.xml:1.1 Thu Mar 6 01:56:24 2003
+++ grapevine/raisen/test/preprocessor.xml Thu Aug 7 15:49:17 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: preprocessor.xml,v 1.1 2003/03/06 09:56:24 blackh Exp $ -->
+<!-- $Id: preprocessor.xml,v 1.2 2003/08/07 22:49:17 blackh Exp $ -->
<!-- Regression test that fails if a certain bug exists. -->
@@ -11,10 +11,10 @@
i=<init/>,
print("preprocessor: "),
{
- <preprocess.if test="language == '1.0'">
+ <preprocess.if test="language == '1.1'">
print("1 "),
</preprocess.if>,
- <preprocess.if test="language != '1.0'">
+ <preprocess.if test="language != '1.1'">
null,
</preprocess.if>
<preprocess.if test="language >= '0.9'">
@@ -23,10 +23,10 @@
<preprocess.if test="language < '0.9'">
null,
</preprocess.if>
- <preprocess.if test="language >= '1.0'">
+ <preprocess.if test="language >= '1.1'">
print("3 "),
</preprocess.if>,
- <preprocess.if test="language < '1.0'">
+ <preprocess.if test="language < '1.1'">
null,
</preprocess.if>
<preprocess.if test="'2' < '10'">
|
|
From: blackh <gra...@li...> - 2003-08-07 22:44:03
|
blackh Thu Aug 7 15:44:02 2003 EDT
Modified files:
/grapevine Makefile.in configure
/grapevine/cpp Engine.cpp Makefile.in
/grapevine/cpp/lib Makefile.in
/grapevine/fec Makefile.in
Log:
Fix build on Redhat 8.0.
|
|
From: blackh <gra...@li...> - 2003-08-07 21:30:01
|
blackh Thu Aug 7 14:30:00 2003 EDT
Modified files:
/grapevine Makefile.in configure configure.ac
/grapevine/cpp Makefile.am Makefile.in
/grapevine/cpp/lib Makefile.in
Log:
Slight improvement to makefile.
Index: grapevine/cpp/lib/Makefile.in
diff -u grapevine/cpp/lib/Makefile.in:1.28 grapevine/cpp/lib/Makefile.in:1.29
--- grapevine/cpp/lib/Makefile.in:1.28 Thu Jul 10 04:02:15 2003
+++ grapevine/cpp/lib/Makefile.in Thu Aug 7 14:30:00 2003
@@ -10,7 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# $Id: Makefile.in,v 1.28 2003/07/10 11:02:15 blackh Exp $
+# $Id: Makefile.in,v 1.29 2003/08/07 21:30:00 blackh Exp $
SHELL = @SHELL@
|
|
From: blackh <gra...@li...> - 2003-08-07 20:05:53
|
blackh Thu Aug 7 13:05:53 2003 EDT
Added files:
/grapevine/raisen/test test-server.xml
Modified files:
/grapevine/cpp IOLoop.cpp Makefile.in
Log:
Fix truncated socket output bug.
Index: grapevine/cpp/Makefile.in
diff -u grapevine/cpp/Makefile.in:1.34 grapevine/cpp/Makefile.in:1.35
--- grapevine/cpp/Makefile.in:1.34 Thu Jul 10 04:02:14 2003
+++ grapevine/cpp/Makefile.in Thu Aug 7 13:05:52 2003
@@ -10,7 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# $Id: Makefile.in,v 1.34 2003/07/10 11:02:14 blackh Exp $
+# $Id: Makefile.in,v 1.35 2003/08/07 20:05:52 blackh Exp $
SHELL = @SHELL@
Index: grapevine/raisen/test/test-server.xml
+++ grapevine/raisen/test/test-server.xml
<?xml version="1.0"?>
<grapevine>
<domain name="test.test-server" author1="Stephen Blackheath" rev="$Revision: 1.1 $">
<rules>
init:
<init/>,
println("Regression test for socket I/O problem. Run this server, and contact"),
println("it over the Internet (otherwise it won't block). Test fails if the"),
println("output is truncated. This was caused by not correctly handling "),
println("EWOULDBLOCK/WSAEWOULDBLOCK errors after ::send / ::write was called."),
println("Fixed in grapevine-1.0.6."),
println(""),
remember new <sys.http-in.listen id="sprat" port="2222" listener="test.test-server"/>;
report:
<sys.http-in.listen id="sprat" port="[port]" status="[status]" error="[error]"/>,
println("listening on port " ## port ## " status=" ## status ## " " ## error);
incoming:
req=<request id="[id]" mode="process"/>,
reply = new <reply id="[id]" count="0" of="1000"/>,
fire reply,
reply#text = base64encode("Welcome to the test server\r\n");
incoming-10:
reply=<reply id="[id]" count="[count]" of="[of]"/>,
count < of,
reply#text = reply#text ## base64encode("Pack my box with five dozen liquor jugs! This is line " ## toString(count+1) ## " of " ## of ## "\r\n"),
reply#count = count + 1;
incoming-20:
reply=<reply id="[id]"/>,
text=reply#text,
length = binaryLength(text),
assert new <sys.http-in.response id="[id]" code="200 OK">
<header content-type="text/plain" content-length="[length]"/>
<text>[text]</text>
</sys.http-in.response>;
</rules>
</domain>
</grapevine>
|
blackh Thu Aug 7 04:43:03 2003 EDT
Modified files:
/grapevine/raisen/grapevine discovery.xml incoming-net-http.xml
join-transaction.xml join.dtd join.xml
messages.dtd transaction-routing.xml
transmit.xml
/grapevine/raisen/local request.xml
Log:
Progress with discovery, though it's not quite working yet.
Made the nodes communicate in raw binary, so we don't waste network traffic.
Memory usage seems excessive at 135M. This happened after the above
changes, so try disabling both and see if this fixes the memory problem.
Index: grapevine/raisen/local/request.xml
diff -u grapevine/raisen/local/request.xml:1.31 grapevine/raisen/local/request.xml:1.32
--- grapevine/raisen/local/request.xml:1.31 Sun Aug 3 02:51:20 2003
+++ grapevine/raisen/local/request.xml Thu Aug 7 04:43:02 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: request.xml,v 1.31 2003/08/03 09:51:20 blackh Exp $ -->
+<!-- $Id: request.xml,v 1.32 2003/08/07 11:43:02 blackh Exp $ -->
<!DOCTYPE grapevine SYSTEM "../raisen.dtd" [
@@ -37,7 +37,7 @@
<grapevine>
- <domain name="local.request" author1="Stephen Blackheath" rev="$Revision: 1.31 $">
+ <domain name="local.request" author1="Stephen Blackheath" rev="$Revision: 1.32 $">
<rules>
main:
req=<request id="[id]" mode="process">
@@ -93,6 +93,10 @@
are giving us by running it on your system, we can complete the project.</p>
<p><font size="-2">Latest code change (03 Aug 2003): Bug fix: Seed node addresses
were getting cleaned up when they shouldn't be.</font></p>
+ <p><font size="-2">I have noticed a lot of people are on links that don't
+ accept incoming TCP connections. The software won't work for you, but it isn't
+ currently clever enough to tell you why it is failing. You'll have to test this
+ for yourself for now.</font></p>
<p>
<table cellspacing="3" cellpadding="0" border="0">
<tr>
|
blackh Sun Aug 3 03:54:00 2003 EDT
Modified files:
/grapevine/raisen/grapevine incoming-net-http.xml
incoming-untrusted.xml init.xml
interface-control.xml interface.xml
join-interface.xml join-transaction.xml
join.xml negotiate-key.xml
transaction.xml transmit.xml
Log:
<sys.time.now>'s made more efficient.
Index: grapevine/raisen/grapevine/transmit.xml
diff -u grapevine/raisen/grapevine/transmit.xml:1.49 grapevine/raisen/grapevine/transmit.xml:1.50
--- grapevine/raisen/grapevine/transmit.xml:1.49 Sat Jun 14 01:27:38 2003
+++ grapevine/raisen/grapevine/transmit.xml Sun Aug 3 03:54:00 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: transmit.xml,v 1.49 2003/06/14 08:27:38 blackh Exp $ -->
+<!-- $Id: transmit.xml,v 1.50 2003/08/03 10:54:00 blackh Exp $ -->
<!--
The tranmission part of the transport layer.
@@ -42,7 +42,7 @@
]>
<grapevine>
- <domain name="grapevine.transmit" author1="Stephen Blackheath" rev="$Revision: 1.49 $">
+ <domain name="grapevine.transmit" author1="Stephen Blackheath" rev="$Revision: 1.50 $">
<facts>
<flag verbose="false" debug="false"/>
@@ -188,7 +188,7 @@
msg#session\-key != "",
msg#state = "timestamp"
} || {
- <sys.time.now secs="[now]"/>,
+ now=<sys.time.now/>#secs,
<obj.address-ref id="[addressRef]" address="[address]"/>,
<!-- Pick the most recently created session key for this address. -->
<!-- Only use address-level session keys for routing to addresses -->
@@ -251,7 +251,7 @@
to be sent to that address. -->
do_flush:
flush=<grapevine.transmit.flush/>,
- nowFact=<sys.time.now secs="[now]"/>,
+ <sys.time.now secs="[now]"/>,
msg=<msg.to address-ref="[addressRef]" location="[location]" session-key="[keyID]" by="[by]" state="pending"/>,
<obj.address-ref id="[addressRef]" address="[address]"/>,
transport=<obj.transport id="[address]"/>,
@@ -333,7 +333,7 @@
cipher-type="[cipherType]" key-length="[keyLength]" key="[key]"/>,
cipher = blockEncrypt(cipherType, keyLength, key, compress(msgText)),
msgText=formatXML(new <encrypted id="[keyID]">[cipher]</encrypted>),
- msgText=base64encode(<![CDATA["<?xml version=\"1.0\"?>\n"]]>) ## msgText,
+ msgText=base64encode(<![CDATA["<?xml version=\"1.0\"?>\n"]]>) ## msgText
} ||
println("transmit: format_and_encrypt - failed to encrypt - missing session key?! id=" ## keyID)
} || true,
|
|
From: blackh <gra...@li...> - 2003-08-03 09:51:21
|
blackh Sun Aug 3 02:51:21 2003 EDT
Modified files:
/grapevine configure configure.ac
/grapevine/raisen/grapevine address-ref.xml address.xml
grapevine.dtd init.xml version.xml
/grapevine/raisen/local request.xml
Log:
Bug fix: Seed node addresses were getting cleaned up when they shouldn't be.
Index: grapevine/raisen/local/request.xml
diff -u grapevine/raisen/local/request.xml:1.30 grapevine/raisen/local/request.xml:1.31
--- grapevine/raisen/local/request.xml:1.30 Wed Jul 23 04:50:59 2003
+++ grapevine/raisen/local/request.xml Sun Aug 3 02:51:20 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: request.xml,v 1.30 2003/07/23 11:50:59 blackh Exp $ -->
+<!-- $Id: request.xml,v 1.31 2003/08/03 09:51:20 blackh Exp $ -->
<!DOCTYPE grapevine SYSTEM "../raisen.dtd" [
@@ -37,7 +37,7 @@
<grapevine>
- <domain name="local.request" author1="Stephen Blackheath" rev="$Revision: 1.30 $">
+ <domain name="local.request" author1="Stephen Blackheath" rev="$Revision: 1.31 $">
<rules>
main:
req=<request id="[id]" mode="process">
@@ -91,10 +91,8 @@
<p>This is the local web interface of your node in the <a target="grapevineproject.org" href="http://grapevineproject.org/">Grapevine</a> peer-to-peer network.</p>
<p>This software doesn't do anything very useful yet, but with the help you
are giving us by running it on your system, we can complete the project.</p>
- <p><font size="-2">Latest code change (23 Jul 2003): Several bug fixes in network logic,
- and some progress on a part of the logic called 'discovery', where a node can introduce
- one of its neighbours to another. This makes all nodes discover their neighbours
- quickly upon joining the network.</font></p>
+ <p><font size="-2">Latest code change (03 Aug 2003): Bug fix: Seed node addresses
+ were getting cleaned up when they shouldn't be.</font></p>
<p>
<table cellspacing="3" cellpadding="0" border="0">
<tr>
|
|
From: blackh <gra...@li...> - 2003-07-31 02:08:41
|
blackh Wed Jul 30 19:06:13 2003 EDT
Modified files:
/grapevine configure configure.ac
Log:
Bug fix.
Index: grapevine/configure.ac
diff -u grapevine/configure.ac:1.39 grapevine/configure.ac:1.40
--- grapevine/configure.ac:1.39 Wed Jul 30 18:56:35 2003
+++ grapevine/configure.ac Wed Jul 30 19:06:13 2003
@@ -5,7 +5,7 @@
AC_INIT(GrapevineC++Engine, 1.0.6pre1)
AC_PREREQ(2.50)
AM_CONFIG_HEADER(config.h)
-AC_REVISION($Revision: 1.39 $)
+AC_REVISION($Revision: 1.40 $)
PACKAGE="$PACKAGE_NAME"
VERSION="$PACKAGE_VERSION"
@@ -516,12 +516,12 @@
[
AC_CHECK_LIB(nsl, inet_addr,
[
- INET_LINK="nsl"
+ INET_LINK=" -lnsl"
AC_DEFINE(HAVE_INET_ADDR, 1, [Define if you have the inet_addr() function])
],
AC_CHECK_LIB(resolv, inet_addr,
[
- INET_LINK="resolv"
+ INET_LINK=" -lresolv"
AC_DEFINE(HAVE_INET_ADDR, 1, [Define if you have the inet_addr() function])
]
)
|
|
From: blackh <gra...@li...> - 2003-07-31 01:56:37
|
blackh Wed Jul 30 18:56:36 2003 EDT
Modified files:
/grapevine configure configure.ac
Log:
Fix bug.
Index: grapevine/configure.ac
diff -u grapevine/configure.ac:1.38 grapevine/configure.ac:1.39
--- grapevine/configure.ac:1.38 Thu Jul 10 04:02:12 2003
+++ grapevine/configure.ac Wed Jul 30 18:56:35 2003
@@ -5,7 +5,7 @@
AC_INIT(GrapevineC++Engine, 1.0.6pre1)
AC_PREREQ(2.50)
AM_CONFIG_HEADER(config.h)
-AC_REVISION($Revision: 1.38 $)
+AC_REVISION($Revision: 1.39 $)
PACKAGE="$PACKAGE_NAME"
VERSION="$PACKAGE_VERSION"
@@ -756,6 +756,8 @@
EXPATLIBNAME=$withval
)
+CPPFLAGS="${CPPFLAGS} -I${EXPATINCLUDE}"
+LDFLAGS="${LDFLAGS} -L${EXPATLIB} -Wl,--rpath -Wl,${EXPATLIB}"
LIBS="${LIBS} -l${EXPATLIBNAME}"
AC_MSG_CHECKING(for Expat library)
|
|
From: blackh <gra...@li...> - 2003-07-30 23:06:15
|
blackh Wed Jul 30 16:06:14 2003 EDT
Modified files:
/website index.php tech-overview.php
Log:
FAQ updates.
Index: website/tech-overview.php
diff -u website/tech-overview.php:1.20 website/tech-overview.php:1.21
--- website/tech-overview.php:1.20 Sat Mar 15 03:43:21 2003
+++ website/tech-overview.php Wed Jul 30 16:06:14 2003
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- $Id: tech-overview.php,v 1.20 2003/03/15 11:43:21 blackh Exp $ -->
+<!-- $Id: tech-overview.php,v 1.21 2003/07/30 23:06:14 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="generator" content=
@@ -96,8 +96,7 @@
(except for Internet backbones).</li>
<li><b>Resistance to the <a target="_top" href=
-"http://www.tuxedo.org/~esr/jargon/html/entry/slashdot-effect.html">
-"Slashdot Effect"</a></b> - i.e. the ability to cope well with
+"http://whatis.techtarget.com/definition/0,289893,sid9_gci214064,00.html">"Slashdot Effect"</a></b> - i.e. the ability to cope well with
files that are enormously commonly requested.</li>
<li><b>Resistance to Denial-Of-Service attacks</b> - resistance to
|
|
From: blackh <gra...@li...> - 2003-07-30 10:08:51
|
blackh Wed Jul 30 03:08:51 2003 EDT
Modified files:
/grapevine start.sh
/grapevine/cpp Operation.cpp Operation.h grapevine.cpp
Log:
Add identifier option to help diagnostics.
Index: grapevine/cpp/grapevine.cpp
diff -u grapevine/cpp/grapevine.cpp:1.72 grapevine/cpp/grapevine.cpp:1.73
--- grapevine/cpp/grapevine.cpp:1.72 Wed Jul 23 04:50:58 2003
+++ grapevine/cpp/grapevine.cpp Wed Jul 30 03:08:51 2003
@@ -1,5 +1,5 @@
/*
- $Id: grapevine.cpp,v 1.72 2003/07/23 11:50:58 blackh Exp $
+ $Id: grapevine.cpp,v 1.73 2003/07/30 10:08:51 blackh Exp $
Copyright (c) 2001-2003, Stephen Blackheath, Tony Jones, & Ross Smith. All rights reserved.
This is free software; see COPYING for copying conditions. There is NO
@@ -114,10 +114,11 @@
<< " -r | --rules debug rules" << endl
<< " -f | --facts debug facts" << endl
<< " -k | --code debug code" << endl
- << " -i | --prefix set tracing prefix fields: 1=date, 2=time, 4=thread (dec)," << endl
+ << " -e | --prefix set tracing prefix fields: 1=date, 2=time, 4=thread (dec)," << endl
<< " 8 thread (hex), 16=file/line, 32=function" << endl
#endif
<< " -t | --timestamp add timestamps to log output" << endl
+ << " -i | --identifier add specified identifier to log output" << endl
<< " -v | --version display version" << endl
<< " -? | --help display help" << endl
;
@@ -213,9 +214,10 @@
{"code", 0, 0, 'k'},
{"facts", 0, 0, 'f'},
{"rules", 0, 0, 'r'},
- {"prefix", 1, 0, 'i'},
+ {"prefix", 1, 0, 'e'},
#endif
- {"timestamp", 0, 0, 't'},
+ {"timestamp", 0, 0, 't'},
+ {"identifier", 1, 0, 'i'},
{NULL, 0, 0, 0}
};
@@ -262,6 +264,7 @@
#endif
bool profile = false;
bool timestamp = false;
+ const char* identifier = NULL;
bool isDaemon = false;
try {
@@ -294,9 +297,9 @@
"R:"
#endif
#ifdef _DEBUG
- "D:kfri:"
+ "D:kfre:"
#endif
- "t"
+ "ti:"
, long_options, &option_index);
if (c == -1)
break;
@@ -348,7 +351,7 @@
case 'D':
DBG_SETMASK(p);
break;
- case 'i':
+ case 'e':
DBG_SETPREFIX(p);
break;
case 'k':
@@ -364,6 +367,9 @@
case 't':
timestamp = true;
break;
+ case 'i':
+ identifier = strdup(p);
+ break;
default:
usage();
retval = ERR_SYNTAX_ERROR;
@@ -372,6 +378,7 @@
} // end while
Print::setTimestamp(timestamp);
+ Print::setIdentifier(identifier);
Print::setDaemon(isDaemon);
if (retval)
|
|
From: blackh <gra...@li...> - 2003-07-24 00:03:21
|
blackh Wed Jul 23 17:03:17 2003 EDT
Modified files:
/grapevine/cpp IOLoop.cpp
Log:
Bug fix (wouldn't release firmware).
Index: grapevine/cpp/IOLoop.cpp
diff -u grapevine/cpp/IOLoop.cpp:1.51 grapevine/cpp/IOLoop.cpp:1.52
--- grapevine/cpp/IOLoop.cpp:1.51 Thu Jul 10 04:02:14 2003
+++ grapevine/cpp/IOLoop.cpp Wed Jul 23 17:03:17 2003
@@ -1,4 +1,4 @@
-// $Id: IOLoop.cpp,v 1.51 2003/07/10 11:02:14 blackh Exp $
+// $Id: IOLoop.cpp,v 1.52 2003/07/24 00:03:17 blackh Exp $
#include "config.h"
@@ -338,6 +338,7 @@
bool IOLoop::anySockets()
{
return
+ ioEventQueue.begin() != ioEventQueue.end() ||
listenSockets.begin() != listenSockets.end() ||
openSockets.begin() != openSockets.end() ||
connectingSockets.begin() != connectingSockets.end() ||
|
|
From: blackh <gra...@li...> - 2003-07-23 11:51:00
|
blackh Wed Jul 23 04:50:59 2003 EDT
Added files:
/grapevine/raisen/grapevine join-interface.dtd join-interface.xml
Modified files:
/grapevine/cpp Operation.cpp Operation.h grapevine.cpp
/grapevine/raisen rudimentary-html.dtd
/grapevine/raisen/grapevine address.xml discovery.xml grapevine.dtd
heartbeat.dtd heartbeat.xml init.xml
interface.xml join.dtd join.xml
messages.dtd route.xml sahp.xml
transaction-routing.xml version.xml
/grapevine/raisen/local request.xml
Log:
Ability to show timestamps in log output (-t switch).
Network logic bug fixes.
Progress with discovery.
|
|
From: blackh <gra...@li...> - 2003-07-23 03:11:13
|
blackh Tue Jul 22 20:11:12 2003 EDT
Modified files:
/website plots.php
Log:
Oops.
Index: website/plots.php
diff -u website/plots.php:1.3 website/plots.php:1.4
--- website/plots.php:1.3 Thu Jul 10 04:30:04 2003
+++ website/plots.php Tue Jul 22 20:11:11 2003
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- $Id: plots.php,v 1.3 2003/07/10 11:30:04 blackh Exp $ -->
+<!-- $Id: plots.php,v 1.4 2003/07/23 03:11:11 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -27,7 +27,7 @@
<h3>The live network</h3>
- <p>This is a plot of the live Grapevine network with three whole nodes on it.
+ <p>This is a plot of the live Grapevine network with four whole nodes on it.
The locations of three of these nodes are
<ul>
<li>Wellington, New Zealand</li>
|
|
From: blackh <gra...@li...> - 2003-07-23 03:10:05
|
blackh Tue Jul 22 20:10:03 2003 EDT
Modified files:
/website designnotes.php
Log:
Index: website/designnotes.php
diff -u website/designnotes.php:1.17 website/designnotes.php:1.18
--- website/designnotes.php:1.17 Sat Mar 15 03:43:21 2003
+++ website/designnotes.php Tue Jul 22 20:10:02 2003
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- $Id: designnotes.php,v 1.17 2003/03/15 11:43:21 blackh Exp $ -->
+<!-- $Id: designnotes.php,v 1.18 2003/07/23 03:10:02 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -326,6 +326,19 @@
End of pgp message
+
+Subject: FFT Prediction #1
+Date: Sun Jul 20 09:36:04 2003
+From: "Martin Katz, Ph.D."
+To: st...@bl...
+
+What you are describing is called autocorrelation. You don't have to
+worry about phase.
+
+The algorithm is unFFT( FFT^2 ). That is, square the FFT and then
+convert back to time domain.
+
+Dr. Bits.
</pre>
<hr/>
|
|
From: blackh <gra...@li...> - 2003-07-21 07:46:55
|
blackh Mon Jul 21 00:46:55 2003 EDT
Modified files:
/website links.php
Log:
Index: website/links.php
diff -u website/links.php:1.120 website/links.php:1.121
--- website/links.php:1.120 Thu Jul 17 16:18:56 2003
+++ website/links.php Mon Jul 21 00:46:54 2003
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- $Id: links.php,v 1.120 2003/07/17 23:18:56 blackh Exp $ -->
+<!-- $Id: links.php,v 1.121 2003/07/21 07:46:54 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="generator" content=
@@ -391,9 +391,9 @@
<h3>Freedom in New Zealand</h3>
<p><a target="_top" href="http://www.pcworld.co.nz/pcworld/pcw.nsf/UNID/C31C0D8269C307AACC256D4E0007261A?OpenDocument">30 Jun 2003 - Govt asks NZ ISPs to snoop</a>
-<br/>This action by the NZ Government supports the conclusion that the
+<br/>This action by the NZ Government supports the theory that the
<a href="http://www.sovereignty.net/center/treaty.html" target="_top">Convention on Cybercrime</a>
-<i>is</i> going to be adopted worldwide. They're not even waiting for it.
+is going to be adopted worldwide. They're not even waiting for it.
<br/>
<br/>
<br/>
@@ -403,7 +403,9 @@
<p><a target="_top" href=
"http://www.eff.org/">Electronic Frontier Foundation</a></p>
-<p><a target="_top" href="http://www.wired.com/news/technology/0,1282,59092,00.html">04 Jun 2003 - Smartcams Take Aim at Terrorists</a>
+<p><a target="_top" href="http://www.wired.com/news/digiwood/0,1412,59654,00.html">21 Jul 2003 - Upload a File, Go to Prison</a>
+<br/>A new bill proposed in Congress on Wednesday would land a person in prison for five years and impose a fine of $250,000 for uploading a single file to a peer-to-peer network.
+<br/><a target="_top" href="http://www.wired.com/news/technology/0,1282,59092,00.html">04 Jun 2003 - Smartcams Take Aim at Terrorists</a>
<br/>Video cameras in public places + massive computer processing = total surveillance.
<br/><a target="_top" href="http://www.rense.com/general37/dark.htm">19 Apr 2003 - Today Show Goes Dark On Tim Robbins</a>
<br/>Actor Tim Robbins's microphone goes strangely quiet when answering questions
|
|
From: blackh <gra...@li...> - 2003-07-17 23:18:56
|
blackh Thu Jul 17 16:18:56 2003 EDT
Modified files:
/website links.php
Log:
Freenet is back in the news.
Index: website/links.php
diff -u website/links.php:1.119 website/links.php:1.120
--- website/links.php:1.119 Thu Jul 3 15:16:48 2003
+++ website/links.php Thu Jul 17 16:18:56 2003
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- $Id: links.php,v 1.119 2003/07/03 22:16:48 blackh Exp $ -->
+<!-- $Id: links.php,v 1.120 2003/07/17 23:18:56 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="generator" content=
@@ -91,7 +91,9 @@
<br/>In particular, have a look at <a target="_top" href="http://www.gilc.org/speech/osistudy">Internet Censorship
Project</a>, an ongoing documentation of Internet censorship policies around the world.</p>
-<p><a target="_top" href="http://www.prnewswire.com/cgi-bin/stories.pl?ACCT=SVBIZINK3.story&STORY=/www/story/04-25-2003/0001934231&EDATE=FRI+Apr+25+2003,+09:35+PM">25 Apr 2003 - Technology Users Rejoice as Judge Rules That Peer-to-Peer Software Such as Gnutella is Legal</a>
+<p><a target="_top" href="http://www.newscientist.com/news/news.jsp?id=ns99993950">16 Jul 2003 - Interest in anonymous file-trading grows</a>
+<br/>Freenet is back in the news.
+<br/><a target="_top" href="http://www.prnewswire.com/cgi-bin/stories.pl?ACCT=SVBIZINK3.story&STORY=/www/story/04-25-2003/0001934231&EDATE=FRI+Apr+25+2003,+09:35+PM">25 Apr 2003 - Technology Users Rejoice as Judge Rules That Peer-to-Peer Software Such as Gnutella is Legal</a>
<br/>USA court decision: that peer-to-peer file-sharing software is legal to use and
develop, even though it can be used for illegal purposes.
<br/><a target="_top" href="http://www.sovereignty.net/center/treaty.html">7 Jan 2003 - New Internet Treaty Readied</a>
|
|
From: blackh <gra...@li...> - 2003-07-14 11:42:44
|
blackh Mon Jul 14 04:42:43 2003 EDT
Modified files:
/grapevine/raisen/grapevine discovery.xml transaction-routing.xml
Log:
Fix bug in transaction routing: had 'ack' instead of 'nack'! No wonder
it wasn't working.
Index: grapevine/raisen/grapevine/transaction-routing.xml
diff -u grapevine/raisen/grapevine/transaction-routing.xml:1.37 grapevine/raisen/grapevine/transaction-routing.xml:1.38
--- grapevine/raisen/grapevine/transaction-routing.xml:1.37 Fri Jun 13 23:15:38 2003
+++ grapevine/raisen/grapevine/transaction-routing.xml Mon Jul 14 04:42:43 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: transaction-routing.xml,v 1.37 2003/06/14 06:15:38 blackh Exp $ -->
+<!-- $Id: transaction-routing.xml,v 1.38 2003/07/14 11:42:43 blackh Exp $ -->
<!--
To route a transaction to another node, set the transaction#
@@ -67,7 +67,7 @@
]>
<grapevine>
- <domain name="grapevine.transaction-routing" author1="Stephen Blackheath" rev="$Revision: 1.37 $">
+ <domain name="grapevine.transaction-routing" author1="Stephen Blackheath" rev="$Revision: 1.38 $">
<facts>
<flag verbose="false" debug="false"/>
@@ -75,9 +75,33 @@
<rules>
+<preprocess.if test="language >= '1.1'">
+ <!-- If we receive a message that contains 'route', we first check to see
+ what the I/O backlog looks like. -->
+ route_message-100:
+ msg = <msg.from interface="[fromInterface]" location="[fromLocation]" remoteIPAddr="[remoteIPAddr]">
+ <route id="[id]" destination="[destination]"/>
+ </msg.from>,
+
+ backlog=backlogMillis(),
+ backlog >= 8000,
+
+ <!-- If the I/O backlog is more than 8 seconds, then we reject the new message.
+ This prevents the grapevine daemon from getting bogged down if its CPU is
+ not fast enough to cope with the traffic it is receiving. -->
+ retract msg,
+ remember new <msg.to location="[fromLocation]" interface="[fromInterface]" within="0">
+ <nack id="[id]"/>
+ </msg.to>,
+ {
+ <flag debug="true"/>,
+ println("transaction-routing: " ## id ## " rejected due to overloading. Backlog=" ## backlog),
+ } || true;
+</preprocess.if>
+
<!-- If we receive a message that contains 'route', then we
route the message to its intended destination. -->
- route_message-100:
+ route_message-105:
msg = <msg.from interface="[interface]" location="[fromLocation]" remoteIPAddr="[remoteIPAddr]">
<route id="[id]" destination="[destination]"/>
</msg.from>,
@@ -168,7 +192,7 @@
println("transaction-routing: " ## id ## " routing loop - send NACK"), <!-- ### -->
<!-- Otherwise send a nack to indicate a routing loop. -->
remember new <msg.to location="[fromLocation]" interface="[fromInterface]" within="0">
- <ack id="[id]"/>
+ <nack id="[id]"/>
</msg.to>
}
} ||
@@ -536,7 +560,7 @@
remember new <got-ack id="[id]" interface="[interface]" routee="[location]"/>;
<!-- If we receive a NACK, then this means we got a routing loop.
- So, propagate again immediately. This will make it try a different destinations. -->
+ So, propagate again immediately. This will make it try a different destination. -->
receive_nack:
trans=<obj.transaction id="[id]" band="[band]"/>,
msg=<msg.from location="[location]">
|
