X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=be15a4095abcb5623db19b78ef9f00211e71cf5b;hb=a3b265fadf5761d8e8a14357db5402d04d65796e;hp=35f16ebaebd2f20577a1609a62719265d6566612;hpb=7b65f9ffa8bf79403c71bb540e9a252826451903;p=tpg%2Fopendispense2.git diff --git a/src/server/server.c b/src/server/server.c index 35f16eb..be15a40 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -55,6 +55,8 @@ 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); // --- Helpers --- int GetUserAuth(const char *Salt, const char *Username, const uint8_t *Hash); void HexBin(uint8_t *Dest, char *Src, int BufSize); @@ -72,7 +74,9 @@ 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} }; #define NUM_COMMANDS (sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0])) int giServer_Socket; @@ -523,6 +527,45 @@ char *Server_Cmd_GIVE(tClient *Client, char *Args) } } +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 ++; + + // 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"); + } +} + /** * \brief Authenticate a user * \return User ID, or -1 if authentication failed