Commit Graph

4768 Commits

Author SHA1 Message Date
Phenom
80ea4de7be Fix clang warning: unused variable 'ftserverzone'
/libretroshare/src/ft/ftserver.cc:34: warning: unused variable
'ftserverzone' [-Wunused-const-variable]
const int ftserverzone = 29539;
2017-07-16 21:16:30 +02:00
Phenom
8a270af519 fixed merging problem 2017-07-16 21:15:26 +02:00
Phenom
35186c4054 Fix clang warning: unused variable 'res'
/libretroshare/src/crypto/chacha20.cpp:978: warning: unused variable
'res' [-Wunused-variable]
        uint256_32 res(q1) ;
2017-07-16 21:12:09 +02:00
Phenom
7f1e23085d Fix clang warning: unused variable 'FT_TM_CRC_MAP_MAX_WAIT_PER_GIG', ...
/libretroshare/src/ft/fttransfermodule.cc:56: warning: unused variable
'FT_TM_CRC_MAP_MAX_WAIT_PER_GIG' [-Wunused-const-variable]
const uint32_t FT_TM_CRC_MAP_MAX_WAIT_PER_GIG = 20; /* 20 seconds per
gigabyte */
/libretroshare/src/ft/fttransfermodule.cc:65: warning: unused variable
'FT_TM_FAST_RTT' [-Wunused-const-variable]
const int32_t FT_TM_FAST_RTT    = 1.0;
/libretroshare/src/ft/fttransfermodule.cc:66: warning: unused variable
'FT_TM_STD_RTT' [-Wunused-const-variable]
const int32_t FT_TM_STD_RTT     = 5.0;
/libretroshare/src/ft/fttransfermodule.cc:67: warning: unused variable
'FT_TM_SLOW_RTT' [-Wunused-const-variable]
const int32_t FT_TM_SLOW_RTT    = 20.0;
/libretroshare/src/ft/fttransfermodule.cc:69: warning: unused variable
'FT_TM_CRC_MAP_STATE_NOCHECK' [-Wunused-const-variable]
const uint32_t FT_TM_CRC_MAP_STATE_NOCHECK      = 0 ;
/libretroshare/src/ft/fttransfermodule.cc:70: warning: unused variable
'FT_TM_CRC_MAP_STATE_DONT_HAVE' [-Wunused-const-variable]
const uint32_t FT_TM_CRC_MAP_STATE_DONT_HAVE = 1 ;
/libretroshare/src/ft/fttransfermodule.cc:71: warning: unused variable
'FT_TM_CRC_MAP_STATE_HAVE' [-Wunused-const-variable]
const uint32_t FT_TM_CRC_MAP_STATE_HAVE                 = 2 ;
2017-07-16 21:11:47 +02:00
Phenom
8b99c80e07 Fix clang warning: 'p3GxsTrans' defined as a class here but previously
declared as a struct

/libretroshare/src/gxstrans/p3gxstrans.h:88: warning: 'p3GxsTrans'
defined as a class here but previously declared as a struct [-
Wmismatched-tags]
class p3GxsTrans : public RsGenExchange, public GxsTokenQueue, public
p3Config, public RsGxsTrans
/libretroshare/src/gxstrans/p3gxstrans.h:31: did you mean class here?
struct p3GxsTrans;
2017-07-16 21:11:10 +02:00
Phenom
c97269bed6 Fix warning: this statement may fall through
/libretroshare/src/gxstrans/p3gxstrans.cc:870: warning: this statement
may fall through [-Wimplicit-fallthrough=]
   pr.sent_ts = time(NULL) ; //pr.mailItem.meta.mPublishTs = time(NULL);
/libretroshare/src/gxstrans/p3gxstrans.cc:872: here
  case GxsTransSendStatus::PENDING_PREFERRED_GROUP:

/libretroshare/src/gxstrans/p3gxstrans.cc:883: warning: this statement
may fall through [-Wimplicit-fallthrough=]
   pr.group_id = mPreferredGroupId ; //pr.mailItem.meta.mGroupId =
mPreferredGroupId;
/libretroshare/src/gxstrans/p3gxstrans.cc:885: here
  case GxsTransSendStatus::PENDING_RECEIPT_CREATE:

/libretroshare/src/gxstrans/p3gxstrans.cc:906: warning: this statement
may fall through [-Wimplicit-fallthrough=]
   pr.presignedReceipt.msg.setBinData(&grsrz[0], grsz);
/libretroshare/src/gxstrans/p3gxstrans.cc:908: here
  case GxsTransSendStatus::PENDING_RECEIPT_SIGNATURE:     // (cyril)
This step is never actually used.

/libretroshare/src/gxstrans/p3gxstrans.cc:924: warning: this statement
may fall through [-Wimplicit-fallthrough=]
   pr.presignedReceipt.meta.setBinData(&srx[0], metaSize);
/libretroshare/src/gxstrans/p3gxstrans.cc:926: here
  case GxsTransSendStatus::PENDING_PAYLOAD_CREATE:

