merged with upstream/master

TODO.txt

@@ -71,6 +71,7 @@ Chat
     E  [ ] add flags to allow distant chat from contact list only / everyone / noone / only signed ids.
 
 Libretroshare
+	E  [ ] groups small packets in pqistreamer::handleoutgoing_locked(), and see if that removes some padding overhead
     E  [ ] make sure at least one location is kept when removing old locations as it avoids lots of connection problems.
     M  [ ] improve serialisation system. Lots of serialisation tasks (header, verifications, serialiser=>template, can be factored)
     M  [ ] separate chat stuff from rsmsgs.h into rschat.h

libbitdht/src/udp/udplayer.cc

@@ -32,7 +32,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
+#ifndef WIN32
 #include <sys/select.h>
+#endif
 
 /***
  * #define UDP_ENABLE_BROADCAST		1

libresapi/src/api/ApiPluginHandler.cpp

@@ -0,0 +1,41 @@
+#include "ApiPluginHandler.h"
+
+namespace resource_api
+{
+
+ApiPluginHandler::ApiPluginHandler(StateTokenServer* statetokenserver, const RsPlugInInterfaces& ifaces)
+{
+    for(int i = 0; i < ifaces.mPluginHandler->nbPlugins(); i++)
+    {
+        RsPlugin* plugin = ifaces.mPluginHandler->plugin(i);
+        // if plugin is not loaded, pointer is null
+        if(plugin == 0)
+            continue;
+        std::string entrypoint;
+        ResourceRouter* child = plugin->new_resource_api_handler(ifaces, statetokenserver, entrypoint);
+        if(child != 0)
+        {
+            mChildren.push_back(child);
+            if(isNameUsed(entrypoint))
+            {
+                std::cerr << "Cannot add plugin api entry point with name=" << entrypoint << ", becaus ethis name is already in use!" << std::endl;
+            }
+            else
+            {
+                std::cerr << "Added libresapi plugin with entrypoint " << entrypoint << std::endl;
+                addResourceHandler(entrypoint, child, &ResourceRouter::handleRequest);
+            }
+        }
+    }
+}
+
+ApiPluginHandler::~ApiPluginHandler()
+{
+    for(std::vector<ResourceRouter*>::iterator vit = mChildren.begin(); vit != mChildren.end(); ++vit)
+    {
+        delete *vit;
+    }
+    mChildren.clear();
+}
+
+} // namespace resource_api

libresapi/src/api/ApiPluginHandler.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "ResourceRouter.h"
+#include <retroshare/rsplugin.h>
+
+namespace resource_api
+{
+
+// forwards all incoming requests to retroshare plugins
+class ApiPluginHandler: public ResourceRouter
+{
+public:
+    ApiPluginHandler(StateTokenServer* statetokenserver, const RsPlugInInterfaces& ifaces);
+    virtual ~ApiPluginHandler();
+
+private:
+    std::vector<ResourceRouter*> mChildren;
+};
+
+} // namespace resource_api

libresapi/src/api/ApiServer.cpp

@@ -13,6 +13,8 @@
 #include "JsonStream.h"
 #include "StateTokenServer.h" // for the state token serialisers
 
+#include "ApiPluginHandler.h"
+
 /*
 data types in json       http://json.org/
 string (utf-8 unicode)
@@ -226,10 +228,11 @@ public:
         mPeersHandler(sts, ifaces.mNotify, ifaces.mPeers, ifaces.mMsgs),
         mIdentityHandler(ifaces.mIdentity),
         mForumHandler(ifaces.mGxsForums),
-        mServiceControlHandler(rsServiceControl), // TODO: don't use global variable here
+        mServiceControlHandler(ifaces.mServiceControl),
         mFileSearchHandler(sts, ifaces.mNotify, ifaces.mTurtle, ifaces.mFiles),
         mTransfersHandler(sts, ifaces.mFiles),
-        mChatHandler(sts, ifaces.mNotify, ifaces.mMsgs, ifaces.mPeers, ifaces.mIdentity, &mPeersHandler)
+        mChatHandler(sts, ifaces.mNotify, ifaces.mMsgs, ifaces.mPeers, ifaces.mIdentity, &mPeersHandler),
+        mApiPluginHandler(sts, ifaces)
     {
         // the dynamic cast is to not confuse the addResourceHandler template like this:
         // addResourceHandler(derived class, parent class)
@@ -249,6 +252,8 @@ public:
                                    &TransfersHandler::handleRequest);
         router.addResourceHandler("chat", dynamic_cast<ResourceRouter*>(&mChatHandler),
                                   &ChatHandler::handleRequest);
+        router.addResourceHandler("apiplugin", dynamic_cast<ResourceRouter*>(&mApiPluginHandler),
+                                  &ChatHandler::handleRequest);
     }
 
     PeersHandler mPeersHandler;
@@ -258,6 +263,7 @@ public:
     FileSearchHandler mFileSearchHandler;
     TransfersHandler mTransfersHandler;
     ChatHandler mChatHandler;
+    ApiPluginHandler mApiPluginHandler;
 };
 
 ApiServer::ApiServer():

libresapi/src/api/ChatHandler.cpp

@@ -173,10 +173,8 @@ void ChatHandler::tick()
         }
     }
 
-    ChatId id = ChatId::makeBroadcastId();
     {
         Lobby l;
-        l.id = id.toLobbyId();
         l.name = "BroadCast";
         l.topic = "Retroshare broadcast chat: messages are sent to all connected friends.";
         l.subscribed = true;

libresapi/src/api/GetPluginInterfaces.cpp

@@ -7,6 +7,7 @@
 #include <retroshare/rsdisc.h>
 #include <retroshare/rsdht.h>
 #include <retroshare/rsnotify.h>
+#include <retroshare/rsservicecontrol.h>
 
 #include <retroshare/rsidentity.h>
 #include <retroshare/rsgxscircles.h>
@@ -28,6 +29,8 @@ bool getPluginInterfaces(RsPlugInInterfaces& interfaces)
     interfaces.mDisc   = rsDisc;
     interfaces.mDht    = rsDht;
     interfaces.mNotify = rsNotify;
+    interfaces.mServiceControl = rsServiceControl;
+    interfaces.mPluginHandler  = rsPlugins;
 
     // gxs
     interfaces.mGxsDir          = "";

libresapi/src/api/ResourceRouter.cpp

@@ -55,4 +55,17 @@ ResponseTask* ResourceRouter::handleRequest(Request& req, Response& resp)
     return 0;
 }
 
+bool ResourceRouter::isNameUsed(std::string name)
+{
+    std::vector<std::pair<std::string, HandlerBase*> >::iterator vit;
+    for(vit = mHandlers.begin(); vit != mHandlers.end(); vit++)
+    {
+        if(vit->first == name)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
 } // namespace resource_api

libresapi/src/api/ResourceRouter.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ApiTypes.h"
+#include <iostream>
 
 namespace resource_api
 {
@@ -20,6 +21,8 @@ public:
     void addResourceHandler(std::string name, T* instance, ResponseTask* (T::*callback)(Request& req, Response& resp));
     template <class T>
     void addResourceHandler(std::string name, T* instance, void (T::*callback)(Request& req, Response& resp));
+
+    bool isNameUsed(std::string name);
 private:
     class HandlerBase
     {
@@ -61,6 +64,10 @@ private:
 template <class T>
 void ResourceRouter::addResourceHandler(std::string name, T* instance, ResponseTask* (T::*callback)(Request& req, Response& resp))
 {
+    if(isNameUsed(name))
+    {
+        std::cerr << "ResourceRouter::addResourceHandler ERROR: name=" << name << " alerady in use. Not adding new Handler!" << std::endl;
+    }
     Handler<T>* handler = new Handler<T>();
     handler->instance = instance;
     handler->method = callback;
@@ -69,6 +76,10 @@ void ResourceRouter::addResourceHandler(std::string name, T* instance, ResponseT
 template <class T>
 void ResourceRouter::addResourceHandler(std::string name, T* instance, void (T::*callback)(Request& req, Response& resp))
 {
+    if(isNameUsed(name))
+    {
+        std::cerr << "ResourceRouter::addResourceHandler ERROR: name=" << name << " alerady in use. Not adding new Handler!" << std::endl;
+    }
     InstantResponseHandler<T>* handler = new InstantResponseHandler<T>();
     handler->instance = instance;
     handler->method = callback;

libresapi/src/libresapi.pro

@@ -65,7 +65,8 @@ SOURCES += \
     api/ChatHandler.cpp \
     api/LivereloadHandler.cpp \
     api/TmpBlobStore.cpp \
-    util/ContentTypes.cpp
+    util/ContentTypes.cpp \
+    api/ApiPluginHandler.cpp
 
 HEADERS += \
 	api/ApiServer.h \
@@ -89,4 +90,5 @@ HEADERS += \
     api/ChatHandler.h \
     api/LivereloadHandler.h \
     api/TmpBlobStore.h \
-    util/ContentTypes.h
+    util/ContentTypes.h \
+    api/ApiPluginHandler.h

libretroshare/src/gxs/rsgxsnetservice.cc

@@ -343,7 +343,6 @@ int RsGxsNetService::tick()
         mLastCleanRejectedMessages = now ;
         cleanRejectedMessages() ;
     }
-    
     return 1;
 }
 

libretroshare/src/retroshare/rsplugin.h

@@ -49,6 +49,7 @@ class RsMsgs ;
 class RsGxsForums;
 class RsGxsChannels;
 class RsNotify;
+class RsServiceControl;
 class p3LinkMgr ;
 class MainPage ;
 class QIcon ;
@@ -75,6 +76,12 @@ class RsGcxs;
 class PgpAuxUtils;
 class p3Config;
 
+namespace resource_api
+{
+    class ResourceRouter;
+    class StateTokenServer;
+}
+
 // Plugin API version. Not used yet, but will be in the future the
 // main value that decides for compatibility.
 //
@@ -108,6 +115,8 @@ public:
     RsUtil::inited_ptr<RsDisc>   mDisc;
     RsUtil::inited_ptr<RsDht>    mDht;
     RsUtil::inited_ptr<RsNotify> mNotify;
+    RsUtil::inited_ptr<RsServiceControl> mServiceControl;
+    RsUtil::inited_ptr<RsPluginHandler> mPluginHandler;
 
     // gxs
     std::string     mGxsDir;
@@ -147,6 +156,12 @@ class RsPlugin
         virtual p3Config   *p3_config() 		const	{ return NULL ; }
 		virtual uint16_t        rs_service_id() 	   const	{ return 0    ; }
 
+
+        // creates a new resource api handler object. ownership is transferred to the caller.
+        // the caller should supply a statetokenserver, and keep it valid until destruction
+        // the plugin should return a entry point name. this is to make the entry point name independent from file names
+        virtual resource_api::ResourceRouter* new_resource_api_handler(const RsPlugInInterfaces& ifaces, resource_api::StateTokenServer* sts, std::string &entrypoint) const { return 0;}
+
 		// Shutdown
 		virtual void stop() {}
 

libretroshare/src/rsserver/rsinit.cc

@@ -1523,6 +1523,8 @@ int RsServer::StartupRetroShare()
 	interfaces.mDisc   = rsDisc;
 	interfaces.mDht    = rsDht;
 	interfaces.mNotify = mNotify;
+    interfaces.mServiceControl = serviceCtrl;
+    interfaces.mPluginHandler  = mPluginsManager;
     // gxs
     interfaces.mGxsDir          = currGxsDir;
     interfaces.mIdentity        = mGxsIdService;

retroshare-gui/src/gui/SearchDialog.cpp

@@ -300,16 +300,16 @@ void SearchDialog::initialiseFileTypeMappings()
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_AUDIO,
 		"aac aif flac iff m3u m4a mid midi mp3 mpa ogg ra ram wav wma");
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_ARCHIVE,
-		"7z bz2 gz pkg rar sea sit sitx tar zip");
+		"7z bz2 gz pkg rar sea sit sitx tar zip tgz");
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_CDIMAGE,
-		"iso nrg mdf");
+		"iso nrg mdf bin");
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_DOCUMENT,
-		"doc odt ott rtf pdf ps txt log msg wpd wps" );
+		"doc odt ott rtf pdf ps txt log msg wpd wps ods xls epub" );
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_PICTURE,
 		"3dm 3dmf ai bmp drw dxf eps gif ico indd jpe jpeg jpg mng pcx pcc pct pgm "
 		"pix png psd psp qxd qxprgb sgi svg tga tif tiff xbm xcf");
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_PROGRAM,
-		"app bat cgi com bin exe js pif py pl sh vb ws ");
+		"app bat cgi com bin exe js pif py pl sh vb ws bash");
 	SearchDialog::FileTypeExtensionMap->insert(FILETYPE_IDX_VIDEO,
 		"3gp asf asx avi mov mp4 mkv flv mpeg mpg qt rm swf vob wmv");
 	SearchDialog::initialised = true;

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

@@ -53,6 +53,8 @@
 #define COLUMN_ID        3
 #define COLUMN_COUNT     4
 
+#define ROLE_SORT            Qt::UserRole + 1
+
 const static uint32_t timeToInactivity = 60 * 10;   // in seconds
 
 /** Default constructor */
