Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-26 09:41:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updates to some of the protobuf files.

Browse Source 
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
This commit is contained in:
drbob 2012-08-25 11:41:39 +00:00
parent 1d35dc2915
commit 51fc0c59fe
5 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rsctrl/src/Makefile
View File

@ -1,12 +1,13 @@
EXEC = protoc EXEC = protoc
#PROTO = core.proto files.proto gxs.proto msgs.proto peers.proto system.proto #PROTO = core.proto files.proto gxs.proto msgs.proto peers.proto system.proto
PROTO = core.proto peers.proto PROTO = core.proto peers.proto system.proto
PROTOPATH = ./definition PROTOPATH = ./definition
CDESTPATH = ./gencc #CDESTPATH = ./gencc
#CDESTPATH = ../../retroshare-nogui/src/rpc/proto/gencc CDESTPATH = ../../retroshare-nogui/src/rpc/proto/gencc
PYDESTPATH = ./genpy #PYDESTPATH = ./genpy
PYDESTPATH = ../../../../github/pyrs/pyrs/proto
CLIST = $(PROTO:%.proto=%.cc) CLIST = $(PROTO:%.proto=%.cc)
CCODE = $(patsubst %.proto,$(CDESTPATH)/%.pb.cc, $(PROTO)) CCODE = $(patsubst %.proto,$(CDESTPATH)/%.pb.cc, $(PROTO))

41
rsctrl/src/definition/core.proto
View File

@ -28,30 +28,57 @@ enum PackageId {
message Status { message Status {
enum StatusCode { enum StatusCode {
FAILED = 0; FAILED = 0;
INVALID_QUERY = 1; NO_IMPL_YET = 1;
SUCCESS = 2; INVALID_QUERY = 2;
READMSG = 3; SUCCESS = 3;
READMSG = 4;
} }
required StatusCode code = 1; required StatusCode code = 1;
optional string msg = 2; optional string msg = 2;
} }
///////////////////////////////////////////////////////////////
message IpAddr {
required string addr = 1 [default = ""];
required uint32 port = 2 [default = 0]; // must be 16 bit, 0 for unknown.
}
///////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
// Peer structures, mainly rsctrl.peers related. // Peer structures, mainly rsctrl.peers related.
message Location { message Location {
enum StateFlags { // ORd together...
ONLINE = 1;
CONNECTED = 2;
UNREACHABLE = 4;
}
required string ssl_id = 1; required string ssl_id = 1;
required string location = 2; required string location = 2;
required string localaddr = 3; required IpAddr localaddr = 3;
required string extaddr = 4; required IpAddr extaddr = 4;
required uint32 state = 5; // Not an ENUM as ORd together.
} }
message Person { message Person {
enum Relationship {
FRIEND = 1;
FRIEND_OF_MANY_FRIENDS = 2; // 3+ at the moment.
FRIEND_OF_FRIENDS = 3; // 1 or 2.
UNKNOWN = 4;
}
required string gpg_id = 1; required string gpg_id = 1;
required string name = 2; required string name = 2;
required Relationship relation = 3;
repeated Location locations = 3; repeated Location locations = 4;
} }
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
@ -115,5 +142,3 @@ message BandwidthSet {
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////

8
rsctrl/src/definition/files.proto
View File

@ -73,7 +73,7 @@ message SearchHit {
} }
required rsctrl.core.File file = 1; required rsctrl.core.File file = 1;
required int no_hits = 2 required uint32 no_hits = 2;
required LocFlag loc = 3; required LocFlag loc = 3;
} }
@ -93,7 +93,7 @@ message SearchSet {
optional RequestBasicSearch basic_req = 3; optional RequestBasicSearch basic_req = 3;
optional RequestAdvSearch adv_req = 4; optional RequestAdvSearch adv_req = 4;
repeated SearchHit = 5; repeated SearchHit hits = 5;
} }
@ -128,7 +128,7 @@ message RequestCloseSearch {
// REQUEST: RequestListShares // REQUEST: RequestListShares
message RequestListShares { message RequestListShares {
required int depth = 1; // HOW Many Directories to drill down. required uint32 depth = 1; // HOW Many Directories to drill down.
repeated string ShareLocation = 2; repeated string ShareLocation = 2;
} }
@ -137,8 +137,6 @@ message ShareLocation {
required string path = 2; required string path = 2;
} }
message
// REQUEST: RequestChangeShares // REQUEST: RequestChangeShares

2
rsctrl/src/definition/peers.proto
View File

@ -27,7 +27,7 @@ message RequestPeers {
enum SetOption { enum SetOption {
OWNID = 1; OWNID = 1;
LISTED = 2; LISTED = 2;
ONLINE = 3; CONNECTED = 3;
FRIENDS = 4; FRIENDS = 4;
VALID = 5; VALID = 5;
SIGNED = 6; SIGNED = 6;

6
rsctrl/src/definition/system.proto
View File

@ -1,4 +1,4 @@
package rsctrl.peers; package rsctrl.system;
import "core.proto"; import "core.proto";
@ -42,8 +42,8 @@ message ResponseSystemStatus {
required rsctrl.core.Status status = 1; required rsctrl.core.Status status = 1;
// Peers. // Peers.
required uint32 peer_count = 2; required uint32 no_peers = 2;
required uint32 online_count = 3; required uint32 no_connected = 3;
// Basic Network Information. // Basic Network Information.
required NetCode net_status = 4; required NetCode net_status = 4;