David Sowder (Zothar) wrote:
> zothar at freenetproject.org wrote:
>> Author: zothar
>> Date: 2006-05-11 04:24:24 +0000 (Thu, 11 May 2006)
>> New Revision: 8652
>>
>> Modified:
>>    trunk/freenet/src/freenet/io/NetworkInterface.java
>>    trunk/freenet/src/freenet/io/comm/Peer.java
>>    trunk/freenet/src/freenet/node/FNPPacketMangler.java
>>    trunk/freenet/src/freenet/node/Node.java
>>    trunk/freenet/src/freenet/node/PeerNode.java
>> Log:
>> When no IP addresses are available for handshake, reset the handshake 
>> timer.  Only do DNS lookups during handshake and store the result.  
>> Explicitly set Java's negative DNS cache TTL.  Factored out the 
>> repeated use of some address lookup methods within a few lines of 
>> each other.  Fixed an NPE caused by trying to call the canGetCipher() 
>> method on a null DHContext.  Added another short-circuit to 
>> getHandshakeIPs().
>>   
> To whomever is in charge of the FreenetLogBot related auto-builder, 
> the SVN revision of 8652 seems to be properly displayed everywhere but 
> on the running node, which still thinks it's on r8649 (the changes 
> otherwise are in the newly built and downloaded version).  Maybe this 
> problem is related to the Eclipse substitution question (dunno if the 
> auto-builder uses it)?
Ah, this is because the keyword substitution does not change the string 
in Version.java unless Version.java has changed.  To solve the annoyance 
of editing files, perhaps the revision could be made derived during the 
build process.  The OpenTTD folks write a "#include" file for their C++ 
code at build time with the revision and uses that verbatim "in-game".  
They use the following to derive the revision:

$(shell if test -d .svn; then svnversion . | awk '{ print "r"$$0 }'; fi)

this has the benefit of working even with local modification (indicated 
by a "M" suffix).

Reply via email to