Commit Graph

5037 Commits

Author SHA1 Message Date
Gioacchino Mazzurco
ab6a5c07cc
RsLoginHelper::createLocation expose capability of creating hidden locations 2018-08-22 17:22:27 +02:00
Gioacchino Mazzurco
8f7bacbb35
Remove #pragma once in .cc file
It was probably introduced by copy paste error on license cleanup
2018-08-22 17:00:22 +02:00
Gioacchino Mazzurco
396fe49312
Merge branch 'master' into jsonapi 2018-08-22 16:59:42 +02:00
Gioacchino Mazzurco
fe8c2c4683
Merge branch 'jsonapi' of github.com:G10h4ck/RetroShare into jsonapi 2018-08-16 23:51:35 +02:00
Gioacchino Mazzurco
4b6f751b09
Implement JSON API generation for async API calls
Move JSON helpers to util/rsjson.* for better usability
Implement JSON ostream manipulator to print compact and pretty JSON
Use lambdas for API wrappers, integrate better and avoid namespace
  pollution
Removed experimental JSON API for notify client wrapper, notifications
  can be implemented automatically with moderns async API calls
Implement and automatically expose to JSON API
  RsGxsChannels::turtleSearchRequest(
        const std::string& matchString,
        const std::function<void (const RsGxsGroupSummary&)>& multiCallback,
        std::time_t maxWait )
2018-08-16 23:48:21 +02:00
Gioacchino Mazzurco
b7f5d4286f
RsGxsNetService::receiveTurtleSearchResults fix deadlock
Avoid notifing observer while the mutex is locked by storing results in
a temporary set
2018-08-16 14:26:41 +02:00
csoler
cc51298de6
fixed warning about badly overloaded function in rsexpr.h 2018-08-02 14:13:14 +02:00
csoler
985be3504e
fixed compilation with RS_AUTO_LOGIN 2018-08-01 23:05:36 +02:00
sehraf
97194fd092
Add wrapper function to convert uint16_t service IDs to internal unsigned int.
Use it when looking up service names.
2018-08-01 20:47:02 +02:00
csoler
c948517c3d
Merge pull request #1306 from csoler/v0.6-TorOnly
V0.6 tor only
2018-07-31 14:18:24 +02:00
csoler
ecd45215c7
disallow empty file when loading shared file list in order to avoid malloc of size 0 2018-07-31 14:13:01 +02:00
csoler
1297d2e106
fixed double calls to pthread_exit() (one being implicit after return from main thread method) -- patch from sss 2018-07-30 10:50:32 +02:00
csoler
d7c7e35d71
fixed compilation on MacOS 2018-07-27 15:15:04 +02:00
csoler
cc1a05ddc9
fixed certificate creation in TorAuto mode 2018-07-27 12:33:06 +02:00
csoler
62b9a74324
fixed running with TorControl in new mode 2018-07-25 15:31:18 +02:00
csoler
d1a375cbd0
removed RETROTOR #ifdef and started using RsAccounts::isTorAuto() instead. Unfinished yet. 2018-07-25 11:37:40 +02:00
Gioacchino Mazzurco
d2a62b03ee
Fix deep search returning 0 results 2018-07-25 00:29:36 +02:00
Gioacchino Mazzurco
b4dd89dd87
Fix deep search returning 0 results 2018-07-25 00:27:39 +02:00
csoler
0f758902cd
started cleaning the mess with rsAccounts: only exposed useful functionality of rsAccount beyond a static class and removed all references to rsAccounts in the code 2018-07-24 23:47:32 +02:00
sehraf
7af5075891
fix jsonapi.h 2018-07-24 20:59:20 +02:00
sehraf
e6acb52d17
add simple chat support 2018-07-24 20:09:45 +02:00
thunder2
7128a04525 Added Xapian to Windows build environment 2018-07-24 16:03:32 +02:00
Gioacchino Mazzurco
1bc518041c
Experiment of notification via NotifyClient + JSON API 2018-07-23 14:52:17 +02:00
Gioacchino Mazzurco
130007b578
Merge branch 'master' into jsonapi 2018-07-23 13:44:01 +02:00
G10h4ck
fbc4e4205d
Merge pull request #1292 from G10h4ck/deep_search
Content search for channels trough xapian
2018-07-23 11:48:55 +02:00
Gioacchino Mazzurco
e8c9ba52b2
Improve code quality after Cyril review 2018-07-23 11:18:32 +02:00
Gioacchino Mazzurco
6f8c2f6f41
Fix compilation if deep_search is disabled 2018-07-22 23:39:06 +02:00
Gioacchino Mazzurco
51c25219bb
Fix compiling with old GCC 2018-07-22 22:47:30 +02:00
Gioacchino Mazzurco
d9aa37219c
Revert "DROP before merge. Reduce INTEGRITY_CHECK_PERIOD"
This reverts commit ce61174d79.
2018-07-22 21:45:43 +02:00
Gioacchino Mazzurco
f97dc8a125
Properly plug deep search in GXS search
Some modifications breaks retrocompatibility of GXS search:
  remove horrible templated RsTypeSerializer::serial_process for
    RsGxsGroupSummary with hardcoded member names
  RsGxsGroupSummary doesn't use old TLV serialization format anymore
  RsGxsGroupSummary remove unused description member
  RsGxsGroupSummary derive from RsSerializable and use serialization
    helper macro
