#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <openssl/sha.h> // SHA1
+//#include <openssl/sha.h> // SHA1
#define USE_NCURSES_INTERFACE 0
#define DEBUG_TRACE_SERVER 0
int Dispense_ShowUser(int Socket, const char *Username);
void _PrintUserLine(const char *Line);
int Dispense_AddUser(int Socket, const char *Username);
- int Dispense_SetUserType(int Socket, const char *Username, const char *TypeString);
+ int Dispense_SetUserType(int Socket, const char *Username, const char *TypeString, const char *Reason);
int Dispense_SetItem(int Socket, const char *Type, int ID, int NewPrice, const char *NewName);
// --- Helpers ---
char *ReadLine(int Socket);
void CompileRegex(regex_t *regex, const char *pattern, int flags);
// === GLOBALS ===
-char *gsDispenseServer = "heathred";
+char *gsDispenseServer = "merlo.ucc.gu.uwa.edu.au";
int giDispensePort = 11020;
tItem *gaItems;
char *gsItemPattern; //!< Item pattern
char *gsEffectiveUser; //!< '-u' Dispense as another user
+
int giUIMode = UI_MODE_STANDARD;
int gbDryRun = 0; //!< '-n' Read-only
+ int gbDisallowSelectWithoutBalance = 1; //!< Don't allow items to be hilighted if not affordable
+
int giMinimumBalance = INT_MIN; //!< '-m' Minumum balance for `dispense acct`
int giMaximumBalance = INT_MAX; //!< '-M' Maximum balance for `dispense acct`
-char *gsUserName; //!< User that dispense will happen as
+
+ char *gsUserName; //!< User that dispense will happen as
char *gsUserFlags; //!< User's flag set
- int giUserBalance=-1; //!< User balance (set by Authenticate)
+ int giUserBalance = -1; //!< User balance (set by Authenticate)
int giDispenseCount = 1; //!< Number of dispenses to do
+
char *gsTextArgs[MAX_TXT_ARGS];
int giTextArgc;
" Show interactive list\n"
" dispense <name>|<index>|<itemid>\n"
" Dispense named item (<name> matches if it is a unique prefix)\n"
+ " dispense finger\n"
+ " Show the finger output\n"
);
if( giTextArgc == 0 || strcmp(gsTextArgs[0], "give") == 0 )
printf(
- " dispense give <user> <ammount> \"<reason>\"\n"
+ " dispense give <user> <amount> \"<reason>\"\n"
" Give money to another user\n"
);
if( giTextArgc == 0 || strcmp(gsTextArgs[0], "donate") == 0 )
printf(
- " dispense donate <ammount> \"<reason>\"\n"
+ " dispense donate <amount> \"<reason>\"\n"
" Donate to the club\n"
);
if( giTextArgc == 0 || strcmp(gsTextArgs[0], "iteminfo") == 0 )
" dispense iteminfo <itemid>\n"
" Get the name and price for an item\n"
);
+// if( giTextArgc == 0 || strcmp(gsTextArgs[0], "enumitems") == 0 )
+// printf(
+// " dispense enumitems\n"
+// " List avaliable items\n"
+// );
if( giTextArgc == 0 )
printf(" == Coke members == \n");
if( giTextArgc == 0 || strcmp(gsTextArgs[0], "acct") == 0 )
printf(
" dispense acct [<user>]\n"
" Show user balances\n"
- " dispense acct <user> [+-]<ammount> \"<reason>\"\n"
+ " dispense acct <user> [+-]<amount> \"<reason>\"\n"
" Alter a account value\n"
- " dispense acct <user> =<ammount> \"<reason>\"\n"
+ " dispense acct <user> =<amount> \"<reason>\"\n"
" Set an account balance\n"
);
if( giTextArgc == 0 || strcmp(gsTextArgs[0], "refund") == 0 )
printf(
" dispense refund <user> <itemid> [<price>]\n"
" Refund an item to a user (with optional price override)\n"
+ " Item IDs can be seen in the cokelog (in the brackets after the item name)\n"
+ " e.g. coke:6 for a coke, snack:33 for slot 33 of the snack machine\n"
);
if( giTextArgc == 0 || strcmp(gsTextArgs[0], "slot") == 0 )
printf(
printf(
" dispense user add <user>\n"
" Create new account\n"
- " dispense user type <user> <flags>\n"
+ " dispense user type <user> <flags> <reason>\n"
" Alter a user's flags\n"
" <flags> is a comma-separated list of user, coke, admin, internal or disabled\n"
" Flags are removed by preceding the name with '-' or '!'\n"
ShowUsage();
return 0;
}
+ else if( strcmp(argv[i], "--dry-run") == 0 ) {
+ gbDryRun = 1;
+ }
+ else if( strcmp(argv[i], "--drinks-only") == 0 ) {
+ giUIMode = UI_MODE_DRINKSONLY;
+ }
+ else if( strcmp(argv[i], "--can-select-all") == 0 ) {
+ gbDisallowSelectWithoutBalance = 0;
+ }
else {
fprintf(stderr, "%s: Unknown switch '%s'\n", argv[0], argv[i]);
ShowUsage();
ShowUsage();
return RV_ARGUMENTS;
}
- if( giTextArgc + 1 == MAX_TXT_ARGS )
+ if( giTextArgc == MAX_TXT_ARGS )
{
fprintf(stderr, "ERROR: Too many arguments\n");
return RV_ARGUMENTS;
continue;
}
- if( giTextArgc + 1 == MAX_TXT_ARGS )
+ if( giTextArgc == MAX_TXT_ARGS )
{
fprintf(stderr, "ERROR: Too many arguments\n");
return RV_ARGUMENTS;
}
+ //
+ // `dispense finger`
+ // -
+ if( strcmp(gsTextArgs[0], "finger") == 0 )
+ {
+ // Connect to server
+ sock = OpenConnection(gsDispenseServer, giDispensePort);
+ if( sock < 0 ) return RV_SOCKET_ERROR;
+
+ // Get items
+ PopulateItemList(sock);
+
+ // Only get coke slot statuses
+ for( i = 0; i <= 6; i ++ )
+ {
+ const char *status;
+ switch(gaItems[i].Status)
+ {
+ case 0: status = "Avail"; break;
+ case 1: status = "Sold "; break;
+ default:
+ status = "Error";
+ break;
+ }
+ printf("%i - %s %3i %s\n", gaItems[i].ID, status, gaItems[i].Price, gaItems[i].Desc);
+
+ }
+
+ return 0;
+ }
+
//
// `dispense acct`
// -
ret = Dispense_AlterBalance(sock, gsTextArgs[1], atoi(gsTextArgs[2]), gsTextArgs[3]);
}
}
- // TODO: Preserve ret if non-zero
+ // On error, quit
+ if( ret ) {
+ close(sock);
+ return ret;
+ }
// Show user information
ret = Dispense_ShowUser(sock, gsTextArgs[1]);
// Update a user
else if( strcmp(gsTextArgs[1], "type") == 0 || strcmp(gsTextArgs[1], "flags") == 0 )
{
- if( giTextArgc != 4 ) {
+ if( giTextArgc < 4 || giTextArgc > 5 ) {
fprintf(stderr, "Error: `dispense user type` requires two arguments\n");
ShowUsage();
return RV_ARGUMENTS;
}
- ret = Dispense_SetUserType(sock, gsTextArgs[2], gsTextArgs[3]);
+ if( giTextArgc == 4 )
+ ret = Dispense_SetUserType(sock, gsTextArgs[2], gsTextArgs[3], "");
+ else
+ ret = Dispense_SetUserType(sock, gsTextArgs[2], gsTextArgs[3], gsTextArgs[4]);
}
else
{
// TODO: More
close(sock);
- return RV_UNKNOWN_ERROR;
+ return ret;
}
// Query an item price
else if( strcmp(gsTextArgs[0], "iteminfo") == 0 )
if( j > 1 ) {
printf("%i items dispensed\n", j);
}
+ Dispense_ShowUser(sock, gsUserName);
close(sock);
- }
- Dispense_ShowUser(sock, gsUserName);
+ }
return ret;
}
int ch;
int i, times;
int xBase, yBase;
- const int displayMinWidth = 40;
+ const int displayMinWidth = 50;
char *titleString = "Dispense";
- int itemCount;
+ int items_in_view;
int maxItemIndex;
int itemBase = 0;
int currentItem;
username = pwd->pw_name;
}
// Get balance
- snprintf(balance_str, sizeof balance_str, "$%i.%02i", giUserBalance/100, abs(giUserBalance)%100);
+ snprintf(balance_str, sizeof(balance_str), "$%i.%02i", giUserBalance/100, abs(giUserBalance)%100);
// Enter curses mode
initscr();
maxItemIndex = ShowItemAt(0, 0, 0, -1, 0);
// Get item count per screen
// - 6: randomly chosen (Need at least 3)
- itemCount = LINES - 6;
- if( itemCount > maxItemIndex )
- itemCount = maxItemIndex;
+ items_in_view = LINES - 6;
+ if( items_in_view > maxItemIndex )
+ items_in_view = maxItemIndex;
// Get first index
currentItem = 0;
while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
// Get dimensions
- height = itemCount + 3;
+ height = items_in_view + 3;
width = displayMinWidth;
// Get positions
PrintAlign(yBase, xBase, width, "/", '-', titleString, '-', "\\");
// Items
- for( i = 0; i < itemCount; i ++ )
+ for( i = 0; i < items_in_view; i ++ )
{
int pos = 0;
// Check for the '...' row
// - Oh god, magic numbers!
if( (i == 0 && itemBase > 0)
- || (i == itemCount - 1 && itemBase < maxItemIndex - itemCount) )
+ || (i == items_in_view - 1 && itemBase < maxItemIndex - items_in_view) )
{
printw(" ..."); pos += 8;
times = (width - pos) - 1;
}
// Scrollbar (if needed)
- if( maxItemIndex > itemCount ) {
+ if( maxItemIndex > items_in_view ) {
if( i == 0 ) {
addch('A');
}
- else if( i == itemCount - 1 ) {
+ else if( i == items_in_view - 1 ) {
addch('V');
}
else {
- int percentage = itemBase * 100 / (maxItemIndex-itemCount);
- if( i-1 == percentage*(itemCount-3)/100 ) {
+ int percentage = itemBase * 100 / (maxItemIndex-items_in_view);
+ if( i-1 == percentage*(items_in_view-3)/100 ) {
addch('#');
}
else {
else {
}
-
- if( itemCount > maxItemIndex && currentItem < itemBase + 2 && itemBase > 0 )
- itemBase = currentItem - 2;
- if( itemCount > maxItemIndex && currentItem > itemBase + itemCount - 2 && itemBase < maxItemIndex-1 )
- itemBase = currentItem - itemCount + 2;
+
+ // Scroll only if needed
+ if( items_in_view < maxItemIndex )
+ {
+ // - If the current item is above the second item shown, and we're not at the top
+ if( currentItem < itemBase + 2 && itemBase > 0 ) {
+ itemBase = currentItem - 2;
+ if(itemBase < 0) itemBase = 0;
+ }
+ // - If the current item is below the second item show, and we're not at the bottom
+ if( currentItem > itemBase + items_in_view - 2 && itemBase + items_in_view < maxItemIndex ) {
+ itemBase = currentItem - items_in_view + 2;
+ if( itemBase > maxItemIndex - items_in_view )
+ itemBase = maxItemIndex - items_in_view;
+ }
+ }
}
else {
switch(ch)
*/
int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
{
- int _x, _y, times;
char *name = NULL;
int price = 0;
int status = -1;
if( Width > 0 )
{
// 4 preceding, 5 price
- int nameWidth = Width - 4 - 5;
+ int nameWidth = Width - 4 - snprintf(NULL, 0, " %4i", price);
move( Row, Col );
if( Index >= 0 )
printw("%-*.*s", nameWidth, nameWidth, name);
-// getyx(stdscr, _y, _x);
- // Assumes max 4 digit prices
-// times = Width - 5 - (_x - Col); // TODO: Better handling for large prices
-// while(times--) addch(' ');
-
printw(" %4i", price);
}
else
{
- printw("-- %s", name);
- getyx(stdscr, _y, _x);
- times = Width - 4 - (_x - Col);
- while(times--) addch(' ');
- printw(" ");
+ printw("-- %-*.*s ", Width-4, Width-4, name);
}
}
// If the item isn't availiable for sale, return -1 (so it's skipped)
- if( status || price >= giUserBalance )
+ if( status || (price > giUserBalance && gbDisallowSelectWithoutBalance) )
Index = -1;
return Index;
char *buf;
int responseCode;
- char *itemType, *itemStart;
+ char *arrayType;
int count, i;
regmatch_t matches[4];
// 202 Item <count>
RunRegex(&gArrayRegex, buf, 4, matches, "Malformed server response");
- itemType = &buf[ matches[2].rm_so ]; buf[ matches[2].rm_eo ] = '\0';
+ arrayType = &buf[ matches[2].rm_so ]; buf[ matches[2].rm_eo ] = '\0';
count = atoi( &buf[ matches[3].rm_so ] );
// Check array type
- if( strcmp(itemType, "Items") != 0 ) {
+ if( strcmp(arrayType, "Items") != 0 ) {
// What the?!
fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n",
- itemType);
+ arrayType);
exit(RV_UNKNOWN_ERROR);
}
-
- itemStart = &buf[ matches[3].rm_eo ];
-
free(buf);
giNumItems = count;
int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason)
{
char *buf;
- int responseCode;
+ int responseCode, rv = -1;
// Check for a dry run
if( gbDryRun ) {
// Sanity
if( Ammount == 0 ) {
- printf("An ammount would be nice\n");
+ printf("An amount would be nice\n");
return RV_ARGUMENTS;
}
buf = ReadLine(Socket);
responseCode = atoi(buf);
- free(buf);
switch(responseCode)
{
- case 200: return 0; // OK
+ case 200:
+ rv = 0; // OK
+ break;
case 402:
fprintf(stderr, "Insufficient balance\n");
- return RV_BAD_ITEM;
+ rv = RV_BAD_ITEM;
+ break;
case 403: // Not in coke
fprintf(stderr, "You are not in coke (sucker)\n");
- return RV_PERMISSIONS;
+ rv = RV_PERMISSIONS;
+ break;
case 404: // Unknown user
fprintf(stderr, "Unknown user '%s'\n", Username);
- return RV_INVALID_USER;
+ rv = RV_INVALID_USER;
+ break;
default:
- fprintf(stderr, "Unknown response code %i\n", responseCode);
- return RV_UNKNOWN_RESPONSE;
+ fprintf(stderr, "Unknown response code %i\n'%s'\n", responseCode, buf);
+ rv = RV_UNKNOWN_RESPONSE;
+ break;
}
+ free(buf);
- return -1;
+ return rv;
}
/**
return ret;
}
-int Dispense_SetUserType(int Socket, const char *Username, const char *TypeString)
+int Dispense_SetUserType(int Socket, const char *Username, const char *TypeString, const char *Reason)
{
char *buf;
int responseCode, ret;
// TODO: Pre-validate the string
- sendf(Socket, "USER_FLAGS %s %s\n", Username, TypeString);
+ sendf(Socket, "USER_FLAGS %s %s %s\n", Username, TypeString, Reason);
buf = ReadLine(Socket);
responseCode = atoi(buf);
break;
case 403:
- printf("Only wheel can modify users\n");
+ printf("Only dispense admins can modify users\n");
ret = RV_PERMISSIONS;
break;
}
else {
len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0);
- if( len < 0 ) {
+ if( len <= 0 ) {
free(ret);
- return strdup("499 Client Connection Error\n");
+ return strdup("599 Client Connection Error\n");
}
- buf[bufPos+len] = '\0';
}
+ buf[bufPos+len] = '\0';
newline = strchr( buf+bufPos, '\n' );
if( newline ) {
if( newline ) {
int newLen = newline - (buf+bufPos) + 1;
bufValid = len - newLen;
- bufPos += newLen;
+ len = newLen;
}
if( len + bufPos == BUFSIZ - 1 ) bufPos = 0;
+ else bufPos += len;
}
#if DEBUG_TRACE_SERVER
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au