[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27014 - gnunet/src/set
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27014 - gnunet/src/set |
Date: |
Thu, 2 May 2013 10:15:29 +0200 |
Author: harsha
Date: 2013-05-02 10:15:29 +0200 (Thu, 02 May 2013)
New Revision: 27014
Modified:
gnunet/src/set/gnunet-set-bug.c
Log:
- client should open connection after the stream server has started listening;
-variable arguments to GNUNET_STREAM_open() and GNUNET_STREAM_listen() should
-end with GNUNET_STREAM_OPTION_END
Modified: gnunet/src/set/gnunet-set-bug.c
===================================================================
--- gnunet/src/set/gnunet-set-bug.c 2013-05-02 08:07:45 UTC (rev 27013)
+++ gnunet/src/set/gnunet-set-bug.c 2013-05-02 08:15:29 UTC (rev 27014)
@@ -32,6 +32,8 @@
static struct GNUNET_PeerIdentity local_id;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
+
static struct GNUNET_STREAM_ListenSocket *listen_socket;
static struct GNUNET_STREAM_Socket *s1;
@@ -45,6 +47,7 @@
GNUNET_STREAM_close (s2);
GNUNET_STREAM_close (s1);
GNUNET_STREAM_listen_close (listen_socket);
+ GNUNET_CONFIGURATION_destroy (cfg);
}
static size_t
@@ -79,8 +82,20 @@
static void
open_cb (void *cls, struct GNUNET_STREAM_Socket *socket)
{
+
}
+static void
+stream_connect (void)
+{
+ s1 = GNUNET_STREAM_open (cfg,
+ &local_id,
+ GNUNET_APPLICATION_TYPE_SET,
+ &open_cb,
+ NULL,
+ GNUNET_STREAM_OPTION_END);
+}
+
/**
* Main function that will be run.
*
@@ -92,23 +107,19 @@
static void
run (void *cls, char *const *args,
const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct GNUNET_CONFIGURATION_Handle *cfg2)
{
+ cfg = GNUNET_CONFIGURATION_dup (cfg2);
GNUNET_CRYPTO_get_host_identity (cfg, &local_id);
listen_socket = GNUNET_STREAM_listen (cfg,
GNUNET_APPLICATION_TYPE_SET,
&listen_cb,
NULL,
- NULL);
-
- s1 = GNUNET_STREAM_open (cfg,
- &local_id,
- GNUNET_APPLICATION_TYPE_SET,
- &open_cb,
- NULL,
- NULL);
+
GNUNET_STREAM_OPTION_SIGNAL_LISTEN_SUCCESS,
+ &stream_connect,
+ GNUNET_STREAM_OPTION_END);
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&do_shutdown, NULL);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27014 - gnunet/src/set,
gnunet <=