mnet-cvs Mailing List for Mnet (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/mnet/darcs-mnet_new_mt/egtp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13176/egtp

Modified Files:
	CryptoCommsHandler.py MojoTransaction.py TCPCommsHandler.py 
	__init__.py peerset.py 
Log Message:
some patches to make it run, vernum bumps

Index: CryptoCommsHandler.py
===================================================================
RCS file: /cvsroot/mnet/darcs-mnet_new_mt/egtp/CryptoCommsHandler.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2

--- CryptoCommsHandler.py	23 Jul 2004 19:03:07 -0000	1.1.1.1
+++ CryptoCommsHandler.py	23 Jul 2004 20:10:17 -0000	1.2
@@ -274,8 +274,11 @@
             # _assert(curcs._lowerstrategy.is_usable(), "internal consistency", curcs) # We can't assert this because it can become unusable spontaneously from the other thread (the asyncore thread).
             peer = self._peerset.get_peer(counterparty_id)
             if peer:
+                try:
                 if not peer.shareablepeercommstrat.is_shareable():
                     peer.shareablepeercommstrat = None
+                except:
+                    peer.shareablepeercommstrat = None
 
             # after a unconfirmed session reset there still is a commstrat,
             #   but no key.

Index: MojoTransaction.py
===================================================================
RCS file: /cvsroot/mnet/darcs-mnet_new_mt/egtp/MojoTransaction.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- MojoTransaction.py	23 Jul 2004 19:03:10 -0000	1.1.1.1
+++ MojoTransaction.py	23 Jul 2004 20:10:17 -0000	1.2
@@ -568,8 +568,11 @@
             self._discoveryman.mark_as_not_so_live(counterparty_id, newlivelevel, reason)
         self._ch.forget_comm_strategy(counterparty_id, badcommstrat, reason=reason)
         if peer:
+            try:
             if not peer.shareablepeercommstrat.is_shareable():
                 peer.shareablepeercommstrat = None
+            except: 
+                peer.shareablepeercommstrat = None
 
     def serialize(self):
         return mencode.mencode({'session keeper': self._mesgen._session_keeper.serialize()})
@@ -962,8 +965,11 @@
         newcs = reduce(CommStrat.choose_best_strategy, commstrat_list)
         peer = self._peerset.get_peer(nodeId)
         if peer:
+            try:
             if not peer.shareablepeercommstrat.is_shareable():
                 peer.shareablepeercommstrat = None
+            except: 
+               peer.shareablepeercommstrat = None
         del commstrat_list
         return self._ch.use_comm_strategy(nodeId, newcs)
 

Index: TCPCommsHandler.py
===================================================================
RCS file: /cvsroot/mnet/darcs-mnet_new_mt/egtp/TCPCommsHandler.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- TCPCommsHandler.py	23 Jul 2004 19:03:12 -0000	1.1.1.1
+++ TCPCommsHandler.py	23 Jul 2004 20:10:17 -0000	1.2
@@ -374,8 +374,11 @@
         (preffedcs, changed,) = CommStrat.choose_best_strategy(curcs, commstrat)
         peer = self._mtm._peerset.get_peer(counterparty_id)
         if peer:
+            try:
             if not peer.shareablepeercommstrat.is_shareable():
                 peer.shareablepeercommstrat = None
+            except:
+                peer.shareablepeercommstrat = None
 
         # debugprint("CommStrat.choose_best_strategy(curcs: %s, commstrat: %s) -> %s\n", args=(curcs, commstrat, preffedcs,))
 

Index: __init__.py
===================================================================
RCS file: /cvsroot/mnet/darcs-mnet_new_mt/egtp/__init__.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- __init__.py	23 Jul 2004 19:03:12 -0000	1.1.1.1
+++ __init__.py	23 Jul 2004 20:10:17 -0000	1.2
@@ -57,7 +57,7 @@
 # Whenever you make any change that anyone might care about, you should bump the
 # "nano" number.  This gets tedious, so you should write a bash/Perl/Python/
 # Haskell script to do it for you and add it to the mnetlib/scripts directory.
-__versionnano__ = 60
+__versionnano__ = 61
 
 # Maybe the following would be useful for things like revision control tags, or
 # flags like "STABLE/UNSTABLE".
@@ -65,5 +65,5 @@
 
 # Please put a URL or other note here which shows where to get the branch of
 # development from which this version grew.
-__versionsources__ = ["http://mnetproject.org/repos/mnet_new_mt",]
+__versionsources__ = ["http://mnetproject.org/repos/mnet_new_mt", "cvs -d:pserver:ano...@cv...:/cvsroot/mnet co darcs-mnet_new_mt",]
 

Index: peerset.py
===================================================================
RCS file: /cvsroot/mnet/darcs-mnet_new_mt/egtp/peerset.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- peerset.py	23 Jul 2004 19:03:11 -0000	1.1.1.1
+++ peerset.py	23 Jul 2004 20:10:17 -0000	1.2
@@ -122,6 +122,24 @@
             self.premencodedphonebookentry = mencode.PreEncodedThing(d)
         assert self.entnode.peerset._assert_consistency()
 
+    def accept_commstrat(self, commstrat):	
+        """	
+        Replace current commstrat with this commstrat.
+        This should be used for incoming hello meassages since we should believe them.	
+        @param commstrat: a commstrat that can be used to communicate with this peer	
+        """	
+        self.peercommstrat = commstrat	
+        try:
+            self.entnode.mtm._ch.use_comm_strategy(self.peercommstrat.id, self.peercommstrat) 	 	
+            if commstrat.is_shareable():	
+                self.shareablepeercommstrat = commstrat	
+                d = self.to_dict()	
+                if d:	
+                    self.premencodedphonebookentry = mencode.PreEncodedThing(d)
+        except:
+            pass #What esle can we do here? --arnowa
+
+
     def consider_commstrat(self, commstrat):
         """
         Replace current commstrat with this commstrat, if and only if this one is better.  Replace the current shareable commstrat with this commstrat if and only if this one is shareable and better.
@@ -137,8 +155,11 @@
             # XXX we should probably clean-up the old one here, or better yet make it get garbage-collected properly by using weakrefs.  --Zooko 2003-10-19
             self.entnode.mtm._ch.use_comm_strategy(self.peercommstrat.id, self.peercommstrat, dontmakepeer=True)
 
+        try:
         if not self.shareablepeercommstrat.is_shareable():
             self.shareablepeercommstrat = None
+        except:
+            self.shareablepeercommstrat = None
 
         if commstrat.is_shareable():
             (bestshareablecommstrat, changed,) = CommStrat.choose_best_strategy(self.shareablepeercommstrat, commstrat)
@@ -189,6 +210,7 @@
         assert self._assert_consistency()
         ref = self.peerset.get(peerId)
         if (ref is None) or (ref() is None):
+            debugprint("New Peer: %s\n", args=(peerId,))
             if strictkey:
                 raise KeyError, peerId
             assert self._assert_consistency()





2002	Jan	Feb (140)	Mar (41)	Apr (89)	May (179)	Jun (97)	Jul (192)	Aug (106)	Sep (232)	Oct (75)	Nov (177)	Dec (256)
2003	Jan (297)	Feb (454)	Mar (220)	Apr (237)	May (382)	Jun (9)	Jul (48)	Aug (124)	Sep (48)	Oct (417)	Nov (320)	Dec (93)
2004	Jan (19)	Feb (126)	Mar (93)	Apr (120)	May (36)	Jun	Jul (11)	Aug	Sep (33)	Oct	Nov	Dec
2005	Jan	Feb (2)	Mar (1)	Apr (3)	May	Jun	Jul	Aug (2)	Sep	Oct (1)	Nov	Dec
2006	Jan (5)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2009	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

mnet-cvs Mailing List for Mnet (Page 3)

mnet-cvs — cvs commit logs from syncmail for the Mnet project