From zothar at freenetproject.org Fri Dec 14 23:33:56 2007 From: zothar at freenetproject.org (zothar at freenetproject.org) Date: Fri, 14 Dec 2007 23:33:56 +0000 (UTC) Subject: [Pyfreenet] r16552 - trunk/apps/pyFreenet Message-ID: <20071214233356.344294796E3@freenetproject.org> Author: zothar Date: 2007-12-14 23:33:55 +0000 (Fri, 14 Dec 2007) New Revision: 16552 Modified: trunk/apps/pyFreenet/refbot.py Log: refbot: Remove the requirement for the location field and optimize some announcerTokenHolder stuff Modified: trunk/apps/pyFreenet/refbot.py =================================================================== --- trunk/apps/pyFreenet/refbot.py 2007-12-14 23:03:25 UTC (rev 16551) +++ trunk/apps/pyFreenet/refbot.py 2007-12-14 23:33:55 UTC (rev 16552) @@ -640,7 +640,7 @@ self.setup_refurl( opts ); needToSave = True; continue; - required_ref_fields = [ "dsaGroup.g", "dsaGroup.p", "dsaGroup.q", "dsaPubKey.y", "identity", "location", "myName", "sig" ]; + required_ref_fields = [ "dsaGroup.g", "dsaGroup.p", "dsaGroup.q", "dsaPubKey.y", "identity", "myName", "sig" ]; for require_ref_field in required_ref_fields: if(not ref_fieldset.has_key(require_ref_field)): log("***"); @@ -776,7 +776,7 @@ self.setup_opennet_refurl( opts ); needToSave = True; continue; - required_ref_fields = [ "dsaGroup.g", "dsaGroup.p", "dsaGroup.q", "dsaPubKey.y", "identity", "location", "opennet", "sig" ]; + required_ref_fields = [ "dsaGroup.g", "dsaGroup.p", "dsaGroup.q", "dsaPubKey.y", "identity", "opennet", "sig" ]; for require_ref_field in required_ref_fields: if(not ref_fieldset.has_key(require_ref_field)): log("***"); @@ -1538,7 +1538,8 @@ self.announcerTokenHolder = self.getAnnouncerTokenHolder() if( self.botircnick == self.announcerTokenHolder ): for announcer in self.botAnnouncePool: - self.sendAnnouncerTokenHolderNotify(announcer) + if( self.botircnick != self.announcerTokenHolder ): + self.sendAnnouncerTokenHolderNotify(announcer) #@-node:maybe_set_announcerTokenHolder #@+node:maybe_set_seenChannelUsersTransferCompleted @@ -1812,7 +1813,7 @@ self.botAnnouncePool.sort(); if( self.check_bot_peer_has_option( botNick, "bot2bot" )): if( botNick in self.botAnnouncePool ): - if( None != self.announcerTokenHolder ): + if( None != self.announcerTokenHolder and self.botircnick != self.announcerTokenHolder ): self.after( 2, self.sendAnnouncerTokenHolderNotify, botNick) if( FreenetNodeRefBot.SEEN_CHANNEL_USERS_TRANSFER_COMPLETED == self.seenChannelUsersTransferState ): self.after( 4, self.sendSeenChannelUsersOffer, botNick ); @@ -1952,7 +1953,7 @@ del self.bots[ botNick ][ "ref" ] del self.bots[ botNick ][ "ref_terminated" ] return - required_ref_fields = [ "dsaGroup.g", "dsaGroup.p", "dsaGroup.q", "dsaPubKey.y", "identity", "location", "myName", "sig" ]; + required_ref_fields = [ "dsaGroup.g", "dsaGroup.p", "dsaGroup.q", "dsaPubKey.y", "identity", "myName", "sig" ]; for require_ref_field in required_ref_fields: if(not ref_fieldset.has_key(require_ref_field)): log("** bot using nick '%s' gave us a ref missing the required '%s' field." % ( botNick, require_ref_field )); @@ -2025,7 +2026,7 @@ del self.bots[ botNick ][ "opennet_ref" ] del self.bots[ botNick ][ "opennet_ref_terminated" ] return - required_ref_fields = [ "dsaGroup.g", "dsaGroup.p", "dsaGroup.q", "dsaPubKey.y", "identity", "location", "opennet", "sig" ]; + required_ref_fields = [ "dsaGroup.g", "dsaGroup.p", "dsaGroup.q", "dsaPubKey.y", "identity", "opennet", "sig" ]; for require_ref_field in required_ref_fields: if(not ref_fieldset.has_key(require_ref_field)): log("** bot using nick '%s' gave us a ref missing the required '%s' field." % ( botNick, require_ref_field )); @@ -3245,9 +3246,9 @@ self.plugin_args[ "isDarknetRef" ] = self.isDarknetRef; self.plugin_args[ "isOpennetRef" ] = self.isOpennetRef; if( self.isDarknetRef ): - required_ref_fields = [ "dsaGroup.g", "dsaGroup.p", "dsaGroup.q", "dsaPubKey.y", "identity", "location", "myName", "sig" ]; + required_ref_fields = [ "dsaGroup.g", "dsaGroup.p", "dsaGroup.q", "dsaPubKey.y", "identity", "myName", "sig" ]; else: - required_ref_fields = [ "dsaGroup.g", "dsaGroup.p", "dsaGroup.q", "dsaPubKey.y", "identity", "location", "opennet", "sig" ]; + required_ref_fields = [ "dsaGroup.g", "dsaGroup.p", "dsaGroup.q", "dsaPubKey.y", "identity", "opennet", "sig" ]; for require_ref_field in required_ref_fields: if(not ref_fieldset.has_key(require_ref_field)): self.status = -1 # invalid ref found at URL From zothar at freenetproject.org Wed Dec 19 14:50:51 2007 From: zothar at freenetproject.org (zothar at freenetproject.org) Date: Wed, 19 Dec 2007 14:50:51 +0000 (UTC) Subject: [Pyfreenet] r16709 - trunk/apps/pyFreenet Message-ID: <20071219145051.15E533C0482@freenetproject.org> Author: zothar Date: 2007-12-19 14:50:50 +0000 (Wed, 19 Dec 2007) New Revision: 16709 Modified: trunk/apps/pyFreenet/refbot.py Log: refbot: Obsoletion notice Modified: trunk/apps/pyFreenet/refbot.py =================================================================== --- trunk/apps/pyFreenet/refbot.py 2007-12-19 14:46:52 UTC (rev 16708) +++ trunk/apps/pyFreenet/refbot.py 2007-12-19 14:50:50 UTC (rev 16709) @@ -27,6 +27,31 @@ import fcp from minibot import log, log_traceback, MiniBot, PrivateChat, my_exit +print; +print; +print; +print "***"; +print "***"; +print "*** IMPORTANT NOTICE:"; +print "***"; +print "*** #freenet-refs has been closed in favor of the in-node implementation of"; +print "*** an automated opennet peer maintenance system. Because #freenet-refs is"; +print "*** no longer needed, refbot.py is now obsolete."; +print "***"; +print "*** If your node does not already have a seednodes.fref file, you may"; +print "*** download it from:"; +print "*** http://downloads.freenetproject.org/alpha/opennet/seednodes.fref"; +print "***"; +print "*** Once you have downloaded a seednodes.fref file, you'll want to place it"; +print "*** in the node's home directory (the same directory that contains"; +print "*** freenet.ini and wrapper.conf)."; +print "***"; +print "***"; +print; +print; +print; +my_exit( 1 ); + have_plugin_module = False; try: import botplugin;