Commit Graph

365 Commits

Author SHA1 Message Date
ewensun
0654836a3d add a downloading queue in ftControl,max 2 files can be download at same time
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@933 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-19 15:02:59 +00:00
ewensun
812cdd6bd6 time out unused uploads
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-18 04:00:24 +00:00
notdefine
5480354492 march=i686 causes problems while 64Bit compiling, GCC tries to generate Output for a m64 machine, but the marchi686 doesnt allow the instructionfs for that.
So i removed this commandline options.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@931 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-17 21:40:25 +00:00
notdefine
e97d661624 Fixed error: ‘UINT_MAX’ was not declared in this scope
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@930 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-17 21:01:05 +00:00
csoler
f109f9c5ef added a Doxygen configuration file in order to help me sort out libretroshare...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@929 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-11 17:51:21 +00:00
csoler
6d6901e6e9 added a callback to fimonitor to be able to keep track of file hashing
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@909 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-04 20:28:48 +00:00
csoler
19aa089701 Added the infrastructure for propagating trust info through third parties
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@892 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-23 16:23:54 +00:00
ewensun
6919d3bd7f clean up completed cache files automatically
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@891 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-18 14:27:22 +00:00
csoler
5a1757c5d9 Invalid read correction (valgrind)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@888 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-11 21:12:53 +00:00
drbob
b3a0d30bbc Small fix to universal script and some extra debugging.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@874 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-07 17:51:11 +00:00
drbob
00f0f3e067 make it only build the library, not the execs.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@873 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-07 16:17:57 +00:00
drbob
d89eda510f * switched off some debugging.
* fixed tickrate slow down (when no activity)
 * added extra flags to interface.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@871 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-07 14:53:57 +00:00
drbob
1efe8a2cb1 Added Authenticated Forums. This required quite a bit of
additional functionality in other places, including:
 * add Sign / Verify functions to authxpgp
 * sign/verify messages, and control flags for p3distrib/p3forums.
 * add authmgr to p3distrib etc.
 * added AUTH flags to rsforums interface.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-06 00:23:43 +00:00
ewensun
889ad3555b implement function for clearCompleted on filetransfer panel
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@866 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-04 21:34:19 +00:00
csoler
67b6b24e63 added display for author of forum posts
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@865 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-03 19:39:20 +00:00
csoler
7fe41aecae suppressed uninitialized memory read.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@860 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-01 12:41:09 +00:00
ewensun
3453604c4d remove temporary file when cancel file transfer
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@859 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-30 21:43:51 +00:00
drbob
9f727e2d94 Bugfixes for correct Channels display.
* Corrected search in ftserver.
 * Updated avail in controller FileDetails.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@858 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-30 17:17:28 +00:00
ewensun
00a0fdfbbf add code for cancen file transfer
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@854 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-29 22:03:36 +00:00
drbob
77cb7314bc Tweaked tabs and order. Added NewsFeed.
Added Template functions for ssl+xpgp code.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@853 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-29 20:17:58 +00:00
drbob
f5fa2f9a68 Added Function to move an 'extraFile' to another location.
This will be used to retrieve channel files.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@844 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-27 21:23:46 +00:00
csoler
d19f696278 suppressed double mutex lock
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@840 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-24 20:13:16 +00:00
raghu-dev
5c9b0b5917 added files gpgauthmgr.cc and gpgauthmgr.h
this provides the new GPG implementation 
added API to store all GPG keys in a map
added APIs to get GPG certificate IDs
added APIs to get Details from the Certificates


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@839 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-24 18:40:03 +00:00
drbob
2c64dec723 missing file for defining sleep() etc under windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@831 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-22 17:48:09 +00:00
drbob
83720439f0 Updated version numbers to v0.4.11b.
Bugfixes for 'sleep' issues under windows.
 Extra debugging for transfer module.
 Fixed channel directory creation. (extra 'break' statement)
 Fixed very slow transfers on Windows platform (uninitialised variable)
 Ready for win/linux/osx release now.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-22 17:07:11 +00:00
