Merge pull request #43 from silicon-heaven/user-id

Add userId definition and login nonce retransmition rules.

src/rpcmessage.md

@@ -54,6 +54,12 @@ should be used to get level if this field is not present. *Admin* access level
 should be considered as the base limit if neither `AccessLevel` nor `Access`
 field is present.
 
+`userId` is string containing information about the login names and the
+broker names along the RPC message path through the brokers hierarchy. The format
+is`user-name1:broker-name1;user-name2:broker-name2;...`, for example:
+`[email protected]:broker1;broker1-login:broker2`. User name and broker name is delimited by `:`,
+user:broker pairs are delimited by ';'.
+
 `Access` is older approach for the access control. It is assigned to request by
 broker according to user rights. Multiple grants can be specified and separated
 by comma. This is no longer the primary way and is used only for pre-SHV 3.0

src/rpcmethods/broker.md

@@ -116,10 +116,11 @@ client.
 
 | Parameter | Result        |
 |-----------|---------------|
-| Null      | [String, ...] |
+| Null      | {String: Int \| Null, ...} |
 
-List of strings is provided where strings are [resource identifiers for
-signals](../rpcri.md) for the existing subscriptions.
+Map of strings to int key value pairs is provided where keys are [resource identifiers for
+signals](../rpcri.md) and values are TTL remaining for the existing subscriptions. Null TTL 
+means, that the subscription lasts forever. 
 
 ```
 => <id:42, method:"subscriptions", path:".broker/currentClient">i{}
@@ -143,7 +144,7 @@ Information the broker has on the client.
 
 | Parameter | Result                                                                                                           |
 |-----------|------------------------------------------------------------------------------------------------------------------|
-| Int       | {"clientId":Int, "userName":String\|Null, "mountPoint":String\|Null, "subscriptions":[String, ...], ...} \| Null |
+| Int       | {"clientId":Int, "userName":String\|Null, "mountPoint":String\|Null, "subscriptions":{String: Int \| Null, ... }, ...} \| Null |
 
 The parameter is client's ID (*Int*). The provided value is *Map* with info
 about the client. The *Null* is provided in case there is no client with this

src/rpcmethods/login.md

@@ -17,7 +17,9 @@ established needs to be `hello` request. It is called with `null` SHV path
 
 Broker should respond with message containing nonce that can be used to perform
 login. The nonce needs to be an ASCII string with length from 10 to 32
-characters.
+characters. The nonce must be the same in case, of `hello` message retransmit 
+during the login phase. Some clients might send more `hello` message to discover,
+that shvbroker is started and ready, especially on serial port. 
 
 ```
 <= <id:1>i{2:{"nonce":"vOLJaIZOVevrDdDq"}}