Commit Graph

5724 Commits

Author SHA1 Message Date
csoler
2bd5bb5a3e
fixed merge with master 2020-01-11 00:08:36 +01:00
Gioacchino Mazzurco
33c2f56a8e
Fixup jsonapi server stopping 2020-01-08 23:16:05 +01:00
Gioacchino Mazzurco
f12ec2b535
JSON API service and RsThread fixups 2020-01-08 14:24:46 +01:00
hunbernd
0e8b12ff9f Merge upstream 2020-01-07 15:05:21 +01:00
Gioacchino Mazzurco
014b5255ed
Fixup windows build 2020-01-07 02:00:57 +01:00
Gioacchino Mazzurco
8718a442d1
Merge branch 'master' of github.com:RetroShare/RetroShare 2020-01-07 01:50:44 +01:00
Gioacchino Mazzurco
880a328c91
Fixup nested include in rsinit.cc 2020-01-07 01:50:17 +01:00
Gioacchino Mazzurco
b17738f668
Merge branch 'csoler-v0.6-SecNotification' 2020-01-07 01:19:08 +01:00
Gioacchino Mazzurco
babd2938c2
Print libretroshare version on init 2020-01-07 01:18:29 +01:00
Gioacchino Mazzurco
37b5d8f307
Fix few glitches in Cyril PR 2020-01-07 00:54:49 +01:00
csoler
c1e23099a0
improved the logic of incoming item handling a little bit: only check service id for items that are for us, and store items with missing keys in waiting queue 2020-01-06 22:23:07 +01:00
Gioacchino Mazzurco
c96223a2a8
Merge "Switched security items to new notification system #1735" csoler-v0.6-SecNotification 2020-01-06 15:09:06 +01:00
Gioacchino Mazzurco
f4f7b8a1ea
Few fixes after rebase 2020-01-06 14:46:36 +01:00
csoler
b067b1402f
added queue for GRouter items that miss a signature key and auto-request of missing keys to friends when needed (simplified changes from PR~1697) 2020-01-04 20:39:43 +01:00
csoler
28ec7f5fb2
improved type definition for GRouter item flags (simplified changed from PR~1697) 2020-01-04 20:35:49 +01:00
csoler
e5d8600f25
Added the possibility to request identities to specific peers (simplified changelog from PR~1697) 2020-01-04 20:34:35 +01:00
csoler
b824bfc166
removed debug output in p3gossipdiscovery.cc 2020-01-01 18:01:53 +01:00
Gioacchino Mazzurco
df87fe53b1
Cleanup RsThread and related classes
Removed antipattern abstraction RsSingleJobThread
Rename runloop() method to run() in RsThread
Ported few classes ineriting from RsSingleJobThread to RsThread
RsThread use std::atomic instead of self implemented strange binary semaphores
Removed RsTickingThread::shutdown() use RsThread::askForStop() instead
Removed RsTickingThread::fullstop() use RsThread::fullstop() instead
Stop properly JSON API server in retroshare-gui
Centralize errno traslation to literal in util/rserrno.*
2019-12-30 10:38:54 +01:00
hunbernd
d49443caf3 Fixed bug preventing hashing files from file paths with special characters 2019-12-30 00:04:36 +01:00
csoler
c544b1da7c
changed RsEvents so that it takes event types when registering handlers, which limits the number of handlers called for each event 2019-12-29 13:50:54 +01:00
csoler
dc2f2f5eb4
fixed ambiguous variable 2019-12-29 13:49:56 +01:00
csoler
a469647386
replaced RsErr() by RsInfo() in pqissl when applicable 2019-12-25 19:24:52 +01:00
csoler
dc3624945f
fixed uninitialized memory read and inconsistent initialization of mReputationScore in GxsReputation 2019-12-23 11:52:32 +01:00
csoler
93cd6a5df1
fixed possible data race in mNotifications 2019-12-19 21:03:08 +01:00
Gioacchino Mazzurco
655582e970
Improve license according to REUSE 3.0
FSFE licensing checking program lint is now happy

$ reuse lint

* Bad licenses:
* Missing licenses:
* Unused licenses:
* Used licenses: AGPL-3.0-only, AGPL-3.0-or-later, Apache-2.0, CC-BY-SA-4.0, CC0-1.0, GPL-3.0-or-later, LGPL-3.0-or-later, MIT
* Read errors: 0
* Files with copyright information: 6324 / 6324
* Files with license information: 6324 / 6324

