void Server_Cmd_USERADD(tClient *Client, char *Args);
void Server_Cmd_USERFLAGS(tClient *Client, char *Args);
// --- Helpers ---
+ int Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value);
int sendf(int Socket, const char *Format, ...);
// === CONSTANTS ===
}
// Get UID
- Client->UID = Bank_GetUserID( Args );
+ Client->UID = Bank_GetAcctByName( Args );
if( Client->UID < 0 ) {
if(giDebugLevel)
printf("Client %i: Unknown user '%s'\n", Client->ID, Args);
}
// Set id
- Client->EffectiveUID = Bank_GetUserID(Args);
+ Client->EffectiveUID = Bank_GetAcctByName(Args);
if( Client->EffectiveUID == -1 ) {
sendf(Client->Socket, "404 User not found\n");
return ;
{
int i;
- if( Args != NULL || strlen(Args) ) {
+ if( Args != NULL && strlen(Args) ) {
sendf(Client->Socket, "407 ENUM_ITEMS takes no arguments\n");
return ;
}
reason ++;
// Get recipient
- uid = Bank_GetUserID(recipient);
+ uid = Bank_GetAcctByName(recipient);
if( uid == -1 ) {
sendf(Client->Socket, "404 Invalid target user\n");
return ;
}
}
+void Server_Cmd_DONATE(tClient *Client, char *Args)
+{
+ char *ammount, *reason;
+ int iAmmount;
+ int thisUid;
+
+ if( !Client->bIsAuthed ) {
+ sendf(Client->Socket, "401 Not Authenticated\n");
+ return ;
+ }
+
+ ammount = Args;
+
+ // Get the start of the reason
+ reason = strchr(Args, ' ');
+ if( !ammount ) {
+ sendf(Client->Socket, "407 Invalid Argument, expected 2 parameters, 1 encountered\n");
+ return ;
+ }
+ *reason = '\0';
+ reason ++;
+
+ // Check the end of the reason
+ if( strchr(reason, ' ') ) {
+ sendf(Client->Socket, "407 Invalid Argument, expected 2 parameters, more encountered\n");
+ return ;
+ }
+
+ // Parse ammount
+ iAmmount = atoi(ammount);
+ if( iAmmount <= 0 ) {
+ sendf(Client->Socket, "407 Invalid Argument, ammount must be > zero\n");
+ return ;
+ }
+
+ // Handle effective users
+ if( Client->EffectiveUID != -1 ) {
+ thisUid = Client->EffectiveUID;
+ }
+ else {
+ thisUid = Client->UID;
+ }
+
+ // Do give
+ switch( DispenseDonate(Client->UID, thisUid, iAmmount, reason) )
+ {
+ case 0:
+ sendf(Client->Socket, "200 Give OK\n");
+ return ;
+ case 2:
+ sendf(Client->Socket, "402 Poor You\n");
+ return ;
+ default:
+ sendf(Client->Socket, "500 Unknown error\n");
+ return ;
+ }
+}
+
void Server_Cmd_ADD(tClient *Client, char *Args)
{
char *user, *ammount, *reason;
}
// Get recipient
- uid = Bank_GetUserID(user);
+ uid = Bank_GetAcctByName(user);
if( uid == -1 ) {
sendf(Client->Socket, "404 Invalid user\n");
return ;
}
// Do give
- switch( DispenseAdd(uid, Client->UID, iAmmount, reason) )
+ switch( DispenseAdd(Client->UID, uid, iAmmount, reason) )
{
case 0:
sendf(Client->Socket, "200 Add OK\n");
{
int i, numRet = 0;
int maxBal = INT_MAX, minBal = INT_MIN;
- int numUsr = Bank_GetMaxID();
+ tAcctIterator *it;
+ int sort = BANK_ITFLAG_SORT_NAME;
// Parse arguments
if( Args && strlen(Args) )
maxBal = atoi(max);
}
+ // Create iterator
+ if( maxBal != INT_MAX )
+ it = Bank_Iterator(0, 0, sort|BANK_ITFLAG_MAXBALANCE, maxBal, 0);
+ else if( minBal != INT_MIN )
+ it = Bank_Iterator(0, 0, sort|BANK_ITFLAG_MINBALANCE, minBal, 0);
+ else
+ it = Bank_Iterator(0, 0, sort, 0, 0);
+
// Get return number
- for( i = 0; i < numUsr; i ++ )
+ while( (i = Bank_IteratorNext(it)) != -1 )
{
int bal = Bank_GetBalance(i);
numRet ++;
}
+ Bank_DelIterator(it);
+
// Send count
sendf(Client->Socket, "201 Users %i\n", numRet);
- for( i = 0; i < numUsr; i ++ )
+
+ // Create iterator
+ if( maxBal != INT_MAX )
+ it = Bank_Iterator(0, 0, sort|BANK_ITFLAG_MAXBALANCE, maxBal, 0);
+ else if( minBal != INT_MIN )
+ it = Bank_Iterator(0, 0, sort|BANK_ITFLAG_MINBALANCE, minBal, 0);
+ else
+ it = Bank_Iterator(0, 0, sort, 0, 0);
+
+ while( (i = Bank_IteratorNext(it)) != -1 )
{
int bal = Bank_GetBalance(i);
_SendUserInfo(Client, i);
}
+ Bank_DelIterator(it);
+
sendf(Client->Socket, "200 List End\n");
}
if(space) *space = '\0';
// Get recipient
- uid = Bank_GetUserID(user);
+ uid = Bank_GetAcctByName(user);
if( uid == -1 ) {
sendf(Client->Socket, "404 Invalid user");
return ;
type = "internal";
}
else if( flags & USER_FLAG_COKE ) {
- if( flags & USER_FLAG_WHEEL )
- type = "coke,wheel";
+ if( flags & USER_FLAG_ADMIN )
+ type = "coke,admin";
else
type = "coke";
}
- else if( flags & USER_FLAG_WHEEL ) {
- type = "wheel";
+ else if( flags & USER_FLAG_ADMIN ) {
+ type = "admin";
}
else {
type = "user";
// TODO: User flags/type
sendf(
Client->Socket, "202 User %s %i %s%s\n",
- Bank_GetUserName(UserID), Bank_GetBalance(UserID),
+ Bank_GetAcctName(UserID), Bank_GetBalance(UserID),
type, disabled
);
}
char *username, *space;
// Check permissions
- if( !(Bank_GetFlags(Client->UID) & USER_FLAG_WHEEL) ) {
- sendf(Client->Socket, "403 Not Wheel\n");
+ if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
+ sendf(Client->Socket, "403 Not a coke admin\n");
return ;
}
if(space) *space = '\0';
// Try to create user
- if( Bank_CreateUser(username) == -1 ) {
+ if( Bank_CreateAcct(username) == -1 ) {
sendf(Client->Socket, "404 User exists\n");
return ;
}
int uid;
// Check permissions
- if( !(Bank_GetFlags(Client->UID) & USER_FLAG_WHEEL) ) {
- sendf(Client->Socket, "403 Not Wheel\n");
+ if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
+ sendf(Client->Socket, "403 Not a coke admin\n");
return ;
}
if(space) *space = '\0';
// Get UID
- uid = Bank_GetUserID(username);
+ uid = Bank_GetAcctByName(username);
if( uid == -1 ) {
sendf(Client->Socket, "404 User '%s' not found\n", username);
return ;
}
// Parse flags
- do {
- int bRemove = 0;
- int i;
- struct {
- const char *Name;
- int Mask;
- int Value;
- } cFLAGS[] = {
- {"disabled", USER_FLAG_DISABLED, USER_FLAG_DISABLED}
- ,{"door", USER_FLAG_DOORGROUP, USER_FLAG_DOORGROUP}
- ,{"coke", USER_FLAG_COKE, USER_FLAG_COKE}
- ,{"wheel", USER_FLAG_WHEEL, USER_FLAG_WHEEL}
- // ,{"internal", USER_FLAG_INTERNAL, USER_FLAG_INTERNAL}
- };
- const int ciNumFlags = sizeof(cFLAGS)/sizeof(cFLAGS[0]);
-
- while( *flags == ' ' ) flags ++; // Eat whitespace
- space = strchr(flags, ','); // Find the end of the flag
- if(space) *space = '\0';
-
- // Check for inversion/removal
- if( *flags == '!' || *flags == '-' ) {
- bRemove = 1;
- flags ++;
- }
- else if( *flags == '+' ) {
- flags ++;
- }
-
- // Check flag values
- for( i = 0; i < ciNumFlags; i ++ )
- {
- if( strcmp(flags, cFLAGS[i].Name) == 0 ) {
- mask |= cFLAGS[i].Mask;
- value &= ~cFLAGS[i].Mask;
- if( !bRemove )
- value |= cFLAGS[i].Value;
- break;
- }
- }
-
- // Error check
- if( i == ciNumFlags ) {
- sendf(Client->Socket, "407 Unknown flag value '%s'\n", flags);
- return ;
- }
-
- flags = space + 1;
- } while(space);
+ if( Server_int_ParseFlags(Client, flags, &mask, &value) )
+ return ;
// Apply flags
Bank_SetFlags(uid, mask, value);
return send(Socket, buf, len, 0);
}
}
+
+int Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value)
+{
+ struct {
+ const char *Name;
+ int Mask;
+ int Value;
+ } cFLAGS[] = {
+ {"disabled", USER_FLAG_DISABLED, USER_FLAG_DISABLED}
+ ,{"door", USER_FLAG_DOORGROUP, USER_FLAG_DOORGROUP}
+ ,{"coke", USER_FLAG_COKE, USER_FLAG_COKE}
+ ,{"admin", USER_FLAG_ADMIN, USER_FLAG_ADMIN}
+ ,{"internal", USER_FLAG_INTERNAL, USER_FLAG_INTERNAL}
+ };
+ const int ciNumFlags = sizeof(cFLAGS)/sizeof(cFLAGS[0]);
+
+ char *space;
+
+ *Mask = 0;
+ *Value = 0;
+
+ do {
+ int bRemove = 0;
+ int i;
+ int len;
+
+ while( *Str == ' ' ) Str ++; // Eat whitespace
+ space = strchr(Str, ','); // Find the end of the flag
+ if(space)
+ len = space - Str;
+ else
+ len = strlen(Str);
+
+ // Check for inversion/removal
+ if( *Str == '!' || *Str == '-' ) {
+ bRemove = 1;
+ Str ++;
+ }
+ else if( *Str == '+' ) {
+ Str ++;
+ }
+
+ // Check flag values
+ for( i = 0; i < ciNumFlags; i ++ )
+ {
+ if( strncmp(Str, cFLAGS[i].Name, len) == 0 ) {
+ *Mask |= cFLAGS[i].Mask;
+ *Value &= ~cFLAGS[i].Mask;
+ if( !bRemove )
+ *Value |= cFLAGS[i].Value;
+ break;
+ }
+ }
+
+ // Error check
+ if( i == ciNumFlags ) {
+ char val[len+1];
+ strncpy(val, Str, len+1);
+ sendf(Client->Socket, "407 Unknown flag value '%s'\n", val);
+ return -1;
+ }
+
+ Str = space + 1;
+ } while(space);
+
+ return 0;
+}
git.ucc.asn.au / tpg / opendispense2.git / blobdiff
UCC git Repository :: git.ucc.asn.au