zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

started adding STREAM support

Browse Source
This commit is contained in:
aum
2004-04-12 05:46:05 +00:00
committed by zzz
parent 7c155545ae
commit de740b1d9d
1 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
apps/sam/jython/src/i2psam.py
View File

@@ -39,15 +39,13 @@ import java
# i2p-specific imports # i2p-specific imports
import net.i2p import net.i2p
import net.i2p.client # to shut up epydoc import net.i2p.client # to shut up epydoc
#import net.i2p.client.I2PClient
# shut up java with a few more imports #import net.i2p.client.I2PClientFactory
#import net.i2p.client.I2PSessionListener
import net.i2p.client.naming
import net.i2p.client.streaming import net.i2p.client.streaming
import net.i2p.crypto import net.i2p.crypto
import net.i2p.data import net.i2p.data
import net.i2p.client.I2PClient
import net.i2p.client.I2PClientFactory
import net.i2p.client.naming
#import net.i2p.client.I2PSessionListener
# handy shorthand refs # handy shorthand refs
i2p = net.i2p i2p = net.i2p
@@ -932,10 +930,14 @@ class I2PSocket:
def connect(self, remdest): def connect(self, remdest):
""" """
Connects to a remote destination Connects to a remote destination
This has one totally major difference from the normal socket
paradigm, and that is that you can have n outbound connections
to different dests.
""" """
# sanity check # sanity check
if self.sockmgr: #if self.sockmgr:
raise I2PSocketError(".sockmgr already present - have you already called listen/connect?") # raise I2PSocketError(".sockmgr already present - have you already called listen/connect?")
# create whole new dest if none was provided to constructor # create whole new dest if none was provided to constructor
if self.dest is None: if self.dest is None:
@@ -949,13 +951,21 @@ class I2PSocket:
opts = net.i2p.client.streaming.I2PSocketOptions() opts = net.i2p.client.streaming.I2PSocketOptions()
try: try:
self.sock = self.sockmgr.connect(remdest._item, opts) sock = self.sock = self.sockmgr.connect(remdest._item, opts)
self.remdest = remdest self.remdest = remdest
except: except:
logException(2, "apparent exception, continuing...") logException(2, "apparent exception, continuing...")
self.instream = self.sock.getInputStream()
self.outstream = self.sock.getOutputStream() self.instream = sock.getInputStream()
self.outstream = sock.getOutputStream()
sockobj = I2PSocket(dest=self.dest,
remdest=remdest,
sock=sock,
instream=instream,
outstream=outstream)
self._connected = 1 self._connected = 1
return sockobj
#@-node:connect #@-node:connect
#@+node:recv #@+node:recv
def recv(self, nbytes): def recv(self, nbytes):
@@ -1185,6 +1195,9 @@ class I2PSamClientHandler(StreamRequestHandler):
self.samSessionIsOpen = 0 self.samSessionIsOpen = 0
self.samSessionStyle = '' self.samSessionStyle = ''
# localise the id allocator
self.samAllocId = self.server.samAllocId
# need a local sending lock # need a local sending lock
self.sendLock = threading.Lock() self.sendLock = threading.Lock()
@@ -1654,7 +1667,8 @@ class I2PSamClientHandler(StreamRequestHandler):
id = args['ID'] id = args['ID']
try: try:
self.samSock.connect(remdest) sock = self.samSock.connect(remdest)
self.localstreams[id] = sock
self.samSend("STREAM", "STATUS", self.samSend("STREAM", "STATUS",
RESULT='OK', RESULT='OK',
ID=id, ID=id,
@@ -1662,9 +1676,10 @@ class I2PSamClientHandler(StreamRequestHandler):
except: except:
self.samSend("STREAM", "STATUS", self.samSend("STREAM", "STATUS",
RESULT='I2P_ERROR', RESULT='I2P_ERROR',
MESSAGE='exception on connect', MESSAGE='exception_on_connect',
) )
#@-node:on_STREAM #@-node:on_STREAM
#@+node:on_DATAGRAM #@+node:on_DATAGRAM
def on_DATAGRAM(self, topic, subtopic, args): def on_DATAGRAM(self, topic, subtopic, args):
@@ -1826,6 +1841,9 @@ class I2PSamClientHandler(StreamRequestHandler):
destb64 = dest.toBase64() destb64 = dest.toBase64()
log(4, "Listening for connections to %s..." % destb64[:40]) log(4, "Listening for connections to %s..." % destb64[:40])
sock.listen()
while 1: while 1:
newsock = sock.accept() newsock = sock.accept()