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
Merge branch 'master' of git://mutabah.net/opendispense2
[tpg/opendispense2.git]
/
src
/
server
/
server.c
diff --git
a/src/server/server.c
b/src/server/server.c
index
9691b69
..
7106e52
100644
(file)
--- a/
src/server/server.c
+++ b/
src/server/server.c
@@
-297,23
+297,24
@@
void Server_ParseClientCommand(tClient *Client, char *CommandString)
{
char *command, *args;
int i;
- #if 0
- char **argList;
- int numArgs = 0;
- #endif
+
+ if( giDebugLevel >= 2 )
+ Debug(Client, "Server_ParseClientCommand: (CommandString = '%s')", CommandString);
if( Server_int_ParseArgs(1, CommandString, &command, &args, NULL) )
{
printf("command=%s, args=%s\n", command, args);
// Is this an error? (just ignore for now)
- args = "";
+
//
args = "";
}
// Find command
for( i = 0; i < NUM_COMMANDS; i++ )
{
- if(strcmp(CommandString, gaServer_Commands[i].Name) == 0) {
+ if(strcmp(command, gaServer_Commands[i].Name) == 0) {
+ if( giDebugLevel >= 2 )
+ Debug(Client, "CMD %s - \"%s\"", command, args);
gaServer_Commands[i].Function(Client, args);
return ;
}
@@
-429,6
+430,8
@@
void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
// You can't be an internal account
if( Bank_GetFlags(Client->UID) & USER_FLAG_INTERNAL ) {
+ if(giDebugLevel)
+ Debug(Client, "Autoauth as '%s', not allowed", username);
Client->UID = -1;
sendf(Client->Socket, "401 Auth Failure\n");
return ;
@@
-483,6
+486,32
@@
void Server_Cmd_SETEUSER(tClient *Client, char *Args)
sendf(Client->Socket, "200 User set\n");
}
+/**
+ * \brief Send an item status to the client
+ * \param Client Who to?
+ * \param Item Item to send
+ */
+void Server_int_SendItem(tClient *Client, tItem *Item)
+{
+ char *status = "avail";
+
+ if( Item->Handler->CanDispense )
+ {
+ switch(Item->Handler->CanDispense(Client->UID, Item->ID))
+ {
+ case 0: status = "avail"; break;
+ case 1: status = "sold"; break;
+ default:
+ case -1: status = "error"; break;
+ }
+ }
+
+ sendf(Client->Socket,
+ "202 Item %s:%i %s %i %s\n",
+ Item->Handler->Name, Item->ID, status, Item->Price, Item->Name
+ );
+}
+
/**
* \brief Enumerate the items that the server knows about
*/
@@
-506,10
+535,7
@@
void Server_Cmd_ENUMITEMS(tClient *Client, char *Args)
for( i = 0; i < giNumItems; i ++ ) {
if( gaItems[i].bHidden ) continue;
- sendf(Client->Socket,
- "202 Item %s:%i %i %s\n",
- gaItems[i].Handler->Name, gaItems[i].ID, gaItems[i].Price, gaItems[i].Name
- );
+ Server_int_SendItem( Client, &gaItems[i] );
}
sendf(Client->Socket, "200 List end\n");
@@
-571,10
+597,7
@@
void Server_Cmd_ITEMINFO(tClient *Client, char *Args)
return ;
}
- sendf(Client->Socket,
- "202 Item %s:%i %i %s\n",
- item->Handler->Name, item->ID, item->Price, item->Name
- );
+ Server_int_SendItem( Client, item );
}
void Server_Cmd_DISPENSE(tClient *Client, char *Args)
@@
-1181,11
+1204,20
@@
int sendf(int Socket, const char *Format, ...)
int Server_int_ParseArgs(int bUseLongLast, char *ArgStr, ...)
{
va_list args;
- char savedChar
= *ArgStr
;
+ char savedChar;
char **dest;
va_start(args, ArgStr);
- printf("Server_int_ParseArgs: ArgStr = '%s'\n", ArgStr);
+ // Check for null
+ if( !ArgStr )
+ {
+ while( (dest = va_arg(args, char **)) )
+ *dest = NULL;
+ va_end(args);
+ return 1;
+ }
+
+ savedChar = *ArgStr;
while( (dest = va_arg(args, char **)) )
{
@@
-1201,20
+1233,22
@@
int Server_int_ParseArgs(int bUseLongLast, char *ArgStr, ...)
do {
*dest = NULL;
} while( (dest = va_arg(args, char **)) );
+ va_end(args);
return -1;
}
- // Set destination
- *dest = ArgStr;
-
if( *ArgStr == '"' )
{
+ ArgStr ++;
+ *dest = ArgStr;
// Read until quote
while( *ArgStr && *ArgStr != '"' )
ArgStr ++;
}
else
{
+ // Set destination
+ *dest = ArgStr;
// Read until a space
while( *ArgStr && *ArgStr != ' ' && *ArgStr != '\t' )
ArgStr ++;
@@
-1223,10
+1257,12
@@
int Server_int_ParseArgs(int bUseLongLast, char *ArgStr, ...)
*ArgStr = '\0';
ArgStr ++;
}
+ va_end(args);
// Oops, extra arguments, and greedy not set
- if(
savedChar == ' ' && bUseLongLast )
+ if(
(savedChar == ' ' || savedChar == '\t') && !bUseLongLast ) {
return -1;
+ }
// Un-mangle last
if(bUseLongLast) {
@@
-1234,8
+1270,6
@@
int Server_int_ParseArgs(int bUseLongLast, char *ArgStr, ...)
*ArgStr = savedChar;
}
- va_end(args);
-
return 0; // Success!
}
UCC
git Repository :: git.ucc.asn.au