Congratulations! Your project is compliant with version 3.0 of the REUSE Specification :-)
2019-12-18 17:57:20 +01:00
csoler
3d7ae59df7
changed enum to enum class and made names globally more consistent for RsEvents 2019-12-17 21:41:21 +01:00
csoler
d7504c59b5
fixing compilation on Travis CI 2019-12-17 15:29:47 +01:00
csoler
baaa67d225
changed NO_ERROR enum into something less likely to collide with existing define 2019-12-17 15:16:24 +01:00
csoler
bdf5d0f753
changed RsGxsForumNotifyRecord into more appropriate RsGxsGroupNotifyRecord 2019-12-17 14:10:18 +01:00
csoler
a54cf981a6
fixed forum/channel subscribe notifications 2019-12-16 22:44:37 +01:00
csoler
11c520d280
replaced QString output of uniqueIdentifier() in feedItem classes by a std::string because QString caused random crashes 2019-12-15 16:46:22 +01:00
csoler
da6e7f9e9b
fixed conflicts with master 2019-12-14 18:27:41 +01:00
csoler
3a3fc25205
finished removing last AddFeedItem from msg, posted, forums and channels 2019-12-13 23:40:21 +01:00
csoler
4fe6e46410
added handling of channel, forum and posted events in GUI 2019-12-12 21:23:42 +01:00
csoler
eef5a5a8ef
added new events for circles 2019-12-12 00:00:51 +01:00
Gioacchino Mazzurco
2a0e1ab59d
Fix Android compilation
Fix also a couple of warnings and update build documentation
2019-12-11 01:25:14 +01:00
G10h4ck
d1b86400bc
Merge pull request #1695 from G10h4ck/gxs_invites
GXS groups links
2019-12-10 22:17:33 +01:00
csoler
27793627e3
moved GxsChanges to rsEvents 2019-12-09 22:19:03 +01:00
csoler
e402630095
attempt to fix thread race between rsEvents and TokenQueue 2019-12-08 21:34:52 +01:00
csoler
b6ca07aaa3
fixed bug caused by accessing Settings from non Qt thread 2019-12-07 22:26:26 +01:00
csoler
f118b4656e
moved more peer connection notifications to rsEvents 2019-12-07 21:43:28 +01:00
csoler
9790b98605
fixed "connexion refused by peer" message 2019-12-06 22:45:33 +01:00
csoler
bb10b82c8e
moved refused connect attempt event to RsAuthSslConnectionAuthentication 2019-12-05 23:43:38 +01:00
csoler
c48aff44b2
removed set/get CurrentConnectionAttemptInfo because it was both prone to error and useless 2019-12-05 22:12:36 +01:00
csoler
00c74f0956
moved rsevent for incomplete cert info to the right place so that it does not trigger when a connection from a non friend is denied 2019-12-04 22:24:11 +01:00
csoler
fcbecbaa16
fixed errors reported by review of PR1735 2019-12-03 21:28:44 +01:00
csoler
65fa54c206
using new notification system for connection attempts 2019-12-02 20:53:51 +01:00
csoler
b799f18df8 fixed early crash caused by calling rsBanList before it is initialized 2019-12-02 13:14:56 +00:00
felisucoibi
c9aab51c7c
Update hash_cache.cc 2019-12-01 23:01:20 +01:00
csoler
d8569d813c
switched security items to new notification system 2019-12-01 22:35:16 +01:00
felisucoibi
ff9c7774f2
Update hash_cache.cc 2019-12-01 12:28:52 +01:00
Gioacchino Mazzurco
610fedabb8
Fix JSON API related files licensing based on talk with Cyril and FSFE suggestions 2019-11-29 19:46:46 +01:00
Gioacchino Mazzurco
ba4af74a06
Add reminder to rsversion.h that no C++ includes are admitted 2019-11-28 18:22:01 +01:00
Gioacchino Mazzurco
5bf8792bc5
Fix windows compile due to rsversion JSON API 2019-11-28 17:41:03 +01:00
Gioacchino Mazzurco
6bae8237e1
TavisCI OSX add miniupnpc include and lib path 2019-11-28 16:01:47 +01:00
Gioacchino Mazzurco
722b1dbffc
Attempt to fix AppveyorCI
+ Cleanup macosx variables
2019-11-28 14:28:27 +01:00
Gioacchino Mazzurco
3bb42ca799
Fix wrong rapidjson include on Appveyor 2019-11-28 01:38:49 +01:00
Gioacchino Mazzurco
c73bdb83cd
Drop libresapi and modules that depends on it
A copy of the repository freezed before this deletion to ease old code
  viewing is available at
  https://github.com/RetroShare/zz_archive_RetroShare_libresapi
Removed some more cruft
Temporarly disabled JSON API generation of RsWebUi methods due to
  compilation breakage when rs_webui is disabled, RsWebUi keeps working
  but cannot be restarted from JSON API
