Merge branch 'master' into webui

README.md

@@ -19,7 +19,7 @@ Compilation on Linux
    sudo zypper install gcc-c++ libqt4-devel libgnome-keyring-devel \
        glib2-devel speex-devel libssh-devel protobuf-devel libcurl-devel \
        libxml2-devel libxslt-devel sqlcipher-devel libmicrohttpd-devel \
-       opencv-devel speexdsp-devel libupnp-devel
+       opencv-devel speexdsp-devel libupnp-devel libavcodec-devel
    ```
    * Arch Linux
    ```bash

build_scripts/Debian+Ubuntu/changelog

@@ -1,5 +1,23 @@
 retroshare06 (0.6.0-1.XXXXXX~YYYYYY) YYYYYY; urgency=low
 
+  4953324 electron128 Sat,  2 Jan 2016 14:53:24 +0100 Merge pull request #235 from PhenomRetroShare/Fix_MakeMACOS_PluginWorking
+  c5e6f62 Phenom      Sat,  2 Jan 2016 14:19:53 +0100 Make Plugin working in Mac OSX.
+  b6b5f9c csoler      Fri,  1 Jan 2016 22:36:07 -0500 fixed some of the issues reported by coverity scan (mainly uninitialised class members)
+  ab3939c csoler      Fri,  1 Jan 2016 11:11:40 -0500 added missing update of mClientMsgUpdateMap, causing both a memory leak and an inconsistency in TS
+  22c00fc electron128 Fri,  1 Jan 2016 14:07:15 +0100 fixed free() in UdpLayer::recv_loop
+  58672e8 electron128 Fri,  1 Jan 2016 13:44:38 +0100 fix the logic to prevent using invalid iterators. First make a valid iterator, then dereference
+  3b2eae4 electron128 Fri,  1 Jan 2016 12:17:08 +0100 fixed memory leak by using stack memory instead of heap memory
+  9cb81f5 electron128 Fri,  1 Jan 2016 12:01:49 +0100 don't create wiki dataservice if wiki is not enabled for compile
+  72812be electron128 Fri,  1 Jan 2016 11:54:59 +0100 added missing initialisation of integers in GxsForumThreadWidget
+  55ea8a5 electron128 Fri,  1 Jan 2016 11:49:03 +0100 init pointer in RsServer
+  7efb763 electron128 Fri,  1 Jan 2016 11:38:29 +0100 restore stream state of std::cerr after printing hex number
+  640d71b electron128 Fri,  1 Jan 2016 11:09:49 +0100 removed delete of RsTemporaryMemory
+  d24ff5a csoler      Thu, 31 Dec 2015 19:42:50 -0500 Merge pull request #232 from G10h4ck/master
+  7895932 Gio         Fri,  1 Jan 2016 00:45:01 +0100 print_stacktrace is OS specific
+  e872727 csoler      Thu, 31 Dec 2015 17:37:05 -0500 updated dos->unix convertion script
+  b6b04dc csoler      Thu, 31 Dec 2015 17:28:42 -0500 added script to convert files to unix format
+  6392d65 csoler      Thu, 31 Dec 2015 16:50:52 -0500 fixed [dos] LF in IdDialog.h
+
   a6ee7cc csoler      Thu, 31 Dec 2015 14:15:14 -0500 Merge pull request #230 from G10h4ck/ss_port_invalid_family
   fac1524 csoler      Thu, 31 Dec 2015 13:58:13 -0500 updated todo list
   c5feafa Gio         Thu, 31 Dec 2015 19:56:50 +0100 Add missing stacktrace.h

libretroshare/src/pqi/p3servicecontrol.h

