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
Fixing coke handler and login (a nice cleanup)
[tpg/opendispense2.git]
/
src
/
server
/
server.c
diff --git
a/src/server/server.c
b/src/server/server.c
index
5d375ee
..
e0fcafa
100644
(file)
--- a/
src/server/server.c
+++ b/
src/server/server.c
@@
-16,11
+16,15
@@
#include <unistd.h>
#include <string.h>
#include <unistd.h>
#include <string.h>
+// HACKS
+#define HACK_TPG_NOAUTH 1
+
+// Statistics
#define MAX_CONNECTION_QUEUE 5
#define INPUT_BUFFER_SIZE 256
#define MAX_CONNECTION_QUEUE 5
#define INPUT_BUFFER_SIZE 256
-#define HASH_TYPE SHA
512
-#define HASH_LENGTH
64
+#define HASH_TYPE SHA
1
+#define HASH_LENGTH
20
#define MSG_STR_TOO_LONG "499 Command too long (limit "EXPSTR(INPUT_BUFFER_SIZE)")\n"
#define MSG_STR_TOO_LONG "499 Command too long (limit "EXPSTR(INPUT_BUFFER_SIZE)")\n"
@@
-40,6
+44,7
@@
typedef struct sClient
// === PROTOTYPES ===
void Server_Start(void);
// === PROTOTYPES ===
void Server_Start(void);
+void Server_Cleanup(void);
void Server_HandleClient(int Socket, int bTrusted);
char *Server_ParseClientCommand(tClient *Client, char *CommandString);
// --- Commands ---
void Server_HandleClient(int Socket, int bTrusted);
char *Server_ParseClientCommand(tClient *Client, char *CommandString);
// --- Commands ---
@@
-69,6
+74,7
@@
struct sClientCommand {
{"DISPENSE", Server_Cmd_DISPENSE}
};
#define NUM_COMMANDS (sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0]))
{"DISPENSE", Server_Cmd_DISPENSE}
};
#define NUM_COMMANDS (sizeof(gaServer_Commands)/sizeof(gaServer_Commands[0]))
+ int giServer_Socket;
// === CODE ===
/**
// === CODE ===
/**
@@
-76,12
+82,14
@@
struct sClientCommand {
*/
void Server_Start(void)
{
*/
void Server_Start(void)
{
- int
server_socket,
client_socket;
+ int client_socket;
struct sockaddr_in server_addr, client_addr;
struct sockaddr_in server_addr, client_addr;
+ atexit(Server_Cleanup);
+
// Create Server
// Create Server
-
server_s
ocket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if(
server_s
ocket < 0 ) {
+
giServer_S
ocket = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if(
giServer_S
ocket < 0 ) {
fprintf(stderr, "ERROR: Unable to create server socket\n");
return ;
}
fprintf(stderr, "ERROR: Unable to create server socket\n");
return ;
}
@@
-93,14
+101,16
@@
void Server_Start(void)
server_addr.sin_port = htons(giServer_Port); // Port
// Bind
server_addr.sin_port = htons(giServer_Port); // Port
// Bind
- if( bind(
server_s
ocket, (struct sockaddr *) &server_addr, sizeof(server_addr)) < 0 ) {
+ if( bind(
giServer_S
ocket, (struct sockaddr *) &server_addr, sizeof(server_addr)) < 0 ) {
fprintf(stderr, "ERROR: Unable to bind to 0.0.0.0:%i\n", giServer_Port);
fprintf(stderr, "ERROR: Unable to bind to 0.0.0.0:%i\n", giServer_Port);
+ perror("Binding");
return ;
}
// Listen
return ;
}
// Listen
- if( listen(
server_s
ocket, MAX_CONNECTION_QUEUE) < 0 ) {
+ if( listen(
giServer_S
ocket, MAX_CONNECTION_QUEUE) < 0 ) {
fprintf(stderr, "ERROR: Unable to listen to socket\n");
fprintf(stderr, "ERROR: Unable to listen to socket\n");
+ perror("Listen");
return ;
}
return ;
}
@@
-111,7
+121,7
@@
void Server_Start(void)
uint len = sizeof(client_addr);
int bTrusted = 0;
uint len = sizeof(client_addr);
int bTrusted = 0;
- client_socket = accept(
server_s
ocket, (struct sockaddr *) &client_addr, &len);
+ client_socket = accept(
giServer_S
ocket, (struct sockaddr *) &client_addr, &len);
if(client_socket < 0) {
fprintf(stderr, "ERROR: Unable to accept client connection\n");
return ;
if(client_socket < 0) {
fprintf(stderr, "ERROR: Unable to accept client connection\n");
return ;
@@
-148,6
+158,12
@@
void Server_Start(void)
}
}
}
}
+void Server_Cleanup(void)
+{
+ printf("Close(%i)\n", giServer_Socket);
+ close(giServer_Socket);
+}
+
/**
* \brief Reads from a client socket and parses the command strings
* \param Socket Client socket number/handle
/**
* \brief Reads from a client socket and parses the command strings
* \param Socket Client socket number/handle
UCC
git Repository :: git.ucc.asn.au