2019-11-27 23:32:38 +01:00
csoler
9a24af87a4
Moved #ifdef RS_WEBUI inside RS_JSONAPI ifdefs so that the webui files cannot be requested unless jsonapi files are compiled 2019-11-27 21:14:20 +01:00
csoler
50529654f8
fixed compilation: both rs_jsonapi and rs_webui are needed to compile p3webui.h/cc 2019-11-27 20:24:56 +01:00
Gioacchino Mazzurco
1d4ca64dee
Prepare for merging 2019-11-27 18:44:10 +01:00
csoler
b1860d8682
fixed two warnings 2019-11-26 18:52:39 +01:00
csoler
3af234f4b0
added missing file 2019-11-26 14:00:20 +01:00
csoler
7aa51423a4
fixes required by review of pr1700 2019-11-25 22:16:32 +01:00
csoler
4a257614f1
merged with upstream/master 2019-11-24 18:38:50 +01:00
csoler
ef76b571c8
added missing restart 2019-11-24 11:04:26 +01:00
csoler
c7af86b4c1
using static resources for webui 2019-11-24 10:50:58 +01:00
csoler
c2d47b01df
added extra check when restarting rb service 2019-11-24 09:40:35 +01:00
csoler
52b0729b31
added missing pushback in resources 2019-11-23 21:51:56 +01:00
csoler
131d73cd11
added resources for local fonts in webui 2019-11-23 21:46:18 +01:00
csoler
d1a9f839a4
fixed restart of webui 2019-11-23 18:40:31 +01:00
csoler
b8b7d103e1
fixed compilation by modifying wrappers to account for the shared_ptr mService 2019-11-23 15:11:22 +01:00
csoler
009ed54ce2
changed layout of restbed/json/webui so that JsonApi is the only server (with thread functionality in a separate class) and webui is a resource provider 2019-11-23 00:17:17 +01:00
G10h4ck
f5bf093409
Merge pull request #1696 from G10h4ck/modern_cpp
Take advantage of modern C++ features
2019-11-21 17:46:53 +01:00
csoler
997501a24d
fixed retroshare_service with embedded webui 2019-11-17 22:01:49 +01:00
csoler
0fdbcf6b57
added dbg info 2019-11-16 23:37:23 +01:00
csoler
9491f1a78e
fixed interactions between webui and jsonapi in GUI 2019-11-16 18:19:07 +01:00
csoler
6878a7773d
fixed start/stop of jsonapi in GUI 2019-11-16 14:30:36 +01:00
csoler
a304ec20ef
converted JsonAPI with public api and using RestbedService system 2019-11-16 00:02:02 +01:00
csoler
3ca22f0052
created separate class for restbed services 2019-11-14 22:02:42 +01:00
csoler
a584b822a8
fixed typo 2019-11-13 21:54:11 +01:00
csoler
1b8f137dee
improved UI for jsonapi and webui pages 2019-11-13 21:35:57 +01:00
csoler
9007d266a8
fixed start/stop of webinterface from GUI 2019-11-13 21:06:20 +01:00
csoler
d19d1685de
made JsonApiServer an singleton through static method instance() 2019-11-12 22:32:18 +01:00
Gioacchino Mazzurco
ca6071fa21
fixup! Improve RsUrl 2019-11-11 23:49:06 +01:00
csoler
3b45fc5199
added user-based token management to jsonApiServer 2019-11-11 22:48:35 +01:00
Gioacchino Mazzurco
056904c90b
Improve RsUrl
Fix a bug in RsUrl::fromString eating one character when parsing URL
  string with IPv6 host
Offer explicit conversion from sockaddr_storage
2019-11-11 11:17:13 +01:00
csoler
93376d3461
added (not yet working) password field 2019-11-10 22:39:21 +01:00
csoler
9dc78d66c1
fixed changing ports and restarting 2019-11-10 22:05:55 +01:00
csoler
3446f0b677
fixed a few bugs. First running version. 2019-11-10 21:29:26 +01:00
csoler
0103a741d6
updated default directory value 2019-11-10 17:56:04 +01:00
csoler
6603dbd913
code to embed webUI server in the main executable (initial version, not yet working) 2019-11-10 17:38:16 +01:00
Gioacchino Mazzurco
7697a57611
Backport rs_unique_cast from grouter_missing_key branch 2019-11-07 19:54:11 +01:00
Gioacchino Mazzurco
bee9dfc19e
Implement comfortable flags type based on scoped enums 2019-11-07 19:51:25 +01:00
Gioacchino Mazzurco
05260ace94
Backport as_const C++17 helper
This is expecially useful to use const_iterator without giving up on
  using auto keyword
2019-11-07 19:51:25 +01:00
Gioacchino Mazzurco
aabba04be9
Remove some cruft from p3peermgr 2019-11-07 19:47:23 +01:00
Gioacchino Mazzurco
a259307218
Deprecate GxsTransSubServices in favor of RsServiceType 2019-11-06 17:16:41 +01:00
csoler
36441c16dc
Merge pull request #1694 from csoler/v0.6-ImprovedGUI
added notification when distant chat has undelivered messages. Update…
2019-11-03 20:50:19 +01:00
Gioacchino Mazzurco
48879d1f40
Remove some cruft 2019-10-31 11:29:16 +01:00
Gioacchino Mazzurco
294b1e9100
Implement RsGxsForums link import/export 2019-10-29 12:10:33 +01:00