@@ -38,15 +38,16 @@
 
 class ServiceNotifications
 {
-public:
+	public:
 	std::set<RsPeerId> mAdded;
 	std::set<RsPeerId> mRemoved;
 };
 
 class ServicePeerFilter
 {
-public:
-	ServicePeerFilter() : mDenyAll(true), mAllowAll(false) {}
+        public:
+        ServicePeerFilter()
+        :mDenyAll(true), mAllowAll(false) {}
 
         bool mDenyAll;
         bool mAllowAll;
@@ -55,11 +56,14 @@ public:
 
 std::ostream &operator<<(std::ostream &out, const ServicePeerFilter &filter);
 
-class ServiceControlSerialiser;
+class ServiceControlSerialiser ;
 
 class p3ServiceControl: public RsServiceControl, public pqiMonitor, public p3Config
 {
 public:
+
+	/**
+	 */
         p3ServiceControl(p3LinkMgr *linkMgr);
 
         /**
@@ -73,86 +77,94 @@ public:
 	 * from ServiceControl.
          * @see rsserver
          */
-	virtual const RsPeerId& getOwnId();
+
+virtual const 	RsPeerId& getOwnId();
 
 	/**
 	 * External Interface (RsServiceControl).
 	 */
-	virtual bool getOwnServices(RsPeerServiceInfo &info);
+
+virtual bool getOwnServices(RsPeerServiceInfo &info);
 
 	// This is what is passed to peers, can be displayed by GUI too.
-	virtual bool getServicesAllowed(const RsPeerId &peerId, RsPeerServiceInfo &info);
+virtual bool getServicesAllowed(const RsPeerId &peerId, RsPeerServiceInfo &info);
 
 	// Information provided by peer.
-	virtual bool getServicesProvided(const RsPeerId &peerId, RsPeerServiceInfo &info);
+virtual bool getServicesProvided(const RsPeerId &peerId, RsPeerServiceInfo &info);
 
 	// Main Permission Interface.
-	virtual bool getServicePermissions(uint32_t serviceId, RsServicePermissions &permissions);
-	virtual bool updateServicePermissions(uint32_t serviceId, const RsServicePermissions &permissions);
+virtual bool getServicePermissions(uint32_t serviceId, RsServicePermissions &permissions);
+virtual bool updateServicePermissions(uint32_t serviceId, const RsServicePermissions &permissions);
 
 	// Get List of Peers using this Service.
-	virtual void getPeersConnected(const uint32_t serviceId, std::set<RsPeerId> &peerSet);
-	virtual bool isPeerConnected(const uint32_t serviceId, const RsPeerId &peerId);
+virtual void getPeersConnected(const uint32_t serviceId, std::set<RsPeerId> &peerSet);
+virtual bool isPeerConnected(const uint32_t serviceId, const RsPeerId &peerId);
 
 	/**
 	 * Registration for all Services.
 	 */
-	virtual	bool registerService(const RsServiceInfo &info, bool defaultOn);
-	virtual	bool deregisterService(uint32_t serviceId);
 
-	virtual	bool registerServiceMonitor(pqiServiceMonitor *monitor, uint32_t serviceId);
-	virtual	bool deregisterServiceMonitor(pqiServiceMonitor *monitor);
+virtual	bool registerService(const RsServiceInfo &info, bool defaultOn);
+virtual	bool deregisterService(uint32_t serviceId);
+
+virtual	bool registerServiceMonitor(pqiServiceMonitor *monitor, uint32_t serviceId);
+virtual	bool deregisterServiceMonitor(pqiServiceMonitor *monitor);
+
+	/**
+	 *
+	 */
+
 
 	// Filter for services.
-	virtual bool checkFilter(uint32_t serviceId, const RsPeerId &peerId);
+virtual bool checkFilter(uint32_t serviceId, const RsPeerId &peerId);
 
-	/*
+	/**
 	 * Interface for ServiceInfo service.
 	 */
 
 	// ServicesAllowed have changed for these peers.
-	virtual void getServiceChanges(std::set<RsPeerId> &updateSet);
+virtual void getServiceChanges(std::set<RsPeerId> &updateSet);
 
 	// Input from peers.	
-	virtual bool updateServicesProvided(const RsPeerId &peerId, const RsPeerServiceInfo &info);
+virtual bool updateServicesProvided(const RsPeerId &peerId, const RsPeerServiceInfo &info);
 
 	// pqiMonitor.
-	virtual void statusChange(const std::list<pqipeer> &plist);
+virtual void    statusChange(const std::list<pqipeer> &plist);
 
 protected:
 	// configuration.
-	virtual bool saveList(bool &cleanup, std::list<RsItem *>&);
-	virtual bool loadList(std::list<RsItem *>& load);
-	virtual RsSerialiser *setupSerialiser() ;
+virtual bool saveList(bool &cleanup, std::list<RsItem *>&);
+virtual bool loadList(std::list<RsItem *>& load);
+virtual RsSerialiser *setupSerialiser() ;
 
 private:
-	void notifyServices();
-	void notifyAboutFriends();
 
-	void updatePeerConnect(const RsPeerId &peerId);
-	void updatePeerDisconnect(const RsPeerId &peerId);
-	void updatePeerNew(const RsPeerId &peerId);
-	void updatePeerRemoved(const RsPeerId &peerId);
+void    notifyServices();
+void    notifyAboutFriends();
 
-	void removePeer(const RsPeerId &peerId);
+void    updatePeerConnect(const RsPeerId &peerId);
+void    updatePeerDisconnect(const RsPeerId &peerId);
+void    updatePeerNew(const RsPeerId &peerId);
+void    updatePeerRemoved(const RsPeerId &peerId);
+
+void 	removePeer(const RsPeerId &peerId);
 
 
-	bool updateAllFilters();
-	bool updateAllFilters_locked();
-	bool updateFilterByPeer(const RsPeerId &peerId);
-	bool updateFilterByPeer_locked(const RsPeerId &peerId);
+bool 	updateAllFilters();
+bool 	updateAllFilters_locked();
+bool 	updateFilterByPeer(const RsPeerId &peerId);
+bool 	updateFilterByPeer_locked(const RsPeerId &peerId);
 
 
 	void    recordFilterChanges_locked(const RsPeerId &peerId,
-									ServicePeerFilter &originalFilter,
-									ServicePeerFilter &updatedFilter);
+        	ServicePeerFilter &originalFilter, ServicePeerFilter &updatedFilter);
 
 	// Called from recordFilterChanges.
 	void filterChangeAdded_locked(const RsPeerId &peerId, uint32_t serviceId);
 	void filterChangeRemoved_locked(const RsPeerId &peerId, uint32_t serviceId);
 
-	bool createDefaultPermissions_locked(uint32_t serviceId, std::string serviceName, bool defaultOn);
-	bool peerHasPermissionForService_locked(const RsPeerId &peerId, uint32_t serviceId);
+bool createDefaultPermissions_locked(uint32_t serviceId, std::string serviceName, bool defaultOn);
+bool peerHasPermissionForService_locked(const RsPeerId &peerId, uint32_t serviceId);
 
 	p3LinkMgr *mLinkMgr;
 	const RsPeerId mOwnPeerId; // const from constructor
@@ -178,8 +190,11 @@ private:
 	RsMutex mMonitorMtx; /* below is protected */
     std::multimap<uint32_t, pqiServiceMonitor *> mMonitors;
 
+    ServiceControlSerialiser *mSerialiser ;
+
     // Below here is saved in Configuration.
     std::map<uint32_t, RsServicePermissions> mServicePermissionMap;
+
 };
 
 

