Commit Graph

2770 Commits

Author SHA1 Message Date
defnax
bbd3902bbe Added for Private Chat Attachments to display for each rs link with file size
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3346 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-06 15:31:30 +00:00
defnax
0abfbbb911 Added a splitter to Privat Chat
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3345 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-06 14:58:53 +00:00
defnax
cfc17398dd added Picture Preview Thumbnail patch for Privat Chat from xiaohan and fixed little design improvements
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3344 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-06 12:30:06 +00:00
csoler
09d5014df5 suppressed double definition of operator<<() when using libbitdht
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3343 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-06 12:26:49 +00:00
leander-256
4bb4fc11e2 This intimidating patch renames libretroshare/src/rsiface/ to
libretroshare/src/retroshare/

All the relevant headers have been modified to reflect that change.

This allows installation of libretroshare on a system, headers will
be put in $WHEREVER/retroshare/ and we keep the ability to compile
against them, be it on the system or in the SVN tree.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3342 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-06 09:40:23 +00:00
thunder2
e69300ccdc Changed the values of ETIMEDOUT to 10060 like in pthread.h to prevent compiler warnings.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3341 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-04 11:27:16 +00:00
csoler
43e9f65003 fixed compilation issue on ubuntu
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3340 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-04 10:14:22 +00:00
csoler
a999c317ff added missing return call
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3339 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-04 09:54:41 +00:00
thunder2
a595ba4fc7 Moved constructor of class bdThread from bdThreads.h to bdThreads.cc.
Initialized member mTid of class RsThread too.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3338 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-03 14:26:54 +00:00
thunder2
e71b1c249f Initialized member mTid of class bdThread.
RetroShare crashes on start, when the initial address on port 7812 is in use.
The thread in UdpLayer::openSocket was not started and the member mTid was uninitialized.
Then a call to join in UdpLayer::reset during the load of the configuration crashes.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3337 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-03 14:07:46 +00:00
thunder2
cfd4eaad37 Small optimizations in MessengerWindow and PeersDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3336 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-03 12:35:26 +00:00
thunder2
6000233267 Fixed compile of libbitdht on Windows
Enabled bitdht in RetroShare.pro and retroshare-nogui.pro too
Fixed link of RetroShare on Windows
-> added ws2_32 after bitdht, maybe someone has a better solution

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-03 12:15:20 +00:00
drbob
627b0f88a2 * Fixed up UDP Port "netReset()" (was stuck on 7812, now follows your tcp port).
* OSX Bug: doesn't like classes in C files. switched to void * pointer.
 * A little extra debugging in pqissl on disconnects.
 * switched on bitdht by default in libretroshare.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3334 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-02 23:21:59 +00:00
chrisparker126
7318fdf9c8 added new tests for msgitem and refactored support functions. testnotes added to keep track of whats left to be done
pls make notes in file when you add tests

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3333 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-02 20:33:53 +00:00
thunder2
2053e08e46 Fixed the "peer is typing" problem by changing the values RS_CHAT_FLAG_... of the chat service to unique values.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3332 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-02 17:53:34 +00:00
csoler
e209952888 updated build script for ubuntu packaging with bitdht
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3331 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-02 10:27:40 +00:00
csoler
5d811a8891 fixed retroshare-nogui compilation (2)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3330 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-02 10:00:29 +00:00
csoler
199c412037 updated for bitdht
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3329 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-02 09:28:09 +00:00
csoler
8c18103902 added additional include directory to comply with debian packaging directory architecture
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3328 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-02 09:11:52 +00:00
drbob
74b36a6af6 Integration with libbitdht.
* Added debuging #defs for annoying output.
 * fixed compiler "unused parameter" warning for rsiface.h



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3327 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-01 18:22:37 +00:00
drbob
f876dcb93b General Bugfixes from RS integration.
* heisenbug fixed. msgout_find_node was inside debugging #defs.
 * fixed ReplyFindNode and ReplyQueryHash counters for stats.
 * added Node Space size() functions.
 * added FINDSELF mode. 60 secs to search for own hash.
 * incremental addition of search ids.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3326 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-01 18:19:27 +00:00
chrisparker126
5ed26b7ccb forgot to commit changes to p3blogs
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3325 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-08-01 10:51:34 +00:00
drbob
6a9be43f31 Changes for bitdht compilation.
* disabled BlogItems, when BLOGS not defined.
 * added bitdht compile option to Retroshare.pro.
 * disabled BLOGS until it can compile in libretroshare



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-31 18:19:12 +00:00
drbob
fcdd7ee113 Changes to integrate bitdht into libretroshare.
Mainly re-organising tcponudp... 
	tests->test area
	network->trash (uses libbitdht classes).
	new udp interfaces (udppeer + udpstunner)

Changes include:
	* p3bitdht: added "addReceiver() call, and more debugging. 
	* p3bitdht: added DO_IDLE flag so searches are continous.
	* p3bitdht/pqiassist: matched up Assist interface.
	* fixed pqiNetListener interface.
	* rsinit/p3connmgr: setup udp init
	* tcpstream: switched to new udp receiver.
	* added "blogs" switch in libretroshare.pro (was stopping compiling ;)
	* added "bitdht" switch in libretroshare.pro 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3323 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-31 18:14:10 +00:00
drbob
c1b624832f updates to libbitdht to make it work with retroshare.
* decreased nodes per bucket to 10 - to try reduce traffic.
 * changed operator< to non const.
 * fixed up debuging.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3322 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-31 18:01:24 +00:00