/libretroshare/src/gxstrans/p3gxstrans.cc:938: warning: this statement
may fall through [-Wimplicit-fallthrough=]
   memcpy(&pr.mailItem.payload[offset], &pr.mailData[0], datasize);
/libretroshare/src/gxstrans/p3gxstrans.cc:940: here
  case GxsTransSendStatus::PENDING_PAYLOAD_ENCRYPT:

/libretroshare/src/gxstrans/p3gxstrans.cc:982: warning: this statement
may fall through [-Wimplicit-fallthrough=]
   }
/libretroshare/src/gxstrans/p3gxstrans.cc:984: here
  case GxsTransSendStatus::PENDING_PUBLISH:
2017-07-16 20:47:45 +02:00
Phenom
18139489cf Fix warning: unused parameter ‘grpItem’ and unused debug variables
/libretroshare/src/gxstrans/p3gxstrans.cc:635: warning: unused parameter
‘grpItem’ [-Wunused-parameter]
         RsGxsGrpItem* grpItem, RsTlvSecurityKeySet& /*keySet*/ )

/libretroshare/src/gxstrans/p3gxstrans.cc:681: warning: unused variable
‘msgId’ [-Wunused-variable]
      const RsGxsMessageId& msgId = *vit;

/libretroshare/src/gxstrans/p3gxstrans.cc:676: warning: unused variable
‘grpId’ [-Wunused-variable]
     const RsGxsGroupId& grpId = it->first;
