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
12,552 Commits 63 Branches 22 Tags 194 MiB
41aa675a9b
Commit Graph

5135 Commits

Author SHA1 Message Date
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
5b1c150acb
added background for post pinning and logic to edit others posts 2018-08-12 15:30:07 +02:00
csoler
ded9c21617
added selection boxes to add forum moderators 2018-08-09 21:18:37 +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
b20bd0a454
added admin list to forum group data 2018-07-15 10:13:04 +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
csoler
0cc87c9880
fixed bug causing search data result to not be forwarded correctly (missing request id) 2018-07-05 12:20:22 +02:00
csoler
0e37de3e11
made retrieval of group data manual instead of automatic 2018-07-05 11:43:55 +02:00
csoler
59c51a250b
removed debug switch to allow display of existing distant group search results 2018-07-05 10:16:48 +02:00
csoler
47e760a2c5
added a few missing mutexes in prevent searches to be shown when already known 2018-07-05 10:11:12 +02:00
csoler
2067b106e4
fixed missing code in passing turtle group data result to client service 2018-07-04 23:54:26 +02:00
csoler
8ad454723a
added group data request when search items are selected 2018-07-04 21:42:09 +02:00
Gioacchino Mazzurco
d3e5b760a2
DeepSearch index channels posts too 
Improve indexing using RsUrl, store some relevant fields in stored url
 2018-07-04 12:08:50 +02:00
Gioacchino Mazzurco
32014eaac1
Use proper path for DeepSearch xapian DB 2018-07-02 17:31:47 +02:00
Gioacchino Mazzurco
5a41b3cb37
Index only public channels 2018-07-02 17:31:47 +02:00
Gioacchino Mazzurco
0f63283f96
Add search capability to DeepSearch 2018-07-02 17:31:47 +02:00
Gioacchino Mazzurco
c15ae864b5
deep_search: use service serializer not serial_process 
Avoid tricky pointers arithmetic, thanks Cyril for suggestion
 2018-07-02 17:31:47 +02:00
Gioacchino Mazzurco
c0e92ddc6b
WIP Index GXS channels with xapian 
Use temporary DB ATM
 2018-07-02 17:29:54 +02:00
Gioacchino Mazzurco
ce61174d79
DROP before merge. Reduce INTEGRITY_CHECK_PERIOD 
So it run each two 2 minutes and it's easy to debug deep search
 2018-07-02 17:29:52 +02:00
Gioacchino Mazzurco
418c42bd11
Extra locators in cert invite made optional 2018-07-02 13:50:02 +02:00
Gioacchino Mazzurco
1dd707710b
Merge branch 'master' into extra_locators_merge 2018-07-02 12:22:23 +02:00
csoler
80a43fe3d5
added secure retrieval of distant groups 2018-06-30 21:52:25 +02:00
Gioacchino Mazzurco
1c63cec735
Expose some RsFiles method trought JSON API 2018-06-29 16:02:07 +02:00
Gioacchino Mazzurco
102558afdf
Merge fixes to serialization from master branch 2018-06-29 00:13:07 +02:00
sehraf
f7625e3526
fix json uint64 2018-06-28 20:25:10 +02:00
Gioacchino Mazzurco
d511b6648e
Extend JSON API to shutdown retroshare gracefully 2018-06-28 15:04:06 +02:00
Gioacchino Mazzurco
0ff80baed3
Extend JSON API with reasonable way to create location 2018-06-28 12:06:43 +02:00
csoler
db06c32e80
turned turtle encryption routine into a generic authenticated encryption method in librs::crypto 2018-06-28 10:01:57 +02:00
Gioacchino Mazzurco
4637fbaff5
Add login JSON API 
Implement a "normal" way to login RsLoginHelper::attemptLogin
Implement a way to get locations list RsLoginHelper::getLocations
Enable JSON API into retroshare-android-service
 2018-06-27 08:52:03 +02:00
csoler
00dfa0f3c2
added fallback for GXS GroupMessage UI to look into cached distant group data 2018-06-26 22:20:02 +02:00
Gioacchino Mazzurco
d14a455cf1
jsonapi-generator fix support for void methods 
Thanks sehraf for reporting
retroshare://forum?name=fucking%20genius&id=8fd22bd8f99754461e7ba1ca8a727995&msgid=503d75bf7ed7fa7568eeae4db5c8d31a7e124c98
 2018-06-26 22:01:17 +02:00
Gioacchino Mazzurco
cb11ad92ea
Merge branch 'master' into jsonapi 2018-06-26 15:19:25 +02:00
Gioacchino Mazzurco
502459a25a
Cleanup rapidjson inclusion 
Fix compilation error of android service
 2018-06-26 15:12:16 +02:00
