git.ucc.asn.au
/
tpg
/
opendispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Client - Fix to possible infinite loop in ReadLine
[tpg/opendispense2.git]
/
src
/
client
/
main.c
diff --git
a/src/client/main.c
b/src/client/main.c
index
4072bd0
..
bf22fab
100644
(file)
--- a/
src/client/main.c
+++ b/
src/client/main.c
@@
-23,7
+23,7
@@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#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
#define USE_NCURSES_INTERFACE 0
#define DEBUG_TRACE_SERVER 0
@@
-87,7
+87,7
@@
void PopulateItemList(int Socket);
int Dispense_ShowUser(int Socket, const char *Username);
void _PrintUserLine(const char *Line);
int Dispense_AddUser(int Socket, const char *Username);
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);
int Dispense_SetItem(int Socket, const char *Type, int ID, int NewPrice, const char *NewName);
// --- Helpers ---
char *ReadLine(int Socket);
@@
-97,7
+97,7
@@
char *trim(char *string);
void CompileRegex(regex_t *regex, const char *pattern, int flags);
// === GLOBALS ===
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;
int giDispensePort = 11020;
tItem *gaItems;
@@
-146,6
+146,11
@@
void ShowUsage(void)
" dispense iteminfo <itemid>\n"
" Get the name and price for an item\n"
);
" 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 )
if( giTextArgc == 0 )
printf(" == Coke members == \n");
if( giTextArgc == 0 || strcmp(gsTextArgs[0], "acct") == 0 )
@@
-161,6
+166,8
@@
void ShowUsage(void)
printf(
" dispense refund <user> <itemid> [<price>]\n"
" Refund an item to a user (with optional price override)\n"
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(
);
if( giTextArgc == 0 || strcmp(gsTextArgs[0], "slot") == 0 )
printf(
@@
-173,7
+180,7
@@
void ShowUsage(void)
printf(
" dispense user add <user>\n"
" Create new account\n"
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"
" 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"
@@
-332,7
+339,7
@@
int main(int argc, char *argv[])
ShowUsage();
return RV_ARGUMENTS;
}
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;
{
fprintf(stderr, "ERROR: Too many arguments\n");
return RV_ARGUMENTS;
@@
-344,7
+351,7
@@
int main(int argc, char *argv[])
continue;
}
continue;
}
- if( giTextArgc
+ 1
== MAX_TXT_ARGS )
+ if( giTextArgc == MAX_TXT_ARGS )
{
fprintf(stderr, "ERROR: Too many arguments\n");
return RV_ARGUMENTS;
{
fprintf(stderr, "ERROR: Too many arguments\n");
return RV_ARGUMENTS;
@@
-402,7
+409,11
@@
int main(int argc, char *argv[])
ret = Dispense_AlterBalance(sock, gsTextArgs[1], atoi(gsTextArgs[2]), gsTextArgs[3]);
}
}
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]);
// Show user information
ret = Dispense_ShowUser(sock, gsTextArgs[1]);
@@
-473,13
+484,16
@@
int main(int argc, char *argv[])
// Update a user
else if( strcmp(gsTextArgs[1], "type") == 0 || strcmp(gsTextArgs[1], "flags") == 0 )
{
// 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;
}
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
{
}
else
{
@@
-547,7
+561,7
@@
int main(int argc, char *argv[])
// TODO: More
close(sock);
// TODO: More
close(sock);
- return
RV_UNKNOWN_ERROR
;
+ return
ret
;
}
// Query an item price
else if( strcmp(gsTextArgs[0], "iteminfo") == 0 )
}
// Query an item price
else if( strcmp(gsTextArgs[0], "iteminfo") == 0 )
@@
-807,10
+821,10
@@
int main(int argc, char *argv[])
if( j > 1 ) {
printf("%i items dispensed\n", j);
}
if( j > 1 ) {
printf("%i items dispensed\n", j);
}
+ Dispense_ShowUser(sock, gsUserName);
close(sock);
close(sock);
- }
- Dispense_ShowUser(sock, gsUserName);
+ }
return ret;
}
return ret;
}
@@
-1118,7
+1132,7
@@
int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
}
// If the item isn't availiable for sale, return -1 (so it's skipped)
}
// If the item isn't availiable for sale, return -1 (so it's skipped)
- if( status || price >
=
giUserBalance )
+ if( status || price > giUserBalance )
Index = -1;
return Index;
Index = -1;
return Index;
@@
-1530,7
+1544,7
@@
void PopulateItemList(int Socket)
char *buf;
int responseCode;
char *buf;
int responseCode;
- char *
itemType, *itemStart
;
+ char *
arrayType
;
int count, i;
regmatch_t matches[4];
int count, i;
regmatch_t matches[4];
@@
-1553,19
+1567,16
@@
void PopulateItemList(int Socket)
// 202 Item <count>
RunRegex(&gArrayRegex, buf, 4, matches, "Malformed server response");
// 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
count = atoi( &buf[ matches[3].rm_so ] );
// Check array type
- if( strcmp(
item
Type, "Items") != 0 ) {
+ if( strcmp(
array
Type, "Items") != 0 ) {
// What the?!
fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n",
// What the?!
fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n",
-
item
Type);
+
array
Type);
exit(RV_UNKNOWN_ERROR);
}
exit(RV_UNKNOWN_ERROR);
}
-
- itemStart = &buf[ matches[3].rm_eo ];
-
free(buf);
giNumItems = count;
free(buf);
giNumItems = count;
@@
-1680,7
+1691,7
@@
int DispenseItem(int Socket, const char *Type, int ID)
int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason)
{
char *buf;
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 ) {
// Check for a dry run
if( gbDryRun ) {
@@
-1698,26
+1709,32
@@
int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const c
buf = ReadLine(Socket);
responseCode = atoi(buf);
buf = ReadLine(Socket);
responseCode = atoi(buf);
- free(buf);
switch(responseCode)
{
switch(responseCode)
{
- case 200: return 0; // OK
+ case 200:
+ rv = 0; // OK
+ break;
case 402:
fprintf(stderr, "Insufficient balance\n");
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");
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);
case 404: // Unknown user
fprintf(stderr, "Unknown user '%s'\n", Username);
- return RV_INVALID_USER;
+ rv = RV_INVALID_USER;
+ break;
default:
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
;
}
/**
}
/**
@@
-2080,7
+2097,7
@@
int Dispense_AddUser(int Socket, const char *Username)
return ret;
}
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;
{
char *buf;
int responseCode, ret;
@@
-2093,7
+2110,7
@@
int Dispense_SetUserType(int Socket, const char *Username, const char *TypeStrin
// TODO: Pre-validate the string
// 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);
buf = ReadLine(Socket);
responseCode = atoi(buf);
@@
-2106,7
+2123,7
@@
int Dispense_SetUserType(int Socket, const char *Username, const char *TypeStrin
break;
case 403:
break;
case 403:
- printf("Only
wheel
can modify users\n");
+ printf("Only
dispense admins
can modify users\n");
ret = RV_PERMISSIONS;
break;
ret = RV_PERMISSIONS;
break;
@@
-2202,12
+2219,12
@@
char *ReadLine(int Socket)
}
else {
len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0);
}
else {
len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0);
- if( len < 0 ) {
+ if( len <
=
0 ) {
free(ret);
free(ret);
- return strdup("
4
99 Client Connection Error\n");
+ return strdup("
5
99 Client Connection Error\n");
}
}
- buf[bufPos+len] = '\0';
}
}
+ buf[bufPos+len] = '\0';
newline = strchr( buf+bufPos, '\n' );
if( newline ) {
newline = strchr( buf+bufPos, '\n' );
if( newline ) {
UCC
git Repository :: git.ucc.asn.au