Commit Graph

4800 Commits

Author SHA1 Message Date
drbob
ce992475a1 Modifications to support the changes in libretroshare.
* Disabled all the VEG services, until GUI has been tweaked to match new interface.
 * Deleted <placeholder> text from PhotoItem.ui - to compile with older version of Qt.
 * Fixes to Retroshare.pro (restore libdht path, disable compilation of VEG classes)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5552 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-15 00:17:23 +00:00
drbob
bfef2c659f Reorganisation of the New GXS Services.
* The Example services have been renamed eg. p3posted => p3postedVEG, to allow the real services to be added.
 * The ServiceIDs have been shifted, to allow both VEG and GXS versions of services to run side-by-side for now.
 * The DataTypes have not been renamed - but potentially should be in the future - if they cause clashes.
 * Interface variables have also been renamed. eg. rsPosted => rsPostedVEG.
 * This means that the GUI will not operate without changes too - TODO.

Minor changes to GXS services to better seperate them from the VEG versions.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5551 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-15 00:16:06 +00:00
chrisparker126
9f20c75f83 about 70% done with PhotoDialog
- can add album (with thumbnail!)
- add photo (with photo!)
- can subscribe, but not added to ui yet

need to try some dummy msgs and bring up gxs_net





git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5549 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-13 22:58:42 +00:00
chrisparker126
088e7d61fc Initial refreshing and refactoring of photoshare
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5544 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-12 21:43:41 +00:00
drbob
b52f8dd2b1 disabled Quit / Exit RPC command - it is not functioning correctly.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5531 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-09 16:10:33 +00:00
drbob
7a55bbc029 removed annoying tick() printouts.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5530 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-09 14:40:21 +00:00
drbob
a9f95289d0 Added more RPC functionality:
* System: Quit & shutdown.
 * Search: New Search, List Searches, Close Search, Search Results.
 * Files: TranferLists, ControlDownloads (Start, Stop, Pause, etc).

Changed the way NotifyTxt records search results. 
 * Must register searchId for results to be saved.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5528 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-09 11:48:25 +00:00
drbob
277b8e66ae Updated proto files:
* Added TransferList & Control Download to files.proto
 * Added Search functionality to search.proto
 * Cleaned up core a little.
 * Added Partial Success code.

NOTE: Incompatible Changes - be sure to refresh all generated files.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5527 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-09 11:43:59 +00:00
drbob
138f462669 Added missing file, and linking to sqlite
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5526 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-08 10:49:43 +00:00
drbob
3cbef49b8e Restored libretroshare.pro, Sorry Chris - your cleaned-up version breaks my build.
removed some debug out from rsdir / and dht.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5525 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-08 10:35:40 +00:00
thunder2
c7ed9c6df7 FeedReader plugin
- reserved service id
- reworked error codes
- added xpath manipulation and basic gui elements in preview dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5514 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-04 23:53:04 +00:00
chrisparker126
08904bf82f Improved token service interface with more obvious request calls (grpIds and msgIds list being empty is not implicit of retrieving all ids)
Updated GXS tests and applied fixes
started transfering flags to gxs flags header file

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5513 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-04 22:32:52 +00:00
drbob
84074fdca1 * Adding Chat RPC support into retroshare-nogui. ( About 90% there, and 40% tested. )
- RPC commands are outlined in the proto file.
	- You can: get listing, send msg, register for recv events, change nickname and join/create lobbiey
	- updated chat & core generated files.

 * Added RpcUniqueId(chan_id, req_id) for identifying requests.
 	- Modified Responses Queues to use new datatype.

 * Fixed reset to occur after the connection has died.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5508 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-03 19:18:59 +00:00
drbob
9ad322d379 Some changes to chat.proto
- Changed ENUMs to include type in the name.
	- made non-essential member of ChatMessage optional.
	- Fixed some incorrect numbering.