Gioacchino Mazzurco
15f39129f1
Complete GxsChannels JSON API with blocking methods 
RsGxsIfaceHelper::requestStatus expose it to JSON API
Implemented RsGxsIfaceHelper::waitToken to wait for GXS operations
RsItem::serial_process fix doxygen warning as it's a comment not documentation
RsTypeSerializer add JSON conversion methods for double [de]serialization not
	implemented yet
RsTypeSerializer_PRIVATE_{FROM,TO}_JSON_ARRAY fix doxygen warning as it's a
	comment not documentation
make GxsChannels::ExtraFileHash a bit more reasonable
jsonapi-generator fix unused variable warning if there is no input or output
	paramethers
jsonapi-generator fix generation for inerithed jsonapi methods
Convert to RsSerializable some Gxs structs for the JSON API
 2018-06-26 13:20:24 +02:00
Gioacchino Mazzurco
d731b665db
Expose tokenservice methods trough GxsIfaceHelper 2018-06-25 10:44:39 +02:00
Gioacchino Mazzurco
2f4b9b3e20
Convert to RsTokenService::GxsRequestStatus 
Indicate GxsRequest status with an enum instead of uint_* that make the
  code less readable and more prone to errors
 2018-06-24 23:24:52 +02:00
Gioacchino Mazzurco
b4d2ce82c1
RsTokenService use enum for request status 2018-06-24 18:56:48 +02:00
Gioacchino Mazzurco
ec95b6d054
Remove unused misleading GXS request status 
Something must be really strange to be finished and incomplete at same
  time..
 2018-06-24 18:03:26 +02:00
csoler
e351d7257e
added retrieval of search results in UI 2018-06-24 16:55:38 +02:00
Gioacchino Mazzurco
7ad337c8d2
Implement automatic JSON API generation 
qmake file add jsonapi-generator target to compile JSON API generator
qmake files add rs_jsonapi CONFIG option to enable/disable JSON API at compile
  time
RsTypeSerializer pass down same serialization flags when creating new context
  for nested objects serial job
RsGxsChannels expose a few methods through JSON API as example
Derive a few GXS types (RsGxsChannelGroup, RsGxsChannelPost, RsGxsFile,
  RsMsgMetaData) from RsSerializables so they can be used for the JSON API
Create RsGenericSerializer::SERIALIZATION_FLAG_YIELDING so JSON objects that
  miss some fields can be still deserialized, this improve API usability
SerializeContext offer friendly constructor with default paramethers
Add restbed 4.6 library as git submodule as most systems doesn't have it yet
Add a bit of documentation about JSON API into jsonapi-generator/README.adoc
Add JsonApiServer class to expose the JSON API via HTTP protocol
 2018-06-24 16:28:33 +02:00
csoler
6ccc7654d6
added code to notify GxsBroadcast system with new distant search results 2018-06-23 22:25:36 +02:00
csoler
5b9666855d
fixed merge with upstream 2018-06-22 23:38:31 +02:00
csoler
2f159efb10
Merge pull request #1288 from csoler/v0.6-GxsFix 
changed std::vector into std::set in notification system, hence remov…
 2018-06-22 22:06:59 +02:00
csoler
84699db744
changed std::vector into std::set in notification system, hence removing lots of std::find(std::vector::begin(),std::vector::end(),T), causing quadratic costs in multiple places. 2018-06-21 15:46:59 +02:00
csoler
3981bc8e3b
extended notification system to add distant search result notification 2018-06-21 13:48:57 +02:00
csoler
5cb48c27de
renamed a few constants of GXS notify system into more consistent values 2018-06-21 09:26:03 +02:00
G10h4ck
9090205747
Merge pull request #1284 from G10h4ck/improve_build 
Improve build and Windows Continuos Integration
 2018-06-19 11:53:07 +02:00
csoler
79e676edbe
fixed re-load of GXS groups (forums/channels) when the read flag is changed 2018-06-18 22:27:05 +02:00
csoler
c67084b7de
fixed mutex problem in turtle-GXS search 2018-06-17 21:23:16 +02:00
csoler
84194b6234
sereral fixes to GXS distant search 2018-06-16 22:39:35 +02:00
csoler
7a135c5c43
added quick and dirty turtle search for channels in Files search tab 2018-06-13 22:46:27 +02:00
csoler
be1e127a93
added test search functions in rsgxsnetservice 2018-06-11 22:00:03 +02:00
Gioacchino Mazzurco
1f76108a9e
Remove some cruft from build files 2018-06-11 14:21:28 +02:00
csoler
6fb459ce64
added logic for GXS search in RsGxsNetTunnel and Gxs client net service 2018-06-10 22:34:17 +02:00
Gioacchino Mazzurco
6010104127
Merge commit '9886840b79d617a32764ad52ef4747f5fd999250' 2018-06-09 18:10:22 +02:00
Gioacchino Mazzurco
9886840b79
Provide proper constructor for SerializeContext 
Deprecate constructor that depends on deprecated declarations.
 2018-06-09 17:59:11 +02:00
