[GNUnet-SVN] [gnunet-nim] branch master updated: disconnect after connecting (shuts down the application)

[gnunet]

This is an automated email from the git hooks/post-receive script.

lurchi pushed a commit to branch master
in repository gnunet-nim.

The following commit(s) were added to refs/heads/master by this push:
     new 21c9466  disconnect after connecting (shuts down the application)
     new e07855e  Merge branch 'master' of ssh://gnunet.org/gnunet-nim
21c9466 is described below

commit 21c94666ae031d6cf4e7afbd16ac31e2ad0aa2d3
Author: lurchi <address@hidden>
AuthorDate: Sun Jul 29 18:28:08 2018 +0200

    disconnect after connecting (shuts down the application)
---
 asynccadet.nim         | 16 +++++++++++-----
 gnunet_application.nim |  1 -
 gnunet_nim.nim         |  6 ++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/asynccadet.nim b/asynccadet.nim
index 93ad2fd..171382a 100644
--- a/asynccadet.nim
+++ b/asynccadet.nim
@@ -82,11 +82,6 @@ proc sendMessage*(channel: CadetChannel, payload: seq[byte]) 
=
                                GNUNET_MESSAGE_TYPE_CADET_CLI)
   GNUNET_MQ_send(GNUNET_CADET_get_mq(channel.handle), envelope)
 
-proc connectCadet*(app: ref GnunetApplication): Future[CadetHandle] =
-  result = newFuture[CadetHandle]("connectCadet")
-  app.connectFutures.add("cadet", result)
-  discard GNUNET_SCHEDULER_add_now(cadetConnectCb, addr app[])
-
 proc openPort*(handle: var CadetHandle, port: string): ref CadetPort =
   var handlers = messageHandlers()
   var port = hashString(port)
@@ -126,3 +121,14 @@ proc createChannel*(handle: CadetHandle, peer: string, 
port: string): CadetChann
                                               channelDisconnectCb,
                                               addr handlers[0])
  
+proc connectCadet*(app: ref GnunetApplication): Future[CadetHandle] =
+  result = newFuture[CadetHandle]("connectCadet")
+  app.connectFutures.add("cadet", result)
+  discard GNUNET_SCHEDULER_add_now(cadetConnectCb, addr app[])
+
+proc disconnect*(handle: var CadetHandle) =
+  for port in handle.openPorts:
+    handle.closePort(port)
+  GNUNET_CADET_disconnect(handle.handle)
+
+
diff --git a/gnunet_application.nim b/gnunet_application.nim
index 2af100a..5f0fa0b 100644
--- a/gnunet_application.nim
+++ b/gnunet_application.nim
@@ -82,7 +82,6 @@ proc microsecondsUntilTimeout*(app: ref GnunetApplication): 
int =
   ## get the duration until timeout in microseconds
   let now = GNUNET_TIME_absolute_get()
   if app.timeoutUs < now.abs_value_us:
-    debug("app.timeoutUs = ", app.timeoutUs, ", now = ", now.abs_value_us)
     return 0
   elif app.timeoutUs == 0xff_ff_ff_ff_ff_ff_ff_ff'u64: # high(uint64) not 
implemented
     return -1
diff --git a/gnunet_nim.nim b/gnunet_nim.nim
index c9b0e14..b4c17b5 100644
--- a/gnunet_nim.nim
+++ b/gnunet_nim.nim
@@ -4,8 +4,10 @@ import asynccadet
 
 proc firstTask(gnunetApp: ref GnunetApplication) {.async.} =
   echo "connecting Cadet"
-  let cadet = await gnunetApp.connectCadet()
-  echo "hello"
+  var cadet = await gnunetApp.connectCadet()
+  echo "connected"
+  cadet.disconnect()
+  echo "disconnected"
 
 proc main() =
   var gnunetApp = initGnunetApplication("gnunet.conf")

-- 
To stop receiving notification emails like this one, please contact
address@hidden