Merge branch 'master' of serenade.mutabah.net:opendispense2

[tpg/opendispense2.git] / proto.txt

diff --git a/proto.txt b/proto.txt
index e8d235c..1619830 100644 (file)
--- a/proto.txt
+++ b/proto.txt
@@ -15,7 +15,9 @@ All server responses are on one line and are prefixed by a three digit response
 403    User not allowed to perform this action
 404    Bad other username
 406    Bad Item ID
+407    Invalid arguments
 500    Unknown Dispense Failure
+501    Action Rejected
 
 == Item IDs ==
 <item_id> represents the item ID
@@ -32,15 +34,9 @@ User is now authenticated
 If the client is connecting from a trusted machine on a root port then
 automatic authentication is allowed
 c      AUTOAUTH <username>\n
-s      200 Auth OK\n or 401 Auth Failure\n or 401 Untrusted\n
+s      200 Auth OK\n or 404 Bad Username\n or 401 Untrusted\n
 
 === Commands ===
---- Get Item list ---
-c      ENUM_ITEMS\n
-s      201 Items <count> <item_id> <item_id> ...\n
---- Get Item Information ---
-c      ITEM_INFO <item_id>\n
-s      202 Item <item_id> <price> <description>\n
 --- Dispense an item ---
 c      DISPENSE <item_id>\n
 s      200 Dispense OK\n or 402 Poor You\n or 500 Dispense Error\n or 406 Bad Item\n
@@ -50,6 +46,13 @@ s    200 Give OK\n or 402 Poor You\n or 404 Bad User\n
 --- Update balance ---
 c      ADD <user> <ammount> <reason>\n
 s      200 Add OK\n or 403 Not Coke\n or 404 Bad User\n
+
+--- Get Item list ---
+c      ENUM_ITEMS\n
+s      201 Items <count> <item_id> <item_id> ...\n
+--- Get Item Information ---
+c      ITEM_INFO <item_id>\n
+s      202 Item <item_id> <price> <description>\n
 --- Set Balance ---
 c      SET <user> <balance> <reason>\n
 s      200 Set OK\n or 403 Not allowed\n or 404 Bad User\n