Gioacchino Mazzurco
1825b263f0
ChunkMap::reAskPendingChunk fix unused parameter warning 2018-06-09 17:21:59 +02:00
cyril soler
8edb1f7535 fixed problem causing infinite loop of net reset in p3NetMgr 2018-06-08 14:32:56 +02:00
G10h4ck
f3b0f7af1f
Merge pull request #1280 from G10h4ck/channels_apiv2_improvements 
Channels apiv2 improvements
 2018-06-07 17:53:42 +02:00
G10h4ck
e5c72481ad
Merge pull request #1281 from G10h4ck/filesharing_apiv2_improvements 
Extend a bit filesharing JSON API v2
 2018-06-07 17:53:26 +02:00
Gioacchino Mazzurco
3eff851cdb
Improve deprecation of RS_TOKREQ_ANSTYPE_* 2018-06-07 14:57:31 +02:00
csoler
7caf06b57d
added structures for generic turtle search and access functions in Gxs objects 2018-06-06 23:15:29 +02:00
csoler
b5c1b8210b
added classes for both group data and group summary results in turtle search 2018-06-02 18:12:27 +02:00
csoler
90d7f55c40
finished implementing GXS search items 2018-05-31 15:41:54 +02:00
csoler
b0f391d66f
fixed compilation and re-licensed zeroconf/ 2018-05-30 21:45:18 +02:00
csoler
bc63726c4c
fixed compilation 2018-05-30 21:35:29 +02:00
csoler
8641da189c
relicensed util/ and moved rsaes to crypto/ 2018-05-30 21:34:38 +02:00
csoler
858dcfc14c
removed unused tempering in random number generator, added comments and license text 2018-05-30 21:19:53 +02:00
csoler
6cf2090149
relicensed tcponudp, turtle, unused, upnp, and part of util/ 2018-05-30 21:19:13 +02:00
csoler
b3853156ce
re-licensed services/ 2018-05-29 21:54:27 +02:00
csoler
70f09b654c
re-licensed serialiser/ 2018-05-29 21:27:12 +02:00
csoler
05e2f684a9
re-licensed rsitems and rsserver 2018-05-29 21:08:17 +02:00
csoler
ff8c37f169
fixed license in retroshare/ 2018-05-28 22:28:51 +02:00
csoler
b3277824eb
license fix in pqi 2018-05-28 22:03:39 +02:00
csoler
1fee544db7
re-licensed gxstrans, gxstunnel, pgp, plugins and half pqi 2018-05-26 14:45:43 +02:00
csoler
33fe823127
Merge pull request #1271 from sehraf/pr_compile-fix-unused-services 
make wiki and photo services compile again
 2018-05-26 11:22:47 +02:00
csoler
8a07f2c8c4
fixed wrong commit with copy-pasted code 2018-05-24 19:50:07 +02:00
csoler
d5627d4b22
fixed license in ft, grouter, and gxs 2018-05-22 22:03:11 +02:00
Gioacchino Mazzurco
1ad1fdc7be
p3NetMgrIMPL::checkNetAddress() notify if port change 
Plus cleanups and proper sockaddr_storage copy
 2018-05-22 19:17:37 +02:00
Gioacchino Mazzurco
0bf02e2bc3
pqissludp::Initiate_Connection() check remote_addr to be IPv4 before use 2018-05-22 19:14:25 +02:00
csoler
544b4af4c2
fixed license in chat, crypto, dht, file_sharing 2018-05-21 20:50:38 +02:00
csoler
50b360bf9d
added missing license to some libresapi files 2018-05-21 20:17:54 +02:00
sehraf
0c19a5640e
compile fix gxsphoto 2018-05-21 14:55:10 +02:00
sehraf
92b21d7332
compile fix wikipoos 2018-05-21 14:26:46 +02:00
Gioacchino Mazzurco
5a301734a9
Extend a bit filesharing JSON API v2 2018-05-17 16:46:34 +02:00
csoler
28981b6c86
Merge pull request #1251 from PhenomRetroShare/Fix_Cppcheck(duplInheritedMember)InRsItem 
Fix CppCheck duplInheritedMember warning in RsItem
 2018-05-16 13:37:02 +02:00
csoler
2145911ac4
Merge pull request #1262 from PhenomRetroShare/Fix_PartialDirCheck 
Fix Partial Dir Check
 2018-05-16 13:30:56 +02:00
