connecting to gnunet

7 files changed, 132 insertions, 202 deletions

diff --git a/secushare.pro b/secushare.pro
index 4bc4b1b..fb36ce8 100644
--- a/secushare.pro
+++ b/secushare.pro
@@ -15,6 +15,7 @@ SOURCES += src/main.cpp \
     src/model/PlaceListModel.cpp \
     src/nym/nym.cpp \
     src/nym/ego.cpp \
+    src/gnunet/gnunet.cpp \
     src/social/socialapp.cpp \
     src/social/modifier.cpp \
     src/social/message.cpp \
@@ -36,6 +37,7 @@ include(deployment.pri)
 HEADERS += \
     src/app.h \
     src/gnunet.h \
+    src/gnunet/gnunet.h \
     src/model/models.h \
     src/model/EgoListModel.h \
     src/model/PlaceListModel.h \
diff --git a/src/app.cpp b/src/app.cpp
index dc277cb..10669b2 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -24,11 +24,38 @@ App::App (QObject * parent)
   m_models = new Models (this);
   m_helpers = new Helpers (this);
   m_qrProvider = new QrImageProvider ();
-  m_social = new SocialApp (this);
   registerQmlTypes ();
   setupTray ();
+  startGnuNet ();
 }
 
+/**
+ * Connect to GNUnet services.
+ * It needs to run in a separate thread.
+ */
+void
+App::startGnuNet ()
+{
+  //Create the GnuNet object
+  m_gnunet = new GnuNet ();
+
+  //New thread where the Gnunet will be run on.
+  m_gnunetThread = new QThread ();
+
+  m_gnunet->moveToThread (m_gnunetThread);
+
+  // Call the start function after our thread is ready to run
+  connect (m_gnunetThread, &QThread::started,
+           m_gnunet, &GnuNet::start);
+
+  m_gnunetThread->start ();
+
+  connect (m_gnunet, &GnuNet::connectedChanged,
+           this, &App::setConnected,
+           Qt::QueuedConnection);
+}
+
+
 // theApp singleton type provider
 static QObject *
 theApp_provider (QQmlEngine * engine, QJSEngine * scriptEngine)
diff --git a/src/app.h b/src/app.h
index bd2dfc4..b0d17ca 100644
--- a/src/app.h
+++ b/src/app.h
@@ -7,6 +7,7 @@
 #include <QQmlEngine>
 #include <QQuickWindow>
 
+#include "gnunet/gnunet.h"
 #include "model/models.h"
 #include "social/socialapp.h"
 #include "settings/settings.h"
@@ -63,7 +64,7 @@ public:
 
   SocialApp *social () const
   {
-    return m_social;
+    return m_gnunet->social ();
   }
 
   void setupTray ();
@@ -79,12 +80,11 @@ public:
 private:
 
   Models * m_models;
-
   Helpers *m_helpers;
-
-  QrImageProvider *m_qrProvider;
-
+  GnuNet *m_gnunet;
+  QThread *m_gnunetThread;
   SocialApp *m_social;
+  QrImageProvider *m_qrProvider;
 
   QMenu *m_trayMenu;
   QSystemTrayIcon *m_tray;
@@ -93,7 +93,11 @@ private:
   // is the connection established to the GNUnet social service?
   bool m_connected;
 
-  void close ();
+  void
+    startGnuNet ();
+
+  void
+    close ();
 
 signals:
   void connectedChanged (bool connected);
diff --git a/src/gnunet/gnunet.cpp b/src/gnunet/gnunet.cpp
index cb18637..6ceeb6f 100644
--- a/src/gnunet/gnunet.cpp
+++ b/src/gnunet/gnunet.cpp
@@ -20,34 +20,40 @@
 
 #include "gnunet.h"
 
-#include "preferences/preferences.h"
-#include "identity/identityService.h"
-#include "social/socialservice.h"
+#include "social/socialapp.h"
 
 #include <math.h>
 #include <QElapsedTimer>
 #include <QWaitCondition>
 
 
+GnuNet::GnuNet (QObject * parent)
+  : QObject (parent)
+{
+  m_connected = false;
+}
+
+GnuNet::~GnuNet ()
+{
+
+}
+
+
 /***********************************
  * START STATIC CALLBACKS
  ***********************************/
 
 /**
  * Static function.
- * The first function executed when GNUNet is running.
+ * The first function executed when GnuNet is running.
  */
 void