libretroshare/src/pqi/pqistreamer.cc

@@ -441,7 +441,6 @@ int	pqistreamer::handleoutgoing_locked()
 		    	mPkt_wpending_size = 0 ;
 	    }
 
-	    outSentBytes_locked(sentbytes);
 	    return 0;
     }
 
@@ -469,7 +468,6 @@ int	pqistreamer::handleoutgoing_locked()
 		    }
 #endif
 
-		    outSentBytes_locked(sentbytes);
 		    return 0;
 	    }
 #define GROUP_OUTGOING_PACKETS 1
@@ -524,12 +522,12 @@ int	pqistreamer::handleoutgoing_locked()
 			    pqioutput(PQL_DEBUG_BASIC, pqistreamerzone, out);
 #endif
 
-			    outSentBytes_locked(sentbytes);
 			    // pkt_wpending will kept til next time.
 			    // ensuring exactly the same data is written (openSSL requirement).
 			    return -1;
 		    }
 		    ++nsent;
+            outSentBytes_locked(mPkt_wpending_size);	// this is the only time where we know exactly what was sent.
 
 #ifdef DEBUG_TRANSFERS
 		    std::cerr << "pqistreamer::handleoutgoing_locked() Sent Packet len: " << mPkt_wpending_size << " @ " << RsUtil::AccurateTimeString();
@@ -549,7 +547,6 @@ int	pqistreamer::handleoutgoing_locked()
     if(nsent > 0)
 	    std::cerr << "nsent = " << nsent << ", total bytes=" << sentbytes << std::endl;
 #endif
-    outSentBytes_locked(sentbytes);
     return 1;
 }
 
