[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34154 - gnunet-qt/SecureShare/core/social
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34154 - gnunet-qt/SecureShare/core/social |
Date: |
Thu, 14 Aug 2014 20:50:29 +0200 |
Author: bratao
Date: 2014-08-14 20:50:29 +0200 (Thu, 14 Aug 2014)
New Revision: 34154
Modified:
gnunet-qt/SecureShare/core/social/place.cpp
gnunet-qt/SecureShare/core/social/place.h
gnunet-qt/SecureShare/core/social/socialservice.cpp
gnunet-qt/SecureShare/core/social/socialservice.h
Log:
Enable host announces
Modified: gnunet-qt/SecureShare/core/social/place.cpp
===================================================================
--- gnunet-qt/SecureShare/core/social/place.cpp 2014-08-14 11:18:12 UTC (rev
34153)
+++ gnunet-qt/SecureShare/core/social/place.cpp 2014-08-14 18:50:29 UTC (rev
34154)
@@ -10,6 +10,7 @@
m_status = "No status";
m_name = "No name";
m_type = "group";//thread;group;contact
+ m_isHost = false;
connect(this,&Place::addConversationSignal,
this,&Place::addConversationSlot, Qt::QueuedConnection);
@@ -25,7 +26,17 @@
void Place::talk(QString text)
{
- emit talkSignal(this,text);
+
+ if(m_isHost)
+ {
+ emit hostTalkSignal(this,text);
+ }
+ else
+ {
+ emit guestTalkSignal(this,text);
+ }
+
+
}
Modified: gnunet-qt/SecureShare/core/social/place.h
===================================================================
--- gnunet-qt/SecureShare/core/social/place.h 2014-08-14 11:18:12 UTC (rev
34153)
+++ gnunet-qt/SecureShare/core/social/place.h 2014-08-14 18:50:29 UTC (rev
34154)
@@ -132,7 +132,8 @@
void contentChanged(QString content);
- void talkSignal (Place* place, QString text);
+ void guestTalkSignal (Place* place, QString text);
+ void hostTalkSignal (Place* place, QString text);
void addConversationSignal(QString text);
Modified: gnunet-qt/SecureShare/core/social/socialservice.cpp
===================================================================
--- gnunet-qt/SecureShare/core/social/socialservice.cpp 2014-08-14 11:18:12 UTC
(rev 34153)
+++ gnunet-qt/SecureShare/core/social/socialservice.cpp 2014-08-14 18:50:29 UTC
(rev 34154)
@@ -73,6 +73,7 @@
newPlace->setPrivateKey(placeKey);
newPlace->setPublicKey(placePubKey);
+
GNUNET_SOCIAL_Slicer* slicer = GNUNET_SOCIAL_slicer_create ();
GNUNET_SOCIAL_slicer_add (slicer, "",
&hostRecvMethodCallback,
&hostRecvModifierCallback,
@@ -88,6 +89,10 @@
&hostFarewellCallback, newPlace);
newPlace->setHost(host);
+
+ connect(newPlace,&Place::hostTalkSignal,
+ this,&SocialService::hostTalk, Qt::QueuedConnection);
+
}
@@ -381,6 +386,10 @@
newPlace->setPublicKey(convertedRoomKey);
GNUNET_SOCIAL_Slicer* slicer = GNUNET_SOCIAL_slicer_create ();
+ GNUNET_SOCIAL_slicer_add (slicer, "",
+ &hostRecvMethodCallback,
&hostRecvModifierCallback,
+ &hostRecvDataCallback, &hostRecvEomCallback,
newPlace);
+
newPlace->setSlicer(slicer);
@@ -391,10 +400,12 @@
&guestRecvEntryDecisionCallback, newPlace);
newPlace->setSocialGuest(gst);
- connect(newPlace,&Place::talkSignal,
+ connect(newPlace,&Place::guestTalkSignal,
this,&SocialService::guestTalk, Qt::QueuedConnection);
+
+
}
static void
@@ -436,7 +447,7 @@
return GNUNET_SYSERR;
}
- if (GNUNET_YES != tmit->paused && 0 < tmit->data_delay[tmit->n])
+ /*if (GNUNET_YES != tmit->paused && 0 < tmit->data_delay[tmit->n])
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Transmission paused.\n");
tmit->paused = GNUNET_YES;
@@ -446,7 +457,7 @@
&transmit_resume, tmit);
*data_size = 0;
return GNUNET_NO;
- }
+ }*/
tmit->paused = GNUNET_NO;
*data_size = size;
@@ -460,23 +471,43 @@
{
TransmitClosure* tmit = new TransmitClosure;
- tmit->env = GNUNET_ENV_environment_create ();
-/*
+
+ tmit->env = NULL;
+
tmit->data[0] = "zzz xxx yyy";
tmit->data[1] = "zyx wvu tsr qpo";
tmit->data[2] = "testing ten nine eight";
- tmit->data_count = 3;*/
+ tmit->data_count = 3;
-
+/*
tmit->data[0] = (char *)text.toStdString().c_str();
- tmit->data_count = 1;
+ tmit->data_count = 1;*/
tmit->guest_talk
- = GNUNET_SOCIAL_guest_talk (place->socialGuest(),
"_message_guest", tmit->env,
+ = GNUNET_SOCIAL_guest_talk (place->socialGuest(),
"_message_guest", NULL,
¬ify_data, tmit,
GNUNET_SOCIAL_TALK_NONE);
}
+
+void
+SocialService::hostTalk(Place* place, QString text)
+{
+
+ TransmitClosure* tmit = new TransmitClosure();
+ tmit->env = NULL;
+
+ tmit->data[0] = "aaa bbb ccc";
+ tmit->data[1] = "abc def ghi jkl";
+ tmit->data[2] = "testing one two three";
+ tmit->data[3] = "four five";
+ tmit->data_count = 4;
+
+ tmit->host_ann
+ = GNUNET_SOCIAL_host_announce (place->host(), "_message_host", tmit->env,
+ ¬ify_data, tmit,
+ GNUNET_SOCIAL_ANNOUNCE_NONE);
+}
Modified: gnunet-qt/SecureShare/core/social/socialservice.h
===================================================================
--- gnunet-qt/SecureShare/core/social/socialservice.h 2014-08-14 11:18:12 UTC
(rev 34153)
+++ gnunet-qt/SecureShare/core/social/socialservice.h 2014-08-14 18:50:29 UTC
(rev 34154)
@@ -103,6 +103,7 @@
void createPlaceSlot();
Q_INVOKABLE void enterRoom(QString pubKey, QString peerIdentity);
+
signals:
void createPlaceSignal();
void enterRoomSignal(QString pubKey, QString peerIdentity);
@@ -110,6 +111,7 @@
void enterRoomSlot(QString pubKey, QString peerIdentity);
void guestTalk(Place *place, QString text);
+ void hostTalk(Place *place, QString text);
private:
GNUNET_IDENTITY_Ego* m_hostEgo;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34154 - gnunet-qt/SecureShare/core/social,
gnunet <=