gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r25056 - gnunet/src/stream


From: gnunet
Subject: [GNUnet-SVN] r25056 - gnunet/src/stream
Date: Mon, 19 Nov 2012 16:34:20 +0100

Author: harsha
Date: 2012-11-19 16:34:20 +0100 (Mon, 19 Nov 2012)
New Revision: 25056

Modified:
   gnunet/src/stream/perf_stream_api.c
   gnunet/src/stream/test_stream_2peers.c
   gnunet/src/stream/test_stream_2peers_halfclose.c
   gnunet/src/stream/test_stream_big.c
   gnunet/src/stream/test_stream_sequence_wraparound.c
Log:
- merged r25055

Modified: gnunet/src/stream/perf_stream_api.c
===================================================================
--- gnunet/src/stream/perf_stream_api.c 2012-11-19 15:18:59 UTC (rev 25055)
+++ gnunet/src/stream/perf_stream_api.c 2012-11-19 15:34:20 UTC (rev 25056)
@@ -439,6 +439,15 @@
 shutdown_completion (void *cls,
                      int operation)
 {
+  static int shutdowns;
+
+  if (++shutdowns == 1)
+  {
+    peer_data[0].shutdown_handle = NULL;
+    peer_data[1].shutdown_handle = GNUNET_STREAM_shutdown 
(peer_data[1].socket, SHUT_RDWR,
+                                                           
&shutdown_completion, cls);
+    return;
+  }  
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STREAM shutdown successful\n");
   GNUNET_SCHEDULER_add_now (&do_close, cls);
 }


Property changes on: gnunet/src/stream/perf_stream_api.c
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
 /branches/gnunet/mantis_0001616/src/stream/perf_stream_api.c:13878-14093
-/gnunet/src/stream/test_stream_local.c:25052
+/gnunet/src/stream/test_stream_local.c:25052,25055
\ No newline at end of property
Modified: gnunet/src/stream/test_stream_2peers.c
===================================================================
--- gnunet/src/stream/test_stream_2peers.c      2012-11-19 15:18:59 UTC (rev 
25055)
+++ gnunet/src/stream/test_stream_2peers.c      2012-11-19 15:34:20 UTC (rev 
25056)
@@ -259,6 +259,15 @@
 shutdown_completion (void *cls,
                      int operation)
 {
+  static int shutdowns;
+
+  if (++shutdowns == 1)
+  {
+    peer1.shutdown_handle = NULL;
+    peer2.shutdown_handle = GNUNET_STREAM_shutdown (peer2.socket, SHUT_RDWR,
+                                                    &shutdown_completion, cls);
+    return;
+  }  
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STREAM shutdown successful\n");
   GNUNET_SCHEDULER_add_now (&do_close, cls);
 }


Property changes on: gnunet/src/stream/test_stream_2peers.c
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,2 ##
+/branches/gnunet/mantis_0001616/src/stream/test_stream_2peers.c:13878-14093
+/gnunet/src/stream/test_stream_local.c:25055
\ No newline at end of property
Index: gnunet/src/stream/test_stream_2peers_halfclose.c
===================================================================
--- gnunet/src/stream/test_stream_2peers_halfclose.c    2012-11-19 15:18:59 UTC 
(rev 25055)
+++ gnunet/src/stream/test_stream_2peers_halfclose.c    2012-11-19 15:34:20 UTC 
(rev 25056)

Property changes on: gnunet/src/stream/test_stream_2peers_halfclose.c
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,2 ##
+/branches/gnunet/mantis_0001616/src/stream/test_stream_2peers_halfclose.c:13878-14093
+/gnunet/src/stream/test_stream_local.c:25055
\ No newline at end of property
Modified: gnunet/src/stream/test_stream_big.c
===================================================================
--- gnunet/src/stream/test_stream_big.c 2012-11-19 15:18:59 UTC (rev 25055)
+++ gnunet/src/stream/test_stream_big.c 2012-11-19 15:34:20 UTC (rev 25056)
@@ -132,6 +132,15 @@
 shutdown_completion (void *cls,
                      int operation)
 {
+  static int shutdowns;
+
+  if (++shutdowns == 1)
+  {
+    peer1.shutdown_handle = NULL;
+    peer2.shutdown_handle = GNUNET_STREAM_shutdown (peer2.socket, SHUT_RDWR,
+                                                    &shutdown_completion, cls);
+    return;
+  }  
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STREAM shutdown successful\n");
   GNUNET_SCHEDULER_add_now (&do_close, cls);
 }


Property changes on: gnunet/src/stream/test_stream_big.c
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,3 ##
 /branches/gnunet/mantis_0001616/src/stream/test_stream_big.c:13878-14093
-/gnunet/src/stream/test_stream_local.c:25052
+/gnunet/src/stream/test_stream_big.c:25055
+/gnunet/src/stream/test_stream_local.c:25052,25055
\ No newline at end of property
Modified: gnunet/src/stream/test_stream_sequence_wraparound.c
===================================================================
--- gnunet/src/stream/test_stream_sequence_wraparound.c 2012-11-19 15:18:59 UTC 
(rev 25055)
+++ gnunet/src/stream/test_stream_sequence_wraparound.c 2012-11-19 15:34:20 UTC 
(rev 25056)
@@ -139,6 +139,15 @@
 shutdown_completion (void *cls,
                      int operation)
 {
+  static int shutdowns;
+
+  if (++shutdowns == 1)
+  {
+    peer1.shutdown_handle = NULL;
+    peer2.shutdown_handle = GNUNET_STREAM_shutdown (peer2.socket, SHUT_RDWR,
+                                                    &shutdown_completion, cls);
+    return;
+  }  
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STREAM shutdown successful\n");
   GNUNET_SCHEDULER_add_now (&do_close, cls);
 }


Property changes on: gnunet/src/stream/test_stream_sequence_wraparound.c
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
 
/branches/gnunet/mantis_0001616/src/stream/test_stream_sequence_wraparound.c:13878-14093
-/gnunet/src/stream/test_stream_local.c:25052
+/gnunet/src/stream/test_stream_local.c:25052,25055
\ No newline at end of property



reply via email to

[Prev in Thread] Current Thread [Next in Thread]