X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=4404f9e68bb06c0d0322c9d34683cd6102ffcb3a;hb=4fef498619ca05876568c6bc5114fadd7c2496ee;hp=5102f6223cb94db064f8b8104e757d1170a495a0;hpb=7dcb4f540cf662f60433cd9822f73969d5800cce;p=tpg%2Fopendispense2.git diff --git a/src/server/server.c b/src/server/server.c index 5102f62..4404f9e 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -17,6 +17,7 @@ #include #include #include +#include #define DEBUG_TRACE_CLIENT 0 @@ -59,6 +60,7 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args); void Server_Cmd_ENUMITEMS(tClient *Client, char *Args); void Server_Cmd_ITEMINFO(tClient *Client, char *Args); void Server_Cmd_DISPENSE(tClient *Client, char *Args); +void Server_Cmd_REFUND(tClient *Client, char *Args); void Server_Cmd_GIVE(tClient *Client, char *Args); void Server_Cmd_DONATE(tClient *Client, char *Args); void Server_Cmd_ADD(tClient *Client, char *Args); @@ -68,6 +70,7 @@ void Server_Cmd_USERINFO(tClient *Client, char *Args); void _SendUserInfo(tClient *Client, int UserID); void Server_Cmd_USERADD(tClient *Client, char *Args); void Server_Cmd_USERFLAGS(tClient *Client, char *Args); +void Server_Cmd_UPDATEITEM(tClient *Client, char *Args); // --- Helpers --- void Debug(tClient *Client, const char *Format, ...); int sendf(int Socket, const char *Format, ...); @@ -87,6 +90,7 @@ const struct sClientCommand { {"ENUM_ITEMS", Server_Cmd_ENUMITEMS}, {"ITEM_INFO", Server_Cmd_ITEMINFO}, {"DISPENSE", Server_Cmd_DISPENSE}, + {"REFUND", Server_Cmd_REFUND}, {"GIVE", Server_Cmd_GIVE}, {"DONATE", Server_Cmd_DONATE}, {"ADD", Server_Cmd_ADD}, @@ -94,14 +98,21 @@ const struct sClientCommand { {"ENUM_USERS", Server_Cmd_ENUMUSERS}, {"USER_INFO", Server_Cmd_USERINFO}, {"USER_ADD", Server_Cmd_USERADD}, - {"USER_FLAGS", Server_Cmd_USERFLAGS} + {"USER_FLAGS", Server_Cmd_USERFLAGS}, + {"UPDATE_ITEM", Server_Cmd_UPDATEITEM} }; #define NUM_COMMANDS ((int)(sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0]))) // === GLOBALS === +// - Configuration int giServer_Port = 11020; - int giServer_NextClientID = 1; - int giServer_Socket; + int gbServer_RunInBackground = 0; +char *gsServer_LogFile = "/var/log/dispsrv.log"; +char *gsServer_ErrorLog = "/var/log/dispsrv.err"; +// - State variables + int giServer_Socket; // Server socket + int giServer_NextClientID = 1; // Debug client ID + // === CODE === /** @@ -113,6 +124,8 @@ void Server_Start(void) struct sockaddr_in server_addr, client_addr; atexit(Server_Cleanup); + // Ignore SIGPIPE (stops crashes when the client exits early) + signal(SIGPIPE, SIG_IGN); // Create Server giServer_Socket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -133,6 +146,26 @@ void Server_Start(void) perror("Binding"); return ; } + +#if 0 + if( gbServer_RunInBackground ) + { + int pid = fork(); + if( pid == -1 ) { + fprintf(stderr, "ERROR: Unable to fork\n"); + perror("fork background"); + exit(-1); + } + if( pid != 0 ) { + // Parent, quit + exit(0); + } + // In child, sort out stdin/stdout + reopen(0, "/dev/null", O_READ); + reopen(1, gsServer_LogFile, O_CREAT|O_APPEND); + reopen(2, gsServer_ErrorLog, O_CREAT|O_APPEND); + } +#endif // Listen if( listen(giServer_Socket, MAX_CONNECTION_QUEUE) < 0 ) { @@ -146,8 +179,10 @@ void Server_Start(void) // write pidfile { FILE *fp = fopen("/var/run/dispsrv.pid", "w"); - fprintf(fp, "%i", getpid()); - fclose(fp); + if( fp ) { + fprintf(fp, "%i", getpid()); + fclose(fp); + } } for(;;) @@ -198,6 +233,7 @@ void Server_Start(void) case 0x825F0D11: // 130.95.13.17 mermaid case 0x825F0D12: // 130.95.13.18 mussel case 0x825F0D17: // 130.95.13.23 martello + case 0x825F0D2A: // 130.95.13.42 meersau case 0x825F0D42: // 130.95.13.66 heathred bTrusted = 1; break; @@ -217,7 +253,7 @@ void Server_Cleanup(void) { printf("\nClose(%i)\n", giServer_Socket); close(giServer_Socket); - unlink("/var/run/dispsrv"); + unlink("/var/run/dispsrv.pid"); } /** @@ -684,6 +720,54 @@ void Server_Cmd_DISPENSE(tClient *Client, char *Args) } } +void Server_Cmd_REFUND(tClient *Client, char *Args) +{ + tItem *item; + int uid, price_override = 0; + char *username, *itemname, *price_str; + + if( Server_int_ParseArgs(0, Args, &username, &itemname, &price_str, NULL) ) { + if( !itemname || price_str ) { + sendf(Client->Socket, "407 REFUND takes 2 or 3 arguments\n"); + return ; + } + } + + if( !Client->bIsAuthed ) { + sendf(Client->Socket, "401 Not Authenticated\n"); + return ; + } + + // Check user permissions + if( !(Bank_GetFlags(Client->UID) & (USER_FLAG_COKE|USER_FLAG_ADMIN)) ) { + sendf(Client->Socket, "403 Not in coke\n"); + return ; + } + + uid = Bank_GetAcctByName(username); + if( uid == -1 ) { + sendf(Client->Socket, "404 Unknown user\n"); + return ; + } + + item = _GetItemFromString(itemname); + if( !item ) { + sendf(Client->Socket, "406 Bad Item ID\n"); + return ; + } + + if( price_str ) + price_override = atoi(price_str); + + switch( DispenseRefund( Client->UID, uid, item, price_override ) ) + { + case 0: sendf(Client->Socket, "200 Item Refunded\n"); return ; + default: + sendf(Client->Socket, "500 Dispense Error\n"); + return; + } +} + void Server_Cmd_GIVE(tClient *Client, char *Args) { char *recipient, *ammount, *reason; @@ -1203,6 +1287,52 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args) sendf(Client->Socket, "200 User Updated\n"); } +void Server_Cmd_UPDATEITEM(tClient *Client, char *Args) +{ + char *itemname, *price_str, *description; + int price; + tItem *item; + + if( Server_int_ParseArgs(1, Args, &itemname, &price_str, &description, NULL) ) { + sendf(Client->Socket, "407 UPDATE_ITEM takes 3 arguments\n"); + return ; + } + + if( !Client->bIsAuthed ) { + sendf(Client->Socket, "401 Not Authenticated\n"); + return ; + } + + // Check user permissions + if( !(Bank_GetFlags(Client->UID) & (USER_FLAG_COKE|USER_FLAG_ADMIN)) ) { + sendf(Client->Socket, "403 Not in coke\n"); + return ; + } + + item = _GetItemFromString(itemname); + if( !item ) { + // TODO: Create item? + sendf(Client->Socket, "406 Bad Item ID\n"); + return ; + } + + price = atoi(price_str); + if( price <= 0 && price_str[0] != '0' ) { + sendf(CLient->Socket, "407 Invalid price set\n"); + } + + // Update the item + free(item->Name); + item->Name = strdup(description); + item->Price = price; + + // Update item file + Items_UpdateFile(); + + // Return OK + sendf(Client->Socket, "200 Item updated\n"); +} + // --- INTERNAL HELPERS --- void Debug(tClient *Client, const char *Format, ...) {