defnax
79010a15f7
modified mingw32make.bat do make clean before start to compile
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3088 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-08 22:24:00 +00:00
csoler
4072113805
corrected bug in rsdiscitem that prevented RsDiscReply packets to transfer cp serialiser/rsdiscitems.cc ../../../../trunk/libretroshare/src/serialiser/rsdiscitems.cc
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-07 22:23:28 +00:00
leander-256
21efccfdd6
Memory leak and compiler warnings fixes:
...
- memory leaks in pqi/cleanupxpgp.cc , 2 new char[] => 2 delete[]
- reordering some constructors' initializing order
- char* myString = "foo" constructs must be prefixed by "const"
- using size_t for variable types when dealing with STL
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3079 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-07 01:47:15 +00:00
csoler
7b0757c4bc
Merged branch commits:
...
3068: added verification for file size computation (bug correction)
3069: set heartbeat values to intermediate values
3070: suppressed uninitialised memory read
3071: automatic removal of file lists from deleted peers, at restart (After
double check that this does not alter exchange of file lists in any way)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3072 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-05 19:16:39 +00:00
chrisparker126
0470477bcc
group modifications now propagate
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3067 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-05 11:19:04 +00:00
thunder2
342768e626
improvements messages:
...
- save msgId in configuration file
- enable previous improvements read/unread state and tags
new function for creating backups of a file
bool createBackup (std::string sFilename, unsigned int nCount = 5);
currently its only available for windows compile. maybe there is a linux developer who change it for linux.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3064 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-04 23:39:33 +00:00
chrisparker126
458eb34fb6
added edit channel info feature and edit distrib group info
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3060 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-04 22:51:18 +00:00
chrisparker126
163c0e96a7
added edit channel info feature
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3059 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-04 22:50:39 +00:00
defnax
5264f46f9e
update the windows bat files, to not close the cmd box when there is a error on compiling.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3056 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-03 18:41:26 +00:00
defnax
ca56bee921
added svn_revision.bat file to update easier the rsversion.h under Windows, and modifyd the mingw32make.bat before compiling write the latest revision to rsversion.h
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3049 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-01 22:46:56 +00:00
csoler
860f3a0568
augmented the heartbeat parameters, to reduce the stress on connections. Seems to help a lot when the traffic is high.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3047 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-01 20:33:27 +00:00
thunder2
c23ea03190
comment out unused method AuthGPG::updateTrustAllKeys_locked
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-31 19:20:52 +00:00
chrisparker126
f36f92eb24
fixed file rename error
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3034 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-30 07:11:19 +00:00
thunder2
334c9b61d3
moved rsGlobalShutDown from MainWindow::doQuit to main
...
rsGlobalShutDown now cleans the threads and some memory on exit
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-29 15:14:25 +00:00
csoler
b80aef1228
Suppressed the possibility for browsable only files to be searched by hash from turtle router.
...
This avoids that an attacker that captures a broadcast hash request can also ask for the file.
This needed to add back explicit sources in SearchDialog and private chat transfer. I dynamically search
for sources in file lists just before calling FileRequest.
When RS links anchorClick() will work properly with Qt, we can remove the search flag "EXTRA" from the
tunnel digging in p3turtle.cc, otherwise, people having this bug can't transfer files in private chat by
copy+paste of a RS link.
Also:
- added missing mutexes in search requests into fimonitor.cc
- suppressed some debug info in connect manager
- added check for write fails when dumping config files
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3027 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-29 13:17:09 +00:00
chrisparker126
39356c9918
added extra constructor to allow distrib cache service item grpkey to be used with p3service.
...
- key sharing now enabled for channels and distrib service
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3024 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-29 12:05:54 +00:00
chrisparker126
c957fb7988
forgot to pass correct inherited service type
...
- caused problems with distrib service information dispersal
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3023 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-29 08:07:44 +00:00
thunder2
c8a805b8e7
added trash in msgservice and trash folder in MessagesDialog
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3020 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-28 14:42:54 +00:00
csoler
a3a75b7aea
Ported branch commit 3017:
...
- added failure tests for fwrite. Some where missing.
- added a test against the IP 1.0.0.0, which pops up on MacOS (when the peer is not connected to the internet?)
- put some additional debug messages.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3018 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-28 14:00:35 +00:00
defnax
6179470511
revision number testing
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3015 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-27 23:56:36 +00:00
defnax
2f2f761043
change rs revision number
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3014 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-27 23:54:58 +00:00
drbob
0b31b54be3
* Debugging for MacOSX, print out NET_RESET stuff.
...
* Fix discspace for OSX.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3012 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-27 22:34:45 +00:00
chrisparker126
cf785bb8a3
added key sharing facility for distrib groups
...
- not yet complete, clients not receiving key
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3004 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-25 22:51:53 +00:00
drbob
d93c56a355
* Switched on Turtle transfers for Channels,
...
* Enabled srcIds from secondary file transfer requests to be used.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3002 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-25 20:42:56 +00:00
thunder2
b0c1467abe
improvement MessagesDialog:
...
- enabled draft box
bugfix MessagesDialog:
- correct from and to in list and message header
changes MessageComposer:
- cleaned channel part
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2994 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-25 09:32:14 +00:00
csoler
dba460ce0c
converted uint32_t to uint64_t for computing free disk space size. Helps getting a correct size estimation on large file systems.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2993 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-25 08:18:10 +00:00
csoler
1122e9fa56
fixed disk space estimation for large file systems
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2992 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-24 19:18:57 +00:00
joss17
7db10d1f6f
add a modular (with friends number taking into account) retry time for connection attempt
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2991 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-24 18:56:11 +00:00
csoler
c54d581472
fixed proper sorting of IP lists. (branch comit 2989)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2990 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-24 12:17:05 +00:00
thunder2
98c99172c0
fixed check free space for the portable version in windows
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-23 23:53:17 +00:00
csoler
757aa7a95d
Ported branch commits 2980/1: cleaned the code in IP address lists management. Removed some bugs. Changed the strategy a bit: only keep the most recent port for identical ips. Changed the interface of extAddrFinder to make it mroe secure.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2983 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-23 22:27:10 +00:00
drbob
54219ea685
Added in #ifdefs and corrected usage of vstat for OSX.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-23 21:27:41 +00:00
drbob
61e8d588a8
Added ClearFeedItems() function to pqinotify interface.
...
Clear NewsFeeds after Cache loading so we only see new stuff.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2974 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-23 16:35:42 +00:00
csoler
89a6142a9b
attempt at fixing windows compilation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2972 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-21 23:59:35 +00:00
csoler
87d96059cc
forgot to commit this
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2969 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-21 22:05:50 +00:00
csoler
0634e461fb
implemented a safety check for low disc space, and safe drop of disk access if too low
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2968 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-21 20:49:48 +00:00
leander-256
00e5dc311f
Bugfix
...
A forgotten malloc() that should have been set to new
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2961 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-20 00:41:50 +00:00
chrisparker126
fc96473f98
also alert rs to config changed (save keys after restoring them)
...
+ added key backup and restore to p3distrib service
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2960 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-19 23:17:37 +00:00
chrisparker126
e48ede4841
added key backup and restore to p3distrib service
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2957 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-19 22:40:53 +00:00
csoler
4b9b15be27
Ported branch commits:
...
2951: cleaned up some desastrous code in rsdiscitems.cc
2952: put back an exit when the local address+port are already in use.
Otherwise this corrupts file lists, config files etc.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2953 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-19 20:08:58 +00:00
csoler
9ff59e4722
fixed win32 compilation issue
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2949 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-19 11:37:17 +00:00
csoler
0cc8fcdbac
improved the security of size determination for file lists (suppresses a small bug that caused a chain reaction ending in crash of client peers when downloading file lists)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2945 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-18 21:15:22 +00:00
chrisparker126
47ba7c0df2
makes sure channels grp folder is created immediately once a channel is created
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2935 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-17 21:21:47 +00:00
csoler
f7305de302
added a workaround for a bug in the cache system that asks for files of size 2^64-1. This results into a division by zero in ftChunkMap. Bu the time I find this bug, the workaroudn should avoid crashes.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-17 21:05:28 +00:00
chrisparker126
105e617596
fixed abug i introduced, copy of grp icon data made in p3distrib
...
- it was previously corrupting group keys
added dynamics size to grps created
- previously limited to 16000 bytes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2928 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-17 14:33:16 +00:00
chrisparker126
7cd6103ff7
intialised channel info file count correctly
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2927 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-17 14:27:05 +00:00
leander-256
913789b972
This is a patch for the previous patch *facepalms*
...
I got confused somehow between the different versions of my modifications and Linux/Windows, anyway it should work now.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2925 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-16 23:59:39 +00:00
leander-256
b30056e17f
This patch allows Windows users to share files and folders with "exotic" characters.
...
The problem was that libretroshare handles files in UTF-8 but Windows's ANSI/POSIX C functions automatically assume that the char* parameters are encoded with the system's code page. There is no way to set that code page as UTF-8. So now under Windows the code translates the file name to UTF-16 before feeding it to one of the Unicode functions (they are usually prefixed or suffixed by 'w'). Please note that it is not very efficient.
Furthermore, Windows does not provide a Unicode version of opendir/readdir/closedir, so it was necessary to use FindFirstFileW/FindNextFileW/FindClose which has a different behaviour as well as different structures. The FolderIterator class was created in order to mimic the Unix way of traversing folders contents. Hence the algorithm is unchanged and the systems differences masked.
As it was necessary to use some functions from the Windows API, <windows.h> had to be included in a few files were it didn't appear before, creating macros and #define conflicts. In order to solve them, util/rswin.h must be included first in a file (if necessary). Otherwise the preprocessor will fail on purpose to avoid the code being compiled with different _WIN32_WINNT values.
As another side-effect, rstlvutil.h and rstlvutil.cc have been removed from libretroshare.pro file. They are only used by testing units and include util/utest.h which defines a macro FAILED that already exists in <windows.h>. I don't know if unit tests are still in use and I don't plan on coding often on Windows, so I'll leave that as an exercise (hot potato?) to a motivated fellow Windows programmer.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2924 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-16 23:26:45 +00:00
csoler
c8576d98ad
added missign lock in ftcontroller. This is likely to correct a bug.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2920 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-16 21:21:41 +00:00
leander-256
e49cc6552c
Minor fixes
...
pqi/authgpg.cc:
- remove French comment (with nasty non-unicode characters)
- use std::cerr instead of fprintf
tcponudp/extaddrfinder.cc:
- initialize correctly the sockaddr_in, former code wouldn't pad sin_zero
(which is required by the standard)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2909 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-14 18:50:20 +00:00
chrisparker126
27895d1781
added group icon support
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2904 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-14 13:00:07 +00:00
csoler
48556396ee
added a check to avoid (possibly rare) data races
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2901 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-14 11:29:15 +00:00
thunder2
84a87fa11b
New methods for calculating the count of peers and messages. It should be faster than getting all data in std::list.
...
Now used in MainWindow.cpp, MessagesDialog.cpp and peerstatus.cpp
void p3Peers::getPeerCount (unsigned int *pnFriendCount, unsigned int *pnOnlineCount);
void p3Msgs::getMessageCount(unsigned int *pnInbox, unsigned int *pnInboxNew, unsigned int *pnOutbox, unsigned int *pnDraftbox, unsigned int *pnSentbox);
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2898 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-13 19:20:40 +00:00
thunder2
b242b73f31
Memory leaks:
...
- ftController::copyFile -> buffer and file pointer leaks in case of error
- PeersDialog::insertSendList -> new QTreeWidgetItem for all online peers, this function is not ready yet
- PeersDialog::insertPeers -> gpg_item = new QTreeWidgetItem(0); in case of no more accept connection
- pqissl::reset -> missing SSL_free of ssl_connection
Missing return:
- IntroPage::nextId
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2891 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-12 20:10:22 +00:00
thunder2
465cd42463
Memory leak:
...
- getLocalInterfaces -> iptable = (MIB_IPADDRTABLE *) malloc(dwSize);
- main -> RshareSettings *_settings = new RshareSettings();
ExtAddrFinder::~ExtAddrFinder - use free for pointer allocated with malloc
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2882 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-09 21:58:28 +00:00
csoler
23a0b60e59
fixed chat bug that was truncating some messages, due to using a uint16_t to store a local size. Totally backward compatible. This fix might also affect blog messages.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2880 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-09 20:06:19 +00:00
csoler
c87844277a
implemented a short circuit to local cache transfers. This saves a large number of file descriptors, and improves reactivity of the software
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2876 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-09 13:52:05 +00:00
astei
a726f3c063
rm a few blankies
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2871 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-08 21:48:14 +00:00
astei
f2f7a3b77d
Close tracker id 2994519 by applying patch, looks clean to me.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2870 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-08 21:44:08 +00:00
chrisparker126
7652e831e8
removed unused files qblog
...
- redundant
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2868 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-08 17:00:41 +00:00
chrisparker126
e1c4992680
added some minor feature to channels
...
- clean up of channels old (> storeperiod) cache file downloads called at rsglobal shutdown
- added extrafilehash and extra-remove to rschannels, so it chooses appropriate way to add files (correct book-keeping)
- added extra files not copied to chan dir if over 100mb (high overhead)
- added limit to channels auto-download (1gig)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2866 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-08 16:10:34 +00:00
csoler
03d0058ca4
suppressed unused files
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2865 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-08 14:43:55 +00:00
thunder2
f239e7e4d4
Improved MessagesDialog:
...
- corrected calculation of message counts
- p3MsgService::checkOutgoingMessages -> notify when message was sent
- refill of message list without clear, selected messages and scroll position are not changed
- corrected sorting of date with only time for today
- changed context menu in message list
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-07 22:23:38 +00:00
csoler
5813a6454a
added a checkpoint to file hashing, to save intermediate results every 10 GB
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2862 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-07 21:17:48 +00:00
leander-256
c85fa705ba
Two different improvements:
...
- since libretroshare doesn't use Qt at all, we remove it from the CONFIG
directive,
- adding files in HEADERS doesn't include them for compilation but only for
installation. Instead we must use gpg-error-config and gpgme-config to fill
correctly INCLUDEPATH.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2856 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-06 11:06:14 +00:00
defnax
b0c4022ef1
update version
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2855 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-06 10:47:09 +00:00
thunder2
086c5f8e53
Bugfix: show correct signed / unsigned state of forum messages
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2853 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-05 23:06:05 +00:00
thunder2
c3d92dc472
Source code maintenance
...
Memory leaks:
- NotifyQt::UpdateGUI -> popup messages (toaster) stay hidden in memory
- p3disc::handleIncoming -> item was not deleted when RsDiscHeartbeat (memory leak every tick)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2852 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-05 22:03:43 +00:00
thunder2
ed566d85b9
sorry, forgot one #ifdef for portable version
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2841 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 22:28:33 +00:00
defnax
9ee0ad5975
update version
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2835 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-02 16:06:38 +00:00
joss17
1ed191fa9f
don't assign an empty dydns address with p3disc
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2823 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-01 19:25:36 +00:00
csoler
6fee3eeeb7
corrected bug about persistence of default chunk strategy
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2817 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-30 21:07:21 +00:00
thunder2
e5e43741d6
Portable version for Windows.
...
RetroShare checks for locale gpg.exe and gpgme-w32spawn.exe and if exists, it starts as portable version.
Modified version of libgpgme-11.dll needed.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2815 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-30 14:34:48 +00:00
joss17
3b1d1d35fe
add a loopback test
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 21:59:59 +00:00
joss17
f6f22e1e5b
lower the timing to avoid network problem under winxp
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2805 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 21:59:37 +00:00
csoler
1b4a70dbb3
- ported trunk commit 2801 into branch
...
Currently the only way to induce a bug is start rs for an ssl_id which
which does not have a password saved, then try use an ssl id at start
dialog which does or does not have a pword (help_pword:bool enters an
illegal state)
I have fixed it by checking if rsinit::passwd == "" then trying to load for
that ssl_id, if that fails then i set help_pword to false; does not have
password and pass flow to gpg to ask for passwd. (problem was rs thought
user had help/pass file and they didn't).
i have checked it in and tested for
1. starting with ssl_id which has saved pword, and switching ids at start
dialog
2. secondary id may or may not have saved pword.
- added check for the result of fscanf
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2802 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 18:50:37 +00:00
chrisparker126
3364b35064
Currently the only way to induce a bug is start rs for an ssl_id which which does not have a password saved, then try use an ssl id at start dialog which does or does not have a pword (help_pword:bool enters an illegal state)
...
I have fixed it by checking if rsinit::passwd == "" then trying to load for that ssl_id,
if that fails then i set help_pword to false; does not have password and pass flow to gpg to ask for passwd. (problem was rs thought user had help/pass file and they didn't).
i have checked it in and tested for
1. starting with ssl_id which has saved pword, and switching ids at start dialog
2. secondary id may or may not have saved pword.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2801 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 15:39:21 +00:00
chrisparker126
8b893fc312
removed authxpgp source files
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2792 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 12:01:47 +00:00
chrisparker126
d751ecedf7
added const 'idle' status
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2791 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 11:56:06 +00:00
chrisparker126
f1dab2b094
documenting p3chatservice,
...
added 'idle' status to status service
- idle status not saved
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2790 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 11:53:46 +00:00
chrisparker126
40da50799e
documenting p3msgs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2789 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-27 11:44:06 +00:00
thunder2
38e06135a4
- The settings in the settings window are only loaded once.
...
- Saving the settings without changing the network settings doesn't shutdown the connections
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-25 23:28:10 +00:00
csoler
78644a2441
- Removed some potentially harmful (deadlock) code.
...
- Put some printf into debugging #ifdef
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-25 19:26:37 +00:00
joss17
a6b5e8c364
remove debug outputs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-25 17:07:18 +00:00
joss17
293efbf702
Set the trust lvl to 3 when accepting a friend and the trust lvl is unknown.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2780 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-25 17:06:48 +00:00
csoler
0773e92f85
Ported patch from thunder2 ( http://sourceforge.net/tracker/index.php?func=detail&aid=2991827&group_id=178712&atid=886241 )
...
- Bug fix: Checkbox for automatic share of the incoming directory doesn't correctly set with setDown, use setChecked
- ShareManager and RSettingsWin doesn't need to be created all the time
- RSettingsWin: Save the last active page for the current runtime
- ShareManager and DirectoryPage: Show changed shared directories direct after the change
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-24 22:09:47 +00:00
chrisparker126
900ae2332f
documented p3chatservice.h
...
come on guys!
http://retroshare.sourceforge.net/wiki/index.php/API_Documentation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-24 11:27:25 +00:00
chrisparker126
101e0d9dc6
custom status now sent without needing to have a private chat
...
- getcustom status now generate a requests to that peer.
- setowncustom status now generates an 'status available' item sent to all peers
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2769 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-24 10:33:12 +00:00
chrisparker126
c5208b29f1
added new const ids for custom status 'request' and 'available'
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2768 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-24 10:30:36 +00:00
csoler
d027af3324
corrected handling of null strings in RsTlvBase::GetTlvString()
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2766 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-23 13:42:01 +00:00
csoler
0d533d14b1
suppressed uninitialized memory read
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2765 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-23 13:13:36 +00:00
csoler
695226301a
added security check against malformed packets
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2764 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-23 12:57:59 +00:00
csoler
c4de9f0219
added a security check to avoid core dump when a bad p3discReply packet is received
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2762 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-22 21:32:54 +00:00
defnax
890622f413
fixed #include <netdb.h> is not available on windows
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-22 20:03:47 +00:00
joss17
b2b32be32a
Udp connection uses now dynsns when available
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2759 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-22 18:50:39 +00:00
joss17
770ea5eada
Small rand() fix
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-22 18:50:25 +00:00
joss17
a1ece0b837
Remove some error detection in deserial for dynDNS backward compatibility
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2757 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-22 18:50:10 +00:00
joss17
d70e7a3b71
Add the setDynDNS to the confcertdialog
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2756 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-22 18:49:51 +00:00
joss17
50e2e5f672
add include for compilation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2755 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-22 18:49:27 +00:00
joss17
948e4fb61d
Commmit the code from Thunder
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-22 18:49:08 +00:00
defnax
df0ed3ced6
disabled version_detail_bash_script from project file, this makes lots of trouble for new Developers or which want compile first time RetroShare.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2750 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-21 11:44:12 +00:00
csoler
2dd10e5151
included patch for openssl-1.0.0 compatibility
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2747 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-21 08:52:04 +00:00
defnax
3577fb9acf
fixed to get work rsStatus under Windows moved out from if def.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2745 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-20 17:10:45 +00:00
csoler
a5fc5e88e8
corrected other mismatched free/delete in avatar items
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2741 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-20 14:30:53 +00:00
csoler
abeb4c92ee
corrected mismatched free/delete in avatar items. Might have caused random crashes.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2740 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-20 14:15:30 +00:00
csoler
7c6ad47bcf
forgot to commit this one! Sorry.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2739 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-20 12:08:25 +00:00
chrisparker126
f2a3486e4b
fixed compile time error
...
- call back function did not pass prev_was_bad as parameter
to gui/qtnotify function which requests password
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2738 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-20 11:51:18 +00:00
csoler
38463c905e
ported branch commit 2732: fixed deadlock in passwd callback
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2734 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-19 21:50:03 +00:00
joss17
768b9288b5
Fix a bug when adding a cert
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-19 11:58:34 +00:00
chrisparker126
a5bc5d7aa2
removed offline status msg
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2729 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-18 20:01:31 +00:00
chrisparker126
7aa487e2b6
documenting: pqi_base.h
...
- could be improved, if anyone knows more on core rs networking (below p3services and cachestrapper)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-15 11:39:54 +00:00
chrisparker126
e2c8053eee
documentation - p3configmgr.h
...
added rstatus config constant id
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2719 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-15 11:26:44 +00:00
chrisparker126
261637ad08
documentation: pqibin
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2718 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-15 10:54:54 +00:00
chrisparker126
a07df15d4d
documentation: pqibin
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2717 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-15 10:53:00 +00:00
chrisparker126
7009fa36f1
removed old p3status.h/cc service, replaced with p3statusservice.h/cc
...
- did not follow naming convention for services
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2716 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-15 10:50:41 +00:00
chrisparker126
300952d2a6
finished status service
...
- can be called use rs interface rstatus
- does not save last rs session status yet
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2715 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-15 10:47:48 +00:00
joss17
2eb3d560e0
add commentary for openssl 1.0 compilation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2713 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-15 09:32:59 +00:00
chrisparker126
26db9fde3c
more documentation: authgpg
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2712 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-14 22:25:13 +00:00
chrisparker126
96ee57e59b
deleting diff.c, earlier mistake, should not be here
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-13 13:20:25 +00:00
chrisparker126
9ed53ad5b5
documentation begins in ernest
...
-see: http://retroshare.sourceforge.net/wiki/index.php/API_Documentation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2704 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-11 08:51:30 +00:00
chrisparker126
aef367ebff
added commandline option '-U' to allow user to access different profile
...
- in the situation where autologin is enabled
- BUG found (or rather autologin induced it), if one asks to make friends to a peer (in ConfCertDialg) 'within' a session that uses autologin it freezes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2703 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-10 22:06:11 +00:00
csoler
c6c8e63e91
ported branch commits 2666-2668, 2670-2672, 2679, 2682-2683 into trunk
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-10 14:56:34 +00:00
joss17
9f8a032d93
block the notify callback of authgpg when the main windows is launched
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2698 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-08 19:08:41 +00:00
joss17
ffdd38ddd5
add the internal counter mutex lock. Move the code of the rw mutec to the rsthreads.cc file
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2697 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-08 19:08:20 +00:00
joss17
5974ac004e
fix a code bug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2696 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-08 19:07:58 +00:00
joss17
0f5214ff76
ad a read / write lock and refactor authgpg with it
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2695 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-08 19:07:40 +00:00
joss17
a2a567851e
Add own key to p3disc clients
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2694 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-08 19:07:16 +00:00
chrisparker126
1485ccbe87
tested autologin on windows, seems fine
...
-removed #ifdef , seems
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2691 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-08 13:24:08 +00:00
chrisparker126
658946bcd2
Added support for Auto-login
...
- Using rc4 to store ssl pword on file for linux, for windows already using cryptprotect
- yes its not safe, but its the user's choice to keep pword or not
- consider using method closely hooked to linux kernel (another layer of obfuscation)
- windows i believe is stronger (because its proprietary/ heavily obfuscated)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2690 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-08 12:02:46 +00:00
csoler
08065b4298
ported branch v0.5.0 commits 2623, 2624, 2626, 2633, 2634, 2643, 2644, 2646, 2651 and 2654 to trunk
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-28 20:46:45 +00:00
joss17
e1ea7cda10
update timings
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2658 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-28 19:39:23 +00:00
joss17
070af5db2d
change the timings and add some randomness for tcp connections
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2657 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-28 19:39:07 +00:00
chrisparker126
ee6e3ccfb3
Cleaning up source - deleted fltkgui folder
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2645 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-27 15:00:16 +00:00
csoler
b000245ef5
merged branch 0.5.0 commits 2576, 2579, 2581-2583 into trunk
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2592 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-21 21:07:12 +00:00
csoler
f8d6590952
ported v0.5.0 commits 2561,2562 and 2574 to trunk
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-17 15:34:36 +00:00
joss17
0fd8b4d4ee
improve the recieving of bad gpg keys
...
Conflicts:
libretroshare/src/services/p3disc.cc
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2555 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-15 19:11:33 +00:00
joss17
f5a616519c
avoid sending bad gpg cert in p3disc
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2554 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-15 19:10:46 +00:00
csoler
cc17744ee3
ported branch v0.5.0 commits 2529 and 2544 to trunk
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2545 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-15 12:57:08 +00:00
joss17
a4d1e61aa2
increase udp ttl
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2543 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-14 19:48:43 +00:00
csoler
ef67dbf244
fixed win32 compilation pb
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2537 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-13 12:24:14 +00:00
joss17
73615104a7
change ssl binary encryption to aes debug code
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2528 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-12 23:10:01 +00:00
joss17
10205473fc
change ssl binary encryption to aes
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2527 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-12 23:09:46 +00:00
joss17
43fe49e8b4
lower connection attempt timings
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2526 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-12 23:09:32 +00:00
joss17
936f0f88cb
put UPNPBase under LGPL
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2525 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-12 23:09:17 +00:00
csoler
c22799b996
moved removal of sources off turtle mutex to avoid cross-lock. Added a closeFile() call when moving files out of the queue
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2523 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-12 19:39:23 +00:00
chrisparker126
596940400d
Fixed original mistake
...
- changed bob's logic by mistake hence configs file were not being written
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2522 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-12 15:37:48 +00:00
csoler
5e0c8e062e
bug correction: avoid reading deleted pointers by moving saveDone() after the next line
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2519 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-11 14:14:55 +00:00
joss17
a208efdaf9
fix a bug in the double file configuration loading
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2513 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-10 16:19:28 +00:00
joss17
63c41801c9
error message
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2512 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-10 16:19:05 +00:00
chrisparker126
6054890725
Fixed config forward compatibility problem
...
- note to self: C++ binary file not same as C binary file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2510 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-10 14:08:52 +00:00
csoler
5f7486f160
added proper dynamic suppression of sources from chunkmap, and updated the gui
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2498 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-07 14:42:13 +00:00
csoler
144669e672
suppressed debug msg
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2494 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-06 23:37:42 +00:00
csoler
9e469d8baf
Added proper dl queue behavior
...
- suppressed old DwlQueue class
- turned mDownloads into a list of pointers to allow easy cross-info update between queue and std::map of downloads
- added queue functionality for moving files top/bottom/up/down
- added the necessary functions in rsFiles
Put back display of exact sizes in FileTransferInfoWidget
Suppressed some warnings.
**Warning**: this commit requires a make clean.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2493 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-06 23:29:47 +00:00
joss17
da095482db
restrain ip list exchange in an attempt for bug solving
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2490 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-06 17:34:04 +00:00
joss17
aa7bed984f
small update of connct mgr and ssl connection
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2489 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-05 21:27:42 +00:00
defnax
aae699b313
removed old instructions from readme
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2479 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-04 11:27:34 +00:00
joss17
5ed5e8eb92
small change in ext address detection
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-03 21:09:49 +00:00
chrisparker126
6ab15c8f83
Added new 2-pass save method to configuration management
...
- essentially if any part of the file saving procedure fails, there should be config files whose signatures/hash match up
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2476 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-03 18:20:24 +00:00
joss17
235d468ef4
disable the extract failed certificate
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2474 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-02 22:36:27 +00:00
joss17
9fbf62e901
make the gpg key list reading a little more error proof
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2473 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-02 22:35:49 +00:00
joss17
6931a25b45
change the pointer offset cast
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2472 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-02 21:54:30 +00:00
joss17
364a3252f0
Revert "removed c style void* pointer-arithmetic with explicit cast"
...
This reverts commit 548b11fc191e258be6ef45544927101596a5a1d8.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-02 21:53:16 +00:00
csoler
e3f2f66702
suppressed bug in file transfer while removing inactive chunks.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2468 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-01 20:46:29 +00:00
csoler
1904c05bf9
added initialisation of gpgmeKeySelected.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2467 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-01 20:42:17 +00:00
csoler
7b183f41a1
suppressed deadlock (mutex explicitely locked before thread exit)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-01 20:35:32 +00:00
chrisparker126
6b3ab2996a
removed c style void* pointer-arithmetic with explicit cast
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-28 13:28:17 +00:00
joss17
0d524d968b
small fix xhen loading detail from a string cert
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2443 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-26 23:43:40 +00:00
joss17
6f651c4a3c
small change in p3disc logs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2441 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-26 23:43:10 +00:00
joss17
8f315a52cc
remove a (useless ?) buggy quote in qmake file for mac section
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2440 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-26 23:42:52 +00:00
csoler
b50b33b573
cleaned the code in fimonitor, modified the order of file hashing, and put a more explicit progress message while hashing.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2438 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-26 23:05:07 +00:00
joss17
bba533a392
disable the ssl cert config persistance
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2436 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-26 16:43:08 +00:00
joss17
2fd91a5b71
corrected a debug message
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2430 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-25 22:44:43 +00:00
joss17
a228503d0e
add the tunnel config to server tab, and activate the tunnel on fresh configs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2429 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-25 22:44:27 +00:00
joss17
3d33f5d729
reimplemented the tunnel handshake
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2428 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-25 22:44:04 +00:00
joss17
47b5f62aeb
update implemention for new ssl encryption
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2427 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-25 22:43:36 +00:00
joss17
57e2e94f8f
update log of p3tunnel
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2426 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-25 22:43:20 +00:00
joss17
be5957742c
remove some exit(1)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2425 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-25 22:43:04 +00:00
joss17
5de1f4db50
implementation of an SSL binary encryption
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2424 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-25 22:42:42 +00:00
csoler
a6c585090a
oups. backward commit this change which I done yesterday by mistake
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2420 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-24 21:39:23 +00:00
csoler
e4a508ab5b
warning suppression
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2411 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-23 22:30:51 +00:00
joss17
80b44220fb
Properly close ssl connection when receiving error SYS_CALL. Bug solved
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2410 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-23 22:27:09 +00:00
csoler
3d11b15490
warning suppression, removed unused p3portservice from compilation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2408 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-23 22:17:06 +00:00
csoler
ede337b7d4
suppressed unninitialisez memory reads
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2407 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-23 21:55:44 +00:00
csoler
5acc8411e5
warning suppression
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2406 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-23 21:55:29 +00:00
csoler
0d67e991e3
suppressed possible un-necessary infinite wait
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2405 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-23 21:54:35 +00:00
chrisparker126
3ff7635171
adding blog bad to gui, test for new blog reply field
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2376 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-19 23:23:19 +00:00
csoler
5633e7b5f4
made complete files stay in the download list
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2373 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-19 20:36:47 +00:00
csoler
fbfff65703
fixed group chat download
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2361 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-18 22:57:45 +00:00
csoler
851e9069f6
corrected compled completion and file progress issues
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2356 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-17 22:10:12 +00:00
drbob
56e9536336
Modified libretroshare to compile under MacOSX.
...
1) b64.c used c++ functions -> b64.cc
2) OSX will use miniupnpc for now -> modified #defines.
3) change in openssl fn signature?
4) updated build file for OSX.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2344 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-16 22:25:58 +00:00
csoler
5ff48963a5
improved tunnel display name
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2337 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-15 21:32:06 +00:00
csoler
154ef63474
removed potentially harmful code. Warning: needs make clean in libretroshare
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-15 20:44:37 +00:00
csoler
799cfca972
added missing scope guard
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2333 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-15 18:03:27 +00:00
joss17
72a3396a58
add a control when establishing a ssl connection and the sockfd is -1
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2331 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-15 15:31:37 +00:00
joss17
5d128e77e9
don't send details to an unsigned gpg friends
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2330 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-15 15:31:06 +00:00
csoler
17ef6b932b
put a safety check against sockfd==-1
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2322 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-14 16:43:42 +00:00
joss17
94aa902a95
clean the qmake files
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2318 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-14 14:18:53 +00:00
csoler
7a10cd6c95
added a ending 0 to form a proper string in gpg cert export
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2306 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-13 22:45:25 +00:00
csoler
5926c79822
corrected bug in file completion
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2301 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-13 20:42:49 +00:00
joss17
56694fbc84
change come locks and code cleaning
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2279 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-10 21:54:28 +00:00
csoler
b0f7275ac0
suppressed uninitialized memory read
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2277 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-10 21:32:45 +00:00
csoler
9753b47576
suppressed bug in creation of cache directories
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2275 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-10 20:32:21 +00:00
csoler
d00739ce7b
suppressed uninitialized memory due to empty cache file
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2274 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-10 20:24:30 +00:00
joss17
b46cf457db
further log cleanings
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2271 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-10 10:56:54 +00:00
csoler
272d9845a6
corrected invalid memory read due to bad deletion method in std::map
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2268 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-09 21:53:49 +00:00
csoler
365ef569dc
suppressed some uninitialised memory reads
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2267 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-09 20:31:49 +00:00
csoler
5ff5a37bd2
corrected invalid write bug in p3chatservice
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2266 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-09 20:20:29 +00:00
joss17
40e6e6ff8f
add back the git part of the version script
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2262 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-09 19:10:58 +00:00
joss17
9262feac1c
add error info when gpg password is wrong
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2261 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-09 19:10:42 +00:00
joss17
fba2a3afae
add gpg password static store when gpg password callback is called
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2260 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-09 19:10:15 +00:00
joss17
5a7fb9a57c
solve a bug when the tmpcfg directory already exists under windows
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2255 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-09 14:11:03 +00:00
csoler
822d25b294
suppressed printf
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2252 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-09 13:14:47 +00:00
csoler
a8cdbfbde1
added security check
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2251 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-09 13:13:50 +00:00
csoler
a84d1e37fc
suppressed possible SIGSEGV due to null information in certificate
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2250 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-09 08:37:01 +00:00
csoler
b899327f13
improved display of turtle routing info, corrected some minor compilation issues
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2248 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-08 23:09:46 +00:00
csoler
024e7f4b44
made the age indicator functional, by recursively changing color of directory/files
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2244 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-08 22:32:00 +00:00
andrewsteinborn
38b0c578bb
Various stuff. FAQ has 0 zero stuff inside, we don't use git, and matched lowercase filenames. Also, a few formatting fixes in the .pro file in libretroshare.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2243 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-08 21:34:40 +00:00
defnax
96caa40895
fixed windows compile
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2241 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-08 17:38:57 +00:00
joss17
1c51a0faab
still further log cleanings
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2240 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-08 16:42:26 +00:00
joss17
6f1e4623ab
further log cleanings
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2239 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-08 14:06:43 +00:00
joss17
5aff139382
further log cleanings
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2235 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-07 23:01:46 +00:00
joss17
a433eb6abd
further log cleanings
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2234 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-07 23:01:18 +00:00
joss17
bf67301d71
remove a maximum of debug outputs for the release
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2232 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-07 21:28:40 +00:00
csoler
3621ef4a95
resurected error msg window. Added a check for file hashes in FileRequest() to detect issues with badly formed file links
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2230 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-07 18:10:12 +00:00
csoler
2521431afa
reverted last change on packet size. Seems to screw the convergence of speed. We need to tweak that a little more
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2221 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-06 22:27:44 +00:00
joss17
47b6cff805
update version info
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2215 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-06 20:49:49 +00:00
joss17
d8ae27123e
gui cleaning
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-06 20:49:24 +00:00
csoler
93aa334219
setup chunk slicing in FT to 32K instead of 8K. Seems to work perfectly, and faster, since TCP slicing is less likely to waste packets when the size is not a multiple of the TCP slice (1500 bytes?)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2210 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-05 23:10:32 +00:00
csoler
3e921bb254
added some security checks to turtle router
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2208 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-05 22:45:52 +00:00
joss17
c381099e59
set private key trust to full when the validity was unknown
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2204 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-05 21:18:28 +00:00
csoler
aab0879f5b
Makefile as no place in svn, as it is generated by qmake
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2203 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-05 21:02:15 +00:00
joss17
6f9b8bb013
solve a bug with gpg private key validity unknown
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2202 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-05 21:00:36 +00:00
joss17
faa1e15db2
fix a bug wich stops multiple connection against the same peer
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2201 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-05 20:39:01 +00:00
chrisparker126
cf6d69c66e
added blogs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2182 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-03 22:53:35 +00:00
chrisparker126
7fc84d7ceb
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2181 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-03 22:47:06 +00:00
joss17
626142e6db
remove double gpg list call
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2179 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-03 21:55:23 +00:00
joss17
cfe3bca2a8
Msg forums are now signed by ssl certs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2178 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-03 21:21:04 +00:00
joss17
5e11947d5c
change the p3disc adding deleted friends
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2177 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-03 21:20:31 +00:00
csoler
8ccf3c3e2d
corrected bug about display/selection of anonymous files
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2176 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-03 20:59:54 +00:00
csoler
e08d13397a
fixed a completion issue in FT
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2174 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-02 22:15:42 +00:00
joss17
1e96a13c5d
add gpg authentication everytime we got an ssl auth error
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2171 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-01 22:59:30 +00:00
joss17
470ec8d11a
initialisation of net reset timeout in p3connectmanager
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2167 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-31 20:17:35 +00:00
joss17
ec7fcffcb5
fix a possible bug in getTlvString
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2166 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-31 20:17:15 +00:00
joss17
15e3a0d075
fix a null pointer bug update
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2165 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-31 19:45:35 +00:00
joss17
906cc25379
fix a null pointer bug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2164 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-31 19:45:08 +00:00
csoler
e0113efb30
small fixes in files context menus
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2162 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-31 14:21:24 +00:00
csoler
d6ebef77fb
compilation fix
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2159 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-30 21:19:46 +00:00
csoler
8e5b1dca64
factorized and cleaned the common code between fistore.cc and fimonitor.cc, improved the stability of FileIndex, improved the display in RemoteDirModel
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2158 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-30 20:47:34 +00:00
andrewsteinborn
bc84ebb494
Delete the odt readme, start on Welsh translation and remove a blank line in rsprint.cc.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2148 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-29 22:14:53 +00:00
joss17
e142c63180
update start wizard, change gui settings directory into ssl profile directory (RestroShare.conf)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-27 22:31:25 +00:00
defnax
4bb320d3cc
fixed compiling under win
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2138 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-27 14:08:51 +00:00
csoler
b592bdac62
added return statements is functions that missed one
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2137 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-27 08:24:39 +00:00
csoler
7fd5c7ad4b
restaured priority queue methods, and made better context menues.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2135 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-26 23:25:00 +00:00
csoler
7b35b7dc6a
added some more robust tests in certificate creation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2134 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-26 20:41:55 +00:00
csoler
a70b106005
- added NETWORK_WIDE flag to remote dir model download
...
- added file priority strategy based on which files are requested first. This provides:
- equal file speed for files with equal (source,priority)
- effective priority speed for file of same source but different priority
- removed state variable load/save from turtle, as it's not needed anymore (FileRequest re-opens tunnels as needed)
- manage availability per peer instead of per file type: direct peer ids always assume file availability, while turtle tunnels don't
I still need to make the download queue work, and code this gui for it.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2133 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-26 20:40:21 +00:00
csoler
0266420798
added a member in RsThread that indicates the id of the thread currently owning the lock, for debugging purposes
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2132 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-26 19:34:31 +00:00
joss17
8bfd696430
solve a bug with gpg signature summary
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2119 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-24 22:20:13 +00:00
csoler
fb1e030cb6
corrected missing return, added some debug printfs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2116 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-24 13:59:22 +00:00
csoler
76cce0c7d2
improved peer name info in cachestrapper, gence improving dir names in file lists
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2115 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-23 21:38:38 +00:00
csoler
0e7f9df638
made contextual menus in FT more contextual, added info about transfer type and chunking strategy, load/save of transfer flags
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2114 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-22 23:23:37 +00:00
csoler
09acb717a0
added a debug ifdef to GPG stuff to remove printfs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2110 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-21 23:01:48 +00:00
joss17
79d95fdc63
fix a bug with gpg id details
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2108 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-21 22:05:26 +00:00
joss17
5d863f6243
reduce the reading access to gpgme
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2107 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-21 22:04:20 +00:00
csoler
f42489d8e6
changed name of turtle tunnels into a more explicit and less losy name ;-)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2103 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-21 12:33:01 +00:00
csoler
e2b807aad7
added regular cleaning of inactive chunks and slices, so that they can be treated by a different peer
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2102 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-21 12:31:00 +00:00
joss17
f481dbef59
add include for latest gcc. Comment usleep fonction in tou_net.h
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2101 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-20 22:02:43 +00:00
joss17
074671af29
don't send an empty gpg key in p3disc
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2100 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-20 21:41:21 +00:00
joss17
5fd9dba515
fix null pointer to string in authgpg save certificate to string
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2098 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-20 21:15:14 +00:00
joss17
fcb92631fb
clean the cert only when manually inserted
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2092 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-19 22:06:42 +00:00
joss17
c0acb71136
add the clean cert routine for gpg certs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2090 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-19 21:44:59 +00:00
joss17
abf19c964a
don't send gpg key when all the ssl childs are on no disc or when we got no ssl child of it
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-19 19:17:21 +00:00
joss17
b4d89ccd94
ask disc info when adding a new friend
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2083 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-19 19:15:22 +00:00
joss17
e4b7ee7766
fix a bug to connect to own gpg key
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2082 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-19 19:12:27 +00:00
joss17
b617dcd1f7
removing of own gpg key as friend when not necessary
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2080 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-19 13:09:11 +00:00
csoler
10b7726e55
suppressed a bug in signature length computation. Old certs are still valid (because of a if I added), but wont connect to new ones, so users should update from now on.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2076 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-18 22:44:18 +00:00
joss17
ac580a6c07
add location to account detail at startup, and improve the peersdialog
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-18 22:44:09 +00:00
joss17
af68fa36ce
add key generation at startup if no gpg key found
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2068 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-18 12:30:54 +00:00
csoler
3afd4442c9
forgot flag in ::alreadyHaveFile()
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2059 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-16 23:51:46 +00:00
csoler
02234325cc
fixed startup password handling, so that it wont ask for passwd again, hence preventing deadlocks when the gui is running
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2057 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-16 22:03:33 +00:00
csoler
e70e995894
added functionnality to complain when a download is initiated over a file already in download, or in the HD
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2055 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-16 15:42:26 +00:00
joss17
5618d145a9
accept connection from our own key
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2053 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-16 12:24:58 +00:00
joss17
3f22602b6c
adding a deleted ssl friends persistence in p3disc to avoid getting back a friend we just deleted
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2051 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-15 21:09:25 +00:00
joss17
0318e73917
fix a bug when removing friends
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2050 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-15 19:43:00 +00:00
joss17
0d06dbe55b
change the removing af dummy friends
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2049 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-15 19:42:15 +00:00
joss17
de1f223d7d
add a test for connection establishement
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2048 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-15 19:41:29 +00:00
joss17
5349ab101a
Revert "Ad a friend right upon connection when necessary. Removed two core mutex to do that, it might be dangerous, we will see"
...
This reverts commit 430b13ab7d12b0911e072887c8347b6855d173af.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-14 22:50:27 +00:00
joss17
e2cc7213a3
Ad a friend right upon connection when necessary. Removed two core mutex to do that, it might be dangerous, we will see
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2037 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-14 01:33:56 +00:00
joss17
8d002a1566
add a ssl check that the peer isn't already connected
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2036 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-14 01:33:36 +00:00
joss17
0291c94702
fix windows compile
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2035 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-14 00:39:14 +00:00
joss17
a51df4ba6b
accept own locations
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2034 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-14 00:38:36 +00:00
joss17
79ead807a2
fix a compilation bug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2033 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-14 00:37:38 +00:00
joss17
810481c8b7
add more explicit param names
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2032 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-14 00:37:15 +00:00
joss17
a38799a98e
add a gpg debug output
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2031 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-14 00:36:02 +00:00
joss17
37cf2e98a2
remove boost call
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-14 00:35:16 +00:00
joss17
3863b8c173
solve a bug with dummy friends
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2029 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:35:27 +00:00
joss17
38df8b54a6
change mutex lock in authgpg to avoid deadlock
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:34:47 +00:00
joss17
c45582738e
send just connected peer info to all others
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2027 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:34:28 +00:00
joss17
115a80045e
implementation of p3disc with new gpg key management
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2026 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:33:54 +00:00
joss17
54c7f8b81a
implement the remove friend for gpg key, and improve the tranfer of ip address from a dummy peer to a normal peer
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2024 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:32:05 +00:00
joss17
018b84a1e1
change the design of the connect friends wizard
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2023 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:30:44 +00:00
joss17
c6edff7df8
change the cert to gpg + some ssl details
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2022 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:29:21 +00:00
joss17
72d9eb2aef
solve a bug in the load list af connect mgr
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2020 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:27:07 +00:00
joss17
3742d3bd8b
add persistence of accepted gpg key to connect with
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2019 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:26:30 +00:00
joss17
e50dc4e3b9
implement dummy friend for a gpg key, improve PersDialog ui
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2018 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:25:18 +00:00
joss17
9976b80566
remove the ssl cert storage. Big rewrite of ssl cert and friend management
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2017 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:22:52 +00:00
joss17
b96a6d879e
small bug correction
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2015 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:17:35 +00:00
joss17
485f27dc11
allow ssl connection with a new cert, ad a friend when happening
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2014 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:16:56 +00:00
joss17
bb45fa3db5
working gui version for peers dialog
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2013 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:16:18 +00:00
joss17
1ae1c9a98b
implement the trust settings in the gui
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2012 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:14:49 +00:00
joss17
dabe44356a
make peer detail gui work for the gpg and the ssl id
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2011 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:12:56 +00:00
joss17
41600dc3cf
make peer details work for GPG key in the network view gui
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2010 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:11:02 +00:00
joss17
77b3c0afd0
first code for the gui : network dialog, start dialog and certificate first generation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2009 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:08:46 +00:00
joss17
45b2287d41
remove the store of the pgp password
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2008 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:06:53 +00:00
joss17
9c17aced37
implemented the sign, trust and validitty functionnality in authGPG. Fix a singleton bug for authGPG and authSSL
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2007 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:05:38 +00:00
joss17
6055c30832
code cleaning
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2006 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:03:36 +00:00
joss17
d2a1084c27
make it work without exchanging keys in p3disc
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2005 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:02:39 +00:00
joss17
7d0854fd90
fix a bug in rsinit with pgp name
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2004 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:01:55 +00:00
joss17
9d53481946
make it run
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2003 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 21:01:06 +00:00
joss17
a0a64fb588
make it compile
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2002 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 20:58:58 +00:00
joss17
c23407cae3
get rid of p3authmgr
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2001 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 20:56:55 +00:00
joss17
2917896834
add stdint to header
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2000 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 20:53:37 +00:00
joss17
bd5df3a9ea
first separation between authSSL and authGPG
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1999 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 20:52:31 +00:00
csoler
fe9b8f353f
compilation fix for 64 bit systems
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1997 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-13 20:36:20 +00:00
csoler
96147a9734
added flags to file request: RS_FILE_HINTS_ASSUME_AVAILABILITY to not wait/ask for chunk maps. Used for cache transfer and also whenever the turtle traffic is not involved, such as chat file exchange, and RS_FILE_HINTS_NETWORK_WIDE to force using turtle routing for traffic. Also moved turtle tunnel start/stop orders from ftServer to ftController
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1995 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-11 22:38:18 +00:00
csoler
f02b009d7b
fixed win32 compilation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1994 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-11 20:10:04 +00:00
csoler
cfaaec31c7
- Implemented chunk-based file transfer from partial sources. This in particular means:
...
- exchange of chunk availability maps from different peers
- correct handling of what is available to which source before asking the data
- correct display of chunks in the progress bars
- generalised the use of compressed chunk maps
- removed the size parameters from the hash search functions
- In addition:
- suppressed a number of per-value transfers of std::string
- improved the FileTransferInfo Widget, to show some additional info
Still to be done:
- chunk map exchange for non anonymous traffic (easy)
- improve accuracy of completion for uploads (for now it's a integer number of chunks)
- check compilation on windows
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1993 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-11 16:00:42 +00:00
joss17
d549d8d144
add a missing declaration
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-09 01:41:57 +00:00
joss17
68802e1191
probably solved a bug with unstable connections
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1985 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-09 01:40:50 +00:00
joss17
6dbc7fd9bc
change hearbeat period to 6 secons. Disconnect when no beat is received after 18 sec
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1970 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-04 13:05:28 +00:00
csoler
b83e894640
- added a generic RsItem to the turtle router and the methods to route it. This makes the code much more elegant.
...
- suppressed a cross mutex lock bug that happened rarely while digging tunnels
- changed FileDetails in ftServer so that it's now possiblt to search for hashes of files being downloaded
- improved the search code in ftdatamultiplex
- added some comments to the turtle code
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1964 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-02 21:30:19 +00:00
csoler
92dee8ff35
suspending the auth code in p3distrib to allow forum messages to display. I need to sort out this mess.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1941 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-29 15:23:48 +00:00
csoler
f4a2eaecce
- implemented a visualisation for currently handled chunks, availability maps, and transfer info
...
- implemented transfer protocol for chunk availability maps between peers (not enabled yet though)
- suppressed rsiface directory from retroshare-gui
- moved notifyqt.{h,cpp} to gui/
next moves:
- send availability maps to clients;
- connect turtle search to unfinished files;
- test multisource download with unfinished files.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1939 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-28 21:11:00 +00:00
joss17
bccd4e7d22
don't add an external address if we are not reachable with it
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-22 18:43:04 +00:00
joss17
79138790dd
add debug code for tunnel test
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-22 12:30:44 +00:00
joss17
e708cf4257
don't do a tunnell connect attempt when already connected through a tunnel
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1931 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-22 12:30:28 +00:00
joss17
b73216a297
use siglen -1 for both gpg2 and gpg1 verify signature
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1930 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-22 12:30:13 +00:00
joss17
6b9392fcae
Add heartbeat (an empty packet, wich is 100 bytes long) in p3disc every 4 seconds
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1929 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-22 10:41:19 +00:00
joss17
9866a93b7c
add some errors for ssl before resetting
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1925 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-20 13:28:01 +00:00
joss17
106645f5e5
start listener not immediately after net reset to avoid connection flickering. Stop listeners is here but not implemented
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1924 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-20 13:27:46 +00:00
joss17
bc27e188f9
stop ssl listening when already connected
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1923 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-20 13:27:26 +00:00
joss17
1bb1f4575b
stop sending data when ssl read returns 0
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1922 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-20 13:27:12 +00:00
joss17
d09fdd1e91
debug for packet sending bug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1921 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-20 13:26:57 +00:00
joss17
22bf9b11b1
fix infinite loop
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1920 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-20 13:26:44 +00:00
joss17
a83345e394
still trying to fix this list serial ip address
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1919 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-20 13:26:23 +00:00
joss17
d485c71126
The external ip address is now set when a peer is connected if there is no upnp or extadrfinder
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1918 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 23:35:57 +00:00
joss17
c90714c5bd
finally got the address list bug : you've got to duplicate the list in order to send the message
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1917 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 23:35:40 +00:00
joss17
cc6b480156
improve address list config serialization
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1916 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 23:35:25 +00:00
joss17
808ac84fa8
improve serial / deser of ip address list
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1915 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 23:35:08 +00:00
joss17
0bf5a5b79d
fix a debug output
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1914 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 23:34:49 +00:00
joss17
335e2e6d71
start peer connection 6 sec after net reset
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1913 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 23:34:34 +00:00
joss17
76c774a76a
upgraded connmgr and p3disc for ext address ip detection when connecting to peers
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1912 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 21:45:45 +00:00
joss17
5c436e2dde
add memory socket address initialisation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1911 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 21:45:28 +00:00
joss17
10cd455519
add some various tests to avoid ip address 0 bugs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1910 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 21:45:13 +00:00
joss17
2d8f30c2c7
ensure that local address is not 0.0.0.0 or port is 0 in the connect manager
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1909 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 17:52:50 +00:00
joss17
7efc0ef9b7
verify that ext addr is not 0
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1908 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 17:52:26 +00:00
joss17
c182f0c27d
change packet version for rsdisc
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1907 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 17:52:11 +00:00
joss17
1a080e1427
fix a bug with ip serialization when ip or port is 0
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1906 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 17:51:56 +00:00
joss17
5f7bc6e69d
change debug output
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1905 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 17:51:40 +00:00
joss17
4f20a4d89c
fix the serial of rsdisc
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1904 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 17:51:23 +00:00
joss17
c06d0c6f98
add serializiont of own ipaddress list in rsdiscitem
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1903 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 17:51:08 +00:00
joss17
fbec787877
send own ip address list with p3disc
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1902 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 17:50:53 +00:00
joss17
4a53fdc0a9
change the way we handle our own address when recieving a disc item
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1901 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 17:50:33 +00:00
joss17
2ed7a96245
Revert "Revert "add a quiet shutdown when SSL_ERROR_SYSCALL is raised""
...
This reverts commit 5f9020b2b69a1920f5886a3ec25a2591902d17ae.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1900 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 17:50:11 +00:00
joss17
225cee6627
fix a bug in upnp
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1899 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 17:49:49 +00:00
joss17
89ab9b1553
Revert "add a quiet shutdown when SSL_ERROR_SYSCALL is raised"
...
This reverts commit 7b8310ff019a9d81ada9d11a7aeceec8c50c9ee0.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1898 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-17 22:22:46 +00:00
joss17
039e41356c
fix a bug for own disc item and address list
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1897 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-17 22:22:27 +00:00
joss17
a12084d620
add a quiet shutdown when SSL_ERROR_SYSCALL is raised
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1896 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-17 22:22:09 +00:00
joss17
00edab16d9
fix a bug when connected through a tunnel
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1895 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-17 22:21:51 +00:00
defnax
e5cd917645
added SVN_REVISION to rsversion to not overwrite LIB_VERSION
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1894 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-16 21:54:46 +00:00
joss17
cfcd773d6e
fix a bug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1893 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-15 22:04:50 +00:00
joss17
7ca2b01791
fix a reconnection bug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1892 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-15 21:50:45 +00:00
joss17
8628be3b35
add a break in case ipAddressList don't deserialize correctly
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1891 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-15 17:50:18 +00:00
joss17
83db3bebb9
add current local and external address to ip list
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1890 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-15 17:48:48 +00:00
joss17
73d92b4a68
add info to gui
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1889 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-15 17:47:43 +00:00
joss17
4f25178d47
improve extract of external ip address from the ip address list
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1888 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-15 16:56:58 +00:00
defnax
263456d54c
removed unused server directory
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1887 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-15 16:05:24 +00:00
joss17
2b52db6c47
rework a little the netCheckConsistency
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1886 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 21:59:15 +00:00
joss17
908a6e1891
add debug info
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1885 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 21:21:51 +00:00
joss17
8e4ce11532
work on the timeout for tcp and udp connection
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1884 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 21:20:17 +00:00
joss17
6f0e7de534
fix ext address peer detector
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1883 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 18:46:08 +00:00
joss17
76d5072624
add ext address detector when connectiong to peers
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1882 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 18:11:19 +00:00
joss17
b7ace087e6
remove DHT from rsInit
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1881 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 18:10:49 +00:00
joss17
35631d180e
add ifdef for debug logs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1880 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 18:10:34 +00:00
joss17
3cac0c1ce9
add ifdef for debug logs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1879 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 18:10:20 +00:00
joss17
df5d249dd1
code cleaning
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1878 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 18:10:05 +00:00
joss17
c71306681e
code cleaning
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1877 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 18:09:46 +00:00
joss17
34c4e500e4
fix a bug in the udp timeout
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1875 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 13:59:25 +00:00
joss17
cd01b0df43
DHT disabled
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1872 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 13:46:38 +00:00
joss17
b447a213ea
perform a net reset when network config is changed
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1871 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 13:46:23 +00:00
joss17
892598d6eb
change the address selection of udp connection
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1869 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-14 10:34:57 +00:00
joss17
fdb3673ce2
Add the tunneling connection. Warning, encryption is not implemented yet for tunnel connection, use only for testing.
...
Redesign the udp connection
Remove the rsiface duplicates from retroshare-gui.
Add some randomness in timings for connect manager
Merge branch 'connectionTunneling'
Conflicts:
libretroshare/src/libretroshare.pro
libretroshare/src/pqi/p3connmgr.cc
retroshare-gui/src/RetroShare.pro
retroshare-gui/src/rsiface/rsfiles.h
retroshare-gui/src/rsiface/rstypes.h
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-13 21:59:26 +00:00
csoler
b6c048a5fd
Implemented load/save of chunk maps for current downloads.
...
The side effect is that even when stopped, downloads show the correct downloaded size (up to the size of one chunk).
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1865 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-10 22:55:27 +00:00
csoler
4d190963cf
windows compilation fix
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1864 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-09 12:42:31 +00:00
csoler
25a09900e9
- Added a ChunkMap class responsible for allocating new chunks to be downloaded, according to
...
- a given chunk strategy
- the availablility map of each source
- Integrated this into ftFileCreator
- added gui menu in file transfer+right click to change the chunk strategy: streaming vs. random
Next step:
- loading/saving file downloading state and availability map
- displaying chunk details in the selected transfer tab (e.g. list of currently worked chunks, and their current downloading completion)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-08 22:29:52 +00:00
defnax
de0cbd50ce
fixed libretroshare.pro
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1862 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-06 12:08:59 +00:00
csoler
426fc06938
forgot to add these two files
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1839 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-19 08:35:11 +00:00
csoler
e88d2c1928
Added consistent display of chunk map
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1837 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-18 23:02:37 +00:00
joss17
adbdb51c5d
removed unused code and logouts, redesign the initial connection
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1836 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-18 17:46:38 +00:00
csoler
506f14eb2f
- Added a parent page widget (class RsAutoUpdatePage) to handle auto-update. The page updates using a timer, only wh
...
en visible, and each time it gets showed. I already made some RS pages derive from this page.
- Modified and renamed the taskGraphPainterWidget to display info about currently selected file transfers. For know, it only shows file chunks info, but we should use it to display additional info about the transfer. Warning: in its
current state, only fake chunk info is displayed.
- Suppressed p3files.h, because it is not used.
Remains to do (in order):
- Implement a chunk map class in ft/ to properly manage which chunks should be downloaded
- Display correct chunk info by requesting the transfer's chunk map
- Add check-sum verification of chunks
- allow RS to import a partially downloaded file by force re-checking chunks
- Add chunk map exchange from file source peer id to file destination peer id.
- Manage chunks from different peers.
- Allow search (turtle search) for partially downloaded files
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-17 12:45:06 +00:00
joss17
36c2a726fa
check to see a peer is connected before doing a net reset. Don't do a net reset when a loopback interface is used. Set netFlagOk down when on a loopback interface.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1831 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-16 10:53:17 +00:00
csoler
e18167a07a
forgot to commit this
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-14 21:54:43 +00:00
csoler
e77064eaf1
removed deadlock by replacing lock() by trylock(). As a result sometimes, authGPG::getDetails() may return false. As soon as it is used by the GUI only, it shoul dbe ok.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1823 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-14 20:20:33 +00:00
joss17
6a48284c31
remove a deadlock
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1822 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-14 11:59:50 +00:00
joss17
573e7b2474
remove upnp mapping before adding new ones
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1821 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-12 22:19:45 +00:00
joss17
8168be6828
less call to extFinderAddr
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1820 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-12 22:19:25 +00:00
joss17
f56e9cfcd9
fix log output with ifdef
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1818 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-12 17:16:06 +00:00
joss17
874d9f45fa
fix a bug when removing 1 from a zero siglen
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1817 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-12 17:14:50 +00:00
joss17
5a2dbc4bdf
simplified and improve ip list for connect attempt. Show the ip in the gui
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-12 11:51:27 +00:00
joss17
6a656eeabc
add port filtering if 0 for address list
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1813 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-11 22:13:07 +00:00
joss17
e0543329ad
add address list to gui
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1812 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-11 22:12:50 +00:00
joss17
d2f9f1c4f1
final code, working on local machine
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1811 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-11 16:49:11 +00:00
joss17
020bb73665
add the ip list to the connect attemps
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1810 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-11 16:47:54 +00:00
joss17
fcea2d3a24
implemented the ipAddressList methods
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1809 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-11 16:47:10 +00:00
joss17
864c504eb4
dummy implementation of the peerConnectState ipAddressList methods
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-11 16:46:28 +00:00
joss17
f85adf7c25
change to only one ip list instead of one local and one remote
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1807 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-11 16:45:46 +00:00
joss17
9a6ff52da1
add the serializing of ip adress list, and the process to ad ip to the list when a connection is made to a peer
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-11 16:44:51 +00:00
joss17
74e20960c2
remove log output
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1805 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-11 16:44:22 +00:00
joss17
00361c22a5
first commit, change some members name from localaddr to currentlocaladdr, and add ip lists in the classes. Not used yet to connect or exchange
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1804 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-11 16:43:51 +00:00
joss17
a444484734
fix a bug when closing RS for upnp
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1803 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-10 17:17:05 +00:00
csoler
c046f76934
display the best available ip for peers in the gui, instead of 0.0.0.0. This does only affect the gui, not the way ips are trusted and propagated.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1799 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-07 22:06:12 +00:00
csoler
10dcad632a
setup reconnexion time to 5 seconds after reset
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-06 22:56:01 +00:00
csoler
1ac3eee9fe
added reset of current connexions and force-reconnect when network configuration changes.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1797 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-06 22:42:41 +00:00
csoler
ad96c86f68
Added dynamic local and external ip reconfiguration. I still need to reset connexions when changing ips.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-06 22:12:58 +00:00
joss17
ef78f90225
fix an upnp bug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-05 20:56:16 +00:00
csoler
37adbae4c1
suppressed unused include of p3files
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-05 20:16:14 +00:00
csoler
7c1288411a
made the passwd dialog call Qt-independent (thanks to notifyBase)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1793 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-11-05 19:38:10 +00:00
joss17
3fc211ab15
Add a QTDialog for the gpg key passphrase input
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1790 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 21:26:35 +00:00
joss17
6e225dec47
Change the unix to linux-* qtcreator files
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1789 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 01:41:16 +00:00
joss17
6fba28ee0d
Solve windows gpg bug and modify windows .pro project files qtcreator
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1787 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:46:58 +00:00
joss17
49b24c2b14
add compilation swtich : libupnp for linux and miniupnp for windows
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:46:36 +00:00
joss17
e0d7178089
remove unused include
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1785 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:46:11 +00:00
joss17
7b7846f22f
windows compilation fix
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:45:57 +00:00
joss17
5d6f6f00f4
initialization of a variable
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1783 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:45:40 +00:00
joss17
cabf6260c2
fix uninitialized pointer fir libupnp
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:45:25 +00:00
joss17
0497666009
fix a escape character ug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1781 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:45:03 +00:00
joss17
62111d00ca
change timer and fix log messages
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1780 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:44:44 +00:00
joss17
4295eee208
change timers
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:44:24 +00:00
joss17
95888fed59
add a timeout to ext addr finder
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1778 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:44:04 +00:00
joss17
c517e42f25
change log message
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:43:46 +00:00
joss17
60210e786b
add extAddressFinder tick search
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1776 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:43:31 +00:00
joss17
8d1b4aff72
improved log info
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1774 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:43:00 +00:00
joss17
ff87287af4
add logs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1773 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:42:44 +00:00
joss17
3e395f5df4
code cleaning
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1772 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:42:31 +00:00
joss17
3ab1b5bb3f
improving safe upnp shutdown
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1771 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:42:13 +00:00
joss17
b99b99f0d5
Bug which causes net reset solved
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:41:55 +00:00
joss17
2e5130a1da
rewrite connection manager
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1769 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:41:24 +00:00
joss17
a20d09f0f4
remove define P3DISC_DEBUG
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1768 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:40:47 +00:00
joss17
cf157422f5
improved stun check
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1767 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:40:31 +00:00
joss17
06c1c0f59f
improve time for initialisation of upnp
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1766 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:40:15 +00:00
joss17
3d82d40a96
add debug log for connection manager
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1765 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:39:59 +00:00
joss17
6eaf201120
improve the async action and getStateVariable
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1764 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:39:43 +00:00
joss17
81e1978a83
store exaddr from upnp to stun
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1763 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:39:26 +00:00
joss17
fcaae207ef
action are passed async
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1762 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:39:06 +00:00
joss17
3c7f714650
improved stun failure resistance
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1761 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:38:52 +00:00
joss17
f090ee87b6
add network reset ehancement for stun and udp
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:38:37 +00:00
joss17
1d5c11c65b
add debug info to upnp
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1759 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:38:19 +00:00
joss17
432311d5c3
small udate
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:38:02 +00:00
joss17
54276344ad
add reset net status when shutingdown
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1757 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:37:45 +00:00
joss17
7fa24f4726
add error log for constructor
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1756 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:37:31 +00:00
joss17
7a7a4fc8d7
better flag management
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1755 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:37:12 +00:00
joss17
20cff8ecbd
add loopback network interface compatibility
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:36:56 +00:00
joss17
04ecbc5514
add new method for external upnp address
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:36:14 +00:00
joss17
938c2edef2
removed unimplemented tcp flag
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1751 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:35:59 +00:00
joss17
32ea1bfd0f
remove unimplemented tcpOk flag
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1750 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:35:44 +00:00
joss17
324b51e250
improve udp stun and upnp collaboration
...
Conflicts:
libretroshare/src/libretroshare.pro
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1749 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:35:12 +00:00
joss17
e7273b0453
change the getStateVariable method
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1748 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:34:51 +00:00
joss17
79e02eb221
remove unused include
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1747 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:34:28 +00:00
joss17
b167fbe587
add missing letter
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1746 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:34:10 +00:00
joss17
333a9d31ee
add missing slash
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1745 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:33:54 +00:00
joss17
4fe1bd8801
Remove miniupnp and add libupnp code
...
Conflicts:
libretroshare/src/libretroshare.pro
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1744 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-30 00:33:40 +00:00
joss17
b6c2b6897a
add gpg engine name log output
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1743 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-28 21:10:35 +00:00
joss17
173ae69b9f
solve configuration bug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1742 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-28 18:08:17 +00:00
joss17
8db756eda3
removed useless log
...
;
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1741 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-27 20:50:55 +00:00
joss17
c00928a349
change back the engine setting. Now it should work with gpg1 and gpg2
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1740 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-27 20:50:30 +00:00
joss17
c1df0e1c1d
remove debug defines
...
Conflicts:
libretroshare/src/libretroshare.pro
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1739 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-27 20:48:46 +00:00
joss17
6f7b21944c
fix the length of the encrypting ssl passphrase
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1738 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-27 20:48:31 +00:00
joss17
62452ed3c5
add gpgme error output
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1737 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-27 20:48:11 +00:00
joss17
8a67100ebf
set gpg2 engine for gpgme
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1734 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-27 20:46:56 +00:00
joss17
af3e43ce4e
code cleaning
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1732 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-27 20:46:17 +00:00
joss17
96fd660065
code cleaning
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-27 20:45:58 +00:00
joss17
a6029d69db
change ssl password encryption to non symmetric
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1730 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-27 20:39:47 +00:00
joss17
9132dcf700
code cleaning
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1729 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-27 20:39:14 +00:00
csoler
500b996ff5
fixed core dump issue.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1721 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-05 20:16:37 +00:00
csoler
5af018912b
finished modification of previous commit about notifying changed about own status msg
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-05 19:55:17 +00:00
csoler
798f6026cc
fixed exchange of custom strings.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1717 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-10-04 22:27:42 +00:00
csoler
97400a74ef
- fixed the update of avatars in the various chat dialogs
...
- added a "peer is typing" function to the group chat.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1706 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-30 22:30:57 +00:00
csoler
dee82c5f1b
- fixed up avatar exchange between peers
...
- reverted preceding commit about PNG/JPG in popup chat dialog. This only concerns internal data representation and this string has nothing to do with accepted image formats.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1704 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-30 20:53:18 +00:00
csoler
396058c665
- ported commit from v0.4.x to integrate new RsAvatarItem code
...
- suppressed compatibility with old avatar transmition code
- added code for storing and sending a custom status string (for e.g. saying "I'm not here now") in p3ChatService
- added code for sending group chat status messages "peer is typing". Not fully functionnal yet.
Warnings:
- this commit breaks the compatibility for avatar transmission
- the new avatar transmission is not fully working yet
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1696 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-29 20:37:20 +00:00
alexandrut
e929b419f4
bugfix with rehashing already shared files
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1694 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-28 20:31:09 +00:00
joss17
36a534b85d
add includes for linux
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1692 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-26 19:17:32 +00:00
defnax
6d178d00cf
added forgotten Path Defines UPNPC_DIR , GPG_ERROR_DIR, GPGME_DIR for linux-g++ section
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1691 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-26 18:09:34 +00:00
alexandrut
4e4d0cb54a
replace raw with tlv string functions for better visibility
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1664 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-19 17:36:29 +00:00
alexandrut
ca4b4dde5e
hope this fix the new bug with exchange of rs version
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1658 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-16 19:42:00 +00:00
csoler
b1434fc86b
removed call to rand() which lacks entropy on windows. Replaced by own congruency generator.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1631 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-11 14:32:06 +00:00
drbob
821855d16e
* Added extra forum sorting method: Last Post.
...
This will hopefully be more useful than the existing ones.
Extra childTS field was added & populated.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1628 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-09 21:15:12 +00:00
csoler
a3b8ed76f5
corrected small display bug of location
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1626 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-09 20:15:38 +00:00
csoler
95a577ccd0
Integrated turtle download to all kind of user-requested downloads
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1625 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-09 20:14:43 +00:00
csoler
64a06fd0bb
fixed core dump issue where AuthSSL::VerifySignBin() is called with NULL parameters. Still, this should not happen.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1624 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-09 11:22:44 +00:00
drbob
3b3c7c7ba4
* Bad loading by TlvString - fixed.
...
* Enabled extra debugging in rstlvtypes as extra check
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1622 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-08 23:41:57 +00:00
drbob
6842115258
Disable wide char stuff, until it works on windoze.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1621 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-08 21:30:59 +00:00
drbob
0f99826623
* Major tweak to the serialiser: shifted size to 32bits to handle bigger packets. This will break compatibility.
...
* Modified tlvitems to support future expansions.
* added random tlv test functios.
* added dummy Wide Directory functions to rsdir (for the future;)
* Fixed Mutex Bug in fimonitor.
* added netiface_test for hiberation / net change testing.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1620 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-08 20:18:43 +00:00
csoler
05676e4399
changed separator for file cache format, added tmp file to avoid file damage
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1619 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-08 19:47:50 +00:00
csoler
67d2fac2df
restored forums workign state. Sorry for that, I introduced this bug myself in commit 1394
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1618 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-08 18:31:00 +00:00
joss17
6b63f511e3
add debug info when ip address is set to an unknown peer
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1604 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-06 19:52:48 +00:00
csoler
52db2c4428
attempt to fix win compilation for defnax
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1601 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-05 18:45:00 +00:00
defnax
d2b3458f2b
added for MSYS compile releated changes by default its disabled
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1598 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-05 17:23:58 +00:00
csoler
57ba727b6a
fixed win32-x-g++ compilation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1595 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-05 11:59:42 +00:00
defnax
4ea523306b
changend OpenSSL dir name for Windows
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1594 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-05 02:12:30 +00:00
csoler
26db7ada52
restored accounting for LAN transfer rates. See also trac ticket #60
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1592 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-04 20:31:25 +00:00
csoler
82f33acf6f
fixed win32-x-ubuntu compilation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1590 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-03 20:51:12 +00:00
csoler
be59ccf135
win32 fix for large file support
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1589 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-03 20:43:18 +00:00
joss17
070bc5bdd3
Revert "removed useless initAuth"
...
This reverts commit 19e73391f92581fb6b7ce3216e8bd23bd143e9ec.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1587 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-02 21:12:05 +00:00
csoler
6de5024634
corrected bug in conversion char * (from gpgme) into string
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1586 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-02 19:31:10 +00:00
joss17
d00a33ca14
add warning log info
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-02 19:20:46 +00:00
joss17
055f9141a6
removed useless initAuth
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1584 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-02 19:20:15 +00:00
joss17
674a6dc719
remove log sslPassword
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1583 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-02 17:49:28 +00:00
csoler
76fe07e428
added missing return in error case handling
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1582 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-09-01 19:48:18 +00:00
csoler
acb1000ef2
corrected potential bug due to double destruction of rsItem
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1581 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-31 20:54:42 +00:00
csoler
2597e6a61e
added large file support
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-29 18:55:13 +00:00
alexandrut
10d44a15b8
-add support for searching and display directories
...
-downloading directories from search dialog not implemented yet
-needs more code clean and beautify the directory tree
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1566 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-25 20:49:50 +00:00
csoler
3c09b4f2d2
added regexp search to turtle router
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1564 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-25 12:04:43 +00:00
joss17
6db7ae1fe5
add error handling. Maybe some code review ciould be a good idea
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1556 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-18 12:44:54 +00:00
joss17
1bb1aa0fc5
add return when decrypting went wrong
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1555 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-18 12:44:32 +00:00
joss17
0a28f35eea
encrypt and decrypt ssl password
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1550 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-18 12:43:19 +00:00
csoler
a293a39d1b
- Integrated the turtle search and download to the gui. Now the search handles both friend and turtle searching.
...
- added a console in config->server->F2F routing to be able to visualize turtle routing statistics
WARNING: this is not complete yet. The fllowing still needs to be done:
- detect duplicates in search results between turtle and friends search
- RegExpr search does ot work with turtle (still to code).
- search does not search own files. Is this really needed after all ?
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1540 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-16 20:10:53 +00:00
csoler
dfeaed705b
corrected potentially harmful uninitialized memory reads
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1534 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-14 07:28:58 +00:00
joss17
0043af68c1
changed ctx->current_cert into X509_STORE_CTX_get_current_cert(ctx) according to steve@openssl.org
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1530 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-13 15:10:43 +00:00
joss17
f95755641e
improved version_detail sript
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1529 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-13 15:10:19 +00:00
joss17
ab07042510
Revert "changing X509 ctx->current_cert to ctx->cert because of null pointer"
...
This reverts commit 7dbe821174ad65db5b22ecebec1e8ae5f356239b.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1528 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-13 15:09:58 +00:00
csoler
243af3ffee
fixed some mutex bugs and some pointer access bugs in the FileIndexStore
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1525 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-12 22:06:11 +00:00
csoler
2807a778e8
ensured early creation of cache directories to avoid "Cannot copy file" bug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1521 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-11 20:00:08 +00:00
csoler
7b534ba299
- added a pointer controller to findex to avoid RemoteDirModel to incidentally request for deleted pointers.
...
- suppressed auto-collapse of directories when updated.
Still To do:
- auto-update QTreeView in PostMod() to avoid display inconsistencies.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1520 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-11 19:43:51 +00:00
csoler
cf2343105b
Improved RemoteDirModel interactivity
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1519 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-11 18:14:55 +00:00
csoler
d78ee60e30
suppressed debugging info to get back to fast directory browsing
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1518 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-11 17:01:23 +00:00
csoler
cb5f22a5c6
Share Flags
...
- now, only files with the NETWORK_WIDE flag are searchable by turtle hopping.
Next move:
- integrate turtle search in default gui.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1512 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-10 19:44:45 +00:00
csoler
45618c39c5
comment correction
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1511 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-10 19:04:02 +00:00
alexandrut
339fcd53ed
add persistence to download queue
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1510 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-10 19:01:27 +00:00
csoler
a808ab9173
Share Flags
...
- 1st attempt at displaying share properties in the SharedFlagsDialog.
- added share flags in DirDetails structure in place of Rank, that is not used anymore.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1509 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-10 18:55:49 +00:00
csoler
792ddf1d25
Share Flags
...
- own directory browsing is now done through FileIndexMonitor. This allows:
- to browse shared directories independently of their flags
- to update files as they get hashed (yeah!)
- still to do:
- turtle requests should respect the share flags
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1507 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-09 20:00:25 +00:00
csoler
4157321000
Share Flags
...
- now only the directories with flag "browsable" on are dispatched to friends
- when switching flags, directories are re-sent to friends
Still to do:
- turtle search only files with "Network wide" flag on
- test what happens when 2 directories have the same base name
- display own directories by calling FileIndexMonitor instead of FileIndexStore
Warning: at this time, directories that are not browsable do not appear in the Files dialog under "my directories".
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1506 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-09 16:32:31 +00:00
csoler
6928b3c426
fixed core dump (double delete) when getFileData fails
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1504 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-09 15:55:31 +00:00
drbob
60349baf9d
* Fixed certificate saving bug. (authssl.cc)
...
* added cert->issuer to external interface (rspeers.h)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1501 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-09 13:06:24 +00:00
drbob
6e5d2f43d8
This is a little experimental modification to the TCP/UDP listening ports.
...
* Modified bind calls to attach to 0.0.0.0:XXXX instead of specific
IP:Port combinations. This will help connectivity when RS chooses
the wrong interface.
* These changes are within #defines so they can be easily reverted.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1498 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-06 10:46:37 +00:00
defnax
c14572b13e
update readme
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1497 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-05 18:35:41 +00:00
defnax
0930dbf8f2
set new miniupnpc version
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1496 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-05 18:27:05 +00:00
drbob
2dfb95ad13
Fixed code to compile under windows.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1495 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-05 16:35:07 +00:00
drbob
2bf94b909a
Reworking of networking code to enable Net Restart.
...
* Stun code now runs continually - to check external network state.
* Udpsorter controls DHT stun is on/off. (via p3ConnectMgr)
* added code to enable threads to join/restart
* enabled NetRestart for UDP and TCP.
* tweaked networking code for faster startup (now ~30 seconds - can still be improved).
* tweaked debug messages for testing networking
* Added test for checking external IP address determination.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1492 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-04 23:22:44 +00:00
csoler
fc6a86b592
forgot to commit this one.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1488 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-04 09:19:32 +00:00
csoler
f9dc3b223b
Started implementing flags to handle the sharing mode.
...
What works:
- the gui shows the flags in ShareManager
- the flags are loaded/saved to ft_shared.cfg and passed on to FileIndexMonitor
What does not work yet:
- the flags are not accounted for yet by FileIndexMonitor
In addition:
- simplified the directories dialog in Preferences, so that it calls the ShareManager instead of dupplicating the directories management
code that becomes larger.
- setup the ShareManager to be a singleton, so as to coherently call it from different places.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1486 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-03 19:43:52 +00:00
defnax
aa1658245c
update Readme
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1482 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-02 20:38:47 +00:00
defnax
5d2da3f6c8
moved version_detail_bash_script to only linux section doesnt works with windows.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1479 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-02 17:49:11 +00:00
joss17
af0b56836f
changing X509 ctx->current_cert to ctx->cert because of null pointer
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-02 14:12:22 +00:00
joss17
96b43d893f
polish string
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1476 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-02 14:12:08 +00:00
joss17
96f2d92ee7
rewrite script to include them in the make file. Use both util/rsversion.h and gui/help/version.html for gui version information
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1473 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-01 13:53:47 +00:00
defnax
19de883705
update
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1472 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-31 23:30:23 +00:00
defnax
6868926de5
update
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-31 23:17:24 +00:00
defnax
23240b3326
removed old readme
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1470 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-31 22:49:24 +00:00
defnax
40a2fb8341
about label "libretroshare" doesnt helps for Peer Details and for FileTransfers doesnt needs to show label "libretroshare", sorry but when needs for some dialogs with libretroshare label then its bether like example this method:
...
ui.version->setText(QString("libetroshare") + QString::fromStdString(vit->second));
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1469 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-31 22:33:30 +00:00
joss17
6af323e6ae
add version information to p3disc
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1464 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-31 18:31:26 +00:00
joss17
e2cd8703d8
Add libretroshare label to the version detail
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1462 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-31 18:29:06 +00:00
defnax
d024c7673a
cleaned little bit libretroshare.pro , removed not needed xpgp sections
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1456 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-31 15:03:43 +00:00
drbob
502183da88
Bug fixes to get the Windows V0.5.0 working.
...
* Missing some RsInitConfig::s
* Updated config-mingw.mk for pgp configuration.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-31 13:11:33 +00:00
drbob
a023a0bfcd
Major change to the way certificates are stored now defaults to ~/.retroshare/SSLID/
...
* supports Multiple Accounts on same computer.
* Enabled libretroshare tests using Makefiles.
* restructured RsInit functions: Config Data is now private.
* switch OpenPGP on by default (added #define to rsinit).
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1451 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-30 21:27:47 +00:00
drbob
870a30eac5
Modifications for updated Windows Build.
...
1) mods to use miniupnpc v1.3
2) bugfix to use WriteFile instead of write under windows with gpgme.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1449 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-30 14:36:42 +00:00
alexandrut
3394239297
let hash name for partial files, use qfile link instead
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1448 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-28 15:29:21 +00:00
alexandrut
e68d874406
*redesign of dwl queue - dwls will be enqueued and picked from there;
...
*changes to display the dwl queue in the transfers dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1447 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-28 10:21:19 +00:00
csoler
65e1c17dbd
added a few malloc gards
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1444 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-27 20:52:55 +00:00
csoler
c9467a2bfe
this is a fix for the file download problem. It does not correct the wrong chunk size, but it checks that the malloc returns something.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1442 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-27 20:31:56 +00:00
alexandrut
e69351dda9
small changes
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1434 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-26 19:00:16 +00:00
alexandrut
c7ecf8c46d
add implementation for priority download queue
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1432 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-26 15:00:29 +00:00
defnax
f24e2dda02
added includepath for gpgme and gpg-error
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1417 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-24 15:34:24 +00:00
defnax
16c97138e3
update version
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1415 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-23 21:41:05 +00:00
alexandrut
e7b42238cb
use real name instead hash name for partials for preview; hope to work now
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-21 21:37:51 +00:00
drbob
369bb6a5c5
Bugfixes to make pgp friend sharing work.
...
* added rsinit.h include so PGPSSL flag is read. (enabling ISSUER sharing)
* extra debugging so we can see the certs being passed around.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1399 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-21 21:25:39 +00:00
csoler
a436053e8b
windows compilation fix
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1397 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-21 20:57:18 +00:00
csoler
4685fadbeb
Hope I finally corrected the connexion + one-way bug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1396 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-21 20:14:31 +00:00
csoler
9de1c5e6e6
suppressed bug in RsTlvBinData that could return true even when the serialisation fails
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1394 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-20 22:29:05 +00:00
csoler
f7475887dc
suppressed some debugging code
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1393 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-20 19:28:16 +00:00
alexandrut
f98d4f080b
added extension for file names in partial dir, so them can be previewed in windows
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1390 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-18 12:23:34 +00:00
alexandrut
d9e99a8774
add RS version on peer details panel
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1388 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-17 21:41:20 +00:00
csoler
6333cc4d37
added Makefile in libretroshare/src/turtle to comply with existing build scripts
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1373 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-14 13:33:14 +00:00
alexandrut
17374bf299
default name for finished downloads directory was changed from Downloads to Incoming
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1362 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-12 16:11:09 +00:00
alexandrut
990ed277bd
share of incoming directory by default
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1359 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-12 13:22:31 +00:00
csoler
49e9066afb
updated libretroshare.pro so that people can choose between pgp and xpgp by doing "qmake CONFIG=pgp" or "qmake CONFIG=xpgp", or directly update the CONFIG variable in the .pro to change the default behavior.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1358 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-12 12:53:49 +00:00
drbob
e9a2c24ab1
Added Authentication update... for cases where
...
auth fails the first time, but is okay the second.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-08 20:58:58 +00:00
ammorais
2eccbce332
Updated the RetroShare.pro, fixed problem in p3face-startup, and upnputil.c with UPNP_AddPortMapping number of parameters when compiled with miniupnpc-1.0
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1332 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-08 14:49:20 +00:00
drbob
fec470c774
Bugfix for gpg connections.
...
added missing files to Makefiles
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1331 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-07 21:53:06 +00:00
defnax
16de90fc8d
update changens from last month to changelog, and set to new version string
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-05 16:15:10 +00:00
alexandrut
0b6800a5ce
exchange of what version of retroshare our friends are using
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-28 20:57:02 +00:00
csoler
bc82110c97
Restored backward compatibility in p3disc:
...
- created a subclass for Own item parts, which is compatible with old format.
- suppressed sending of Issuer packets when not using PGP
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1307 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-23 21:36:02 +00:00
csoler
f16c136cbb
changed the order of upnp/stun and extaddrFinder to limit wrong analysis of firewalled situation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1302 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-16 18:58:42 +00:00
csoler
5e91af8be0
small bug fix about not acconting identical tunnels appropriately
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1301 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-15 20:34:34 +00:00
csoler
2ff271f810
added missing continue which caused sigsegv
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1300 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-15 07:28:23 +00:00
csoler
51eb8b8eaf
added removal of turtle handling when canceling/ending a file transfer. next step: Turtle download is now ready for gui integration
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1299 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-14 19:34:22 +00:00
csoler
0a7d39d4da
- improved integration with FT
...
- added function for properly removing handled file hashes
- tested/debugged persistence of file hashes
- tested/debugged tunnel re-digging and maintenance
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1298 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-14 18:59:42 +00:00
csoler
130d846207
- made turtle tunnel ids asymetric
...
- cleaned up the documentation in p3turtle.h
- update tunnel time stamp only *on the way back* to avoid unsuccessful requests to update a timestamp.
- implemented persistence of which hashes are to be handled.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1297 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-13 19:28:47 +00:00
alexandrut
9b7d486d6c
bug fixing when storing incoming and partials directory
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1296 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-11 21:41:42 +00:00
csoler
211acc6adf
suppressed file download memory leak
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1294 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-11 08:09:08 +00:00
joss17
646603d71d
new computing for download and upload rate. No more indiv rate settings
...
Merge branch 'maxUploadRate'
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1293 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-08 17:09:00 +00:00
csoler
3d6697e28b
win32 compilation fix
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1290 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-04 19:30:19 +00:00
csoler
48218e98cb
turtle tunnel management
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1289 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-03 18:47:14 +00:00
joss17
a26206cfbb
gcc44 compliance
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1283 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-28 19:41:03 +00:00
joss17
7b4c7384b5
Merge branch 'gcc44'
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1279 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-27 20:59:48 +00:00
csoler
1046bdd846
First commit for the turtle download. It works without perturbating RS traffic, but still needs some (internal) smoothing
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1275 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-26 21:42:45 +00:00
defnax
c298de7f15
removed pqistrings header from libretroshare project file doesnt needed more
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1274 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-26 15:37:17 +00:00
drbob
d4b52a59e5
Major bugfixes to get PGP authentication finished.
...
* p3disc now exchanges "Issuer" (pgp) certificates as well.
* additional types for rsdiscitems.h
* Bug Fix for NULL packet in p3service.cc
* allow unauthed SSL certificates to be added in AuthSSL - otherwise cant add new friends!
* only save authed SSL certificates.
* fixed ref/unref of PGP keys in AuthGPG
* added Mutex protection to AuthGPG
* added PGP reloading when key is imported, or signed.
* Fixed PGP key signing.
* added Additional field validLvl to RsPeerDetails.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1270 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-25 11:38:47 +00:00
drbob
387b7bae6a
* Fixed up SSL peerIds and gpg password stuff.
...
* PGP version compiling / running on OSX now.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1268 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-24 10:33:08 +00:00
drbob
edd13ba38a
Missed these files from libretroshare
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1267 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-23 17:40:35 +00:00
drbob
5f28f76b07
* Addition of openpgp support!
...
This is not enabled by default. Instructions to enable are at the end of msg.
This is 60% complete. Supports creation of certificates, adding friends and connections.
Parts still to do: pgpids, p3discovery, signing and trusting peers.
The main reason it is being commited is so that connections between peers can be
properly tested, and development on OSX and win can start.
This requires gpg and the gpgme.h development libraries, and no longer
requires the custom ssl libraries.
To compile it switch the configuration flags in scripts/config-linux.mk
To compile XPGP (v0.4.x) enable PQI_USE_XPGP:
#PQI_USE_SSLONLY = 1
PQI_USE_XPGP = 1
To compile SSL only, enable PQI_USE_SSLONLY:
PQI_USE_SSLONLY = 1
#PQI_USE_XPGP = 1
To compile OpenPGP, disable both:
#PQI_USE_SSLONLY = 1
#PQI_USE_XPGP = 1
and enable RS_USEPGPSSL in rsiface/rsinit.h
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1265 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-23 15:07:35 +00:00
csoler
79388588b0
added missing BIN_FLAGS_READABLE to pqistore constructor calls
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1231 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-13 20:18:03 +00:00
csoler
2bf79b663d
added missing BIN_FLAGS_WRITABLE
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1230 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-13 19:54:33 +00:00
csoler
f73c925507
added a missing return after deletion of membio in case of fail read (error handling)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1228 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-13 15:38:02 +00:00
csoler
c996915bd1
suppressed double item deletion that happens rarely (error handling case)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1227 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-13 15:30:11 +00:00
drbob
02fc02d23c
Modified (all I hope) remaining pqistream -> pqistore for cache file save/loads.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1223 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-12 21:55:50 +00:00
joss17
ec072e53f4
add include complying to gcc 4.4
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1217 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-11 14:30:53 +00:00
csoler
d22e1ceb23
added entry for pqistore
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1205 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-09 10:25:44 +00:00
drbob
2f1a8700ac
Switched configuration back from 'Archive' Format to the standard
...
RsItem Packets.... but used an alterative streamer similar to pqiarchive.
This will cause problems, and delete the configuration for those
who have upgraded in the last month .... but will maintain compatibility
with previous stable release.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1201 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-09 00:19:54 +00:00
drbob
65e02ba4de
* Rolled back Modifications to SearchDialog and PopupChatDialog.
...
- unable to get windows to compile with PopupChat on windows.
- not happy with new SearchDialog. Not an improvement on old dialog + uses Qt4.4
* updated version numbers...
* added a couple of windows scripts.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1200 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-08 23:07:08 +00:00
drbob
20593c9de2
Modified libretroshare to compile on Cygwin / MinGW.
...
* removed exceptions from serialiser (had troubles previously on win32).
* Modified code in startup (enable CRYPTO structure) and rsdir.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1189 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-07 21:36:17 +00:00
joss17
e34173759e
timeout on fil index cache transfer \n Set fileIndex cache transfer timeout to 300sec \n Remove the downloads item for file index cache transfer
...
Merge branch 'fiIndexCacheTransfertImprove'
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1180 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-06 20:48:32 +00:00
joss17
22dea2ceea
Revert "Merge branch 'singleFileClient'"
...
This reverts commit 1bf9ed770532f3093548fa4120209be3a31c5c21, reversing
changes made to 5b0464d7a0aaa034851dfc80ca0a2d367f4c28ef.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1179 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-06 11:39:34 +00:00
joss17
698425ba9e
Merge branch 'badPacketMessage'
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1168 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-05 13:35:36 +00:00
joss17
16231dea2b
Merge branch 'singleFileClient'
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1167 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-05 13:32:59 +00:00
csoler
e144e75ba6
Added "peer is typing" functionality to private chat. This shoudld be extended to additional stuff like "idle", and to public chat. Also the display is the status bar of the chat window could be made nicer, e.g. directly in the msg window. Suppressed ChatDialog class that is not more used
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1164 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-05 13:18:53 +00:00
defnax
72f7fd0be4
update Readme
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1153 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-01 22:01:34 +00:00
drbob
28df984148
* Added partially completed authssl.cc, as we move towards openpgp authentication.
...
Once completed this will allow standard ssl authentication and provide the base for
the openpgp authenticator,
* Tweaks, and removed debug statements.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1140 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-22 23:29:16 +00:00
drbob
5466c447ae
Added missing files (extaddrfinder & p3turtle) to Makefiles.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1139 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-21 19:12:43 +00:00
csoler
bb681ae78f
Turtle tunnel management. In progress.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1133 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-19 19:59:54 +00:00
notdefine
c01529e400
Remove compiling of tests.
...
This is because test programs have not been maintained since we switched to qmake for compiling libretroshare.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1132 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-19 18:38:46 +00:00
csoler
8ed7d936f9
win32 compilation fix
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1131 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-16 20:30:59 +00:00
csoler
1aaf6f5c27
Corrected potential mutex lock problem
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1130 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-16 19:36:58 +00:00
csoler
e2ea2ec75b
Implemented turtle tunneling. Not debugged yet 8-).
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1127 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-13 20:26:13 +00:00
beardog_uk
2f7fb3690f
This should fix the bug with copypasting certifcates.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1126 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-10 19:52:07 +00:00
csoler
fac2a1cb83
made ip service checkbox permanent
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1125 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-09 21:13:48 +00:00
defnax
449674be3f
fixed libretroshare.pro for win32 compile
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1121 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-09 17:04:32 +00:00
csoler
ab43d876c8
Added automatic slicing of search response packets so as to cope with streaming packet size requirements. Tested.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1118 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-06 21:06:44 +00:00
csoler
1ff00dcf07
it happens sometimes that files of size 0 are transfered. In such a case the destination file is not written down, and the following calls to moveFile in ftcontroller.cc produce an error. Ive put an if to avoid this.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1117 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-06 19:41:40 +00:00
csoler
9d89c12a38
added NULL gard in dhtPublish()
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1116 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-06 18:57:30 +00:00
csoler
1542d5ad2c
tried fix for cygwin
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1115 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-06 11:55:27 +00:00
csoler
49570daf72
tried fix for cygwin
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1114 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-06 11:34:34 +00:00
csoler
4bb497a905
Cleaned the gui a little bit:
...
- added a checkbox to control the use of external servers for ip determination.
- put back Network on the left
- put channels out of RS_RELEASE_VERSION, as it's not working yet.
- NetworkDialog:
- set the info in columns about trust to be more explicit
- changed dark green into light green to comply with colors in the trust matrix (it's also more readable in light green)
- corrected trust strings that appeared in the Last Contact column
- changed "generate certificate" in connect friends wizard into "export my certificate..." which is more appropriate
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1113 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-05 13:04:18 +00:00
csoler
afb51d5d31
added missing file entry
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1112 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-04 16:42:52 +00:00
csoler
304bd556e0
added server-based ip determination as a fallback to existing methods. Forced Dht publishing as soon as an external ip is known
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1110 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-03 09:21:58 +00:00
csoler
e23bd13bc9
added server-based ip determination as a fallback to existing methods. Forced Dht publishing as soon as an external ip is known
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1109 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-03 09:21:20 +00:00
csoler
8b36ac51e5
tentative compilation fix for cygwin
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1107 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-02 18:38:06 +00:00
csoler
0cd24c8f21
Corrected the 127.0.0.1 persistency bug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-03-30 20:07:24 +00:00
csoler
9b59f89cdf
Fixed file rename by using a common rsDirUtil function
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1103 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-03-29 13:58:28 +00:00
csoler
4d278ac414
win32 compatibility for moving files
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1099 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-03-26 13:24:27 +00:00
csoler
ef54d9d176
win32 compatibility
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1095 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-03-23 14:45:51 +00:00
csoler
4ef56e1b79
suppressed #ifdef TURTLE_HOPPING from libretroshare, as it s not anymore needed.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1094 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-03-22 14:08:02 +00:00