Commit Graph

59 Commits

Author SHA1 Message Date
thunder2
959c9c2aca Fixed compile on Windows when using shadow build.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-01 13:50:34 +00:00
csoler
299678b9c8 patch from Stefan Sperling to allow openbsd compilation.Forgot these files last time
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6618 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-26 17:38:51 +00:00
thunder2
4ce08bee38 Renamed the lib of sqlcipher to libsqlcipher.a for Windows too.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6482 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-06 00:58:17 +00:00
csoler
fa3cc82790 latest version of sqlcipher has changed the lib name to libsqlcipher.a
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6481 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-05 18:57:56 +00:00
csoler
8d7bbb25f8 fixed slite lib linkage
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-25 19:48:51 +00:00
thunder2
05f8b15cfe Added missing file "stream.proto" to the automatic generation in retroshare-nogui.pro.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6336 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-23 21:43:24 +00:00
drbob
f02383f5d6 from retroshare/code/branches/v0.5-rpc-b1
--- Merging r6107 through r6332 into the rest of retroshare.

Updated version of RPC protocol with fancy new features like:
 - streaming.
 - add / remove friends.
 - file listings.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-23 21:10:34 +00:00
drbob
bef0b26744 Improvements to SSH RPC interface.
- Added Directory Listings.
 - Added File Streaming Node->Client
 - Updated generated protobuf files.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-rpc-b1@6282 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-25 19:05:31 +00:00
csoler
8cc98aeabc added missing pthread lib for ubuntu raring
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6196 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-08 12:57:27 +00:00
csoler
579b04db05 switched libssh to 0.5.4
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-04 22:09:10 +00:00
thunder2
d1b488002e - Fixed generating of protobuf files in retroshare-nogui.pro for shadow build and Windows compile.
- Added dummy files for generated protobuf files. Without these files qmake doesn't add it to the makefile.
- Added svnignore:* to gencc directory.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6180 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-02 13:50:07 +00:00
csoler
2752a6975d patch from Henry Morgan to auto-detect system-wide libssh and use it to compile
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-28 22:48:28 +00:00
csoler
7e03ba812d patch from Henry Morgan to handle proto files from the .pro file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6167 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-28 22:32:13 +00:00
csoler
641a24edac removed default qt, gui and xml flags from Qt,not wanted in no-gui
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6146 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-25 17:34:12 +00:00
drbob
e1e040c3eb Improved interfaces for Search, Chat and Peers.
Added latest protobuf files.

NB: This branch is now incompatible with most RPC Clients.
It will be developed in parallel with pyrs branch "rpc_dev"




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-rpc-b1@6137 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-22 20:54:46 +00:00
csoler
c23cfd4a0f removed intermediate (re-generated) protobuf .cc and .h files. Fixed missing include line
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6132 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-17 17:01:22 +00:00
thunder2
635f915f46 Fixed ssl path in retroshare-nogui.pro for Windows compile
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-02 18:30:43 +00:00
csoler
b1ffc14954 removed gxs from default
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6099 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-30 09:21:57 +00:00
csoler
eed8fb7bfb fixed .pro file. libssh-0.5.2 should be unzipped in a directory next to trunk/
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6096 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-28 11:48:16 +00:00
thunder2
e2ad5b6cb6 Disabled "CONFIG += debug" in retroshare-nogui.pro
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6016 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-18 21:26:01 +00:00
thunder2
8b794a8f8f retroshare-nogui
- fixed path to libssh
- link static ssh on Windows
- fixed compiler warning on Windows

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6015 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-18 19:48:31 +00:00
defnax
46054187fc fixed retroshare no-gui project file for windows compile
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6013 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-18 10:52:34 +00:00
drbob
d3787cb324 Make rs-nogui+SSH compile against the trunk.
* converted to new flags format for File Operations.
 * converted from PUBLIC to VISIBLE lobbies. NB: This required name changes to protobuf definitions.
 * converted DataRates to new function.
 * directory sharing shifted to using OTHERS flags (text menus) - No support for group Flags yet.
 * Added == operator to Flags Type.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6000 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-17 01:24:16 +00:00