@@ -568,7 +565,6 @@ int pqistreamer::handleincoming_locked()
 	if(!(mBio->isactive()))
 	{
 		mReading_state = reading_state_initial ;
-		inReadBytes_locked(readbytes);
         free_rpend_locked();
 		return 0;
 	}
@@ -606,8 +602,6 @@ start_packet_read:
 		{
 			pqioutput(PQL_DEBUG_BASIC, pqistreamerzone, "pqistreamer::handleincoming() Didn't read BasePkt!");
 
-			inReadBytes_locked(readbytes);
-
 			// error.... (either blocked or failure)
 			if (tmplen == 0)
 			{
@@ -824,6 +818,8 @@ continue_packet:
 		std::cerr << "[" << (void*)pthread_self() << "] " << "deserializing. Size=" << pktlen << std::endl ;
 #endif
 
+        inReadBytes_locked(pktlen);	// only count deserialised packets, because that's what is actually been transfered.
+
         RsItem *pkt = mRsSerialiser->deserialise(block, &pktlen);
 
 		if ((pkt != NULL) && (0  < handleincomingitem_locked(pkt,pktlen)))
@@ -854,7 +850,6 @@ continue_packet:
 	}
 #endif
 
-	inReadBytes_locked(readbytes);
 	return 0;
 }
 

retroshare-gui/src/gui/chat/ChatWidget.cpp

@@ -1391,7 +1391,13 @@ void ChatWidget::smileyWidget()
 
 void ChatWidget::addSmiley()
 {
-	ui->chatTextEdit->textCursor().insertText(qobject_cast<QPushButton*>(sender())->toolTip().split("|").first());
+	QString smiley = qobject_cast<QPushButton*>(sender())->toolTip().split("|").first();
+	// add trailing space
+	smiley += QString(" ");
+	// add preceding space when needed (not at start of text or preceding space already exists)
+	if(!ui->chatTextEdit->textCursor().atStart() && ui->chatTextEdit->toPlainText()[ui->chatTextEdit->textCursor().position() - 1] != QChar(' '))
+		smiley = QString(" ") + smiley;
+	ui->chatTextEdit->textCursor().insertText(smiley);
 }
 
 void ChatWidget::clearChatHistory()

retroshare-gui/src/gui/chat/ChatWidget.ui

@@ -11,12 +11,21 @@
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <property name="verticalSpacing">
     <number>2</number>
    </property>
-   <property name="margin">
-    <number>0</number>
-   </property>
    <item row="1" column="0">
     <layout class="QHBoxLayout" name="hl_TextChat">
      <property name="spacing">
@@ -37,7 +46,16 @@
         <enum>QFrame::Raised</enum>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_2">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
@@ -113,7 +131,16 @@
            <enum>QFrame::Box</enum>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_2">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>6</number>
+           </property>
+           <property name="topMargin">
+            <number>6</number>
+           </property>
+           <property name="rightMargin">
+            <number>6</number>
+           </property>
+           <property name="bottomMargin">
             <number>6</number>
            </property>
            <item>
@@ -299,7 +326,16 @@ border-image: url(:/images/closepressed.png)
            <enum>QFrame::Sunken</enum>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>2</number>
+           </property>
+           <property name="topMargin">
+            <number>2</number>
+           </property>
+           <property name="rightMargin">
+            <number>2</number>
+           </property>
+           <property name="bottomMargin">
             <number>2</number>
            </property>
            <item>
@@ -326,8 +362,8 @@ border-image: url(:/images/closepressed.png)
               <enum>Qt::NoFocus</enum>
              </property>
              <property name="icon">
-              <iconset resource="../images.qrc">
-               <normaloff>:/images/emoticons/kopete/kopete020.png</normaloff>:/images/emoticons/kopete/kopete020.png</iconset>
+              <iconset resource="../emojione.qrc">
+               <normaloff>:/emojione/1F603.png</normaloff>:/emojione/1F603.png</iconset>
              </property>
              <property name="iconSize">
               <size>
@@ -486,7 +522,16 @@ border-image: url(:/images/closepressed.png)
               <enum>QFrame::Plain</enum>
              </property>
              <layout class="QHBoxLayout" name="HL_pluginButtonFrame">
-              <property name="margin">
+              <property name="leftMargin">
+               <number>2</number>
+              </property>
+              <property name="topMargin">
+               <number>2</number>
+              </property>
+              <property name="rightMargin">
+               <number>2</number>
+              </property>
+              <property name="bottomMargin">
                <number>2</number>
               </property>
              </layout>