csoler
1069ed0c58 - corrected 1 bug in serialisation of CRC32Maps for peer transfer
- corrected 1 bug (missing hashing thread deletion on failure)


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3321 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-30 21:01:51 +00:00
csoler
38be555332 restored the NETWORK_WIDE flag in RetroShareLink->processFileRequest, because this security was designed in a specific context. Now the FileRequest for links is factored in a single place.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3320 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-30 13:47:31 +00:00
csoler
b8fe977f05 corrected typo (causing a SIGSEGV)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3319 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-30 13:31:29 +00:00
csoler
012808ea00 - Implemented CRC32 map traffic through direct downloads
- replaced the findItems() call into a hand-written search (this was causing a rare bug in displaying downloads)


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3318 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-29 21:07:07 +00:00
chrisparker126
7a789edcbf completed distrib items (chan,blog, forum and base unit tests)
- written test for new forumreadstatus item, and other recent changes to distrib items

added graphics support to blogs - can now have pics for html blogs! but removed attachment, a channels artifact
added copy constructor to rstlvimage, needed for tests to work

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3317 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-28 23:12:19 +00:00
csoler
81203b3cfd - modified ftFileProvider so as to keep multiple client peers per instance
- updated TransfersDialog to display this info correctly


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3316 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-27 16:05:21 +00:00
chrisparker126
8b3af9143f serialiser updates for distrib config saving
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3315 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-26 22:17:33 +00:00
chrisparker126
e40c469aa4 added config saving feature to distrib services. you can now save configurations that is local to
a particular distrib service (forum, channels, and blogs) -- needs full rs-gui recompile

- added ability of forum's to save 'msg read' status 
(meant to supercede current similar feature implement in qt gui side)

- updated test for distrib items, added forum items test

- added doxygen comments for rsinit and others.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3314 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-26 22:09:33 +00:00
csoler
cee8600a93 - implemented bidirectional exchange of chunk maps for direct downloads, to allow showing proper completion of transfers from direct friends.
- moved the direction flag upward in the pipeline (ftDataSend instead of p3turtle)




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3313 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-25 19:04:31 +00:00
thunder2
569ac25843 cleaned include files
- removed some dependencies between other header files
- removed many includes of <QtGui> and replaced it with only needed files

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3312 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-23 18:52:58 +00:00
defnax
ba47eedfe3 fixed GPG password freeze
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-23 11:55:21 +00:00
csoler
8bfc74485a First implementation of per-chunk CRC32 check. This is triggered
- by the right-click+Force Check on files.
- when a global hash on a downloaded file does not match the announced hash.

When a CRC map check is ordered, the CRC map is requested to one of the sources for the current file download.
When received, all downloaded chunks are checked w.r.t the reference CRC and marked as not done if the CRCs do not match.
The exchange of CRC32 map and requests has been tested, as well as CRC map checking during download (force check).

To be implemented soon:
    - caching of CRC32 maps (although these are fast to compute)
    - CRC32 map packets for normal downloads. For now these work only for turtle tunnels.
    - handling of errors if the CRC never comes. For now, the download will stay stuck in "Checking..." mode.

So, don't play too much with the force check feature for now...





git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3310 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-21 23:14:10 +00:00
defnax
db034b026f Added Idle settings to Settings Gui
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3309 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-21 18:48:33 +00:00
thunder2
423f6811ce new methods for set and get the max time before idle on RshareSettings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-21 07:39:14 +00:00
thunder2
e3e4c97369 RsAutoUpdatePage
- Changed the timer of RsAutoUpdatePage to a single-shot timer.
  The update can take longer than the given timer interval.

Changed status service:
- send status when the peer connects (new monitor)
- send status to all online peers only when user changed it (not in every timer tick)

MessengerWindow:
- remove load and save of custom state string in settings

p3ChatService::sendCustomState
- send empty custom state string too

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3307 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-20 19:45:07 +00:00
drbob
f7282edf33 removed unix include. windows should now compile!
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3306 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-18 21:49:58 +00:00
thunder2
3baae3a602 added status combobox to statusbar in MainWindow (initial code from defnax)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3305 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-18 21:28:56 +00:00
drbob
0049549eb7 * changed inet_aton into bdnet_inet_aton for windows compatibility
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3304 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-18 21:22:59 +00:00
defnax
b5461e0544 fixed first windows compile include missed
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3303 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-18 20:49:40 +00:00
drbob
d70337a642 First pass for windows compilation:
* brought over tou_net / tou_error => bdnet for windoze compatibility.
 * updated udplayer to inline with rs changes + win compatibility.
 * removed unix only networking #includes, replaced with "util/bdnet.h"
 * added subdirectory to #includes.
 * made udpbitdht_nettest use a random node id.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3302 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-18 16:28:51 +00:00
thunder2
d53a6c9d29 Create the instance of MessengerWindow only when needed and delete it on close.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3301 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-18 11:43:39 +00:00
thunder2
8f5fe8bae2 - added new status menu to tray menu
- moved internal status functions from MessengerWindow to MainWindow
- cleaned some includes

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3300 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-17 23:19:43 +00:00
defnax
d92e1911eb enabled Channels for release
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3299 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-17 21:17:14 +00:00
defnax
724e6f81a8 update revision string
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3298 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-17 20:51:25 +00:00
chrisparker126
1f873e023e added channel msg thumbnail, you'll lose all your current channel msgs before this rev
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3297 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-17 20:17:14 +00:00