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
Hacked to stop root dispenses
[tpg/opendispense2.git]
/
src
/
server
/
server.c
diff --git
a/src/server/server.c
b/src/server/server.c
index
a2279fd
..
b103e83
100644
(file)
--- a/
src/server/server.c
+++ b/
src/server/server.c
@@
-23,6
+23,7
@@
// Statistics
#define MAX_CONNECTION_QUEUE 5
#define INPUT_BUFFER_SIZE 256
// Statistics
#define MAX_CONNECTION_QUEUE 5
#define INPUT_BUFFER_SIZE 256
+#define CLIENT_TIMEOUT 10 // Seconds
#define HASH_TYPE SHA1
#define HASH_LENGTH 20
#define HASH_TYPE SHA1
#define HASH_LENGTH 20
@@
-153,6
+154,18
@@
void Server_Start(void)
return ;
}
return ;
}
+ // Set a timeout on the user conneciton
+ {
+ struct timeval tv;
+ tv.tv_sec = CLIENT_TIMEOUT;
+ tv.tv_usec = 0;
+ if( setsockopt(client_socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) )
+ {
+ perror("setsockopt");
+ return ;
+ }
+ }
+
// Debug: Print the connection string
if(giDebugLevel >= 2) {
char ipstr[INET_ADDRSTRLEN];
// Debug: Print the connection string
if(giDebugLevel >= 2) {
char ipstr[INET_ADDRSTRLEN];
@@
-225,6
+238,7
@@
void Server_HandleClient(int Socket, int bTrusted)
* it is saved to the beginning of `inbuf` and `buf` is updated to
* the end of it.
*/
* it is saved to the beginning of `inbuf` and `buf` is updated to
* the end of it.
*/
+ // TODO: Use select() instead (to give a timeout)
while( (bytes = recv(Socket, buf, remspace, 0)) > 0 )
{
char *eol, *start;
while( (bytes = recv(Socket, buf, remspace, 0)) > 0 )
{
char *eol, *start;
@@
-342,7
+356,7
@@
void Server_Cmd_USER(tClient *Client, char *Args)
// Debug!
if( giDebugLevel )
// Debug!
if( giDebugLevel )
- Debug("Authenticating as '%s'", Args);
+ Debug(
Client,
"Authenticating as '%s'", Args);
// Save username
if(Client->Username)
// Save username
if(Client->Username)
@@
-403,7
+417,7
@@
void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
// Check if trusted
if( !Client->bIsTrusted ) {
if(giDebugLevel)
// Check if trusted
if( !Client->bIsTrusted ) {
if(giDebugLevel)
- Debug("Untrusted client attempting to AUTOAUTH");
+ Debug(
Client,
"Untrusted client attempting to AUTOAUTH");
sendf(Client->Socket, "401 Untrusted\n");
return ;
}
sendf(Client->Socket, "401 Untrusted\n");
return ;
}
@@
-412,7
+426,7
@@
void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
Client->UID = Bank_GetAcctByName( Args );
if( Client->UID < 0 ) {
if(giDebugLevel)
Client->UID = Bank_GetAcctByName( Args );
if( Client->UID < 0 ) {
if(giDebugLevel)
- Debug("Unknown user '%s'", Args);
+ Debug(
Client,
"Unknown user '%s'", Args);
sendf(Client->Socket, "401 Auth Failure\n");
return ;
}
sendf(Client->Socket, "401 Auth Failure\n");
return ;
}
@@
-427,7
+441,7
@@
void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
Client->bIsAuthed = 1;
if(giDebugLevel)
Client->bIsAuthed = 1;
if(giDebugLevel)
- Debug("Auto authenticated as '%s' (%i)", Args, Client->UID);
+ Debug(
Client,
"Auto authenticated as '%s' (%i)", Args, Client->UID);
sendf(Client->Socket, "200 Auth OK\n");
}
sendf(Client->Socket, "200 Auth OK\n");
}
@@
-1031,13
+1045,14
@@
void Server_Cmd_USERINFO(tClient *Client, char *Args)
space = strchr(user, ' ');
if(space) *space = '\0';
space = strchr(user, ' ');
if(space) *space = '\0';
- if( giDebugLevel )
- Debug(Client, "User Info '%s'", user);
+ if( giDebugLevel ) Debug(Client, "User Info '%s'", user);
// Get recipient
uid = Bank_GetAcctByName(user);
// Get recipient
uid = Bank_GetAcctByName(user);
+
+ if( giDebugLevel >= 2 ) Debug(Client, "uid = %i", uid);
if( uid == -1 ) {
if( uid == -1 ) {
- sendf(Client->Socket, "404 Invalid user");
+ sendf(Client->Socket, "404 Invalid user
\n
");
return ;
}
return ;
}
@@
-1160,9
+1175,10
@@
void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
void Debug(tClient *Client, const char *Format, ...)
{
va_list args;
void Debug(tClient *Client, const char *Format, ...)
{
va_list args;
- printf("%010lli [%i] ", time(NULL), Client->ID);
+ //printf("%010i [%i] ", (int)time(NULL), Client->ID);
+ printf("[%i] ", Client->ID);
va_start(args, Format);
va_start(args, Format);
- vprintf(
NULL, 0,
Format, args);
+ vprintf(Format, args);
va_end(args);
printf("\n");
}
va_end(args);
printf("\n");
}
UCC
git Repository :: git.ucc.asn.au