HidUser0
/
i2plib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove useless session_ready lock

master
Viktor Villainov 2018-12-25 03:10:45 -05:00
parent 47d1a88d96
commit 48b9178fe1
No known key found for this signature in database
GPG Key ID: 8EB38B46F33BAF2F
4 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/examples/irc_bot.py
View File

@ -9,10 +9,7 @@ async def irc_bot():
irc_server, nickname, channel = "irc.ilita.i2p", "aiobot", "0"
session_name = "ircbot"
READY = asyncio.Event()
asyncio.ensure_future(
i2plib.create_session(session_name, session_ready=READY))
await READY.wait()
await i2plib.create_session(session_name)
reader, writer = await i2plib.stream_connect(session_name, irc_server)

5
docs/examples/isup.py
View File

@ -16,10 +16,7 @@ async def check_peer(sam_address, loop, session_name, domain):
async def isup(sam_address, loop, domains):
session_name = "checker"
READY = asyncio.Event(loop=loop)
asyncio.ensure_future(i2plib.create_session(session_name,
sam_address=sam_address, loop=loop, session_ready=READY), loop=loop)
await READY.wait()
await i2plib.create_session(session_name, sam_address=sam_address, loop=loop)
tasks = [check_peer(sam_address, loop, session_name, d) for d in domains]
result = await asyncio.gather(*tasks, loop=loop)

5
docs/examples/wget.py
View File

@ -28,10 +28,7 @@ async def http_get(sam_address, loop, session_name, url):
async def wget(sam_address, loop, url):
session_name = "wget"
READY = asyncio.Event(loop=loop)
asyncio.ensure_future(i2plib.create_session(session_name,
sam_address=sam_address, loop=loop, session_ready=READY), loop=loop)
await READY.wait()
await i2plib.create_session(session_name, sam_address=sam_address, loop=loop)
res = await http_get(sam_address, loop, session_name, url)
print(res)

16
i2plib/aiosam.py
View File

@ -62,7 +62,7 @@ async def new_destination(sam_address=i2plib.sam.DEFAULT_ADDRESS, loop=None,
return i2plib.sam.Destination(reply["PRIV"], has_private_key=True)
async def create_session(session_name, sam_address=i2plib.sam.DEFAULT_ADDRESS,
loop=None, session_ready=None, style="STREAM",
loop=None, style="STREAM",
signature_type=i2plib.sam.Destination.default_sig_type,
destination=None, options={}, session_created=None,
args=()):
@ -71,8 +71,6 @@ async def create_session(session_name, sam_address=i2plib.sam.DEFAULT_ADDRESS,
:param session_name: Session nick name
:param sam_address: (optional) SAM API address
:param loop: (optional) Event loop instance
:param session_ready: (optional) asyncio.Event instance to notify when
session is ready
:param style: (optional) Session style, can be STREAM, DATAGRAM, RAW
:param signature_type: (optional) If the destination is TRANSIENT, this
signature type is used
@ -111,8 +109,6 @@ async def create_session(session_name, sam_address=i2plib.sam.DEFAULT_ADDRESS,
destination = i2plib.sam.Destination(
reply["DESTINATION"], has_private_key=True)
logging.debug(destination.base32)
if session_ready:
session_ready.set()
logging.debug("Session created {}".format(session_name))
if session_created:
asyncio.ensure_future(session_created(loop, reader, writer,
@ -123,15 +119,13 @@ async def create_session(session_name, sam_address=i2plib.sam.DEFAULT_ADDRESS,
async def stream_connect(session_name, destination,
sam_address=i2plib.sam.DEFAULT_ADDRESS, loop=None,
session_ready=None, stream_connected=None, args=()):
stream_connected=None, args=()):
"""A coroutine used to connect to a remote I2P destination.
:param session_name: Session nick name
:param destination: I2P destination to connect to
:param sam_address: (optional) SAM API address
:param loop: (optional) Event loop instance
:param session_ready: (optional) asyncio.Event instance to notify when
session is ready
:param stream_connected: (optional) A coroutine to be executed after the
connection has been established. Executed with arguments
(loop, session_name, reader, writer, \*args)
@ -144,7 +138,6 @@ async def stream_connect(session_name, destination,
elif isinstance(destination, str):
destination = await dest_lookup(destination, sam_address, loop)
if session_ready: await session_ready.wait()
reader, writer = await get_sam_socket(sam_address, loop)
writer.write(i2plib.sam.stream_connect(session_name, destination.base64,
silent="false"))
@ -160,22 +153,19 @@ async def stream_connect(session_name, destination,
raise i2plib.exceptions.SAM_EXCEPTIONS[reply["RESULT"]]()
async def stream_accept(session_name, sam_address=i2plib.sam.DEFAULT_ADDRESS,
loop=None, session_ready=None, stream_connected=None,
loop=None, stream_connected=None,
args=()):
"""A coroutine used to accept a connection from the I2P network.
:param session_name: Session nick name
:param sam_address: (optional) SAM API address
:param loop: (optional) Event loop instance
:param session_ready: (optional) asyncio.Event instance to notify when
session is ready
:param stream_connected: (optional) A coroutine to be executed after the
connection has been established. Executed with arguments
(loop, session_name, reader, writer, \*args)
:param args: (optional) Arguments for a stream_connected coroutine
:return: A (reader, writer) pair
"""
if session_ready: await session_ready.wait()
reader, writer = await get_sam_socket(sam_address, loop)
writer.write(i2plib.sam.stream_accept(session_name, silent="false"))
reply = parse_reply(await reader.read(BUFFER_SIZE))