[GNUnet-SVN] r28820 - gnunet/src/scalarproduct

[gnunet]

Author: grothoff
Date: 2013-08-23 15:45:49 +0200 (Fri, 23 Aug 2013)
New Revision: 28820

Added:
   gnunet/src/scalarproduct/scalarproduct.conf.in
   gnunet/src/scalarproduct/scalarproduct_testing.h
Removed:
   gnunet/src/scalarproduct/vectorproduct.conf.in
   gnunet/src/scalarproduct/vectorproduct_testing.h
Log:
-more renaming

Copied: gnunet/src/scalarproduct/scalarproduct.conf.in (from rev 28818, 
gnunet/src/scalarproduct/vectorproduct.conf.in)
===================================================================
--- gnunet/src/scalarproduct/scalarproduct.conf.in                              
(rev 0)
+++ gnunet/src/scalarproduct/scalarproduct.conf.in      2013-08-23 13:45:49 UTC 
(rev 28820)
@@ -0,0 +1,7 @@
+[vectorproduct]
+BINARY = gnunet-service-vectorproduct
+UNIXPATH = /tmp/gnunet-service-vectorproduct.sock
+HOME = $SERVICEHOME
+# PORT = 2106
address@hidden@ PORT = 2087
+

Copied: gnunet/src/scalarproduct/scalarproduct_testing.h (from rev 28818, 
gnunet/src/scalarproduct/vectorproduct_testing.h)
===================================================================
--- gnunet/src/scalarproduct/scalarproduct_testing.h                            
(rev 0)
+++ gnunet/src/scalarproduct/scalarproduct_testing.h    2013-08-23 13:45:49 UTC 
(rev 28820)
@@ -0,0 +1,129 @@
+/* 
+ * File:   scalarproduct_testing.h
+ * Author: gnunet
+ *
+ * Created on June 29, 2013, 7:39 PM
+ */
+
+#ifndef SCALARPRODUCT_TESTING_H
+#define        SCALARPRODUCT_TESTING_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+    
+struct GNUNET_SCALARPRODUCT_TESTING_handle
+{
+  /**
+   * Testing library system handle
+   */
+  struct GNUNET_TESTING_System *tl_system;
+  
+  /**
+   * head DLL of peers
+   */
+  struct PeerContext *p_head;
+
+  /**
+   * tail DLL of peers
+   */
+  struct PeerContext *p_tail;
+};
+
+struct PeerContext 
+{
+  /**
+   * Next element in the DLL
+   */
+  struct PeerContext *next;
+
+  /**
+   * Previous element in the DLL
+   */
+  struct PeerContext *prev;
+
+  /**
+   * Peer's testing handle
+   */
+  struct GNUNET_TESTING_Peer *peer;
+
+  /**
+   * Peer identity
+   */
+  struct GNUNET_PeerIdentity id;
+  
+  /**
+   * Handle for the peer's ARM process
+   */
+  struct GNUNET_OS_Process *arm_proc;
+  
+  /**
+   * Pointer to Vector Product Handle
+   */
+  struct GNUNET_SCALARPRODUCT_Handle *vh;
+  
+  /**
+   * Closure for the callbacks
+   */
+  void *cb_cls;
+
+  /**
+   * An unique number to identify the peer
+   */
+  unsigned int no;
+  
+  /**
+   * Peer's configuration
+   */
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+  
+  /**
+   * Pointer to the master testing handle
+   */
+  struct GNUNET_SCALARPRODUCT_TESTING_handle * vth;
+  
+  /**
+    * Callback when two peers are connected and both have called the connect 
callback
+    * to notify clients about a new peer
+    */
+   void (*start_cb) (struct PeerContext * p, void *cls);
+  
+//  /**
+//   * Pointer to function where the test occurs
+//   */
+//  GNUNET_SCALARPRODUCT_TESTING_start_cb start_cb;
+};
+
+/**
+ * Callback when two peers are connected and both have called the connect 
callback
+ * to notify clients about a new peer
+ */
+typedef void (*GNUNET_SCALARPRODUCT_TESTING_start_cb) (struct PeerContext * p,
+                                                   void *cls);
+
+struct GNUNET_SCALARPRODUCT_TESTING_handle *
+GNUNET_SCALARPRODUCT_TESTING_init();
+
+static void
+GNUNET_SCALARPRODUCT_TESTING_done(struct GNUNET_SCALARPRODUCT_TESTING_handle * 
vth);
+
+struct PeerContext *
+GNUNET_SCALARPRODUCT_TESTING_start_peer (struct 
GNUNET_SCALARPRODUCT_TESTING_handle * vth,
+                                     const char *cfgname, int peer_id,
+                                     GNUNET_SCALARPRODUCT_TESTING_start_cb 
start_cb,
+                                     void *cb_cls);
+
+static void
+GNUNET_SCALARPRODUCT_TESTING_stop_peer
+        (struct GNUNET_SCALARPRODUCT_TESTING_handle * vth,
+        struct PeerContext *p);
+
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SCALARPRODUCT_TESTING_H */
+

