Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,938 Commits 63 Branches 22 Tags 194 MiB
c97269bed6
Commit Graph

4560 Commits

Author SHA1 Message Date
csoler
eb4bb5be65 fixed bug in gxs trans stats counting 2017-06-17 21:42:00 +02:00
csoler
43dcddce67 Merge pull request #880 from PhenomRetroShare/Add_GxsCircleNotify 
Add Circle Feed Item.
 2017-06-16 12:37:09 +02:00
csoler
a29bc4408e Merge pull request #874 from G10h4ck/silent_initiate_distant_chat_api 
libresapi: silent /chat/initiate_distant_chat
 2017-06-16 12:24:45 +02:00
csoler
25565a7ecd merged upstream/master 2017-06-15 23:58:29 +02:00
csoler
6633b04a44 changed constants for GxsTransport anti-spam 2017-06-15 23:57:02 +02:00
csoler
26bb865d29 added code to reject messages based on existing per-user statistics 2017-06-15 19:32:31 +02:00
sehraf
fe5ec8bda8 reduce BOB log level 2017-06-15 07:06:52 +02:00
csoler
09ff94c9ec added new virtual method to refuse incoming msgs (similar to groups) in RsGenExchange, and used it in p3GxsTrans to refuse msgs from peers who send too much 2017-06-14 23:19:52 +02:00
csoler
79825eb2e2 fixed thread issue in RsGxsCleanupThread that caused random crashes 2017-06-12 20:36:02 +02:00
Phenom
aa64c4d3c5 Add Circle Feed Item. 2017-06-11 16:16:41 +02:00
csoler
1766087f71 fixed update notification and display in GxsTransStatistics 2017-06-07 23:10:59 +02:00
csoler
9853b53f8b fixed debug output in GxsNetService 2017-06-07 23:10:24 +02:00
csoler
4cb7522feb added deleted gxs messages to the reject list of GxsNetService to avoid re-downloading them right away 2017-06-07 21:41:00 +02:00
csoler
23156ab4b1 fixed malloc problem when chat avatar is missing 2017-06-07 20:14:27 +02:00
cyril soler
e726bd1061 attempt to fix the crash in DataStore by not calling deleteMsgs directly 2017-06-07 13:37:55 +02:00
csoler
39f003f9f9 Merge pull request #875 from csoler/v0.6-GxsTransport 
V0.6 gxs transport
 2017-06-06 22:00:08 +02:00
Gioacchino Mazzurco
528317d374 libresapi: silent /chat/initiate_distant_chat 
Avoid to forge the
[Starting distant chat. Please wait for secure tunnel to be established]
message on requesting chat id from API as it is a nuisance in most
libresapi use cases
 2017-06-06 18:57:32 +02:00
csoler
f62028b2c1 moved metadata info to members of OutgoingRecord, so that the un-serialized meta is not lost when saved. Ensured backward compatibility when reloading old items. 2017-06-06 00:15:06 +02:00
csoler
1e652d6577 reduced number of calls to indicateConfigChanged(), and renamed mIngoingQueue into mIncomingQueue in GxsTrans 2017-06-05 22:27:54 +02:00
csoler
b7c09bd6cf added calls to indicateConfigChanged() to force saving GxsTrans outgoing records when updated 2017-06-05 21:15:42 +02:00
BabushkaRetroShare
7fb0419c75
Typo fixes 2017-06-04 20:34:10 +02:00
csoler
1967204821 restored GXS trans cleanign delay 2017-06-04 18:43:12 +02:00
csoler
831b560780 moved deletion of msgs in GxsTransport inside the service thread 2017-06-04 18:37:38 +02:00
csoler
861dab32a5 Merge pull request #863 from G10h4ck/qmlapp_pex_alpha 
Multiple improvements to android qml app and libreaspilocal
 2017-06-03 13:27:21 +02:00
csoler
fb7ac7a8f6 fixed mismatched free/delete (free is used in rschatitems.cc to delete avatars) 2017-06-02 23:10:43 +02:00
Gioacchino Mazzurco
efdfa4666b Merge branch 'libresapi_attempt_connection' into qmlapp_pex_alpha 2017-06-02 10:39:42 +02:00
cyril soler
8e7e70035a fixed compilation for windows 2017-06-01 10:16:30 +02:00
Gioacchino Mazzurco
59b77da6a2 Merge branch 'master' into qmlapp_pex_alpha 2017-05-31 12:11:15 +02:00
csoler
1ebcc6006b Merge pull request #861 from RetroShare/v0.6-GxsTransport 
V0.6 gxs transport
 2017-05-30 22:22:06 +02:00