@@ -80,10 +82,25 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
     distantChatAct = new QAction(QIcon(":/images/chat_24.png"), tr("Start private chat"), this);
     sendMessageAct = new QAction(QIcon(":/images/mail_new.png"), tr("Send Message"), this);
     
+    QActionGroup *sortgrp = new QActionGroup(this);
+    actionSortByName = new QAction(QIcon(), tr("Sort by Name"), this);
+    actionSortByName->setCheckable(true);
+    actionSortByName->setChecked(true); 
+    actionSortByName->setActionGroup(sortgrp);
+
+    actionSortByActivity = new QAction(QIcon(), tr("Sort by Activity"), this);
+    actionSortByActivity->setCheckable(true);
+    actionSortByActivity->setChecked(false); 
+    actionSortByActivity->setActionGroup(sortgrp);
+
+
     connect(muteAct, SIGNAL(triggered()), this, SLOT(changePartipationState()));
     connect(distantChatAct, SIGNAL(triggered()), this, SLOT(distantChatParticipant()));
     connect(sendMessageAct, SIGNAL(triggered()), this, SLOT(sendMessage()));
     
+    connect(actionSortByName, SIGNAL(triggered()), this, SLOT(sortParcipants()));
+    connect(actionSortByActivity, SIGNAL(triggered()), this, SLOT(sortParcipants()));
+
 	// Add a button to invite friends.
 	//
 	inviteFriendsButton = new QToolButton ;