-GNUNet::mainLoopCallback (void *cls, char *const *args, const char *cfgfile,
+GnuNet::mainLoopCallback (void *cls, char *const *args, const char *cfgfile,
                           const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  //Retrive our main funtion
-  GNUNet *gnunetInstance = (GNUNet *) cls;
-
-  Q_ASSERT (gnunetInstance);
-
-  //Call our main loop
-  gnunetInstance->mainLoop (args, cfgfile, cfg);
+  GnuNet *gnunet = (GnuNet *) cls;
+  Q_ASSERT (NULL != gnunet);
+  gnunet->mainLoop (args, cfgfile, cfg);
 }
 
 
@@ -56,22 +62,21 @@ GNUNet::mainLoopCallback (void *cls, char *const *args, const char *cfgfile,
  * Called to process our internal messages
  */
 void
-GNUNet::keepaliveTaskCallback (void *cls,
+GnuNet::keepaliveTaskCallback (void *cls,
                                const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   Q_UNUSED (tc);
 
-  //Retrive our main funtion
-  Q_ASSERT (cls);
-  GNUNet *gnunetInstance = (GNUNet *) cls;
+  GnuNet *gnunet = (GnuNet *) cls;
+  Q_ASSERT (NULL != gnunet);
 
   //Process the events
-  gnunetInstance->processEvents ();
+  gnunet->processEvents ();
 
   //Call again in 500 millisecond.
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                 (GNUNET_TIME_UNIT_MILLISECONDS, 500),
-                                &keepaliveTaskCallback, gnunetInstance);
+                                &keepaliveTaskCallback, gnunet);
 }
 
 
@@ -80,32 +85,13 @@ GNUNet::keepaliveTaskCallback (void *cls,
  ***********************************/
 
 
-GNUNet::GNUNet (QObject * parent):
-QObject (parent)
-{
-
-  m_connected = false;
-  m_myPeer = new GNUNET_PeerIdentity;
-
-
-}
-
-GNUNet::~GNUNet ()
-{
-  delete m_myPeer;
-}
-
 /**
  * Start GNUnet
  */
 
 void
-GNUNet::start ()
+GnuNet::start ()
 {
-  m_identity = new IdentityService (this);
-
-  m_social = new SocialService (this);
-
   static struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
@@ -121,85 +107,52 @@ GNUNet::start ()
 }
 
 /**
- * It's the first function executed when GNUNet is running.
+ * It's the first function executed when GnuNet is running.
  */
 void
-GNUNet::mainLoop (char *const *args, const char *cfgfile,
+GnuNet::mainLoop (char *const *args, const char *cfgfile,
                   const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   Q_UNUSED (args);
   Q_UNUSED (cfgfile);
   Q_UNUSED (cfg);
 
-  char *privateKeyFileName;
-
-  //Create our configuration
+  // Create our configuration
   m_config = GNUNET_CONFIGURATION_create ();
   GNUNET_CONFIGURATION_load (m_config, cfgfile);
 
-  //Get my information
-
-  //load private key
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (m_config, "PEER", "PRIVATE_KEY",
-                                               &privateKeyFileName))
-  {
-    qWarning () <<
-        QString
-        ("Could not find option `GNUNETD:HOSTKEYFILE' in configuration.\n");
-    return;
-  }
-
-
   //Get my own peer
-  GNUNET_CRYPTO_get_peer_identity (m_config, m_myPeer);
-
-  char *str = GNUNET_CRYPTO_eddsa_public_key_to_string (&m_myPeer->public_key);
+  GNUNET_CRYPTO_get_peer_identity (m_config, &m_peerId);
 
-  setMyPublicKeyStr (QString (str));
+  char *str = GNUNET_CRYPTO_eddsa_public_key_to_string (&m_peerId.public_key);
+  m_peerIdStr = QString (str);
   GNUNET_free (str);
 
+  emit peerIdChanged (m_peerId);
+  emit peerIdStringChanged (m_peerIdStr);
 
-  //A update function to process our messages
+  // An update function to process our messages
   GNUNET_SCHEDULER_add_now (keepaliveTaskCallback, this);
 
-
-  //Start arm
-  startServices ();
+  connectServices ();
 }
 
 
 /**
- * Start the services such as filesharing
+ * Connect to the services
  */
-
 void
-GNUNet::startServices ()
+GnuNet::connectServices ()
 {
-  m_identity->start (m_config);
-
+  m_social = new SocialApp (m_config, this);
   emit gnunetStarted ();
 }
 
-
-void
-GNUNet::identitySetSlot ()
-{
-  m_social->start (m_config);
-}
-
 /**
  * Process our internal pending messages.
  */
 void
-GNUNet::processEvents ()
+GnuNet::processEvents ()
 {
   QCoreApplication::processEvents ();
 }
-
-
-GNUNET_PeerIdentity *
-GNUNet::myPeer () const
-{
-  return m_myPeer;
-}
diff --git a/src/gnunet/gnunet.h b/src/gnunet/gnunet.h
index 52546c7..07290f9 100644
--- a/src/gnunet/gnunet.h
+++ b/src/gnunet/gnunet.h
@@ -21,42 +21,49 @@
 
 #ifndef GNUNET_H
 #define GNUNET_H
+
 #include <QtCore>
 #include <QString>
 
+#include "social/socialapp.h"
 
-#include "gnunet_includes.h"
+class GnuNet : public QObject
+{
+  Q_OBJECT;
 
+  Q_PROPERTY (SocialApp * social
+              READ social CONSTANT);
 
-class IdentityService;
+  Q_PROPERTY (GNUNET_CONFIGURATION_Handle * config
+              READ config);
 
-class SocialService;
+  Q_PROPERTY (bool connected
+              READ isConnected
+              NOTIFY connectedChanged);
 
-class GNUNet:public QObject
-{
-Q_OBJECT Q_PROPERTY (IdentityService * identity READ identity CONSTANT) Q_PROPERTY (SocialService * social READ social CONSTANT) Q_PROPERTY (GNUNET_CONFIGURATION_Handle * config READ config) Q_PROPERTY (bool connected READ isConnected WRITE setConnected NOTIFY connectedChanged) Q_PROPERTY (QString myPublicKeyStr READ myPublicKeyStr WRITE setMyPublicKeyStr NOTIFY myPublicKeyStrChanged) public:
-  explicit GNUNet (QObject * parent =
-                   0);
-  ~GNUNet ();
+  Q_PROPERTY (GNUNET_PeerIdentity peerId
+              READ peerId
+              NOTIFY peerIdChanged);
 
-  IdentityService *identity () const
-  {
-    return m_identity;
-  }
+  Q_PROPERTY (QString peerIdString
+              READ peerIdString
+              NOTIFY peerIdStringChanged);
 
-  SocialService *social () const
+ public:
+
+  explicit GnuNet (QObject *parent = 0);
+  ~GnuNet ();
+
+  SocialApp *social () const
   {
     return m_social;
   }
 
-
   GNUNET_CONFIGURATION_Handle *config () const
   {
     return m_config;
   }
 
-
-
   bool isConnected () const
   {
     return m_connected;
@@ -68,30 +75,24 @@ Q_OBJECT Q_PROPERTY (IdentityService * identity READ identity CONSTANT) Q_PROPER
     emit connectedChanged (m_connected);
   }
 
-
-
-  //Public Key Str
-  QString myPublicKeyStr () const
+  // Peer ID
+  GNUNET_PeerIdentity peerId () const
   {
-    return m_myPublicKeyStr;
+    return m_peerId;
   }
-  void setMyPublicKeyStr (QString key)
+  QString peerIdString () const
   {
-    m_myPublicKeyStr = key;
-    emit myPublicKeyStrChanged (key);
+    return m_peerIdStr;
   }
 
+ private:
 
-
-  GNUNET_PeerIdentity *myPeer () const;
-
-
-
-private:
+  GNUNET_PeerIdentity m_peerId;
+  QString m_peerIdStr;
 
   /**
-      Static Definitions
-     */
+   * Static Definitions
+   */
   static void mainLoopCallback (void *cls, char *const *args,
                                 const char *cfgfile,
                                 const struct GNUNET_CONFIGURATION_Handle *cfg);
@@ -100,73 +101,39 @@ private:
                                      const struct GNUNET_SCHEDULER_TaskContext
                                      *tc);
 
-public:
-  void armConnectionStateChange (int connected);
+ signals:
 
-
-signals:
   void gnunetStarted ();
 
   void gnunetConnected ();
 
   void connectedChanged (bool connected);
 
-  void myPublicKeyStrChanged (QString key);
-
+  void peerIdChanged (GNUNET_PeerIdentity peerId);
 
-  public slots:void start ();
+  void peerIdStringChanged (QString peerIdStr);
 
-  void identitySetSlot ();
+ public slots:
 
-  private slots:void startServices ();
+  void start ();
 
-private:
+ private slots:
 
-  /**
-     * Pointer to GNUnet Identity Service.
-     */
-  IdentityService * m_identity;
-
-
-  /**
-     * Pointer to GNUnet Social Service.
-     */
-  SocialService *m_social;
-
-
-
-  /**
-     * @brief m_config
-     */
-  struct GNUNET_CONFIGURATION_Handle *m_config;
-
-  /**
-     * @brief m_connected
-     */
-  bool m_connected;
-
-
-
-  /**
-     * My peer.
-     */
-
-  struct GNUNET_PeerIdentity *m_myPeer;
-
-  /**
-     * My public key.
-     */
-  QString m_myPublicKeyStr;
+   void connectServices ();
 
+ private:
 
+   SocialApp *m_social;
 
+   struct GNUNET_CONFIGURATION_Handle *m_config;
 
+   bool m_connected;
 
-  void processEvents ();
+   void processEvents ();
 
-  void mainLoop (char *const *args, const char *cfgfile,
-                 const GNUNET_CONFIGURATION_Handle * cfg);
+   void mainLoop (char *const *args, const char *cfgfile,
+                  const GNUNET_CONFIGURATION_Handle * cfg);
 
 };
 
-#endif // GNUNET_H
+#endif
diff --git a/src/social/socialapp.cpp b/src/social/socialapp.cpp
index 10b6be2..4ad9970 100644
--- a/src/social/socialapp.cpp
+++ b/src/social/socialapp.cpp
@@ -8,17 +8,9 @@
 #include "social/guest.h"
 
 
-SocialApp::SocialApp (QObject *parent) : QObject (parent)
-{
-}
-
-
-/**
- * @brief Should be called when the GNUnet service is connected to start everything
- * @param config
- */
-void
-SocialApp::start (struct GNUNET_CONFIGURATION_Handle *config)
+SocialApp::SocialApp (struct GNUNET_CONFIGURATION_Handle *config,
+                      QObject *parent)
+  : QObject (parent)
 {
   this->m_config = config;
   this->m_app =
@@ -70,17 +62,9 @@ SocialApp::guestPlaceCallback (void *cls,
 
 
 void
-SocialApp::createPlaceSlot ()
-{
-
-}
-
-
-bool
 SocialApp::createPlace ()
 {
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Creating a New Place.\n");
-  if (NULL == m_app || NULL == )
 
   Host *host = new Host (m_app, m_curEgo); // FIXME: ego
   m_places += host;
@@ -89,12 +73,6 @@ SocialApp::createPlace ()
 
 
 void
-SocialApp::enterPlaceSlot (QString pubKeyStr, QString peerIdStr)
-{
-}
-
-
-void
 SocialApp::enterPlace (QString pubKeyStr, QString peerIdStr)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Entering to place %s as guest.\n",
diff --git a/src/social/socialapp.h b/src/social/socialapp.h
index 1dc5776..519eef4 100644
--- a/src/social/socialapp.h
+++ b/src/social/socialapp.h
@@ -13,9 +13,8 @@ class SocialApp : public QObject
 
  public:
 
-  explicit SocialApp (QObject *parent = 0);
-
-  void start (GNUNET_CONFIGURATION_Handle * config);
+  explicit SocialApp (GNUNET_CONFIGURATION_Handle * config,
+                      QObject *parent = 0);
 
   Q_INVOKABLE void createPlace ();
   Q_INVOKABLE void enterPlace (QString pubKeyStr, QString peerIdStr);