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
csoler
99d8b7d5d8
switched service control items to new serialization
2017-05-01 21:23:34 +02:00
csoler
3d17d31e49
Merge pull request #789 from PhenomRetroShare/Add_FriendTimeOffsetNewsFeed
...
Add Friend Time Offset news feed.
2017-04-30 22:43:10 +02:00
csoler
16b8947af1
improved serializer documentation
2017-04-30 20:31:43 +02:00