@@ -94,7 +111,7 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::Wi
 	inviteFriendsButton->setToolTip(tr("Invite friends to this lobby"));
 
         mParticipantCompareRole = new RSTreeWidgetItemCompareRole;
-        mParticipantCompareRole->setRole(0, Qt::UserRole);
+        mParticipantCompareRole->setRole(COLUMN_ACTIVITY, ROLE_SORT);
 
 	{
 	QIcon icon ;
@@ -179,6 +196,9 @@ void ChatLobbyDialog::participantsTreeWidgetCustomPopupMenu(QPoint)
     contextMnu.addAction(sendMessageAct);
     contextMnu.addSeparator();
     contextMnu.addAction(muteAct);
+    contextMnu.addSeparator();
+    contextMnu.addAction(actionSortByActivity);
+    contextMnu.addAction(actionSortByName);
 
 
 	muteAct->setCheckable(true);
@@ -451,6 +471,9 @@ void ChatLobbyDialog::updateParticipantsList()
             time_t tLastAct=widgetitem->text(COLUMN_ACTIVITY).toInt();
             time_t now = time(NULL);
             
+                widgetitem->setSizeHint(COLUMN_ICON, QSize(20,20));
+
+
             if(isParticipantMuted(it2->first))
                 widgetitem->setIcon(COLUMN_ICON, QIcon(":/icons/bullet_red_128.png"));
             else if (tLastAct + timeToInactivity < now)
@@ -472,7 +495,7 @@ void ChatLobbyDialog::updateParticipantsList()
         }
     }
     ui.participantsList->setSortingEnabled(true);
