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
8,440 Commits 63 Branches 22 Tags 194 MiB
3b18c43d8e
Commit Graph

3455 Commits

Author SHA1 Message Date
csoler
682930938b merged PR 219 from Jolavilette+Phenom, with some minor modifications 2015-12-29 23:40:09 -05:00
csoler
2fe646c5cb merged PR 219 from Jolavilette+Phenom, with some minor modifications 2015-12-29 23:39:52 -05:00
Gio
3cfa22e35b Guard checkNetAddress debug, unary + comment clarification 2015-12-29 23:51:16 +01:00
csoler
9e0dc01110 changed the reset of client map into a reset f server map when subscribing a group 2015-12-29 17:31:35 -05:00
Cyril Soler
2d438b7407 Merge pull request #162 from G10h4ck/getLocalAddresses 
Get local addresses
 2015-12-29 16:39:15 -05:00
Phenom
4521e8ee95 Fix pqihandler::UpdateRates() to get more accurate. 2015-12-28 13:48:26 +01:00
Cyril Soler
00517fe68d Merge pull request #223 from csoler/v0.6-ContactList 
V0.6 contact list
 2015-12-27 22:22:51 -05:00
csoler
71b3638c36 removed some debug output in distant chat 2015-12-27 22:19:30 -05:00
csoler
a80a6669b6 added notifiction of denying conversation for distant chat 2015-12-27 22:16:04 -05:00
csoler
9dfac71822 connected GUI to distant chat permission flags system 2015-12-27 21:10:20 -05:00
csoler
672ab256d7 added safeguard against absurdly large packets in rsserial.cc and output of the beginning of the packet. 2015-12-27 10:03:07 -05:00
csoler
140205108a added backend for distant message and distant chat filtering based on contact list 2015-12-25 22:37:06 -05:00
electron128
e3f496f3d9 fixed bug from contact list branch. Identity flags (pgp-linked, contact) where resettet so signed lobbies did not work. 2015-12-24 13:21:40 +01:00
Cyril Soler
f30f71db8e Merge pull request #218 from csoler/v0.6-ContactList 
V0.6 contact list
 2015-12-23 18:07:10 -05:00
csoler
52da8cd0e6 fixed display of contactlist when changing status, and improved computaitonal efficiency 2015-12-23 12:08:20 -05:00
csoler
98b27d6a2b moved notify calls to RsGenExchange out of RsGxsNetService lock zone, to avoid deadlocks 2015-12-23 11:18:26 -05:00
defnax
226948cab5 Merge pull request #217 from PhenomRetroShare/Fix_CompilationWhenNXS_NET_DEBUG_0 
From jolavillette-morkitu: in rsgxsnetservice.cc when #define
 2015-12-23 14:08:28 +01:00
Phenom
1346259411 Miss recomment NXS_NET_DEBUG_0... 2015-12-23 13:45:39 +01:00
Phenom
4aea100e4f From jolavillette-morkitu: in rsgxsnetservice.cc when #define 
NXS_NET_DEBUG_0 is set to 1 the compilation fails with:
gxs/rsgxsnetservice.cc: In member function ‘void
RsGxsNetService::updateClientSyncTS()’:
gxs/rsgxsnetservice.cc:1686:117: error: ‘now’ was not declared in this
scope
 2015-12-23 13:40:01 +01:00
csoler
5d9272055f merged with upstream/master 2015-12-22 18:33:01 -05:00
Phenom
86b559191e Fix MacOSX 10.10 Yosemite Compilation 
by using retroshare.pri file like linux or windows,
 fixing namespace for unordered_set,
 fixing c++11 for ostream& operator<<,
 checking if ntohll and htonll already defined.
 2015-12-22 17:27:51 +01:00
Gio
436f619fcb getLocalAddresses collects loopback address too 2015-12-21 17:34:53 +01:00
Gio
9d78bba3b8 Guard getLocalAddresses debug 2015-12-21 15:48:59 +01:00
Gio
9826c72969 added rs_inet_ntop crossplatform version of inet_ntop 2015-12-21 15:32:28 +01:00
Gio
ca1a9707ef Removed dead code 2015-12-21 15:31:47 +01:00
Gio
1b2fa3600a Adapted getLocalAddresses() includes for windows 2015-12-21 15:31:46 +01:00
Gio
5a541e7feb Removed unused getLocalInterfaces_ipv4 2015-12-21 09:10:00 +01:00
Gio
77bcc99030 Added sockaddr_storage_dump(...), implemented sockaddr_storage_ipv6_iptostring(...) 2015-12-21 09:10:00 +01:00
Gioacchino Mazzurco
747a03a0b9 Substitute getpreferredinterface flawed logic with simpler getLocalAddresses still just one address used at moment 2015-12-21 09:10:00 +01:00
Cyril Soler
f12b4a1474 Merge pull request #213 from csoler/v0.6-GxsDebug 
fixed a number of memory leaks in gxsnetservice. Used a class that au…
 2015-12-20 20:53:11 -05:00
