Removed debug from server, cleaning client

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

diff --git a/src/server/server.c b/src/server/server.c
index d7466a9..4549ff6 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -55,6 +55,9 @@ char  *Server_Cmd_AUTOAUTH(tClient *Client, char *Args);
 char   *Server_Cmd_ENUMITEMS(tClient *Client, char *Args);
 char   *Server_Cmd_ITEMINFO(tClient *Client, char *Args);
 char   *Server_Cmd_DISPENSE(tClient *Client, char *Args);
+char   *Server_Cmd_GIVE(tClient *Client, char *Args);
+char   *Server_Cmd_ADD(tClient *Client, char *Args);
+char   *Server_Cmd_USERINFO(tClient *Client, char *Args);
 // --- Helpers ---
  int   GetUserAuth(const char *Salt, const char *Username, const uint8_t *Hash);
 void   HexBin(uint8_t *Dest, char *Src, int BufSize);
@@ -72,7 +75,10 @@ struct sClientCommand {
        {"AUTOAUTH", Server_Cmd_AUTOAUTH},
        {"ENUM_ITEMS", Server_Cmd_ENUMITEMS},
        {"ITEM_INFO", Server_Cmd_ITEMINFO},
-       {"DISPENSE", Server_Cmd_DISPENSE}
+       {"DISPENSE", Server_Cmd_DISPENSE},
+       {"GIVE", Server_Cmd_GIVE},
+       {"ADD", Server_Cmd_ADD},
+       {"USER_INFO", Server_Cmd_USERINFO}
 };
 #define NUM_COMMANDS   (sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0]))
  int   giServer_Socket;
@@ -202,6 +208,11 @@ void Server_HandleClient(int Socket, int bTrusted)
                        char    *ret;
                        *eol = '\0';
                        ret = Server_ParseClientCommand(&clientInfo, start);
+                       
+                       #if DEBUG_TRACE_CLIENT
+                       //printf("ret = %s", ret);
+                       #endif
+                       
                        // `ret` is a string on the heap
                        send(Socket, ret, strlen(ret), 0);
                        free(ret);
@@ -302,9 +313,7 @@ char *Server_Cmd_USER(tClient *Client, char *Args)
        Client->Salt[7] = 0x21 + (rand()&0x3F);
        
        // TODO: Also send hash type to use, (SHA1 or crypt according to [DAA])
-       // "100 Salt xxxxXXXX\n"
-       ret = strdup("100 SALT xxxxXXXX\n");
-       sprintf(ret, "100 SALT %s\n", Client->Salt);
+       ret = mkstr("100 SALT %s\n", Client->Salt);
        #else
        ret = strdup("100 User Set\n");
        #endif
@@ -379,7 +388,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;
@@ -513,15 +521,74 @@ 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");
+       }
+}
+
+char *Server_Cmd_ADD(tClient *Client, char *Args)
+{
+       char    *user, *ammount, *reason;
+        int    uid, iAmmount;
+       
+       if( !Client->bIsAuthed )        return strdup("401 Not Authenticated\n");
+
+       user = Args;
+
+       ammount = strchr(Args, ' ');
+       if( !ammount )  return strdup("407 Invalid Argument, expected 3 parameters, 1 encountered\n");
+       *ammount = '\0';
+       ammount ++;
+
+       reason = strchr(ammount, ' ');
+       if( !reason )   return strdup("407 Invalid Argument, expected 3 parameters, 2 encountered\n");
+       *reason = '\0';
+       reason ++;
+
+       // TODO: Check if the current user is in coke/higher
+
+       // Get recipient
+       uid = GetUserID(user);
+       if( uid == -1 ) return strdup("404 Invalid user");
+
+       // Parse ammount
+       iAmmount = atoi(ammount);
+       if( iAmmount == 0 && ammount[0] != '0' )        return strdup("407 Invalid Argument, ammount must be > zero\n");
+
+       // Do give
+       switch( DispenseAdd(uid, Client->UID, iAmmount, reason) )
+       {
+       case 0:
+               return strdup("200 Add OK\n");
+       case 2:
+               return strdup("402 Poor Guy\n");
+       default:
+               return strdup("500 Unknown error\n");
        }
 }
 
+char *Server_Cmd_USERINFO(tClient *Client, char *Args)
+{
+        int    uid;
+       char    *user = Args;
+       char    *space;
+       
+       space = strchr(user, ' ');
+       if(space)       *space = '\0';
+       
+       // Get recipient
+       uid = GetUserID(user);
+       if( uid == -1 ) return strdup("404 Invalid user");
+
+       return mkstr("202 User %s %i user\n", user, GetBalance(uid));
+}
+
 /**
  * \brief Authenticate a user
  * \return User ID, or -1 if authentication failed