1 files changed, 32 insertions, 26 deletions

diff --git a/protocol/udm.proto b/protocol/udm.proto
index 0898bf9..05059b8 100644
--- a/protocol/udm.proto
+++ b/protocol/udm.proto
@@ -22,7 +22,7 @@
 enum MODULE_UI_ELEMENT_TYPE {
 	UI_STRING = 0;
 	UI_INTEGER = 1;
-	UI_PERCENT_BAR = 2;
+	UI_PROGRESS_BAR = 2;
 	UI_WINDOW = 3;
 }
 
@@ -30,58 +30,64 @@ message module_ui_element_info {
 	optional MODULE_UI_ELEMENT_TYPE type = 1 [default = UI_STRING];
 	required string id = 2; //internal element id used to get element value
 	optional string name = 3 [default = "not set"];
-	optional int32 width = 1001 [default = 0];
-	optional int32 height = 1002 [default = 0];
 }
 
-enum MODULE_SETTING_TYPE {
-	SETTING_INTEGER = 0;
-	SETTING_STRING = 1;
+message setting {
+	required string id = 1;
+	optional string name = 2 [default = "not set"];
+	optional string default_value = 3 [default = "empty"];
+	optional string value = 4 [default = "empty"];
 }
 
-message module_setting {
-	required MODULE_SETTING_TYPE type = 1 [default = SETTING_INTEGER];
-	required string id = 2;
-	optional string name = 3 [default = "not set"];
-	optional string default_value = 4 [default = "empty"];
-	optional string value = 5 [default = "empty"];
-}
-
-message module_settings_info {
-	repeated module_setting settings = 1;
+message settings_info {
+	repeated setting settings = 1;
 }
 
 message module_info
 {
 	required string name = 1;
 	required string version = 2;
-	repeated module_ui_element_info ui_elements = 3;
-	optional string decription = 4 [default = "no description specified"];
+	optional string decription = 3 [default = "no description specified"];
 }
 
 
 
 
 enum CLIENT_MSG_TYPE {
-    CLIENT_HELLO = 0;
-    CLIENT_AUTH_REQUEST = 1;
-    CLIENT_DATA_TRANSFER_REQUEST = 2;
+    CLIENT_AUTH_REQUEST = 0;
+    CLIENT_DATA_TRANSFER_REQUEST = 1;
+}
+
+
+message client_auth_info {
+	required string login = 1;
+	required string password = 2;
+}
+
+message client_data_transfer_info {
+    optional int64 data_size = 1;
 }
 
 message client_msg {
 	required CLIENT_MSG_TYPE type = 1;
-	required bytes auth_token = 2;
+	optional string auth_token = 2;
+	optional client_auth_info auth_info = 3;
+	optional client_data_transfer_info data_transfer_info = 4;
 }
 
 
 
-
 enum SERVER_MSG_TYPE {
-	SERVER_HELLO = 0;
-	SERVER_AUTH_REPLY = 1;
+	SERVER_AUTH_REPLY = 0;
 }
 
+message server_auth_info {
+	required bool status = 1;
+	optional string auth_token = 2;
+	optional string error_description = 3;
+}
+
+
 message server_msg {
 	required SERVER_MSG_TYPE type = 1;
-	required bytes auth_token = 2;
 }