@@ -556,7 +601,16 @@ border-image: url(:/images/closepressed.png)
         <enum>QFrame::Sunken</enum>
        </property>
        <layout class="QHBoxLayout" name="hlTitleBarFrame">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>2</number>
+        </property>
+        <property name="topMargin">
+         <number>2</number>
+        </property>
+        <property name="rightMargin">
+         <number>2</number>
+        </property>
+        <property name="bottomMargin">
          <number>2</number>
         </property>
         <item>
@@ -637,7 +691,16 @@ border-image: url(:/images/closepressed.png)
            <enum>QFrame::Plain</enum>
           </property>
           <layout class="QHBoxLayout" name="HL_pluginTitleFrame">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>2</number>
+           </property>
+           <property name="topMargin">
+            <number>2</number>
+           </property>
+           <property name="rightMargin">
+            <number>2</number>
+           </property>
+           <property name="bottomMargin">
             <number>2</number>
            </property>
           </layout>
@@ -652,7 +715,16 @@ border-image: url(:/images/closepressed.png)
            <enum>QFrame::Raised</enum>
           </property>
           <layout class="QGridLayout" name="gridLayout_2">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
             <number>0</number>
            </property>
            <item row="0" column="5">
@@ -1020,6 +1092,7 @@ border-image: url(:/images/closepressed.png)
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../emojione.qrc"/>
  </resources>
  <connections/>
 </ui>

retroshare-gui/src/gui/connect/ConnectFriendWizard.ui

@@ -94,7 +94,7 @@
     <item>
      <widget class="QLabel" name="userCertLabel">
       <property name="text">
-       <string>The text below is your PGP certificate. You have to provide it to your friend</string>
+       <string>The text below is your Retroshare certificate. You have to provide it to your friend</string>
       </property>
      </widget>
     </item>
@@ -278,7 +278,7 @@
     <item>
      <widget class="QLabel" name="friendCertLabel">
       <property name="text">
-       <string>Please, paste your friend's PGP certificate into the box below</string>
+       <string>Please, paste your friend's Retroshare certificate into the box below</string>
       </property>
      </widget>
     </item>
@@ -291,6 +291,9 @@
           <family>Courier New</family>
          </font>
         </property>
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This box expects your friend's Retroshare certificate. WARNING: this is different from your PGP key. Do not paste your PGP key here (or even a part of it). It's not going to work.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
         <property name="lineWrapMode">
          <enum>QPlainTextEdit::NoWrap</enum>
         </property>
@@ -524,16 +527,7 @@
    <layout class="QGridLayout" name="gridLayout">
     <item row="0" column="0">
      <layout class="QHBoxLayout" name="horizontalLayout_10">
-      <property name="leftMargin">
-       <number>9</number>
-      </property>
-      <property name="topMargin">
-       <number>9</number>
-      </property>
-      <property name="rightMargin">
-       <number>9</number>
-      </property>
-      <property name="bottomMargin">
+      <property name="margin">
        <number>9</number>
       </property>
       <item>

retroshare-gui/src/gui/emojione.qrc

@@ -188,16 +188,6 @@
     <file>emojione/1F199.png</file>
     <file>emojione/1F201.png</file>
     <file>emojione/1F202.png</file>
-    <file>emojione/1F232.png</file>
-    <file>emojione/1F233.png</file>
-    <file>emojione/1F234.png</file>
-    <file>emojione/1F235.png</file>
-    <file>emojione/1F236.png</file>
-    <file>emojione/1F237.png</file>
-    <file>emojione/1F238.png</file>
-    <file>emojione/1F239.png</file>
-    <file>emojione/1F250.png</file>
-    <file>emojione/1F251.png</file>
     <file>emojione/1F300.png</file>
     <file>emojione/1F301.png</file>
     <file>emojione/1F302.png</file>
@@ -544,8 +534,6 @@
     <file>emojione/2934.png</file>
     <file>emojione/2935.png</file>
     <file>emojione/3030.png</file>
-    <file>emojione/3297.png</file>
-    <file>emojione/3299.png</file>
     <file>emojione/1f910.png</file>
     <file>emojione/1f911.png</file>
     <file>emojione/1f912.png</file>