Deleted: gnunet/src/scalarproduct/vectorproduct.conf.in
===================================================================
--- gnunet/src/scalarproduct/vectorproduct.conf.in      2013-08-23 13:44:46 UTC 
(rev 28819)
+++ gnunet/src/scalarproduct/vectorproduct.conf.in      2013-08-23 13:45:49 UTC 
(rev 28820)
@@ -1,7 +0,0 @@
-[vectorproduct]
-BINARY = gnunet-service-vectorproduct
-UNIXPATH = /tmp/gnunet-service-vectorproduct.sock
-HOME = $SERVICEHOME
-# PORT = 2106
address@hidden@ PORT = 2087
-

Deleted: gnunet/src/scalarproduct/vectorproduct_testing.h
===================================================================
--- gnunet/src/scalarproduct/vectorproduct_testing.h    2013-08-23 13:44:46 UTC 
(rev 28819)
+++ gnunet/src/scalarproduct/vectorproduct_testing.h    2013-08-23 13:45:49 UTC 
(rev 28820)
@@ -1,129 +0,0 @@
-/* 
- * File:   scalarproduct_testing.h
- * Author: gnunet
- *
- * Created on June 29, 2013, 7:39 PM
- */
-
-#ifndef SCALARPRODUCT_TESTING_H
-#define        SCALARPRODUCT_TESTING_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-    
-struct GNUNET_SCALARPRODUCT_TESTING_handle
-{
-  /**
-   * Testing library system handle
-   */
-  struct GNUNET_TESTING_System *tl_system;
-  
-  /**
-   * head DLL of peers
-   */
-  struct PeerContext *p_head;
-
-  /**
-   * tail DLL of peers
-   */
-  struct PeerContext *p_tail;
-};
-
-struct PeerContext 
-{
-  /**
-   * Next element in the DLL
-   */
-  struct PeerContext *next;
-
-  /**
-   * Previous element in the DLL
-   */
-  struct PeerContext *prev;
-
-  /**
-   * Peer's testing handle
-   */
-  struct GNUNET_TESTING_Peer *peer;
-
-  /**
-   * Peer identity
-   */
-  struct GNUNET_PeerIdentity id;
-  
-  /**
-   * Handle for the peer's ARM process
-   */
-  struct GNUNET_OS_Process *arm_proc;
-  
-  /**
-   * Pointer to Vector Product Handle
-   */
-  struct GNUNET_SCALARPRODUCT_Handle *vh;
-  
-  /**
-   * Closure for the callbacks
-   */
-  void *cb_cls;
-
-  /**
-   * An unique number to identify the peer
-   */
-  unsigned int no;
-  
-  /**
-   * Peer's configuration
-   */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-  
-  /**
-   * Pointer to the master testing handle
-   */
-  struct GNUNET_SCALARPRODUCT_TESTING_handle * vth;
-  
-  /**
-    * Callback when two peers are connected and both have called the connect 
callback
-    * to notify clients about a new peer
-    */
-   void (*start_cb) (struct PeerContext * p, void *cls);
-  
-//  /**
-//   * Pointer to function where the test occurs
-//   */
-//  GNUNET_SCALARPRODUCT_TESTING_start_cb start_cb;
-};
-
-/**
- * Callback when two peers are connected and both have called the connect 
callback
- * to notify clients about a new peer
- */
-typedef void (*GNUNET_SCALARPRODUCT_TESTING_start_cb) (struct PeerContext * p,
-                                                   void *cls);
-
-struct GNUNET_SCALARPRODUCT_TESTING_handle *
-GNUNET_SCALARPRODUCT_TESTING_init();
-
-static void
-GNUNET_SCALARPRODUCT_TESTING_done(struct GNUNET_SCALARPRODUCT_TESTING_handle * 
vth);
-
-struct PeerContext *
-GNUNET_SCALARPRODUCT_TESTING_start_peer (struct 
GNUNET_SCALARPRODUCT_TESTING_handle * vth,
-                                     const char *cfgname, int peer_id,
-                                     GNUNET_SCALARPRODUCT_TESTING_start_cb 
start_cb,
-                                     void *cb_cls);
-
-static void
-GNUNET_SCALARPRODUCT_TESTING_stop_peer
-        (struct GNUNET_SCALARPRODUCT_TESTING_handle * vth,
-        struct PeerContext *p);
-
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SCALARPRODUCT_TESTING_H */
-