csoler
3f88e3e901
added check to avoid hashing files that are currently being modified 2018-05-16 13:24:52 +02:00
csoler
8451550561
added missing licence to file_tree.h 2018-05-16 11:40:39 +02:00
csoler
291c86e2d0
Merge pull request #1265 from csoler/v0.6-GxsFix 
fixed bug causing new forums and identities to not show up immediately
 2018-05-16 11:17:22 +02:00
csoler
4661329bee
fixed bug causing new forums and identities to not show up immediately 2018-05-16 11:15:18 +02:00
G10h4ck
9f37b63e4d
Merge pull request #1264 from G10h4ck/channel_json_api_v2 
Channel json api v2
 2018-05-16 10:49:28 +02:00
Phenom
f12cd5774d Fix Partial Dir Check 
Add WrongValue StyleSheet property, when bad directory selected.
Update QLineEdit with current setting so it's possible to see if
something is modified. No need to restart.
 2018-05-12 14:31:28 +02:00
csoler
4d287d68bc
fixed weird mistake in grouter which causes an issue only in gcc > 8 2018-05-09 13:27:16 +02:00
Phenom
f39fd069b5 Fix CppCheck duplInheritedMember warning in RsItem 
/libretroshare/src/rsitems/rsitem.h:92: warning:
Cppcheck(duplInheritedMember): The class 'RsPeerNetItem' defines member
variable with name 'peerId' also defined in its parent struct 'RsItem'.
/libretroshare/src/rsitems/rsitem.h:92: warning:
Cppcheck(duplInheritedMember): The class 'RsHistoryMsgItem' defines
member variable with name 'peerId' also defined in its parent struct
'RsItem'.
/libretroshare/src/rsitems/rsitem.h:91: warning:
Cppcheck(duplInheritedMember): The class 'RsBanListConfigItem' defines
member variable with name 'type' also defined in its parent struct
'RsItem'.
/libretroshare/src/rsitems/rsitem.h:92: warning:
Cppcheck(duplInheritedMember): The class 'RsBanListConfigItem' defines
member variable with name 'peerId' also defined in its parent struct
'RsItem'.
 2018-05-07 17:29:11 +02:00
csoler
a6821f4ded
Merge pull request #1249 from sehraf/pr_libsecret 
Add support for libsecret (including KDE keyring) and fix retroshare-nogui autologin
 2018-05-06 23:02:18 +02:00
Phenom
dca33daae8 Fix CppCheck in ftcontroller.cc 
/libretroshare/src/ft/ftcontroller.cc:91: warning:
Cppcheck(passedByValue): Function parameter 'fname' should be passed by
reference.
/libretroshare/src/ft/ftcontroller.cc:92: warning:
Cppcheck(passedByValue): Function parameter 'tmppath' should be passed
by reference.
/libretroshare/src/ft/ftcontroller.cc:92: warning:
Cppcheck(passedByValue): Function parameter 'dest' should be passed by
reference.
/libretroshare/src/ft/ftcontroller.cc:1482: warning:
Cppcheck(stlIfStrFind): Inefficient usage of string::find() in
condition; string::compare() would be faster.
/libretroshare/src/ft/ftcontroller.cc:1491: warning:
Cppcheck(stlIfStrFind): Inefficient usage of string::find() in
condition; string::compare() would be faster.
 2018-05-06 18:54:25 +02:00
csoler
e7182013bf
added items for generic search result items for GXS 2018-05-05 18:41:41 +02:00
csoler
0ada4d4895
improved GxsNetTunnel comment section 2018-05-05 18:08:27 +02:00
sehraf
1129bcb0c0
Add support for libsecret 2018-05-04 20:47:41 +02:00
csoler
8d5c013a17
added proper synchronization of GxsIds through tunnels of another service 2018-05-03 23:21:59 +02:00
csoler
8e111c2ee2
added rapidjson-1.1.0 code hard-coded in the source directory to allow everyone to compile without the need to tweak too much. When v1.1.0 is mainstream (espcially on ubuntu) we can revert back to an external dependency 2018-05-02 22:46:27 +02:00
csoler
4d6fed643a
reverted to single GxsTunnelService shared for all services 2018-05-01 20:10:56 +02:00
csoler
ba0819f8d0
added additional debug info to test proper distant request of GXS ids 2018-05-01 15:17:41 +02:00
csoler
c5ba0e975f
fixed TS in tunnel management 2018-04-29 19:20:14 +02:00
csoler
9973978350
improved management of tunnels and virtual peers 2018-04-29 16:19:45 +02:00
Gioacchino Mazzurco
be75e89ad2
Fix compialtion after merge 2018-04-27 20:55:38 +02:00
Gioacchino Mazzurco
f3ae61b462
Merge branch 'json_experiments' 2018-04-27 18:17:09 +02:00