Enabled chat in core.proto & Makefile.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5507 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-03 19:11:17 +00:00
drbob
9c2f7f39e7 Added Multiple Channels and Event support to RPC system.
* added chan_id parameter to many RPC calls, this allows RPC to support multiple SSH clients.
     - the combination of (chan_id, req_id) rather than req_id, should be unique now  
     		-> TODO inside rpcserver queued requests.
 * Modified SSH server to match the new API. Multiple client support has not been added here yet.
 * Modified Menu System to match these changes too.
 * Added an Registration Framework to RpcQueueService, to enable easy event support.
 
This code has not been throughly tested yet.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5500 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-01 19:35:23 +00:00
chrisparker126
46c945de96 nxs msg transaction now working and test commited
some clean up still needed (msgs to sync should be determined by grp flag in db)

 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5497 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-01 14:47:22 +00:00
drbob
bd1435c72b Added First Pass at a chat RPC protocol.
This still needs to be generalised further - and made future proof.
 It is based roughly on libretroshare/src/retroshare/rsmsgs.h



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5485 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-29 23:42:00 +00:00
chrisparker126
60e1d5e68e Fix for NXS group sync: need to set destination peer when constructing
payload. 
Generalised nxstest to simulate sync among arbitrary number of peers
added pass conditions to test scenerio with seperate notify observers
per peer
cleaned up test code and enabled auto cleaning of run dir (remove db
junk)


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5480 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-28 21:11:54 +00:00
chrisparker126
e99d84403d All Msg and Grp meta modification tests done, no fixes needed!
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5475 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-26 21:07:51 +00:00
chrisparker126
932a1a44f5 added gxs group tests (submission, all retrieval types)
also tested group meta mod request for service strings

all group and msg submission and retrieval requests now tested
msg meta mod request to test still

Added fixes:
genexchange (mGrpSign was not included in overloaded assignment
operator)
added grp sign flag as Db field


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5473 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-26 14:02:47 +00:00
chrisparker126
a6cb2b6a35 fix for msg/grp meta retrieval, added service string to == operator
overloads for grps and msgs
added gxs updated tests, was not included mistakenly in my last update
(5471)


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5472 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-25 17:01:13 +00:00
chrisparker126
9d42715cad Fixes for Gxs msg retrieval:
msgId retrieval fixed, including incorrect stack mtx lock
msgRelatedId retrieval fixed, mem leak removed (did not clean meta)
msg data retrieval fixed 

added related tests 

RsThread::start now initialises mIsRunning to true, needed to unit tear
down on gxs test system.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-25 15:48:55 +00:00
drbob
c8350ad011 Got the first RPC commands working now and tested with python library.
* Switched from BASE => CORE in proto files.
 * finished first RPC call to list peers.
 * return "NO_IMPL_YET" for other peer fns (Not Implemented Yet)
 * Added SystemStatus RPC call too.
 * Disable Verbose SSH logging - so we can see debug better.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5469 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-25 11:47:20 +00:00
drbob
51fc0c59fe Updates to some of the protobuf files.
Added System.proto for basic info.
 - added relationship field to core.person.
 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5468 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-25 11:41:39 +00:00
drbob
1d35dc2915 Changed base.proto & namespace to "core", as base is a reserved keyword in C#
* Started specifying the search protocol in files.proto
 * Added Create Msgs in gxs.proto.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-24 22:33:24 +00:00
chrisparker126
7694bc8bf3 fixed bug introduced into retrodb.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5465 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-24 11:49:31 +00:00
chrisparker126
e1f54c239f system test code for rsgenexchange
initial attempt at msg retrieval test 
added dummy serialiser and dummy gxs items
need to make some more compile fixes but essentials in place


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-23 21:59:51 +00:00
drbob
5a1115e6e4 * Updated message definitions.
- only base & peers are vaguely complete, the others are work in progress.
	- gxs is a crazy idea: to expose the generic gxs interface, so anyone can write an external GXS service.
 * Added Makefile to generate python and c++ code.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5462 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-23 15:44:04 +00:00
