More cleanup, implementing `dispense give`

[tpg/opendispense2.git] / src / server / server.c

diff --git a/src/server/server.c b/src/server/server.c
index e0fcafa..35f16eb 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -18,6 +18,7 @@
 
 // HACKS
 #define HACK_TPG_NOAUTH        1
+#define HACK_ROOT_NOAUTH       1
 
 // Statistics
 #define MAX_CONNECTION_QUEUE   5
@@ -378,7 +379,6 @@ char *Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
  */
 char *Server_Cmd_ENUMITEMS(tClient *Client, char *Args)
 {
-//      int    nItems = giNumItems;
         int    retLen;
         int    i;
        char    *ret;
@@ -466,6 +466,7 @@ char *Server_Cmd_ITEMINFO(tClient *Client, char *Args)
 char *Server_Cmd_DISPENSE(tClient *Client, char *Args)
 {
        tItem   *item;
+        int    ret;
        if( !Client->bIsAuthed )        return strdup("401 Not Authenticated\n");
 
        item = _GetItemFromString(Args);
@@ -473,7 +474,7 @@ char *Server_Cmd_DISPENSE(tClient *Client, char *Args)
                return strdup("406 Bad Item ID\n");
        }
 
-       switch( DispenseItem( Client->UID, item ) )
+       switch( ret = DispenseItem( Client->UID, item ) )
        {
        case 0: return strdup("200 Dispense OK\n");
        case 1: return strdup("501 Unable to dispense\n");
@@ -511,12 +512,14 @@ char *Server_Cmd_GIVE(tClient *Client, char *Args)
        if( iAmmount <= 0 )     return strdup("407 Invalid Argument, ammount must be > zero\n");
 
        // Do give
-       switch( Transfer(Client->UID, uid, iAmmount, reason) )
+       switch( DispenseGive(Client->UID, uid, iAmmount, reason) )
        {
        case 0:
                return strdup("200 Give OK\n");
-       default:
+       case 2:
                return strdup("402 Poor You\n");
+       default:
+               return strdup("500 Unknown error\n");
        }
 }
 
@@ -537,6 +540,10 @@ int GetUserAuth(const char *Salt, const char *Username, const uint8_t *ProvidedH
        if( strcmp(Username, "tpg") == 0 )
                return GetUserID("tpg");
        #endif
+       #if HACK_ROOT_NOAUTH
+       if( strcmp(Username, "root") == 0 )
+               return GetUserID("root");
+       #endif
        
        #if 0
        //