Add autor id and signature flags to the index so there is no need to
  retrive them from GXS, thus improving performances
RsGroupNetworkStats initialize members properly
RsGxsGroupSummary rename members to follow usual mMemberName convention
2018-07-22 21:33:40 +02:00
csoler
82c9084ca4
Merge pull request #1303 from csoler/v0.6-GXS-DistSync3-TurtleSearch
fixed deadlock due to turtle calling addVirtualPeer for client servic…
2018-07-22 00:22:51 +02:00
csoler
2ab12a2ef5
fixed deadlock due to turtle calling addVirtualPeer for client services inside a mutex protected zone (breaks mutex order service > turtle) 2018-07-22 00:21:45 +02:00
Gioacchino Mazzurco
6982ae6cd5
Improve retrocompatibility with older xapian 2018-07-21 13:35:05 +02:00
Gioacchino Mazzurco
ff166b2295
Merge branch 'master' into deep_search 2018-07-21 12:57:05 +02:00
csoler
e72ef242c9
Merge pull request #1298 from csoler/v0.6-DebianPackaging
V0.6 debian packaging
2018-07-20 19:16:58 +02:00
Gioacchino Mazzurco
3fc9ff3fef
WIP Plug deep search into GXS search 2018-07-20 15:29:37 +02:00
Gioacchino Mazzurco
a31b06ab60
Merge branch 'master' into deep_search
Needed to make deep search and GXS search cooperate
2018-07-20 13:15:11 +02:00
csoler
d4fce07e4c
changed lrand48 to RSRandom for cross-plateform compatibility, in rsgxsnettunnel.cc 2018-07-19 23:46:31 +02:00
csoler
2bab688dec
fixed merge with upstream/master 2018-07-19 23:22:24 +02:00
csoler
b8062f2e21
Merge pull request #1294 from csoler/v0.6-GXS-DistSync3-TurtleSearch
V0.6 gxs dist sync3 turtle search
2018-07-19 22:59:43 +02:00
csoler
dac885e24d
made randomBias initilized with true random bytes at start 2018-07-18 21:22:38 +02:00
csoler
9b0a4b966e
removed extra call to loadConfiguration() 2018-07-18 21:20:51 +02:00
sehraf
55e99ef0d1
add auto detection of installed rapidjson 2018-07-16 23:22:04 +02:00
csoler
1de31493a9
fixed up display of GXS net tunnel info 2018-07-15 19:09:12 +02:00
csoler
fd45d44826
added interface to get statistics about GxsNetTunnel 2018-07-15 11:14:58 +02:00
csoler
6848a586f3
merged upstream/master 2018-07-08 21:17:48 +02:00
chelovechishko
b3dddeafdf add missing namespaces 2018-07-06 23:55:12 +09:00
csoler
0c45217fc0
merged upstream/master 2018-07-05 17:41:30 +02:00
csoler
98f8e4da0a
added per-item type limit for turtle search results 2018-07-05 17:40:06 +02:00
csoler
4a64ea5f1f
added optional use of dist sync in GroupFrameDialog 2018-07-05 14:00:04 +02:00