From 6f3d7c7413735e008dad4741173756ddb018653c Mon Sep 17 00:00:00 2001 From: Adriana Draghici Date: Tue, 26 Jan 2010 14:50:46 +0200 Subject: [PATCH] bt_comm: changed message format for clients data --- bt_comm/PROTOCOL | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/bt_comm/PROTOCOL b/bt_comm/PROTOCOL index 7caa6f9..de8d54c 100644 --- a/bt_comm/PROTOCOL +++ b/bt_comm/PROTOCOL @@ -1,22 +1,28 @@ Comunicare Client <-> Server -+---------+ start server +----------------------------------------------------------+ + + +++---------+ start server +----------------------------------------------------------+ | |---------------> | +--------------+ +--------+ +-------------+ | | Client | send commands | | Server daemon| | tribler| | transmission| .... | | |---------------> | +--------------+ +--------+ +-------------+ | -+---------+<--------------- +----------------------------------------------------------+ - ack +++---------+<--------------- +----------------------------------------------------------+ + ack 1. Pas initial - informatiile legate de clienti - msg 1: tipul mesajului: CONFIG_MSG (definit in Util.py) - - msg 2: lista de dictionare cu datele din clients.xml - exp: [{CLIENT:"tribler", FILE:"Tribler/Tools/cmdline.py", + - msg 2: dictionar de dictionare cu datele din clients.xml + exp: {"tribler":{FILE:"Tribler/Tools/cmdline.py", RUN_TYPE:"script", INTERPRETER:"python", PREFIX:"PYTHONPATH=.",SUFFIX:"", UP_LIMIT_OPTION:"",DL_LIMIT_OPTION:"", PORT_OPTION:"-p", - LOG_DIR_OPTION:"-l",DL_DIR_OPTION:"-d"}] + LOG_DIR_OPTION:"-l",DL_DIR_OPTION:"-d"} + } + - dupa fiecare msg 1,2 Serverul trimite un mesaj care indica daca a aparut sau nu vreo eroare + + 2. Mesaje START - trimis pt pornirea unui client @@ -25,16 +31,19 @@ Comunicare Client <-> Server exp: {CLIENT:"tribler", BASE_DIR: "/home/p2p/p2p-clients/tribler/", UP_LIMIT: "512", DL_LIMIT:"256", PORT:"9999", DL_DIR:"/this/dir", LOG_DIR:"/this/dir"} + - dupa fiecare msg 1,2 Serverul trimite un mesaj care indica daca a aparut sau nu vreo eroare 3. Mesaje STOP - trimis pt oprirea unui client - msg 1: STOP_MSG (definit in Util.py) - msg 2: numele clientului (un string) + - dupa fiecare msg 1,2 Serverul trimite un mesaj care indica daca a aparut sau nu vreo eroare 4. Mesaje STATUS - trimise de client pt interogarea starii - msg 1: tipul mesajului STATUS_MSG (definit in Util.py) - msg 2: dictionar - TODO + - dupa fiecare msg 1,2 Serverul trimite un mesaj care indica daca a aparut sau nu vreo eroare -- 2.20.1