drbob
b67f66faa0 Put the first rpc service into action. (untested though).
* Added functions to split up MsgId into Extension / Service / SubMsg.
 * Updated the generated code.
 * Switched on compilation too.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5461 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-23 15:20:43 +00:00
drbob
ccb43660a8 First bits of the RPC Protobuf Service. Doesn't compile yet - this is just a check-point checkin.
* Added generated protobuf code in proto/gencc
 * Added rpcprotopeers.h : Interface for getting/modifying peer information.
 * Added Stuff to .pro file. (disabled at the moment)
 * tweaked update times for SSH Menu, as they were too slow.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-23 14:04:01 +00:00
drbob
9a24b16226 Adding Ralf's patch to add Shared Directory control to SSH Menu Interface.
* Adds Shared Dir SubMenu with Add, Toggle Flags, Remove Shared Dir Commands.

I tweaked it a bit:
 * Changes the Add Command to not use std::stringstream (as Windows don't like it!)
 * Added Check that the directory exists.
 * Changed Virtual Folder name to the top directory from the path.

Still to do on the SubMenu;
 * Listing should be updated if a Share is Added/Removed.
 * Descriptions are too long, should be changed to short descriptions: Add Share, Toggle Browsable, etc.
 





git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5459 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-23 13:52:37 +00:00
chrisparker126
0d9a74d5b6 added contentvalue src in pro file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5453 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-21 22:31:44 +00:00
chrisparker126
6dd18eea46 seperated content value from retrodb
added local meta changing fucntionality to gxs 
also added msgrelated info id retrieval to tokeservice


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5452 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-21 21:32:07 +00:00
drbob
8a7c011c5d Added Directory structure for new rsctrl protocol.
* see NOTES.txt for how to implement it.
 * protobuf definitions are in rsctrl/src/definition

This does not compile yet, and just early thoughts.
Suggestions and help developing this are welcome.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5445 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-20 18:59:13 +00:00
drbob
bb10b6b400 Added first version of RPC system for external control of retroshare-nogui.
The protocol message format is as follows: 
	[HEADER: 16 bytes: 4 x Network Order uint32_t][ VARIABLE LENGTH BODY ] 

	[ MAGIC_CODE ] [ MSG_ID ] [ REQ_ID ] [ BODY_SIZE ] [ ........ BODY ......... ]
	MagicCode = 0x137f0001 ... this will be incremented for new versions of the protocol.
 	MsgID = Corresponds to the format of the Body.
	ReqID = Generated by Requester, Returned in Response, make sure its unique. (undefined behaviour for duplicates)
        BodySize = Byte Length of Body.

	The Body will consist of a protobuf encoded message.

For the moment, the RPC server just ECHOs the request back to the sender - for testing purposes.

Usage:
 * Create SSH connection to retroshare-nogui.
 * Create Request Message(s), and send over SSH channel - You can send as meny requests as you want. 
 * They will processed, and responses sent back (potentially in an arbitary order).

Specific Changes here:
 * Modified rssshd to support arbitary recv/send applications. (interface is RpcComms).
 * Added rpc directory, with server, setup and echo service.
 * Modified Menu System to use the new interface to rssshd 
 * Wrote new matching interface for Terminal Usage.
	- NOTE: Strange BUG in Terminal version.... causes stderr to disappear. TODO.
 * Added -C commandline option to switch on RPC system.

This is the first version - so I expect there will be bugs. Please report for a prompt fix!



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5444 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-20 14:59:41 +00:00
chrisparker126
c17460d1b1 Got message retrieval working for genexchange across gxs chain
- fixed segv bugs for message retrieval and improved data service meta data retrieval 
- fixed compile for windows (exposed too many of rs internals in interface!)
- fixed msg signing functionality and id creation with ssl
- still need to complete photoservice gui and local meta change function

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5443 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-19 22:15:37 +00:00
chrisparker126
5425ab36b5 laptop power supply dead, commiting,
added tokens to submissions, got it working
added generic service string to meta
added msg and grp creation
 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5439 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-18 10:01:35 +00:00
csoler
34ffb229e4 fixed compilation with libssh4
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5436 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-17 14:22:53 +00:00
csoler
2c4a1bf6e4 compatibility with libssh4
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5433 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-16 15:24:16 +00:00
thunder2
f51af0d4de FeedReader plugin:
- added new classes for XML/HTML parse and modify
- added basic error handling
- added new GUI for a preview and a tree to show the structure of the page (will be continued)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5412 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-13 21:35:11 +00:00
chrisparker126
acaefada65 Got group retrieval working with gui and fixed subsequent bugs
add p3distribsecurity mirror gxssecurity (does not have grp or msg verification implemented, but other methods are valid)


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5406 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-12 20:46:21 +00:00
thunder2
148d1310a2 Added new button to open the link of the message in browser or copy the link of the message.
Added "RSS: " for the forum feeds.
Parse the feedburner:origLink in the rss feed.
Moved download functions to a new class CURLWrapper for easy use.
Added two new functions (currently only for local feeds for testing):
- embed images into the message (works for Qt 4.7 and higher)
- save complete web page

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5399 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-10 18:06:29 +00:00
drbob
8f2ff3eaf5 Changes to bring the SSH Menu system online!
* Commandline Options added (./retroshare-nogui -h for help).
 * Added Password Hash system.
 * Shifted Menu output to std::string buffers.
 * Built interface to SSH server.
 * changed menus to lowercase.
 * Fixed SSH server restart issue.
 * Updates Output regularly now.
	


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5398 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-09 13:45:05 +00:00
drbob
fa65173171 switched output from std::cerr to std::cout....
now you can run ./retroshare-nogui 2> /dev/null
  to get a usable terminal rs console.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5391 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-08 09:23:26 +00:00
drbob
db35ae95af Added Basics of Menu System to retroshare-nogui.
* Menu System basic structure complete.
 * Added functions to NotifyTxt to handle search results.
 * Running from std::cin at the moment.
 * Functional Commands:
	- List Friends, Network.
	- Show Transfers, Cancel Transfers.
	- Basic Search, and Download.
 * Not Connected to SSH server at this point, TODO.
 * Lots of Other Commands to add (e.g. import/add/remove friends, forums, etc)
 * Enable via option in retroshare-nogui.pro, instructions at bottom of file.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5390 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-07 23:55:43 +00:00
chrisparker126
a715947046 Added Rs photo v2 item serialisation test, fixed subsequent bugs
Reactivated Photodialog. almost completed integration, publishing and item storage working, 
but data retrieval algorithm needs to be changed (request flags need to be translated, based on update call rather than client assumption)
fixed bug in rsgenexchange notification. 
Added LGPL notices


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5387 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-06 21:00:38 +00:00
thunder2
3948234310 Fixed compile on Windows.
Added missing path to sqlite.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5386 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-06 20:42:16 +00:00
drbob
b8729de06a Added SSHv2 connections to retroshare-nogui.
* Using libssh in a seperate thread.
 * Binds to fixed port, and accepts connections from standard SSH clients.
 * Only an Echo Server at the moment: Interface to be decided yet.
 * Only accepts 1 connection, 2nd connection hangs at the moment.
 * A long way to go before it will be useful!



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5380 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-05 17:08:29 +00:00
thunder2
f710dba2c6 FeedReader plugin:
- fixed compile on Linux
- added compatibility with iconv

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5378 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-04 01:15:40 +00:00
chrisparker126
d220e14c4a fresh recompile needed!
TokenQueueV2 added, 
first change to photoshare to deal with gxs backend 
needed to redirect meta types to mine in order to get compilation working and definition fixes 
to rsgenexchange. 
Next step is to get GxsRunner going

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5377 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-03 06:39:50 +00:00