csoler
832ba69b69 fixed up cleanup for GxsTransport 2017-05-30 21:38:59 +02:00
csoler
a7eb167f96 fixed a bug in RsThread which made finished threads unaware of their state 2017-05-30 20:57:20 +02:00
csoler
5410c51ab9 added cleanup thread for GxsTransport 2017-05-30 20:45:39 +02:00
csoler
0868b64436 fixed uninitialized memory read in GxsTrans msg Id 2017-05-28 22:49:07 +02:00
Phenom
28119b5094 Fix Windows Compilation 2017-05-28 12:57:36 +02:00
csoler
6d76624e91 fixed uninitialized memory read in grouter 2017-05-27 23:16:20 +02:00
csoler
eea63ac217 minor code cleaning in p3GxsTrans (struct->class for consistency, sendMail->sendData), added popularity+subscribed status display in statistics 2017-05-27 22:19:52 +02:00
csoler
7c439983de Merge pull request #842 from csoler/v0.6-GxsTransport 
V0.6 gxs transport
 2017-05-26 22:04:33 +02:00
csoler
a3096f26a5 added data hash to GxsTrans display 2017-05-26 20:28:44 +02:00
csoler
4fa6cbe6e6 fixed display in GxsTrans stats widget 2017-05-26 18:42:52 +02:00
csoler
14b9a54773 added group data retrieval to GxsTransStatistics 2017-05-25 16:56:29 +02:00
sehraf
a3ee85a30d Add I2P BOB support to libretroashare and RetroShare GUI 2017-05-24 19:40:01 +02:00
csoler
a136fb6fda added display of ongoing record status for GxsTrans. Unfinished. 2017-05-22 23:54:55 +02:00
csoler
fbeb6ff98d added infrastructure for gathering statistics about GxsTransport. Unfinished. 2017-05-21 15:57:10 +02:00
csoler
dbc23969f4 Merge pull request #830 from Gottox/fix-libressl 
fix building with libressl
 2017-05-21 14:52:20 +02:00
csoler
33ab7faec4 Merge pull request #831 from Gottox/fix-musl 
fix building with musl libc
 2017-05-21 14:49:13 +02:00
csoler
b341fea170 merged upstream/master 2017-05-21 13:49:41 +02:00
Enno Boland
a578acdea8 fix building with musl libc 2017-05-21 10:54:19 +02:00
Enno Boland
2046d9eaae fix building with libressl 2017-05-21 10:48:58 +02:00
csoler
a439fbf63e fixed bug (due to new serializer) that caused a wrong hash to be computed when sending distant messages 2017-05-20 23:01:56 +02:00
csoler
162095bf20 fixed count of unread/new posts by not counting older versions 2017-05-20 22:37:31 +02:00
csoler
51710c10a0 merge comments between channel item versions 2017-05-20 17:33:05 +02:00
Gioacchino Mazzurco
de9a44fac7 Merge branch 'v0.6-GxsTransport' into qmlapp_pex_alpha 2017-05-15 19:16:08 +02:00
Gioacchino Mazzurco
10ec52718d Fix GxsTrans related serialization regressions 2017-05-15 19:13:29 +02:00
Gioacchino Mazzurco
745462a61b Merge branch 'v0.6-GxsTransport' into qmlapp_pex_alpha 2017-05-15 15:05:07 +02:00
Gioacchino Mazzurco
93a6b7dcd4 Fix serialization regression in async chat 2017-05-15 15:00:21 +02:00
csoler
c0c5cc52db Merge branch 'master' into gxs_mail_experiments 2017-05-13 21:08:16 +02:00
csoler
3cc79fb242 Merge pull request #774 from PhenomRetroShare/Fix_LobbyTopic 
Fix Lobby Topic not send on invite.
 2017-05-10 20:00:42 +02:00
csoler
11708c8a34 Merge pull request #814 from csoler/v0.6-ImprovedGUI 
prevent to remove old forum messages that have follow-ups.
 2017-05-09 22:44:00 +02:00
csoler
bd9a8ae3aa prevent to remove old forum messages that have follow-ups. 2017-05-09 22:39:15 +02:00
csoler
0af05d2517 patch to avoid re-asking for rejected plugins when the executable is upgraded. 2017-05-09 19:07:17 +02:00
csoler
34dd68d7bf Merge pull request #809 from csoler/v0.6-FT 
fixed previous commit
 2017-05-08 23:05:16 +02:00