-    ui.participantsList->sortItems(COLUMN_NAME, Qt::AscendingOrder);
+    sortParcipants();
 }
 
 /**
@@ -762,3 +785,14 @@ void ChatLobbyDialog::showDialog(uint chatflags)
 		dynamic_cast<ChatLobbyWidget*>(MainWindow::getPage(MainWindow::ChatLobby))->setCurrentChatPage(this) ;
 	}
 }
+
+void ChatLobbyDialog::sortParcipants()
+{
+
+	if (actionSortByActivity->isChecked()) {
+        ui.participantsList->sortItems(COLUMN_ACTIVITY, Qt::DescendingOrder);
+	} else if (actionSortByName->isChecked()) {
+        ui.participantsList->sortItems(COLUMN_NAME, Qt::AscendingOrder);
+	}
+  
+}

retroshare-gui/src/gui/chat/ChatLobbyDialog.h

@@ -47,6 +47,7 @@ public:
     void setIdentity(const RsGxsId& gxs_id);
     bool isParticipantMuted(const RsGxsId &participant);
 	ChatLobbyId id() const { return lobbyId ;}
+	void sortParcipants();
 
 private slots:
 	void participantsTreeWidgetCustomPopupMenu( QPoint point );
@@ -104,6 +105,8 @@ private:
 
     QAction *muteAct;
     QAction *distantChatAct;
+    QAction *actionSortByName;
+    QAction *actionSortByActivity;
     QWidgetAction *checkableAction;
     QAction *sendMessageAct;