updated RPC messages.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-rpc-b1@6281 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-03-25 19:01:54 +00:00
parent c1f6bcd765
commit 4d205a8a4e
4 changed files with 61 additions and 26 deletions

View File

@ -13,11 +13,13 @@ import "core.proto";
enum RequestMsgIds {
MsgId_RequestTransferList = 1;
MsgId_RequestControlDownload = 2;
MsgId_RequestShareDirList = 3;
}
enum ResponseMsgIds {
MsgId_ResponseTransferList = 1;
MsgId_ResponseControlDownload = 2;
MsgId_ResponseShareDirList = 3;
}
///////////////////////////////////////////////////////////////
@ -86,22 +88,32 @@ message ResponseControlDownload {
///////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////
// SHARED FILES
// THIS STUFF IS NOT FINISHED YET!
//
//// REQUEST: RequestListShares
//message RequestListShares {
//
// required uint32 depth = 1; // HOW Many Directories to drill down.
// repeated string ShareLocation = 2;
//}
//
//message ShareLocation {
// required string ssl_id = 1;
// required string path = 2;
//}
//
//
//
// REQUEST: RequestShareDirList
message RequestShareDirList {
required string ssl_id = 1;
required string path = 2;
}
// RESPONSE: ResponseShareDirList
message ResponseShareDirList {
required rsctrl.core.Status status = 1;
enum ListType {
DIRQUERY_ROOT = 1; // the query refers to root.
DIRQUERY_PERSON = 2; // the query refers to person
DIRQUERY_FILE = 3; // the query refers to a file.
DIRQUERY_DIR = 4; // move to top of queue.
}
required string ssl_id = 2;
required string path = 3;
required ListType list_type = 4;
repeated rsctrl.core.File files = 5;
}
//// REQUEST: RequestChangeShares
//
//// REQUEST: RequestLiCloseSearch

View File

@ -89,6 +89,7 @@ message RequestExaminePeer {
///////////////////////////////////////////////////////////////
// REQUEST: RequestModifyPeer
// THIS IS INCOMPLETE... DON'T USE.
message RequestModifyPeer {
enum ModCmd {

View File

@ -18,8 +18,8 @@ enum RequestMsgIds {
}
enum ResponseMsgIds {
MsgId_ResponseStreamDetail = 1; // RESPONSE to
MsgId_StreamData = 2;
MsgId_ResponseStreamDetail = 1; // RESPONSE to List and Control.
MsgId_ResponseStreamData = 101;
}
///////////////////////////////////////////////////////////////
@ -38,7 +38,7 @@ enum StreamState {
STREAM_STATE_ERROR = 0;
STREAM_STATE_RUN = 1;
STREAM_STATE_PAUSED = 2;
STREAM_TYPE_FINISHED = 3;
STREAM_STATE_FINISHED = 3;
}
message StreamFileDetail {
@ -52,7 +52,7 @@ message StreamFileDetail {
message StreamVoipDetail {
// THIS NEEDS MORE DEFINITION.
required string peerId = 1;
required string peer_id = 1;
required uint64 duration = 2;
required uint64 offset = 3;
@ -64,7 +64,7 @@ message StreamDesc {
required uint32 stream_id = 1;
required StreamType stream_type = 2;
required StreamState stream_state = 3;
required float rate_kBs = 4;
required float rate_kbs = 4;
optional StreamFileDetail file = 5;
optional StreamVoipDetail voip = 6;
@ -90,11 +90,11 @@ message StreamData {
message RequestStartFileStream {
required rsctrl.core.File file = 1;
required float rate_kBs = 2;
required float rate_kbs = 2;
// byte range. allows to restart transfer!
optional uint64 startByte = 3;
optional uint64 endByte = 4;
optional uint64 start_byte = 3;
optional uint64 end_byte = 4;
}
@ -123,8 +123,8 @@ message RequestControlStream {
required uint32 stream_id = 1;
required StreamAction action = 2;
optional float rate_kBs = 3;
optional int64 seek_byte = 4;
optional float rate_kbs = 3;
optional uint64 seek_byte = 4;
}
///////////////////////////////////////////////////////////////

View File

@ -10,12 +10,14 @@ enum RequestMsgIds {
MsgId_RequestSystemStatus = 1;
MsgId_RequestSystemQuit = 2;
MsgId_RequestSystemExternalAccess = 3;
MsgId_RequestSystemAccount = 4;
}
enum ResponseMsgIds {
MsgId_ResponseSystemStatus = 1;
MsgId_ResponseSystemQuit = 2;
MsgId_ResponseSystemExternalAccess = 3;
MsgId_ResponseSystemAccount = 4;
}
///////////////////////////////////////////////////////////////
@ -93,6 +95,26 @@ message ResponseSystemExternalAccess {
required string dht_key = 3;
}
///////////////////////////////////////////////////////////////
// REQUEST: RequestSystemAccount
message RequestSystemAccount {
// Nothing here?
}
// RESPONSE: ResponseSystemAccount
message ResponseSystemAccount {
// Status of response.
required rsctrl.core.Status status = 1;
required string pgp_name = 2;
required string location = 3;
required string pgp_id = 4;
required string ssl_id = 5;
}
///////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////