thunder2
f764a82408 Fixed compile of gxs on Windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5999 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-16 22:39:58 +00:00
drbob
069b72e0b2 Merged branch v0.5-gxs-b1 into trunk (from -r 5351 -> 5995)
This brings a huge amount of goodness into the trunk,
but there is still a big chunk todo before it can be released.

 * GXS Backend.
 * GXS Services:
	- Identities.
	- Circles
	- Photos
	- Wiki
	- GxsForums
	- Posted.
 * SSH no-gui server.

See branch commits for more info.

To switch on GXS stuff, enable CONFIG += gxs
in both libretroshare.pro and retroshare-gui.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-16 19:17:11 +00:00
drbob
fde1e8d66d tweaked cyrils mods to be compatible with old ssh location, and use pregenerated proto.cc files.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5712 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-22 18:42:54 +00:00
csoler
3d4869e226 forgot to commit this file last time
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5708 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 19:59:53 +00:00
thunder2
56635e4ce4 Added more PRE_TARGETDEPS for Windows compile.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5700 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 11:51:38 +00:00
defnax
92454adbe7 added the required include dirs for win
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5647 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-08 15:59:22 +00:00
csoler
20747426ec added missing libs to compile on arch linux (Patch by AC)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5558 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-17 18:42:31 +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
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
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
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
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
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
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
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
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
csoler
7b6820a6e1 removed gpgme from link line
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5301 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-07-15 16:17:56 +00:00
thunder2
703e5def72 Removed usages of gpg.h and cleaned pro-files for Windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5296 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-07-14 00:02:40 +00:00
csoler
efa5460a52 fixed compilation of retroshare-nogui
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5262 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-07-01 13:21:05 +00:00
thunder2
1885fb66c4 - Enabled compile on Windows (bzip2 library needed).
- Fixed crash after the second call to RsInit::InitRetroShare when keyring does not exist.
The instance of AuthSSL was created twice and AuthGPG was deleted without stopping the thread. Stopped the AuthGPG thread on exit of RetroShare.
- Added the correct path to the keyring for Windows in RsInit::copyGnuPGKeyrings.
- Changed the detection of the portable version on Windows from the file "gpg.exe" to the file "portable".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5211 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-06-10 00:29:46 +00:00
thunder2
bd7fe9f53d Fixed path to the libs in Windows build of retroshare-nogui.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4982 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-23 11:11:33 +00:00
drbob
446db939b2 Added Code to convert retroshare-nogui into an "Introduction Server".
Perhaps the community can use this instead of their existing certificate exchanger.

The way it works:
	- Designed to be coupled up with a WEB Interface to allow new users to interact with each other.
	- Automatically sets up some Chat Lobbies, so that the new users can chat to each other.
	- If you drop a Certificate File into the NEWCERT directory, it is automatically loaded as a friend.
	- These Certificates automatically expire after a fixed period (2 Weeks at the moment).

So the idea is that Users upload their Certificates to the Intro WebServer, then they have two weeks
to test out Retroshare, and use the Intro Server to make some RS Friends.

To enable this Build, edit the .pro file.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4900 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-07 17:01:07 +00:00
drbob
4e5e149a95 Patch from Peter - to build Retroshare on FreeBSD.
- Fixup BSD qmake parameters: mainly library locations.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-29 14:27:14 +00:00
thunder2
cfed637215 Removed "release" from the win32 build in retroshare-nogui.pro.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-10 11:27:52 +00:00
csoler
d8702d73d2 added missign lib for ubuntu oneiric
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4641 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-10-15 18:44:37 +00:00
csoler
7efe04b8c7 added missign lib
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4003 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-01-30 16:28:26 +00:00