csoler
d4926cbc61 fixed a number of memory leaks in gxsnetservice. Used a class that auto-deletes retrieved items. 2015-12-20 20:35:48 -05:00
csoler
ea137adc42 fixed compilation on OSX pb in pqistreamer 2015-12-20 19:07:04 -05:00
Cyril Soler
d50875b9bb Merge pull request #212 from csoler/v0.6-TrafficOptim 
V0.6 traffic optim
 2015-12-19 21:38:55 -05:00
csoler
141b799c9d removed debug info 2015-12-19 21:20:25 -05:00
Cyril Soler
124da6f3b7 Merge pull request #210 from G10h4ck/pqicleaning 
[RFC] Made pqiperson more readable evidence some strange code
 2015-12-19 21:12:57 -05:00
csoler
462f969da7 merged with upstream/master 2015-12-19 19:15:48 -05:00
csoler
ccc5f0f8fc improved debug info in rsgxsnetservice 2015-12-19 19:04:49 -05:00
csoler
5fcaa36736 fixed some serialising bugs, and added proper notification of observer 2015-12-19 19:00:06 -05:00
csoler
6910ad3695 added stats exchange system to gather number of posts in unsubscribed groups without the need to actually DL the messages (reduced bw a lot) 2015-12-19 17:38:52 -05:00
Gio
b2c27a1fed Made pqiperson more readable evidence some strange code 2015-12-19 22:10:07 +01:00
csoler
b1b75a35a1 fixed stupid bug causing cleanRejectedMessages() to be called continuously 2015-12-18 08:07:00 -05:00
Cyril Soler
374aa65c66 Merge pull request #209 from csoler/v0.6-GxsDebug 
added rejection list to gxsnetservice that is fed by calls from GenEx…
 2015-12-17 23:10:02 -05:00
csoler
e8b881b2f1 added rejection list to gxsnetservice that is fed by calls from GenExchange system, to avoid infinitely re-downloading rejected messages due to bad reputation, bad signatures, missing ids, etc 2015-12-17 23:08:02 -05:00
Cyril Soler
45fb453e92 Merge pull request #208 from csoler/v0.6-GxsDebug 
V0.6 gxs debug
 2015-12-17 09:23:16 -05:00
csoler
55e66d090c fixed mismatch between API versions causing signed groups created with old API to fail author signature checking 2015-12-17 00:08:08 -05:00
csoler
dc034fe523 removed debug info from GxsNetService 2015-12-15 23:17:35 -05:00
csoler
0c4fd8e274 added missing time-stamping of keys 2015-12-15 18:13:40 -05:00
csoler
3617f9ced0 added NXS_NET_DEBUG_5 to print summary of incoming items 2015-12-15 18:09:49 -05:00
csoler
92780b7688 added auto-request of missing GXS ids for group posts authors and group authors 2015-12-15 18:01:03 -05:00
electron128
f7ab3ad04f allow plugins to integrate into the JSON API 2015-12-15 19:56:49 +01:00
csoler
8d886b8ecc added regular timestamp-ing of GXS ids of group authors and group post authors for all subscribed groups 2015-12-15 12:31:03 -05:00
csoler
3f132f2c33 added missing timestamp at message creation time and group creation time 2015-12-14 21:13:44 -05:00
csoler
f702c942ed added a few methods to improve consistency between client and server sides, and force update of groups in some cases (such as database erased) 2015-12-13 18:22:04 -05:00
csoler
82d43eb8a0 fixed a few bugs in packet packing in pqistreamer. 2015-12-12 23:07:33 -05:00
csoler
ed7a261001 added check for NULL client update map in rsgxsnetservice::debugDump() 2015-12-12 21:07:48 -05:00
csoler
ad1aafebf7 added missing mutex 2015-12-12 14:05:45 -05:00
csoler
f6a84aa4ad added packet packing in pqistreamer. To be tested for improvement in bw 2015-12-12 11:52:48 -05:00
csoler
534be72360 improved debug info in rsgxsnetservice.cc 2015-12-11 22:54:45 -05:00
csoler
7be7233b29 fixed a number of timing issues in rsgxsnetservice. To be tested. 2015-12-11 22:38:17 -05:00
csoler
66d6f053f5 added debugDump() method to display update timestamps of GXS groups on both sides 2015-12-11 19:01:20 -05:00
csoler
16d815f891 added protocol documentation in rsgxsnetservice.cc 2015-12-11 18:03:44 -05:00
csoler
039db26cd2 improved debug info in rsgxsnetservice.cc 2015-12-10 22:25:09 -05:00
csoler
c9af8e3240 improved debug info in rsgxsnetservice.cc 2015-12-10 22:08:28 -05:00
csoler
3cb3662d2d improved debug info in rsgxsnetservice.cc 2015-12-10 21:54:48 -05:00
csoler
9db0524f34 merged with upstream/master 2015-12-10 00:10:51 -05:00
csoler
9843c1fb34 started updating debug info in gxsnetservice 2015-12-10 00:03:01 -05:00
csoler
893f178ce1 changed GxsTunnel method for computing turtle hash, to avoid crashing old peers 2015-12-07 23:09:44 -05:00
csoler
0957e7068a changed the method of computation for tunnel hashes in global router in order to avoid conflict with GxsTunnel service (breaks compatibility of distant message sending) 2015-12-07 22:39:45 -05:00
Cyril Soler
e2542a6c50 added missing check after deserialisation of grouter item which caused a crash when receiving a malformed message data 2015-12-07 10:02:04 -05:00
csoler
0c1e6301b3 merged with latest upstream trunk 2015-12-05 16:49:00 -05:00
electron128
7cd880e1e4 removed member gxs_id from ChatId class, because ChatId now uses tunnel ids stored in distant_chat_id for distant chat. 
reverted naming confusion in in libresapi ChatHandler and fixed author of distant chat messages (distant chat is still unfinished)
 2015-12-05 17:00:57 +01:00