2017-07-16 20:46:55 +02:00
Phenom
e1ea92d733 Fix warning: unused parameter ‘n’
/libretroshare/src/serialiser/rstypeserializer.cc:358: warning: unused
parameter ‘n’ [-Wunused-parameter]
 template<> void RsTypeSerializer::print_data( const std::string& n,
2017-07-16 20:41:24 +02:00
Phenom
f193af2865 Fix warning: unused parameter ‘size’
/libretroshare/src/gxs/rsgenexchange.cc:3079: warning: unused parameter
‘size’ [-Wunused-parameter]
 bool RsGenExchange::acceptNewMessage(const RsGxsMsgMetaData* /
*grpMeta*/,uint32_t size ) { return true; }
2017-07-16 20:41:01 +02:00
Phenom
d8b0b5222b Fix warning: variable ‘it’ set but not used
/libretroshare/src/gxs/rsgxsnetservice.cc:867: warning: variable ‘it’
set but not used [-Wunused-but-set-variable]
     std::map<RsGxsGroupId,RsGxsServerMsgUpdate>::iterator it =
mServerMsgUpdateMap.find(grpId) ;

/libretroshare/src/gxs/rsgxsnetservice.cc:2434: warning: variable ‘it’
set but not used [-Wunused-but-set-variable]
             ClientGrpMap::iterator it =
mClientGrpUpdateMap.find(peerFrom);
2017-07-16 20:40:31 +02:00
Phenom
b11022a239 Fix warning: this statement may fall through
/libretroshare/src/util/dnsresolver.cc:49: warning: this statement may
fall through [-Wimplicit-fallthrough=]
       case DNSResolver::DNS_LOOKUP_ERROR:  if(it-
>second.last_lookup_time + MAX_TIME_BEFORE_RETRY > now)
/libretroshare/src/util/dnsresolver.cc:52: here
       case DNSResolver::DNS_DONT_HAVE:   next_call = it->first ;
2017-07-16 20:38:43 +02:00
Phenom
0e302e254e Fix warning: this statement may fall through
/libretroshare/src/util/rsnet_ss.cc:1031: warning: this statement may
fall through [-Wimplicit-fallthrough=]
   success = inet_ntop( addr.ss_family, (const void *) &(addrv4p-
>sin_addr), ipStr, INET_ADDRSTRLEN );
/libretroshare/src/util/rsnet_ss.cc:1033: here
  case AF_INET6:
2017-07-16 20:36:16 +02:00
Phenom
7b4d3c5a24 Fix warning: this statement may fall through
/libretroshare/src/util/rscompress.cc:165: warning: this statement may
fall through [-Wimplicit-fallthrough=]
      ret = Z_DATA_ERROR;     /* and fall through */
/home/phenom/GIT/RetroShare/trunk/libretroshare/src/util/rscompress.cc:
166: here
     case Z_DATA_ERROR:
2017-07-16 20:34:38 +02:00
Phenom
476b581506 Fix warning: this statement may fall through
/libretroshare/src/rsserver/p3serverconfig.cc:292: warning: this
statement may fall through [-Wimplicit-fallthrough=]
    if (mPeerMgr->getFriendCount(true, false) > MIN_BASIC_FRIENDS)
/libretroshare/src/rsserver/p3serverconfig.cc:297: here
   case RSCONFIG_USER_LEVEL_BASIC:

/libretroshare/src/rsserver/p3serverconfig.cc:300: warning: this
statement may fall through [-Wimplicit-fallthrough=]
    if (mPeerMgr->haveOnceConnected())
/libretroshare/src/rsserver/p3serverconfig.cc:306: here
   case RSCONFIG_USER_LEVEL_CASUAL:
2017-07-16 20:33:55 +02:00
Phenom
7bd7c57ff9 Fix warning: variable ‘pgpNameFound’ set but not used
/libretroshare/src/rsserver/rsaccounts.cc:130: warning: variable
‘pgpNameFound’ set but not used [-Wunused-but-set-variable]
  bool pgpNameFound = false;
2017-07-16 20:32:32 +02:00
Phenom
a0506c1a0f Fix warning: this statement may fall through
/libretroshare/src/pqi/pqissl.cc:449: warning: this statement may fall
through [-Wimplicit-fallthrough=]
    sslmode = PQISSL_ACTIVE; /* we're starting this one */
/libretroshare/src/pqi/pqissl.cc:456: here
   case WAITING_DELAY:
2017-07-16 20:31:49 +02:00
Phenom
b9d4651f07 Fix warning: this statement may fall through
/libretroshare/src/pqi/pqisslpersongrp.cc:125: warning: this statement
may fall through [-Wimplicit-fallthrough=]
     std::cerr << " --> falling back to Tor" << std::endl;
/libretroshare/src/pqi/pqisslpersongrp.cc:126: here
    case RS_HIDDEN_TYPE_TOR:
2017-07-16 20:30:41 +02:00
Phenom
e12f51b1be Fix warning: variable ‘peerIt1’ set but not used
/libretroshare/src/pqi/p3peermgr.cc:2619: warning: variable ‘peerIt1’
set but not used [-Wunused-but-set-variable]
                     std::set<RsPgpId>::iterator peerIt1 =
groupItem.peerIds.find(*peerIt);
2017-07-16 20:28:24 +02:00
Phenom
78cfde9b4f Fix warning: this statement may fall through
/libretroshare/src/pgp/pgphandler.cc:62: warning: this statement may
fall through [-Wimplicit-fallthrough=]
   case OPS_PARSER_CMD_GET_SK_PASSPHRASE_PREV_WAS_BAD: prev_was_bad =
true ;

/libretroshare/src/pgp/pgphandler.cc:63: here
   case OPS_PARSER_CMD_GET_SK_PASSPHRASE:
2017-07-16 20:27:46 +02:00
Phenom
3a6ad822da Fix warning: this statement may fall through
/libretroshare/src/ft/ftchunkmap.cc:190: warning: this statement may
fall through [-Wimplicit-fallthrough=]
    case FileChunksInfo::CHUNK_CHECKING: _file_is_complete = false ;

/libretroshare/src/ft/ftchunkmap.cc:191: here
    case FileChunksInfo::CHUNK_DONE:   _total_downloaded +=
sizeOfChunk(i) ;
2017-07-16 20:27:09 +02:00
Phenom
635246c462 Fix warning: this statement may fall through
/libretroshare/src/tcponudp/bss_tou.c:246: warning: this statement may
fall through [-Wimplicit-fallthrough=]
   num=0;

/libretroshare/src/tcponudp/bss_tou.c:247: here
  case BIO_C_FILE_SEEK:
2017-07-16 20:25:11 +02:00
Phenom
59e018e02d Fix GUI AutoLogin 2017-07-16 16:03:56 +02:00
csoler
08faa3f5d5 fixed p3Gxstunnel so that it sends the data packets in the same order it received them. This fixes the bug in distant chat causing images to not transfer correctly in some cases 2017-07-15 22:16:45 +02:00
csoler
9c391cb015 added an additional param to BinToHex so as to limit the size of the output 2017-07-15 22:15:51 +02:00
csoler
98b0585ba4 Merge pull request #937 from csoler/v0.6-ImprovedNoGUI
V0.6 improved no gui
2017-07-13 21:23:13 +02:00
Gioacchino Mazzurco
69aa5b6a09 Clean some garbage from the code 2017-07-13 13:00:32 +02:00
csoler
fd452af088 removed some debut output that perturbated the passwd command line 2017-07-12 23:03:17 +02:00
csoler
00c1a9a7ff fixed autologin 2017-07-12 22:53:35 +02:00
csoler
66268c8267 fixed variable shadowing a parameter 2017-07-12 18:48:06 +02:00
csoler
4cfdef5ff9 do not display auto-login option when software is compiled without autologin 2017-07-11 23:39:04 +02:00
csoler
a5e0b1c336 fixed -U option in rs-nogui. Removed debug output that would ruin the terminal interface 2017-07-11 23:32:22 +02:00
csoler
3e3ee1a34b little improvement to command line help display 2017-07-09 22:12:01 +02:00
csoler
5dfbce7e3a fixed Terminal Api Client logic 2017-07-09 21:16:41 +02:00
csoler
7ee527ecbd removed comments 2017-07-08 17:35:34 +02:00
csoler
b5976e195e fixed message when passphrase is empty 2017-07-08 16:48:24 +02:00
Phenom
54047cd7a7 Fix multi download of same file. 2017-07-06 22:38:08 +02:00
Gioacchino Mazzurco
c630f1fa89 Fix unused warning in gxstokenqueue 2017-07-06 16:28:59 +02:00
Gioacchino Mazzurco
b935bacd99 Add missing break in p3IdService::handleResponse 2017-07-06 16:28:00 +02:00
csoler
141277b131 removed debug info 2017-07-05 22:16:14 +02:00
csoler
c1e18c7fe6 fixed bug causing an infinite subscribe/unsubscribe loop in GxsTrans 2017-07-05 22:12:56 +02:00
csoler
370d50b41a cleaned a bit the code in rsinit.cc 2017-07-05 21:36:00 +02:00
cyril soler
f413433480 removed zeroing of preferred group causing a bug in GxsTrans 2017-07-03 11:25:12 +02:00
csoler
1b4e8a46ed Merge pull request #909 from csoler/v0.6-GxsTransport
V0.6 gxs transport
2017-06-29 18:38:10 +02:00
csoler
64e3fc97e8 fixed bug preventing correct subscribe in GxsTrans 2017-06-29 18:37:39 +02:00
csoler
700d114cf4 fixed bug causing failure of group autosubscribe in GxsTrans 2017-06-29 18:27:00 +02:00
Phenom
b4071d158e Add General Direct Download setting.
Yes, No, Per User
2017-06-29 17:18:28 +02:00
csoler
37edcc1e37 fixed subscribe policy to GxsTrans groups as a function of last available post and group usage 2017-06-29 13:44:40 +02:00
csoler
dc605c02f1 added a last modif TS in GrpNetworkStats, that is inited from network Grp statistics, and used to provide a value for unsubscribed groups 2017-06-29 13:15:39 +02:00
csoler
533e2a8b45 added check to fix existing wrong storage time value in GxsTrans 2017-06-28 23:23:27 +02:00
csoler
f37ba83c07 moved msg keep period settings to netService and made the initialisation obei the default settings of the service 2017-06-28 23:12:33 +02:00
csoler
12b562893d added more debug info in GxsUtil 2017-06-27 22:21:35 +02:00
csoler
51c7e18a3a added last msg time in GxsTrans stats. Added mutex to protect non atomic mPreferredGroup 2017-06-27 19:56:21 +02:00
csoler
2bb49f6925 Merge pull request #898 from csoler/v0.6-GxsTransport
fixed memory leak in GxsTrans
2017-06-23 21:58:54 +02:00
csoler
0f99647a86 fixed memory leak in GxsTrans 2017-06-23 21:58:17 +02:00
csoler
0133be757a Merge pull request #887 from csoler/v0.6-GxsTransport
V0.6 gxs transport
2017-06-17 23:07:10 +02:00
csoler
12a45294a3 added ifdef for comments on GxsTrans 2017-06-17 23:02:28 +02:00
csoler
eb4bb5be65 fixed bug in gxs trans stats counting 2017-06-17 21:42:00 +02:00
csoler
43dcddce67 Merge pull request #880 from PhenomRetroShare/Add_GxsCircleNotify
Add Circle Feed Item.
2017-06-16 12:37:09 +02:00
csoler
a29bc4408e Merge pull request #874 from G10h4ck/silent_initiate_distant_chat_api
libresapi: silent /chat/initiate_distant_chat
2017-06-16 12:24:45 +02:00
csoler
25565a7ecd merged upstream/master 2017-06-15 23:58:29 +02:00
csoler
6633b04a44 changed constants for GxsTransport anti-spam 2017-06-15 23:57:02 +02:00
csoler
26bb865d29 added code to reject messages based on existing per-user statistics 2017-06-15 19:32:31 +02:00
sehraf
fe5ec8bda8 reduce BOB log level 2017-06-15 07:06:52 +02:00
csoler
09ff94c9ec added new virtual method to refuse incoming msgs (similar to groups) in RsGenExchange, and used it in p3GxsTrans to refuse msgs from peers who send too much 2017-06-14 23:19:52 +02:00
csoler
79825eb2e2 fixed thread issue in RsGxsCleanupThread that caused random crashes 2017-06-12 20:36:02 +02:00
Phenom
aa64c4d3c5 Add Circle Feed Item. 2017-06-11 16:16:41 +02:00
csoler
1766087f71 fixed update notification and display in GxsTransStatistics 2017-06-07 23:10:59 +02:00
csoler
9853b53f8b fixed debug output in GxsNetService 2017-06-07 23:10:24 +02:00
csoler
4cb7522feb added deleted gxs messages to the reject list of GxsNetService to avoid re-downloading them right away 2017-06-07 21:41:00 +02:00
csoler
23156ab4b1 fixed malloc problem when chat avatar is missing 2017-06-07 20:14:27 +02:00
cyril soler
e726bd1061 attempt to fix the crash in DataStore by not calling deleteMsgs directly 2017-06-07 13:37:55 +02:00
csoler
39f003f9f9 Merge pull request #875 from csoler/v0.6-GxsTransport
V0.6 gxs transport
2017-06-06 22:00:08 +02:00
Gioacchino Mazzurco
528317d374 libresapi: silent /chat/initiate_distant_chat
Avoid to forge the
[Starting distant chat. Please wait for secure tunnel to be established]
message on requesting chat id from API as it is a nuisance in most
libresapi use cases
2017-06-06 18:57:32 +02:00
csoler
f62028b2c1 moved metadata info to members of OutgoingRecord, so that the un-serialized meta is not lost when saved. Ensured backward compatibility when reloading old items. 2017-06-06 00:15:06 +02:00
csoler
1e652d6577 reduced number of calls to indicateConfigChanged(), and renamed mIngoingQueue into mIncomingQueue in GxsTrans 2017-06-05 22:27:54 +02:00
csoler
b7c09bd6cf added calls to indicateConfigChanged() to force saving GxsTrans outgoing records when updated 2017-06-05 21:15:42 +02:00
BabushkaRetroShare
7fb0419c75
Typo fixes 2017-06-04 20:34:10 +02:00
csoler
1967204821 restored GXS trans cleanign delay 2017-06-04 18:43:12 +02:00
csoler
831b560780 moved deletion of msgs in GxsTransport inside the service thread 2017-06-04 18:37:38 +02:00
csoler
861dab32a5 Merge pull request #863 from G10h4ck/qmlapp_pex_alpha
Multiple improvements to android qml app and libreaspilocal
2017-06-03 13:27:21 +02:00
csoler
fb7ac7a8f6 fixed mismatched free/delete (free is used in rschatitems.cc to delete avatars) 2017-06-02 23:10:43 +02:00
Gioacchino Mazzurco
efdfa4666b Merge branch 'libresapi_attempt_connection' into qmlapp_pex_alpha 2017-06-02 10:39:42 +02:00
cyril soler
8e7e70035a fixed compilation for windows 2017-06-01 10:16:30 +02:00
Gioacchino Mazzurco
59b77da6a2 Merge branch 'master' into qmlapp_pex_alpha 2017-05-31 12:11:15 +02:00
csoler
1ebcc6006b Merge pull request #861 from RetroShare/v0.6-GxsTransport
V0.6 gxs transport
2017-05-30 22:22:06 +02:00
csoler
832ba69b69 fixed up cleanup for GxsTransport 2017-05-30 21:38:59 +02:00
csoler
a7eb167f96 fixed a bug in RsThread which made finished threads unaware of their state 2017-05-30 20:57:20 +02:00
csoler
5410c51ab9 added cleanup thread for GxsTransport 2017-05-30 20:45:39 +02:00
csoler
0868b64436 fixed uninitialized memory read in GxsTrans msg Id 2017-05-28 22:49:07 +02:00
Phenom
28119b5094 Fix Windows Compilation 2017-05-28 12:57:36 +02:00
csoler
6d76624e91 fixed uninitialized memory read in grouter 2017-05-27 23:16:20 +02:00
csoler
eea63ac217 minor code cleaning in p3GxsTrans (struct->class for consistency, sendMail->sendData), added popularity+subscribed status display in statistics 2017-05-27 22:19:52 +02:00
csoler
7c439983de Merge pull request #842 from csoler/v0.6-GxsTransport
V0.6 gxs transport
2017-05-26 22:04:33 +02:00
csoler
a3096f26a5 added data hash to GxsTrans display 2017-05-26 20:28:44 +02:00
csoler
4fa6cbe6e6 fixed display in GxsTrans stats widget 2017-05-26 18:42:52 +02:00
csoler
14b9a54773 added group data retrieval to GxsTransStatistics 2017-05-25 16:56:29 +02:00
sehraf
a3ee85a30d Add I2P BOB support to libretroashare and RetroShare GUI 2017-05-24 19:40:01 +02:00
csoler
a136fb6fda added display of ongoing record status for GxsTrans. Unfinished. 2017-05-22 23:54:55 +02:00
csoler
fbeb6ff98d added infrastructure for gathering statistics about GxsTransport. Unfinished. 2017-05-21 15:57:10 +02:00
csoler
dbc23969f4 Merge pull request #830 from Gottox/fix-libressl
fix building with libressl
2017-05-21 14:52:20 +02:00
csoler
33ab7faec4 Merge pull request #831 from Gottox/fix-musl
fix building with musl libc
2017-05-21 14:49:13 +02:00
csoler
b341fea170 merged upstream/master 2017-05-21 13:49:41 +02:00
Enno Boland
a578acdea8 fix building with musl libc 2017-05-21 10:54:19 +02:00
Enno Boland
2046d9eaae fix building with libressl 2017-05-21 10:48:58 +02:00
csoler
a439fbf63e fixed bug (due to new serializer) that caused a wrong hash to be computed when sending distant messages 2017-05-20 23:01:56 +02:00
csoler
162095bf20 fixed count of unread/new posts by not counting older versions 2017-05-20 22:37:31 +02:00
csoler
51710c10a0 merge comments between channel item versions 2017-05-20 17:33:05 +02:00
Gioacchino Mazzurco
de9a44fac7 Merge branch 'v0.6-GxsTransport' into qmlapp_pex_alpha 2017-05-15 19:16:08 +02:00
Gioacchino Mazzurco
10ec52718d Fix GxsTrans related serialization regressions 2017-05-15 19:13:29 +02:00
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
csoler
cecd9a3368 merged upstream/master 2017-04-30 20:14:23 +02:00
csoler
24c7c38016 removed old file rssrviceserialiser.h/cc 2017-04-30 20:08:30 +02:00
csoler
14076de1e0 moved code of rsservicerserialiser into rsserializer.h/cc and renamed it into RsRawSerializer 2017-04-30 19:17:44 +02:00
csoler
e401b90e02 moved rsserializer and rstypeserializer to serialiser/ 2017-04-30 16:05:37 +02:00
csoler
4f92f483fa dwicthed GxsTunnel items to new serialization 2017-04-29 23:02:44 +02:00
csoler
1159c863a2 moved wiki and wire items to rsitems/ 2017-04-29 21:50:55 +02:00
csoler
d58c638af8 switched wiki and wire items to new serialization 2017-04-29 21:46:54 +02:00
Phenom
77adc82aa2 Fix Missing messages when mark all as read.
If message get olders versions, these ones was not marked as read. So it
left unread messages on thread despite nothing appears on tree view.
2017-04-29 17:32:23 +02:00
csoler
5cba0059c8 moved recognitems to rsitems/ 2017-04-28 23:32:47 +02:00
csoler
23492698d4 switch rsrecognitems to new serialization 2017-04-28 23:28:56 +02:00
csoler
8341c68388 removed old code 2017-04-28 18:54:07 +02:00
csoler
688813fbf5 moved photo items to rsitems/ 2017-04-28 18:51:35 +02:00
csoler
634efb6142 switched rsphotoitems to new serialization 2017-04-28 18:42:11 +02:00
csoler
d3c960e4e7 removed old code 2017-04-28 17:48:54 +02:00
csoler
22e2416f3e moved rsserviceinfo items to rsitems/ 2017-04-28 17:47:41 +02:00
csoler
2d19783296 switched serviceinfo items to new serialization 2017-04-28 17:44:45 +02:00
csoler
c33c34b175 moved rspluginitems to rsitems/ 2017-04-28 16:44:04 +02:00
csoler
d32a8caf06 switched PluginItems to new serialization 2017-04-28 16:39:54 +02:00
csoler
45eaf27deb moved rsgxsupdateitems to rsitems/ 2017-04-28 16:30:33 +02:00
csoler
2e6766569d switched MsgUpdate items to new serialization 2017-04-28 16:26:59 +02:00
Gioacchino Mazzurco
3fddbaf070 Merge branch 'master' into qmlapp_pex_alpha 2017-04-28 13:26:31 +02:00
csoler
5995e508c5 moved rsstatusitem.h to rsitems/ 2017-04-27 21:24:27 +02:00
csoler
87018edeb2 switched rsstatusitem to new serializer 2017-04-27 21:20:30 +02:00
csoler
07a93be1b2 moved heartbeatitem.h to rsitems/ 2017-04-27 21:11:10 +02:00
csoler
9adbab3281 switched heartbeatitems to new serialization 2017-04-27 21:10:22 +02:00
Phenom
19b4fb892c Add Friend Time Offset news feed. 2017-04-27 16:42:25 +02:00
csoler
349d14b354 moved rsposteditems to rsitems/ 2017-04-27 14:44:41 +02:00
csoler
35ecc19677 switched rsposteditems to new serialization 2017-04-27 14:41:31 +02:00
csoler
22f6d150df moved rsnxsitems.cc to rsitems/ 2017-04-27 14:21:46 +02:00
csoler
3c20a85335 switched RsNxsItems to new serialization 2017-04-27 14:16:57 +02:00
csoler
f6e59f7dee moved gxsforumitems to rsitems/ 2017-04-27 11:59:18 +02:00
csoler
449a4209d9 dwitched gxsforum items to new serialization 2017-04-27 11:56:56 +02:00
csoler
f50670f773 moved circle items to rsitems/ 2017-04-26 20:59:59 +02:00
csoler
559137d05b switched gxscircleitems to new serialization 2017-04-26 20:57:28 +02:00
csoler
db645239cb moved rsgxschannel items to rsitems 2017-04-26 20:15:54 +02:00
csoler
69729ad7d2 switch Channel items to new serialization 2017-04-26 18:55:23 +02:00
csoler
77c2e6da8c improved error handlign in pqistore 2017-04-26 18:14:10 +02:00
csoler
8f97647246 fixed bug in RsGxsId deserialization 2017-04-26 15:43:00 +02:00
csoler
c31396a010 moved dsdv code to unused directory 2017-04-26 14:31:15 +02:00
csoler
508a2e2864 moved gxs comment and Id items to rsitems/ 2017-04-26 14:28:25 +02:00
csoler
97d0df0737 added comment about serialization hack 2017-04-26 14:19:34 +02:00
csoler
c0d8735251 switched RsGxsIdItems to new serialization 2017-04-26 14:17:38 +02:00
csoler
fb34fa19c0 switch GxsComment item to new serialization 2017-04-26 13:44:09 +02:00
csoler
9c610a736d cleaned the hierarchy of serialization classes 2017-04-26 11:40:46 +02:00
csoler
77e809ea4b switched GRouter to new serialization 2017-04-25 21:21:46 +02:00
Phenom
3592d5bf5d Fix GCC warnings: unused parameter ‘names’
/libretroshare/src/pqi/pqiservice.h:80: warning: unused parameter
‘names’ [-Wunused-parameter]
     virtual void getItemNames(std::map<uint8_t,std::string>& names)
const {} // This does nothing by default. Service should derive it in
order to give info for the UI
                                                              ^~~~~
2017-04-25 09:53:06 +02:00
csoler
0d7df568b4 moved rsconfigitems and rshistoryitems to rsitems/ 2017-04-24 22:47:08 +02:00
csoler
f7338d4a3d removed old code 2017-04-24 22:39:05 +02:00
csoler
43b3b87782 fixed a few bugs in config items 2017-04-24 22:36:03 +02:00
csoler
fcabe6359f switch RsConfigItems to new serialization 2017-04-24 18:51:51 +02:00
csoler
af4fcf7679 switched rshistoryitems to new serialization 2017-04-24 17:33:30 +02:00
csoler
8ae6541ceb added two new classes for config/service serialisers and a base generic serialiser class 2017-04-24 17:10:01 +02:00
csoler
dc2df071a5 renamed RsSerializer into RsServiceSerializer 2017-04-24 14:14:34 +02:00
csoler
976a80a7af switch rsfilelistitems to new serialization 2017-04-24 13:30:18 +02:00
csoler
26e95416d1 moved RTT items to rsitems/ 2017-04-24 11:06:51 +02:00
csoler
f6aaee7382 converted RTT items to new serialization 2017-04-24 11:01:45 +02:00
csoler
5071c4bc7f moved msgitems to rsitems/ 2017-04-24 11:00:57 +02:00
csoler
fc82b20833 removed old serialization code in msgs 2017-04-24 10:36:22 +02:00
csoler
08867945f3 fixed bug caused by wrong cast in lobby msg signature validation 2017-04-24 10:29:57 +02:00
csoler
91b04098b6 fixed two memory bugs in serialization code 2017-04-24 10:11:24 +02:00
csoler
31c07f4dfd converted RsMsgItems to new serialization. Added format and flag members to RsSerialiser and used the later to handle signature and config serialization techniques 2017-04-23 22:40:26 +02:00
csoler
63b4b3a1f7 moved discovery2 items to rsitems/ 2017-04-23 19:07:26 +02:00
csoler
9d9ff567bb switched discovery2items to new serialization 2017-04-23 19:02:12 +02:00
csoler
2e7127077d fixed previous file move 2017-04-22 21:36:39 +02:00
csoler
bef6db4b43 moved files 2017-04-22 21:32:57 +02:00
csoler
311f257090 converted GxsReputationItems to new serialization 2017-04-22 21:10:55 +02:00
csoler
782c02744f added names for turtle sub items 2017-04-22 16:00:01 +02:00
electron128
8b9c447063 fixed possible crash and return value in rsGetHostByName(), thanks to Kotyara for reporting this 2017-04-22 10:13:23 +02:00
csoler
5f8bf03dfe added mechanism to allow services to document the names of their items, and improved bandwidth graph to show names for GXS services. Other services still need to supply their own names 2017-04-20 20:54:51 +02:00
Gioacchino Mazzurco
5ee517b64f Expose libresapi for GXS contacts import/export
To import contact
/identity/import_key
{"radix":"AgIRBAAABd..."}

To export contact
/identity/export_key
{"gxs_id":"ffffffffffffffffffffffffffffffff"}

In both cases if everithing went fine the answer is something like
{"data":{"radix":"AgIRBAAABd...", "gxs_id":"fff..."}, "returncode":"ok"}

Some retrocompatible adaptations were necessary to libretroshare

RsGenExchange::deserializeGroupData
p3IdService::deserialiseIdentityFromMemory

Now accept an extra optional pointer parameter to return the id of the
  key so we can return it back from libresapi too and can be used to
  request more information about the key to the API.
2017-04-19 23:48:25 +02:00
Gioacchino Mazzurco
4455bfa92d Merge branch 'master' into merge_alpha_master 2017-04-18 21:30:25 +02:00
csoler
e2d9152b22 moved converted serialisation files into new directory rsitems/, leaving serialiser/ for the serialisation classes 2017-04-18 21:11:37 +02:00
Phenom
37331372c1 Fix Clang warnings: implicit conversion
warning: implicit conversion from 'int' to 'char' changes value from 255
to -1 [-Wconstant-conversion]
                                asctobin()[i] = 255;    /* used to
detect invalid characters */
2017-04-18 11:25:41 +02:00
Phenom
32eeb957b2 Fix Clang warnings: unused private field
warning: private field 'mAutoBanIdentitiesLimit' is not used [-Wunused-
private-field]
    float mAutoBanIdentitiesLimit ;
warning: private field 'mFiles' is not used [-Wunused-private-field]
    RsFiles* mFiles;
2017-04-17 21:35:29 +02:00
Phenom
4ac3b3f5bf Fix Clang warnings: implicit conversion of NULL to bool
warning: implicit conversion of NULL constant to 'bool' [-Wnull-
conversion]
        return NULL ;
        ~~~~~~ ^~~~
               false
2017-04-17 21:33:39 +02:00
Phenom
e83104ee0f Fix Clang warnings: Add author and date to #warning 2017-04-17 21:32:14 +02:00
Phenom
039908b2c6 Fix Clang warnings: private field not used
warning: private field 'mNetMgr' is not used [-Wunused-private-field]
    p3NetMgr *mNetMgr;
2017-04-17 21:29:16 +02:00
Phenom
872f42bcef Fix Clang warnings: Overloaded vf hide in pluginmanager
warning: 'RsPluginManager::loadConfiguration' hides overloaded virtual
function [-Woverloaded-virtual]
                virtual void loadConfiguration() ;
2017-04-17 21:28:24 +02:00
Phenom
22043094b5 Fix Clang warnings: extraneous parentheses
warning: equality comparison with extraneous parentheses [-Wparentheses-
equality]
                else if ((err == ECONNREFUSED))
                          ~~~~^~~~~~~~~~~~~~~
2017-04-17 21:26:50 +02:00
Phenom
dc533b1346 Fix Clang warnings: private field not used
warning: private field 'lastGroupId' is not used [-Wunused-private-
field]
    uint32_t lastGroupId;
warning: private field 'waittimes' is not used [-Wunused-private-field]
        int waittimes;
warning: private field 'listen_checktime' is not used [-Wunused-private-
field]
        long listen_checktime;
2017-04-17 21:26:09 +02:00
Phenom
65321501e4 Fix Clang warnings: Overloaded vf hide in p3dhtmgr
warning: 'p3DhtMgr::findPeer' hides overloaded virtual function [-
Woverloaded-virtual]
virtual bool    findPeer(std::string id);
warning: 'p3DhtMgr::dropPeer' hides overloaded virtual function [-
Woverloaded-virtual]
virtual bool    dropPeer(std::string id);
warning: 'p3DhtMgr::getPeerStatus' hides overloaded virtual function [-
Woverloaded-virtual]
virtual bool    getPeerStatus(std::string id,
2017-04-17 21:24:45 +02:00
Phenom
5bc6558567 Fix Clang warnings: explicitly assigning value to itself
/home/phenom/GIT/RetroShare/trunk/libretroshare/src/util/radix64.h:96:
warning: explicitly assigning value of variable of type 'int' to itself
[-Wself-assign]
                        idx = idx;
                        ~~~ ^ ~~~
2017-04-17 21:19:06 +02:00
Phenom
6fecac5f7b Fix Clang warnings: Overloaded vf hide
warning: 'pqiconnect::connect_parameter' hides overloaded virtual
function [-Woverloaded-virtual]
        virtual bool connect_parameter(uint32_t type, std::string value)
{ return ni->connect_parameter(type, value);}
                     ^
2017-04-17 21:15:52 +02:00
Phenom
cf963c0c73 Fix Clang warnings: struct declared as class
warning: 'RsMsgMetaData' defined as a struct here but previously
declared as a class [-Wmismatched-tags]
struct RsMsgMetaData
^
2017-04-17 21:15:15 +02:00
Phenom
105840ab98 Fix Clang Warning: Overloaded vf hide
warning: 'pqiConnectCbDummy::peerConnectRequest' hides overloaded
virtual function [-Woverloaded-virtual]
virtual void    peerConnectRequest(const RsPeerId& id,
                ^
2017-04-17 21:10:22 +02:00
csoler
f8fc8b40e4 removed old code in turtle serialiser 2017-04-16 20:16:59 +02:00
csoler
2ca46ec636 fixed bug in serialization of data chunks 2017-04-16 20:11:54 +02:00
csoler
121133488c fixed bug in serialization for turtle 2017-04-16 19:59:22 +02:00
csoler
636450f14d moved turtle and FT to new serialization 2017-04-15 18:46:44 +02:00
csoler
3453a3e57d switched FileTransfer items to new serialization 2017-04-11 23:05:27 +02:00
csoler
80e8769ed7 added missign file and converted BW control items 2017-04-11 21:37:35 +02:00