csoler
e0cb0f4847 fixed previous commit 2017-05-08 23:04:04 +02:00
csoler
9a0df3f757 Merge pull request #804 from PhenomRetroShare/Fix_Warnings 
Fix warnings
 2017-05-08 22:21:28 +02:00
csoler
4a2f5f0f82 Merge pull request #808 from csoler/v0.6-FT 
added a per-friend upload slots limit in FT. Default is 0=unlimited
 2017-05-08 22:02:38 +02:00
csoler
8a86b9ed7d added a per-friend upload slots limit in FT. Default is 0=unlimited 2017-05-08 22:00:51 +02:00
Gioacchino Mazzurco
f67617a449 Add override and final placeolders for old GCC compatibility 2017-05-08 16:57:37 +02:00
Phenom
d02cba5a91 Fix Lobby Topic not send on invite. 2017-05-08 15:38:36 +02:00
Gioacchino Mazzurco
ccaf4881a8 Merge branch 'master' into qmlapp_pex_alpha 2017-05-08 13:38:29 +02:00
Phenom
4a2f688f14 Fix Windows Compilation: 
pqi/authssl.cc: In member function 'virtual X509*
AuthSSLimpl::SignX509ReqWithGPG(X509_REQ*, long int)':
pqi/authssl.cc:929:3: error: jump to label 'err' [-fpermissive]
   err:
   ^
pqi/authssl.cc:872:22: error:   from here [-fpermissive]
                 goto err;
                      ^
pqi/authssl.cc:877:24: error:   crosses initialization of 'unsigned
char* p'
         unsigned char *p=buf_in;
                        ^
pqi/authssl.cc: In member function 'virtual bool
AuthSSLimpl::AuthX509WithGPG(X509*, uint32_t&)':
pqi/authssl.cc:1091:1: error: jump to label 'err' [-fpermissive]
 err:
 ^
pqi/authssl.cc:1027:8: error:   from here [-fpermissive]
   goto err;
        ^
pqi/authssl.cc:1035:17: error:   crosses initialization of 'unsigned
char* p'
  unsigned char *p=buf_in;
                 ^
 2017-05-08 13:01:34 +02:00
Gioacchino Mazzurco
8f306346a4 Merge branch 'gxs_mail_experiments' into qmlapp_pex_alpha 2017-05-08 12:33:40 +02:00
Phenom
58c812aea8 Fix Warnings: unused parameter ‘s’ 
warning: unused parameter ‘s’ [-Wunused-parameter]
 template<> uint32_t RsTypeSerializer::serial_size(uint16_t /*
type_subtype */,const uint32_t& s)
                                                                                               ^
 2017-05-08 12:17:01 +02:00
Phenom
ee7e92d6c4 Fix Warnings: this ‘if’ clause does not guard... 
warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
     if(buffer.empty())
     ^~
 2017-05-08 12:15:45 +02:00
Phenom
9b1209db68 Fix Warnings: unused parameter ‘s’ & 'n' 
warning: unused parameter ‘s’ [-Wunused-parameter]
 template<> uint32_t RsTypeSerializer::serial_size(const
PeerBandwidthLimits& s)
                                                                              ^
 2017-05-08 12:14:04 +02:00
Phenom
91e3cc3e5f Fix Warnings: variable ‘p’ set but not used 
warning: variable ‘p’ set but not used [-Wunused-but-set-variable]
  unsigned char *p,*buf_in=NULL;
                 ^
 2017-05-08 12:11:48 +02:00
Phenom
ca291b7ee6 Fix Warnings: warning: unused variable ‘i2d’ 
warning: unused variable ‘i2d’ [-Wunused-variable]
  int (*i2d)(X509_CINF*, unsigned char**) = i2d_X509_CINF;
        ^~~
 2017-05-08 12:05:58 +02:00
Phenom
9021609a6b Fix Warnings: unused variable ‘p’ 
warning: unused variable ‘p’ [-Wunused-variable]
         unsigned char *p,*buf_in=NULL;
                        ^
 2017-05-08 12:04:08 +02:00
Phenom
7892004641 Fix Warnings: unused parameter ‘member_name’ 
warning: unused parameter ‘member_name’ [-Wunused-parameter]
   static void serial_process(RsGenericSerializer::SerializeJob
j,RsGenericSerializer::SerializeContext& ctx,t_RsFlags32<N>& v,const
std::string& member_name)
                                                                                                                                                  ^~~~~~~~~~~
 2017-05-08 12:04:08 +02:00