Cyril Soler
0ac76d621e Merge pull request #188 from csoler/v0.6-SecuredTunnelService 
V0.6 secured tunnel service. Please reports bugs to me (I have tested with valgrind and as many configurations as possible, but the multi-service gathering into GXS tunnels shared for each GXS id pair is not a totally simple thing, so I expect to have missed a few issues).
 2015-12-05 10:28:16 -05:00
csoler
325956e8ed renamed flag for messaging permissions to a more appropriate name 2015-12-04 23:15:52 -05:00
csoler
be17a563d1 fixed compilation and added flag function for permissions in messaging 2015-12-04 23:08:49 -05:00
csoler
9193d3579b merged with latest master before creating PR 2015-12-04 21:24:51 -05:00
csoler
318be3a2ad fixed a few bugs in distant chat: disabled history (for now), improved tunnel handling 2015-12-04 00:06:14 -05:00
csoler
b198f1a007 fixed some cleaning of remotely closed tunnels in GxsTunnelService 2015-12-03 00:34:13 -05:00
realityfabric
9f561993ee fixed spelling errors in several files 2015-12-02 06:18:17 -08:00
csoler
81b196d38d added GUI to display authenticated tunnel info. Added counting of data sent/recvd. 2015-12-01 23:40:35 -05:00
csoler
266652f70e put ifdefs around debug info in tunnel service 2015-11-30 21:02:12 -05:00
csoler
12866cd735 fixed a few bugs in new distant chat 2015-11-30 20:51:47 -05:00
csoler
81ab43beb9 fixed GUI update of avatars and status for distant chat. Updated backend for new model. Fixed a few bugs in serialisation 2015-11-30 00:02:44 -05:00
csoler
6951d730a5 debugging of GxsTunnel service - fixed transport layer 2015-11-28 18:02:57 -05:00
csoler
a29f15ae32 fixed compilation, added missing methods for new distant chat 2015-11-28 14:55:56 -05:00
csoler
6ca49a2d98 fixed serialisation methods for GxsTunnel service 2015-11-27 23:37:39 -05:00
csoler
a2e0f4196b updated GUI for new distant chat 2015-11-26 20:40:06 -05:00
Cyril Soler
874f304cd2 Merge pull request #167 from G10h4ck/pqicleaning 
Removed some cruft like mymethod(){return;} from pqi
 2015-11-26 14:48:30 -05:00
csoler
87ede7eff5 removed debug info 2015-11-25 18:41:40 -05:00
csoler
bca89c63c6 fixed serialisation bug and added new GUI bits 2015-11-25 18:08:53 -05:00
csoler
26f4523f5f fixed compilation 2015-11-25 17:34:13 -05:00
csoler
b552408aab added service part and item queues to GXS tunnel service 2015-11-24 21:57:59 -05:00
csoler
19f1a82bd8 fixed compilation 2015-11-23 22:31:31 -05:00
csoler
85a9e4cbae coding phase done. Needs testing/debugging 2015-11-23 22:19:18 -05:00
csoler
5c0f1dac08 saving ongoing work. Implementation almoast finished. 2015-11-22 23:19:46 -05:00
csoler
8df9d4be04 added some doc for tunnel service. Fixed a few function prototypes 2015-11-22 11:36:14 -05:00
Jenster
699299ae8a latest OSX patches 2015-11-20 08:10:59 -08:00
csoler
3fbbc57a1f added update of flags for contacts 2015-11-19 23:04:13 -05:00
csoler
1347ee4b37 added regular contacts list and method to move RsGxsIds from/into this list 2015-11-19 22:58:28 -05:00
csoler
1de55d8fc5 replaced the few bools in RsIdentityDetail by a set of flags 2015-11-19 21:14:32 -05:00
csoler
cb97ce6f72 half-way through GxsTunnel service 2015-11-18 23:56:35 -05:00