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);
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, ...);
{"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},
{"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])))
// 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(;;)
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;
{
printf("\nClose(%i)\n", giServer_Socket);
close(giServer_Socket);
- unlink("/var/run/dispsrv");
+ unlink("/var/run/dispsrv.pid");
}
/**
}
// Get UID
- Client->UID = Bank_GetAcctByName( username );
+ Client->UID = Bank_GetAcctByName( username, 0 );
if( Client->UID < 0 ) {
if(giDebugLevel)
Debug(Client, "Unknown user '%s'", username);
}
// Set id
- Client->EffectiveUID = Bank_GetAcctByName(username);
+ Client->EffectiveUID = Bank_GetAcctByName(username, 0);
if( Client->EffectiveUID == -1 ) {
sendf(Client->Socket, "404 User not found\n");
return ;
}
}
+ // KNOWN HACK: Naming a slot 'dead' disables it
+ if( strcmp(Item->Name, "dead") == 0 )
+ status = "sold"; // Another status?
+
sendf(Client->Socket,
"202 Item %s:%i %s %i %s\n",
Item->Handler->Name, Item->ID, status, Item->Price, Item->Name
}
}
+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, 0);
+ 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;
}
// Get recipient
- uid = Bank_GetAcctByName(recipient);
+ uid = Bank_GetAcctByName(recipient, 0);
if( uid == -1 ) {
sendf(Client->Socket, "404 Invalid target user\n");
return ;
}
// Get recipient
- uid = Bank_GetAcctByName(user);
+ uid = Bank_GetAcctByName(user, 0);
if( uid == -1 ) {
sendf(Client->Socket, "404 Invalid user\n");
return ;
}
// Get recipient
- uid = Bank_GetAcctByName(user);
+ uid = Bank_GetAcctByName(user, 0);
if( uid == -1 ) {
sendf(Client->Socket, "404 Invalid user\n");
return ;
if( giDebugLevel ) Debug(Client, "User Info '%s'", user);
// Get recipient
- uid = Bank_GetAcctByName(user);
+ uid = Bank_GetAcctByName(user, 0);
if( giDebugLevel >= 2 ) Debug(Client, "uid = %i", uid);
if( uid == -1 ) {
}
// Get UID
- uid = Bank_GetAcctByName(username);
+ uid = Bank_GetAcctByName(username, 0);
if( uid == -1 ) {
sendf(Client->Socket, "404 User '%s' not found\n", username);
return ;
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");
+ }
+
+ switch( DispenseUpdateItem( Client->UID, item, description, price ) )
+ {
+ case 0:
+ // Return OK
+ sendf(Client->Socket, "200 Item updated\n");
+ break;
+ default:
+ break;
+ }
+}
+
// --- INTERNAL HELPERS ---
void Debug(tClient *Client, const char *Format, ...)
{