Phenom
381aca4197 Fix Warnings: unused parameter ‘j’, 'ctx' & 'name' 
warning: unused parameter ‘j’ [-Wunused-parameter]
 void
RsChatLobbyListRequestItem::serial_process(RsGenericSerializer::SerializeJob
j,RsGenericSerializer::SerializeContext& ctx)
                                                                                   ^
 2017-05-08 12:04:08 +02:00
Phenom
dd089a9683 Fix Warnings: this ‘if’ clause does not guard 
warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
     if(service_id != RS_SERVICE_TYPE_CHAT)
     ^~
 2017-05-08 12:04:08 +02:00
Phenom
5050d4f66a Fix Warnings: unused parameter ‘indent’ 
warning: unused parameter ‘indent’ [-Wunused-parameter]
         virtual std::ostream& print(std::ostream &out, uint16_t indent
= 0) { return out; } // derived from RsItem, but should be removed
                                                                          ^
 2017-05-08 12:04:08 +02:00
Gioacchino Mazzurco
8e9b3c97d5 Fix missing include 2017-05-08 12:03:42 +02:00
Gioacchino Mazzurco
ea8f800003 Port GxsTrans to new serialization system 
RsItem added some comment and more verbose error reporting
RsTypeSerializer added support for RsItem derived classes as members
  added utility macros for better readability of the code and easier
  handling of RsItem derived members
  RS_REGISTER_SERIAL_MEMBER(I)
  RS_REGISTER_SERIAL_MEMBER_TYPED(I, T)
  RS_REGISTER_ITEM_TYPE(T)

RsNxsMsg::serial_process use new macros for better readability and to
 have an exemple of usage with RsTlvItem derived class
Fix undefined reference to RsNxsMsg::print
 2017-05-08 00:19:11 +02:00
csoler
b18a186c5f fixed ftExtraList to accept e2e encrypted transfers in addition to direct transfers. This fixed the drag+drop of shared files in a distant chat 2017-05-06 18:20:48 +02:00
csoler
59ac5a5bfa added on-the-fly fix of group privacy flags, so that edited groups with old un-set flags will be set automatically. Also fixes the bug preventing to grant membership on old circles 2017-05-06 16:51:38 +02:00
csoler
868c0467f2 fixed bug in serializer caused to not updating the size parameter. Also fixes unittests 2017-05-06 13:23:26 +02:00
csoler
f7f0d8ddd0 Merge pull request #800 from sehraf/pr-openssl-chacha20 
add support for openssl's chacha20-poly1305 implementation
 2017-05-05 23:10:07 +02:00
csoler
00c80b1c1e Merge pull request #797 from PhenomRetroShare/Fix_WindowsCompilation 
Fix Windows Compilation
 2017-05-05 23:06:25 +02:00
csoler
e4dde95621 Merge pull request #798 from PhenomRetroShare/Fix_TravisCompilation 
Fix UnitTest compilation
 2017-05-05 23:04:28 +02:00
sehraf
7371fdc432 add openssl chacha20 support 2017-05-05 21:01:19 +02:00
Gioacchino Mazzurco
f7f36f697e fixup! Merge branch 'master' into gxs_mail_experiments 2017-05-05 17:52:44 +02:00
Gioacchino Mazzurco
5159e326c7 Merge branch 'master' into gxs_mail_experiments 2017-05-05 15:44:22 +02:00
sehraf
96b4a1b2d8 add openssl chacha20-poly1305 support 2017-05-05 15:40:02 +02:00
csoler
e913f3689a fixed crash when trying to deserialize an empty buffer in rsrecogn 2017-05-04 21:40:32 +02:00
csoler
e6a7168122 merged upstream/master 2017-05-04 16:41:02 +02:00
Phenom
1c2b43b7e0 Fix UnitTest compilation 
But running failed.
 2017-05-04 15:01:25 +02:00
Phenom
d31b80c13a Fix Windows Compilation 2017-05-04 11:58:45 +02:00
csoler
4f4240d570 fixed bug in history serializer 2017-05-03 22:43:16 +02:00
csoler
214aaa7c9b added safety check for null chunks in TlvMemBlock_proxy deserialization 2017-05-03 22:20:58 +02:00
csoler
f006146ee4 merged upstream/master 2017-05-02 22:41:01 +02:00
csoler
4bee52c406 removed old unused serialization code 2017-05-02 22:34:45 +02:00