drbob
4610d1ddac Added Mutex protection to the core comms (pqihandler + pqipersongrp).
also added a Mutex to the ServiceServer.

  This will hopefully fix the random threading crashes.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@829 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-22 13:15:07 +00:00
drbob
c46b823261 * fixed, transfer start when subscribing to channel.
* cleaned up p3distrib callbacks.
 * added holdQueue for transfer startup in controller. 
 * fixed partial resume.
 * updated Mac script to only build library.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@828 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-21 00:10:59 +00:00
drbob
71797d6f70 Fixed compatibility bug in file transfer...
can now communicate between V0.4.9b and V0.4.11+



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@827 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-20 22:59:58 +00:00
drbob
7c596231e1 Improvements to the file transfer algorithm.
Increased max individual file speed to 1MB/s



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@826 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-19 01:12:21 +00:00
drbob
c60cf84e95 * Switched off lots of debugging.
* Tweaks to the transfer rates.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-18 21:22:58 +00:00
defnax
df7cbc58e6 * Fixed Messages Dialogs QLabels
* Fixed Online and Message Toaster to look bether .
* Update stylesheets for bold fonts for Subject,From,Date,To, Subject Text
* Set for From Text Label Blue font.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@814 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-17 03:03:23 +00:00
drbob
1c16cc8d22 Modified services to only include more complete ones for now.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@809 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-15 23:44:12 +00:00
drbob
66bf56207d * Added Configurations to new file transfer.
* Enabled config in p3file-startup.cc
 * Enabled resumeTransfers
 * Added new RsFileConfigItem to serialiser.
 * extended ftFiMonitor to use Configuration.
 * bug fix to add/remove Shared Dirs.
 * Increased Channel/forum periods to 3/12 months.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-15 20:00:29 +00:00
drbob
fce83cb232 More bugfixes ... got the basic channels file transfer working.
* Create channels directory correctly.
 * added File Transfers to Config List.
 * connected statusChange() monitor callback.
 * fixed file sources in transfermodule.
 * fixed up transfer restarts / sleeps.
 * enabled opening files read only.
 * disabled some of the debug.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@799 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-13 23:03:46 +00:00
drbob
aee6cb85b4 * More bugfixes for file transfer.
* Added File Transfer / ExtraList to channels.
 * fixed mutex deadlock.
 * added slow transfer for background tf.
 * added checks to FileRequest to accumulate peers.
 * added ExtraList callback.
 * etc, etc.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@797 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-09 22:17:20 +00:00
