[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36383 - in gnunet-qt/secushare: . core/social
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r36383 - in gnunet-qt/secushare: . core/social |
|
Date: |
Mon, 28 Sep 2015 19:41:03 +0200 |
Author: tg
Date: 2015-09-28 19:41:03 +0200 (Mon, 28 Sep 2015)
New Revision: 36383
Modified:
gnunet-qt/secushare/core/social/socialservice.cpp
gnunet-qt/secushare/core/social/socialservice.h
gnunet-qt/secushare/deployment.pri
gnunet-qt/secushare/main.cpp
gnunet-qt/secushare/secushare.pro
Log:
now it compiles against the latest social api
Modified: gnunet-qt/secushare/core/social/socialservice.cpp
===================================================================
--- gnunet-qt/secushare/core/social/socialservice.cpp 2015-09-28 17:40:08 UTC
(rev 36382)
+++ gnunet-qt/secushare/core/social/socialservice.cpp 2015-09-28 17:41:03 UTC
(rev 36383)
@@ -67,15 +67,11 @@
GNUNET_CRYPTO_EddsaPrivateKey *placeKey =
GNUNET_CRYPTO_eddsa_key_create_from_file(filename.toStdString().c_str());
GNUNET_CRYPTO_EddsaPublicKey *placePubKey= new
GNUNET_CRYPTO_EddsaPublicKey;
-
-
GNUNET_CRYPTO_eddsa_key_get_public (placeKey, placePubKey);
char* id = GNUNET_CRYPTO_eddsa_public_key_to_string (placePubKey);
QString strId = QString::fromLatin1(id);
-
-
Place* newPlace = theApp->models()->placesModel()->add(strId);
newPlace->setName(strId);
@@ -82,27 +78,28 @@
newPlace->setPrivateKey(placeKey);
newPlace->setPublicKey(placePubKey);
-
GNUNET_SOCIAL_Slicer* slicer = GNUNET_SOCIAL_slicer_create ();
- GNUNET_SOCIAL_slicer_add (slicer, "",
- &hostRecvMethodCallback,
&hostRecvModifierCallback,
- &hostRecvDataCallback, &hostRecvEomCallback,
newPlace);
-
+ GNUNET_SOCIAL_slicer_method_add (slicer, "",
+ &hostRecvMethodCallback,
+ &hostRecvModifierCallback,
+ &hostRecvDataCallback,
+ &hostRecvEomCallback,
+ newPlace);
newPlace->setSlicer(slicer);
-
-
- GNUNET_SOCIAL_Host * host = GNUNET_SOCIAL_host_enter (m_config, m_hostEgo,
placeKey,
-
GNUNET_PSYC_CHANNEL_PRIVATE, slicer,
-
&hostEnteredCallback, &hostAnswerDoorCallback,
-
&hostFarewellCallback, newPlace);
-
+ GNUNET_SOCIAL_Host *
+ host = GNUNET_SOCIAL_host_enter (m_config, m_hostEgo, placeKey,
+ GNUNET_PSYC_CHANNEL_PRIVATE,
+ slicer,
+ &hostEnteredCallback,
+ &hostAnswerDoorCallback,
+ &hostFarewellCallback,
+ newPlace);
newPlace->setHost(host);
connect(newPlace,&Place::hostTalkSignal,
this,&SocialService::hostTalk, Qt::QueuedConnection);
-
//Save hosts
theApp->models()->placesModel()->save();
@@ -109,8 +106,6 @@
}
-
-
void
SocialService::hostRecvMethodCallback (void *cls,
const struct GNUNET_PSYC_MessageMethod
*meth,
@@ -129,12 +124,13 @@
void
SocialService::hostRecvModifierCallback (void *cls,
- const struct
GNUNET_PSYC_MessageModifier *mod,
+ const struct GNUNET_MessageHeader
*msg,
uint64_t message_id,
enum GNUNET_ENV_Operator oper,
const char *name,
const void *value,
- uint16_t value_size)
+ uint16_t value_size,
+ uint16_t full_value_size)
{
/* GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Test #: Host received modifier for message ID %i:\n"
@@ -277,15 +273,13 @@
void
SocialService::hostFarewellCallback (void *cls,
- struct GNUNET_SOCIAL_Nym *nym,
- struct GNUNET_ENV_Environment *env,
- size_t variable_count,
- struct GNUNET_ENV_Modifier *variables)
+ const struct GNUNET_SOCIAL_Nym *nym,
+ struct GNUNET_ENV_Environment *env)
{
// FIXME: this function is not called yet
- struct GNUNET_CRYPTO_EcdsaPublicKey *
- nym_key = GNUNET_SOCIAL_nym_get_key (nym);
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *
+ nym_key = GNUNET_SOCIAL_nym_get_key (nym);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Nym %s has left the place.\n",
GNUNET_CRYPTO_ecdsa_public_key_to_string (nym_key));
@@ -317,23 +311,27 @@
void
SocialService::guestRecvEntryDecisionCallback (void *cls,
int is_admitted,
- const struct
GNUNET_PSYC_Message *entry_resp)
+ const struct
GNUNET_PSYC_Message *entry_msg)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Guest received entry decision: %d.\n",
is_admitted);
- if (NULL != entry_resp)
+ if (NULL != entry_msg)
{
struct GNUNET_ENV_Environment *env = GNUNET_ENV_environment_create ();
const char *method_name = NULL;
const void *data = NULL;
uint16_t data_size = 0;
- GNUNET_PSYC_message_parse (entry_resp, &method_name, env, &data,
&data_size);
+ struct GNUNET_PSYC_MessageHeader *
+ pmsg = GNUNET_PSYC_message_header_create_from_psyc (entry_msg);
+ GNUNET_PSYC_message_parse (pmsg, &method_name, env, &data, &data_size);
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%s\n%.*s\n",
method_name, data_size, data);
+ GNUNET_free (pmsg);
/* FIXME: check response message */
}
@@ -399,9 +397,12 @@
newPlace->setPublicKey(convertedRoomKey);
GNUNET_SOCIAL_Slicer* slicer = GNUNET_SOCIAL_slicer_create ();
- GNUNET_SOCIAL_slicer_add (slicer, "",
- &hostRecvMethodCallback,
&hostRecvModifierCallback,
- &hostRecvDataCallback, &hostRecvEomCallback,
newPlace);
+ GNUNET_SOCIAL_slicer_method_add (slicer, "",
+ &hostRecvMethodCallback,
+ &hostRecvModifierCallback,
+ &hostRecvDataCallback,
+ &hostRecvEomCallback,
+ newPlace);
newPlace->setSlicer(slicer);
Modified: gnunet-qt/secushare/core/social/socialservice.h
===================================================================
--- gnunet-qt/secushare/core/social/socialservice.h 2015-09-28 17:40:08 UTC
(rev 36382)
+++ gnunet-qt/secushare/core/social/socialservice.h 2015-09-28 17:41:03 UTC
(rev 36383)
@@ -34,7 +34,8 @@
public:
explicit SocialService(QObject *parent = 0);
- static void hostRecvMethodCallback (void *cls,
+ static void
+ hostRecvMethodCallback (void *cls,
const struct GNUNET_PSYC_MessageMethod *meth,
uint64_t message_id,
uint32_t flags,
@@ -43,12 +44,13 @@
static void
hostRecvModifierCallback (void *cls,
- const struct GNUNET_PSYC_MessageModifier *mod,
- uint64_t message_id,
- enum GNUNET_ENV_Operator oper,
- const char *name,
- const void *value,
- uint16_t value_size);
+ const struct GNUNET_MessageHeader *msg,
+ uint64_t message_id,
+ enum GNUNET_ENV_Operator oper,
+ const char *name,
+ const void *value,
+ uint16_t value_size,
+ uint16_t full_value_size);
static void
hostRecvDataCallback (void *cls,
@@ -80,10 +82,8 @@
uint64_t max_message_id);
static void
hostFarewellCallback (void *cls,
- struct GNUNET_SOCIAL_Nym *nym,
- struct GNUNET_ENV_Environment *env,
- size_t variable_count,
- struct GNUNET_ENV_Modifier *variables);
+ const struct GNUNET_SOCIAL_Nym *nym,
+ struct GNUNET_ENV_Environment *env);
static void
@@ -97,7 +97,6 @@
guestRecvLocalEnter(void *cls, int result, uint64_t max_message_id);
-
void start(GNUNET_CONFIGURATION_Handle *config);
Q_INVOKABLE void createPlace(QString name);
void createPlaceSlot(QString name);
Modified: gnunet-qt/secushare/deployment.pri
===================================================================
--- gnunet-qt/secushare/deployment.pri 2015-09-28 17:40:08 UTC (rev 36382)
+++ gnunet-qt/secushare/deployment.pri 2015-09-28 17:41:03 UTC (rev 36383)
@@ -17,7 +17,7 @@
qnx {
target.path = /tmp/$${TARGET}/bin
} else {
- target.path = /opt/$${TARGET}/bin
+ target.path = /usr/local/bin
}
export(target.path)
}
Modified: gnunet-qt/secushare/main.cpp
===================================================================
--- gnunet-qt/secushare/main.cpp 2015-09-28 17:40:08 UTC (rev 36382)
+++ gnunet-qt/secushare/main.cpp 2015-09-28 17:41:03 UTC (rev 36383)
@@ -14,10 +14,8 @@
//Start our core object
Psyc psyc;
-
QQmlApplicationEngine engine(QUrl(QStringLiteral("qrc:///qml/main.qml")));
-
//Connect Window to quit signal
QObject *topLevel = engine.rootObjects().value(0);
theWindow = qobject_cast<QQuickWindow *>(topLevel);
@@ -25,28 +23,18 @@
qWarning("Error: Your root item has to be a Window.");
return -1;
}
+
QObject::connect(&engine, SIGNAL(quit()), &app, SLOT(quit()));
-
psyc.registerImageProvider(&engine);
-
-
//Create the tray icon
theApp->setupTray();
- theWindow->setTitle(QString("SecureShare 1.0"));
+ theWindow->setTitle(QString("secushare 0.1"));
theWindow->setIcon(QIcon(":/assets/icon.ico"));
-
theWindow->show();
-
-
return app.exec();
-
-
-
-
-
}
Modified: gnunet-qt/secushare/secushare.pro
===================================================================
--- gnunet-qt/secushare/secushare.pro 2015-09-28 17:40:08 UTC (rev 36382)
+++ gnunet-qt/secushare/secushare.pro 2015-09-28 17:41:03 UTC (rev 36383)
@@ -4,10 +4,6 @@
LIBS += -lgnunetutil -lgnunetcore -lgnunetidentity -lgnunetarm -lgnunetsocial
-lgnunetenv -lgnunetpsycutil -lgnunetfriends -lextractor -lqrencode
-
-
-
-
#include(3rdParty/qzxing-master/QZXing.pro)
SOURCES += main.cpp \
@@ -48,3 +44,5 @@
utils/qrimageprovider.h \
core/social/socialservice.h \
core/social/place.h
+
+CONFIG += debug
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36383 - in gnunet-qt/secushare: . core/social,
gnunet <=