#define DEBUG_TRACE_SERVER 0
#define USE_AUTOAUTH 1
-#define MAX_TXT_ARGS 4 // Maximum number of textual arguments (including command)
+#define MAX_TXT_ARGS 5 // Maximum number of textual arguments (including command)
enum eUI_Modes
{
int main(int argc, char *argv[])
{
int sock;
- int i;
+ int i, ret = 0;
char buffer[BUFSIZ];
char *text_args[MAX_TXT_ARGS]; // Non-flag arguments
int text_argc = 0;
if( sock < 0 ) return -1;
// List accounts?
if( text_argc == 1 ) {
- Dispense_EnumUsers(sock);
- return 0;
+ ret = Dispense_EnumUsers(sock);
+ close(sock);
+ return ret;
}
// text_args[1]: Username
exit(1);
}
- Dispense_SetBalance(sock, text_args[1], atoi(text_args[2]+1), text_args[3]);
+ ret = Dispense_SetBalance(sock, text_args[1], atoi(text_args[2]+1), text_args[3]);
}
else {
// Alter balance
- Dispense_AlterBalance(sock, text_args[1], atoi(text_args[2]), text_args[3]);
+ ret = Dispense_AlterBalance(sock, text_args[1], atoi(text_args[2]), text_args[3]);
}
}
+ // TODO: Preserve ret if non-zero
// Show user information
- Dispense_ShowUser(sock, text_args[1]);
+ ret = Dispense_ShowUser(sock, text_args[1]);
close(sock);
- return 0;
+ return ret;
}
//
// `dispense give`
// - "Here, have some money."
if( strcmp(text_args[0], "give") == 0 )
{
- if( text_argc != 3 ) {
+ if( text_argc != 4 ) {
fprintf(stderr, "`dispense give` takes three arguments\n");
ShowUsage();
return -1;
if( Authenticate(sock) )
return -1;
- Dispense_Give(sock, text_args[1], atoi(text_args[2]), text_args[3]);
- return 0;
+ ret = Dispense_Give(sock, text_args[1], atoi(text_args[2]), text_args[3]);
+
+ close(sock);
+
+ return ret;
}
//
// `dispense user`
// Add new user?
if( strcmp(text_args[1], "add") == 0 )
{
- if( text_argc != 2 ) {
+ if( text_argc != 3 ) {
fprintf(stderr, "Error: `dispense user add` requires an argument\n");
ShowUsage();
exit(1);
}
- Dispense_AddUser(sock, text_args[2]);
+ ret = Dispense_AddUser(sock, text_args[2]);
}
// Update a user
- else if( strcmp(text_args[1], "type") == 0 )
+ else if( strcmp(text_args[1], "type") == 0 || strcmp(text_args[1], "flags") == 0 )
{
- if( text_argc != 3 ) {
- fprintf(stderr, "Error: `dispense user type` requires two arguments\n");
+ if( text_argc != 4 ) {
+ fprintf(stderr, "Error: `dispense user flags` requires two arguments\n");
ShowUsage();
exit(1);
}
- Dispense_SetUserType(sock, text_args[2], text_args[3]);
+ ret = Dispense_SetUserType(sock, text_args[2], text_args[3]);
}
else
{
ShowUsage();
exit(1);
}
- return 0;
+ close(sock);
+ return ret;
}
-
// Donation!
- if( strcmp(text_args[0], "donate") == 0 )
+ else if( strcmp(text_args[0], "donate") == 0 )
{
// Check argument count
- if( text_argc != 2 ) {
+ if( text_argc != 3 ) {
fprintf(stderr, "Error: `dispense donate` requires two arguments\n");
ShowUsage();
exit(1);
return -1;
// Do donation
- Dispense_Donate(sock, atoi(text_args[1]), text_args[2]);
-
- return 0;
+ ret =Dispense_Donate(sock, atoi(text_args[1]), text_args[2]);
+
+ close(sock);
+
+ return ret;
}
+ // Query an item price
+ else if( strcmp(text_args[0], "iteminfo") == 0 )
+ {
+ regmatch_t matches[3];
+ char *type;
+ int id;
+ // Check argument count
+ if( text_argc != 2 ) {
+ fprintf(stderr, "Error: `dispense iteminfo` requires an argument\n");
+ ShowUsage();
+ exit(1);
+ }
+ // Parse item ID
+ if( RunRegex(&gUserItemIdentRegex, text_args[1], 3, matches, NULL) != 0 ) {
+ fprintf(stderr, "Error: Invalid item ID passed (<type>:<id> expected)\n");
+ exit(1);
+ }
+ type = text_args[1] + matches[1].rm_so;
+ text_args[1][ matches[1].rm_eo ] = '\0';
+ id = atoi( text_args[1] + matches[2].rm_so );
+
+ sock = OpenConnection(gsDispenseServer, giDispensePort);
+ if( sock < 0 ) return -1;
+ ret = Dispense_ItemInfo(sock, type, id);
+ close(sock);
+ return ret;
+ }
+ // Item name / pattern
else {
- // Item name / pattern
gsItemPattern = text_args[0];
}
sock = OpenConnection(gsDispenseServer, giDispensePort);
if( sock < 0 ) return -1;
Authenticate(sock);
- DispenseItem(sock, "door", 0);
+ ret = DispenseItem(sock, "door", 0);
close(sock);
- return 0;
+ return ret;
}
// Item id (<type>:<num>)
else if( RunRegex(&gUserItemIdentRegex, gsItemPattern, 3, matches, NULL) == 0 )
Dispense_ItemInfo(sock, ident, id);
Authenticate(sock);
- DispenseItem(sock, ident, id);
+ ret = DispenseItem(sock, ident, id);
close(sock);
- return 0;
+ return ret;
}
// Item number (6 = coke)
else if( strcmp(gsItemPattern, "0") == 0 || atoi(gsItemPattern) > 0 )
Dispense_ItemInfo(sock, gaItems[i].Type, gaItems[i].ID);
Authenticate(sock);
- DispenseItem(sock, gaItems[i].Type, gaItems[i].ID);
+ ret = DispenseItem(sock, gaItems[i].Type, gaItems[i].ID);
close(sock);
}
- return 0;
+ return ret;
}
void ShowUsage(void)
" == Everyone ==\n"
" dispense\n"
" Show interactive list\n"
- " dispense <item>\n"
- " Dispense named item\n"
+ " dispense <name>|<index>|<itemid>\n"
+ " Dispense named item (<name> matches if it is a unique prefix)\n"
" dispense give <user> <ammount> \"<reason>\"\n"
" Give money to another user\n"
" dispense donate <ammount> \"<reason>\"\n"
" Donate to the club\n"
+ " dispense iteminfo <type>:<id>\n"
+ " Get the name and price for an item\n"
" == Coke members == \n"
" dispense acct [<user>]\n"
" Show user balances\n"
fprintf(stderr, "Failed to create socket\n");
return -1;
}
+
+// printf("geteuid() = %i, getuid() = %i\n", geteuid(), getuid());
- if( geteuid() == 0 )
+ if( geteuid() == 0 || getuid() == 0 )
{
int i;
struct sockaddr_in localAddr;
localAddr.sin_family = AF_INET; // IPv4
// Loop through all the top ports until one is avaliable
- for( i = 1001; i < 1024; i ++)
+ for( i = 512; i < 1024; i ++)
{
localAddr.sin_port = htons(i); // IPv4
// Attempt to bind to low port for autoauth
}
if( i == 1024 )
printf("Warning: AUTOAUTH unavaliable\n");
+// else
+// printf("Bound to 0.0.0.0:%i\n", i);
}
if( connect(sock, (struct sockaddr *) &serverAddr, sizeof(serverAddr)) < 0 ) {
switch(responseCode)
{
- case 200: return 0; // OK
+ case 200:
+ printf("Give succeeded\n");
+ return 0; // OK
case 402:
fprintf(stderr, "Insufficient balance\n");
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au