drbob
1e33267951 Modifications to libretroshare to enable a
build against a standard OpenSSL library... 
Still lots to do (implement AuthSSL), compiles all but final gui.
use USE_XPGP flag in build script to control it.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-09 16:52:14 +00:00
defnax
5153dca534 update openoffice retroshare README
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@793 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-07 16:53:44 +00:00
defnax
b2b8b3f575 update readme
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@792 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-07 13:15:54 +00:00
drbob
80f4686100 Bugfixes and extra debugging for file transfer.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@791 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-04 23:12:53 +00:00
defnax
6343de176e added a readme for compiling under linux from latest wiki Howto,
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@790 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-04 18:28:16 +00:00
defnax
3c6f9eff60 update readme
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@789 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-04 13:56:52 +00:00
stockpicker
db263b160c Fixes missing includes and strict gcc 4 code checks for Linux
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@787 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-02 13:53:17 +00:00
stockpicker
c222c354d6 Changes to support both miniupnpc 1.0 and up-to-date 1.2
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-02 13:33:06 +00:00
stockpicker
c0e846f7f7 Fixes missing includes and strict gcc 4 code checks for Linux
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@785 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-02 12:59:21 +00:00
stockpicker
b987d014e5 Replaced deprecated m486 flag in config-linux.mk with march=i686
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-02 12:47:43 +00:00
drbob
0d96b43d34 Enabled new File Transfer Code in libretroshare.
NB: This is not yet working. so SVN is now officially broken :(
Hope to have the bugs ironed out soon.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-02 11:38:11 +00:00
drbob
88ef2e0e34 Major bugfixes and testing changes for ft.
It is now almost ready for integration with rs.

Added ftserver3test.cc which successfully tests:
	* Hashing of a directory.
	* Transfer of Cache Files.
	* Local Searching.
	* Remote Searching.
	* Download from multiple sources.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@773 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-10-29 20:58:23 +00:00
drbob
889825b77e update for 64 bit interface change.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@772 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-10-29 20:54:43 +00:00
drbob
5e9a7d976b Updated Interface to 64 bit file size - helps fix > 2GB problem.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@771 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-10-29 20:53:14 +00:00
defnax
a50cd7ceb1 update readme
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@769 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-10-28 12:19:02 +00:00
drbob
ef9bb372b4 re-wrote ftfileprovider / ftfilecreator to be more simple and robust.
re-wrote associated tests to be more robust.
added new fttransfermoduletest.cc 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-10-22 18:12:58 +00:00
drbob
38b1c02101 MacOSX Bugfix: Commandline ip addresses were not initialised properly. added clear_sockaddr() call.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-10-19 13:43:56 +00:00
drbob
bc98b9ea7d BugFix: DHT was not turning on.
also updated the ServerDialog with more info on exact network state.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@753 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-10-18 16:02:06 +00:00
drbob
95d5f38222 Added more comments describing how to start up libretroshare
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-10-17 22:41:31 +00:00
chrisparker126
5b2e6b2d62 simplification of qblog, only supports blogging now
- i.e. no file or profile view support


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@733 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-21 21:09:12 +00:00
chrisparker126
d14a1ffb39 simplified qblog for blogging only, hopefully test everything out soon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-21 20:30:34 +00:00
chrisparker126
a52c34a551 git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@730 b45a01b8-16f6-495d-af2f-9b41ad6348cc 2008-09-21 11:08:08 +00:00
ewensun
fa4727865c roll back to 725 again
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@728 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-17 13:18:12 +00:00
ewensun
cc41cbb708 roll back to 725
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@727 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-11 10:33:43 +00:00
ewensun
e8d21abdd5 ftFileStatus contruct failure
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@726 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-10 14:12:13 +00:00
ewensun
3af7d41d7f solve compile faults.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@725 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-09 13:08:22 +00:00
ewensun
86ffedb50d small updates for fttransfermodule.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@723 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-09 07:24:06 +00:00
ewensun
7b609a6aea implement cancelTransfer and update transfer module for debug log
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@722 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-08 14:04:10 +00:00
ewensun
9b0bfb26c2 add fileControl and fileCancel code in ftController
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-08 08:44:37 +00:00
drbob
174c3f7377 * Added Sourashis' work on certificate cleanup.
* Added call to function when loading certificate from a string. 
	(ie when the user cut n pastes it).
 * added return 1 call to pqipersongrp.cc




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@714 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-31 18:50:31 +00:00
drbob
f7fca4295b Improvements/bugfixes to File Transfer.
* Lots more debugging messages.
 * Fixed Sleep / sleep issue on windows.
 * added pthread / WSAStartup.
 * added ownId to ftDataMultiplex for loopback file transfer.
 * now start ftDataMultiplex thread.
 * several bugfixes in ftfilecreator



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@710 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-30 01:07:24 +00:00
ewensun
059effcfac add draft code to test ftcontroller and fttransfermodule
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-28 14:20:53 +00:00
drbob
d62876ae37 * fixes for windows
* corrected allocation in ftfilecreator



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@707 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-25 20:03:39 +00:00
drbob
f243e5f6d3 * Added lots of debugging.
* Partial bug fix for allocate algorithms.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@706 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-23 21:28:08 +00:00
drbob
7b7446c5b5 More bugfixes for file transfer stuff.
* Completed 2 basic tests (ftserver1test & ftserver2test)
 * Updated test notes.
 * debugging stderr output. 
 * fixed return code in ftfilesearch.cc
 * corrected ftcontroller run() to call fttransfermodule::tick()
 * fixed ONLINE status for OwnId (ftcontroller too)
 * corrected message sources for test harness.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@705 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-21 21:30:59 +00:00
drbob
eb8dacc798 Integration of ft into a working system.
* Made ftTransferModule compile.
 * bugfixes to make ftserver1test work.
 * New P3Pipe / P3Hub ...
 * Added Test Notes.
 * First functions added to ftcontroller
 * added isOnline to p3ConnectMgr.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@698 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-17 15:23:11 +00:00
drbob
cf7d072a5b Added missing functions to connectMgr.
Some debugging (which should be #ifdefd )
Removed old make.opt



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@691 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-16 15:40:47 +00:00
drbob
8df643596e Missed a file.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@690 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-16 15:06:03 +00:00
drbob
33032e8a83 * Modified p3ConnectMgr to enable Standalone testing of components.
* Created pqiNetAssist interfaces for DHT and UPnP.
 * Created PQIHub etc for standalone testing (in ft/pqitestor.h for now).
 * Add basics of first server test ... its not quite complete yet.
 * Improvements to ftserver.
 * Changes to many tests to match other mods.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@689 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-16 15:02:24 +00:00
drbob
189dcbb482 Completed most of ftserver class.
Also changes to make everything fit together.
changes to Interface to support srcId list.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@675 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-09 17:03:24 +00:00
drbob
d7e1a90c28 Tweaked dbase functions for ftSearch functionality.
(made a bunch of functions "const")



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@674 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-09 16:06:01 +00:00
ewensun
6f1a6e78cc fill adjustSpeed and recvFileData
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@664 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-06 04:12:36 +00:00
drbob
5c6e558942 More Improvements to FileTransfer:
* Added TlvShallowClear() to serialisers
 * Added RsQueueThread for periodic queue processes.
 * Completed ftDataMultiplex which replaces ftServer/ClientModules.
 * Added Server Queue / Thread to ftDataMultiplex.
 * Added ftdataplextest to exercise ftDataMultiplex.
 * Generalised ftFileSearch to handle an array of ftSearch classes.
 * Tweaked rsfiles.h #defines to match new ftFileSearch scheme.
 * Added Generic ftData Interfaces for Testing.
 * added ftDataSend/Recv Interfaces to ftServer + ftDataMultiplex respectively.
 * Completed much of ftServer (External Interface), but not yet done.
 * Extra debugging and small changes to ftExtraList
 * Integrated new ftTransferModule with minor interface changes.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-03 12:45:53 +00:00
ewensun
9a4fc54943 draft version for implementation of transfer module.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-29 15:18:27 +00:00
ewensun
3bcb97ff4c update according to Bob's comments.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@651 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-29 15:16:31 +00:00
drbob
79727897dd Addition of next stage of new FileTransfer Code:
* Completed rough ftExtraList class (with Test Case)
 * Added data flow interface (ftData.h)
 * Added ftDataMultiplex (server + client modules).
 * Finished parts of ftcontroller / ftserver.
 * Minor Tweaks to ftTransferModules interface for compilation.
Related Changes in other parts of the code:
 * Added new Job/Queue Thread Class.
 * Added more user-friendly directory functions.
 * Added FileInfo print operator.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@650 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-23 22:01:59 +00:00
drbob
80e1be2839 Improved the 'AutoConnect' information
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@646 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-10 21:26:10 +00:00
drbob
d36b15d526 Major cleanup of Retroshare Logging - aimed at enabling proper UDP testing.
* Switched off most of std::cerr output. (expect UPnP)
 * moved pqi/pqidebug to util/rsdebug to allow greater usage.
 * added Mutexes to logging.
 * Downgraded many log messages to DEBUG.
 * New Log messages for connections, dht and udp code.
 * Added check for bad UDP socket.
 * Added check for non-firewalled scenario.
 * Increased Storage period from 1 Month to 6 Months for Links & Blog.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@644 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-10 16:29:18 +00:00
drbob
ca69e3d5e3 Removed most of the output to stderr.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@641 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-09 09:55:09 +00:00
drbob
b58e3f7e28 BUGFIX: Stopped it producing thousands of empty files.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@638 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-06 16:38:52 +00:00
drbob
9629c6923c * BUGFIX: Multiple DHT searches / reconnect attempts (p3dhtmgr) done!
* Tweaks to the File Interface.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@636 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-06 15:05:59 +00:00
drbob
56639fd1ba * Added NewsFeed for new Message.
* Disabled newsFeed for failed connection and disconnect.
 * Switched interface file_size to 64 bits for larger files.
 * Flagged distrib groups as changed when subscribe request is processed.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@634 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-04 14:27:10 +00:00
ewensun
e0b8a14e0b git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@632 b45a01b8-16f6-495d-af2f-9b41ad6348cc 2008-07-03 13:11:20 +00:00
drbob
be392405e8 * Switched to rsFiles interface for all File Information.
* added TMP p3Files class to interface with old system.
 * cleaned up old RsControl + RsIface file information.
 * removed unnecessary functions from RsServer.
 * Tweaked interfaces for ftServer + ftExtraList.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@630 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-02 16:58:13 +00:00
drbob
473f3f75f3 * Addition of new File Transfer structure. (server / search / extralist / controller)
* Fixed up variable names in p3Qblog.cc
 * Cleaned up unused BaseInfo/PersonInfo/DirInfo in rstypes/rsiface
 * added new rsfiles interface (rough outline at the moment)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@628 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-02 13:19:59 +00:00
cppenthu
eeb13e7b18 Corrected formatting
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@627 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-02 04:05:58 +00:00
cppenthu
1db82dee51 ftfileprovider.cc - takes care of getting data from a requested file
ftfilecreator.cc -- creates a file, tracks missing chunks, timed out 
chunks etc



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@626 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-02 02:36:39 +00:00
chrisparker126
93d785b8ff added revised qblog core
* added new tlv type rstlvwide key value pair for internationalisation
* profile interface method not fully implemented yet
* blog methods implemented          
* added extra constructor to facilitate extensibility (rename packet 
type)




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@625 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-26 13:08:48 +00:00
drbob
993a5e901d Added Structure/Example for Port Forwarding Service.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@624 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-24 23:12:25 +00:00
drbob
b9ccbd54e8 Addition of new channels service.
* Addition of channels serialiser.
 * New channels interface.
 * Added Channels to startup code.
 * New CFG Id for serialiser.
 * Cleanup of old channels stuff from interfaces.
 * Cleanup of messages as well.
 * Changed file size to uint64_t



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@620 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-24 04:22:42 +00:00
drbob
d8def217fa removed duplicate function p3peers::CertToFile().
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@619 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-20 13:16:39 +00:00
chrisparker126
2059e102bf removing add config for qblog (no longer user pqi config for saving)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@618 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-20 13:04:43 +00:00
drbob
9f024eaee7 Changes to support the new NewsFeed.
* added interface to rsnotify/p3notify/pqinotify
 * added getForumInfo() to forum interface.
 * added virtual functions to p3distrib for event feedback.

New NewsFeed Notification.
 * Peer Connection/Disconnection.
 * Failed Certificate connection.
 * New/Updated Forums and Forum Msgs.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@616 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-20 12:38:11 +00:00
drbob
971ad4fe9b Added header files for new file transfer design.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@615 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-19 22:49:23 +00:00
chrisparker126
2a44784999 core modification for Qblog
*final modifications to qblog network messages: might need to consider 
wstring for profile kvsets tho
*update qblog core to hanldle messages
*updated interface with all methods we will ever need hopefully


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@614 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-19 21:34:13 +00:00
drbob
098851592c * Added isOnline to rspeers.h interface
Various improvements to get p3distrib Messages working:
 * Defensive programming in cachestrapper (forcing ownId on save).
 * Changed CONFIG_CACHE_ID to last -> to force correct loading order at startup
   This should be Config Files, Local Cache Files, then Remote Caches.
 * Hack to maintain existing Cache Files.
 * Improvments to forum_test.

Lots of work on p3distrib:
 * fixed nextCacheSubId.
 * Added new Msgs to Config Save.
 * Fixed Cache reload issues.
 * Overall: Enabled Forum Msg publication.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@611 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-16 20:37:48 +00:00
drbob
c47c751532 Added StartMinimised Option (-m as distinct from AutoLogin Option -a)
The core does nothing with this, but it can be used by the gui.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@600 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-14 13:22:39 +00:00
drbob
9c2558dbf0 Final changes as we head towards V0.4.09a release.
* Switched on RELEASE flag in libretroshare.
 * Added missing Mutex lock in upnphandler.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@598 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-13 23:22:20 +00:00
drbob
14bdaaf964 Added includes for GCC4.4
#include <stdlib.h>
#include <string.h>



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@596 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-13 16:02:36 +00:00
drbob
fe284b628a * Added rstlvimage.cc to serialiser (missed in other checkin).
* Added Forum ID to configuration Manager.
 * added proper startup for p3Forums.
 * updated forums/distrib interfaces.
 * Switch Auto-Login on by default.
 * switched out lots of debugging.
 * add RM libretroshare.a to top-level Makefile.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@594 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-13 15:42:08 +00:00
drbob
14dac82c85 Major work on distrib/forums system.
- Now creates Distribution Groups, with Admin + Publish Keys.
 - Distributes Groups + Public Keys in the Cache File.
 - Stores private Keys and subscribed groups in Configuration.
 - Forum Test to check basic functionality.
 - Added nullService for services that require tick(), but no instant messages.
 - removed debugging for other services (ranking/gamelauncher) 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@593 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-13 15:32:12 +00:00
drbob
602c7cc7b7 Addition of serialisers for forum/distrib
Addition of TLV for Keys, Signatures and Images



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@592 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-13 15:26:31 +00:00
drbob
e42ce13454 Add in storage of the current Data Rate to pqihandler.cc.
Add in interface for the Data Rates.
Increase DHT Bootstrap buckets to 8.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@590 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-10 00:47:24 +00:00
drbob
4a58c71f9e Added new functions to support profile and favourite files in Blog.
Added Dummy information too.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@587 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-08 18:32:40 +00:00
drbob
3b03f084fa Reorganised the Service Ids.
Services which are being designed / tested should use an Id 
  between 0xf000 - 0xffff until the messages are finalised.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@584 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-07 16:06:21 +00:00
drbob
9fbf95bf5d Added Filter to Stun Results to ensure that we only get external addresses.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@583 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-07 11:22:01 +00:00
drbob
cbd0b216a4 moved isLocalNet() etc to util/rsnet.cc
Fixed FAILURE in net_test1



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@582 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-07 11:21:00 +00:00
drbob
a827b0a839 Moved several network related functions from pqinetwork to here.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@581 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-07 11:19:09 +00:00
chrisparker126
bba3c20045 tick for Qblog service added to update server
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@580 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-06 23:40:43 +00:00
chrisparker126
5a2c0a27a2 add tick fn
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-06 23:39:05 +00:00
chrisparker126
96ce0a8eff added tick fn
cleaned up logical update behaviour, still needs fine tuning


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@578 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-06 23:38:37 +00:00
drbob
9786a2ad54 BUGFIX: use correct id for FileTransfer data.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-06 00:03:10 +00:00
drbob
dd771b9940 * Improvements to Upload information output: destination id, size and rate of last transfer
* Deletes fileCache after 30 seconds of inactivity.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@574 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-06 00:01:57 +00:00
drbob
42579f4dec Fixed warnings from -pedantic
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@573 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-05 22:10:28 +00:00
drbob
9b3213a02b Chris: Don't change the paths in here. They should work as they are!
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@572 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-05 21:42:01 +00:00
chrisparker126
d8bfc6d8b3 Mostly connectivity code additions
* implementation of p3config, cache functionality to p3Qblog
* added peerid (pid) attribute to rsQblog item and its serialisation
* TODO: logical updating for p3Qblog
* TODO: implement tick() so can add to server 
* TODO: test p3Qblog after addition of tick with some peers



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@571 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-04 10:59:24 +00:00
drbob
452d664b2a Added missing #includes for picky compilers (ArchLinux)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@569 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-31 13:39:04 +00:00
drbob
aa906da74a Added #includes for picky compiler (ArchLinux) mainly: stdlib.h & string.h
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@568 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-31 13:31:11 +00:00
drbob
9f64df3f20 added missing #include <algorithm> for std::find
(ArchLinux complained).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@566 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-30 10:36:47 +00:00
drbob
39f4fa3d6c Modified rankings to take into account the User Score (-2 -> +2).
Scores can be based on:
	Time: Average Comment Age.
	Ranking: Sum of peer scores.
	Combo: Sum of (score * age)

These are still rather crude and could be improved significantly
if anyone is interested in trying.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@562 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-24 20:20:16 +00:00
chrisparker126
fe22d0b651 final interface, before starting on connectivity
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@561 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-24 15:10:59 +00:00
chrisparker126
7d571f6e2c git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@560 b45a01b8-16f6-495d-af2f-9b41ad6348cc 2008-05-24 15:09:51 +00:00
chrisparker126
ab4b0d0251 fixed some issues with dummy function
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@559 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-18 20:25:14 +00:00
vinnyx
9cd24b315f Added network message objects for the Status service - RsStatusItem
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@554 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-14 10:35:12 +00:00
drbob
5913872a77 Fixed cross-platform bugs.
(1) std::map<> doesn't support .at() on OSX or Windows. (use [] or find())
 (2) u_int32_t is invalid on windows. (use uint32_t )



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@553 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-13 16:56:27 +00:00
drbob
d48205286a * Improvements to Link Cloud Service. You can now vote anonymously on a Link,
this will spread it to your friends anonymously.
 
 * Completed Mutex Locking on Connection Manager.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@551 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-13 15:41:40 +00:00
chrisparker126
b763bd5ae9 added P3Qblog to services makefile
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@549 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-11 20:05:17 +00:00
chrisparker126
386a22746a added external interface
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@548 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-11 19:36:02 +00:00
chrisparker126
066ffd2447 fixed up some definition issues
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@546 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-10 21:33:07 +00:00
chrisparker126
d4b8340885 needed to make p3qblog public to rsQblog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@545 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-10 20:01:49 +00:00
chrisparker126
cb736a2d5b added initialised qblog interface
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@544 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-10 20:00:02 +00:00
chrisparker126
7d5b3af65a qblog dummy service implemented
- need to test with qblog gui
- added to make compiles fine


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@540 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-09 01:01:13 +00:00
chrisparker126
2ac5b4cc65 qblog dummy service implemented
- needs to be tested with gui
- added to make, compiles fine


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@539 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-09 00:30:29 +00:00
chrisparker126
de0ad9b68f qblog dummy service implemented
- needs to be tested with gui
- compiles fine


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@538 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-09 00:29:10 +00:00
chrisparker126
556a2f32b8 dummy service implemented, needs to be test with GUI
- added to make, compiles fine


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@537 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-09 00:27:28 +00:00
chrisparker126
f1081651e5 fully implemented qblog serialiser
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@536 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-05 20:21:22 +00:00
chrisparker126
ca861f6306 fully implemented qblog serial items
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@535 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-05 20:20:18 +00:00
chrisparker126
041b1fb07c fully implemented chat serialiser
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@534 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-05-05 20:19:25 +00:00
vinnyx
3eafd7d00e Added RsStatusString() - returns a string for given status number
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@527 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-04-28 11:50:39 +00:00
vinnyx
26d2def720 Added status service: p3status
Added status service to core: p3face-startup


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@524 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-04-26 09:39:02 +00:00
vinnyx
02c6d70e30 Changed include from <string.h> to <string>
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@523 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-04-26 06:30:40 +00:00
chrisparker126
180c5ad542 for rsQblog service. TODO: fully implement and test
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@522 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-04-25 18:43:23 +00:00
chrisparker126
46dd2988bb for rsQblog service, TODO: fully implement and test
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@521 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-04-25 18:42:35 +00:00
chrisparker126
4f918b2fab add QBLOG service ID
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@520 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-04-25 18:37:57 +00:00
vinnyx
4e03fa5d06 #ifndef protection
global pointer to interface
LGPL header


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@517 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-04-24 12:26:44 +00:00