projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update version and package name
[umurmur.git]
/
src
/
client.c
diff --git
a/src/client.c
b/src/client.c
index 2294b3aa23c18ee546a7ca463a37eebce2abe3c2..58ffb2514294f3656f5567687a9e4b63fdad70f1 100644
(file)
--- a/
src/client.c
+++ b/
src/client.c
@@
-1,4
+1,4
@@
-/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
+/* Copyright (C) 20
09-20
10, Martin Johansson <martin@fatbob.nu>
Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
@@
-42,6
+42,8
@@
#include "version.h"
#include "voicetarget.h"
#include "version.h"
#include "voicetarget.h"
+extern char system_string[], version_string[];
+
static int Client_read(client_t *client);
static int Client_write(client_t *client);
static int Client_send_udp(client_t *client, uint8_t *data, int len);
static int Client_read(client_t *client);
static int Client_write(client_t *client);
static int Client_send_udp(client_t *client, uint8_t *data, int len);
@@
-97,7
+99,11
@@
void Client_janitor()
if (Timer_isElapsed(&c->lastActivity, 1000000LL * INACTICITY_TIMEOUT)) {
/* No activity from client - assume it is lost and close. */
if (Timer_isElapsed(&c->lastActivity, 1000000LL * INACTICITY_TIMEOUT)) {
/* No activity from client - assume it is lost and close. */
- Log_info("Session ID %d timeout - closing", c->sessionId);
+ Log_info("Timeout, closing session %d - %s@%s:%d",
+ c->sessionId,
+ c->playerName,
+ inet_ntoa(c->remote_tcp.sin_addr),
+ ntohs(c->remote_tcp.sin_port));
Client_free(c);
}
}
Client_free(c);
}
}
@@
-195,9
+201,8
@@
int Client_add(int fd, struct sockaddr_in *remote)
sendmsg->payload.version->has_version = true;
sendmsg->payload.version->version = PROTOCOL_VERSION;
sendmsg->payload.version->release = strdup(UMURMUR_VERSION);
sendmsg->payload.version->has_version = true;
sendmsg->payload.version->version = PROTOCOL_VERSION;
sendmsg->payload.version->release = strdup(UMURMUR_VERSION);
- /* XXX - set OS to something relevant? */
- /* sendmsg->payload.version->os = strdup("Linux/OpenWRT"); */
-
+ sendmsg->payload.version->os = strdup(system_string);
+ sendmsg->payload.version->os_version = strdup(version_string);
Client_send_message(newclient, sendmsg);
return 0;
Client_send_message(newclient, sendmsg);
return 0;
@@
-208,7
+213,9
@@
void Client_free(client_t *client)
struct dlist *itr, *save;
message_t *sendmsg;
struct dlist *itr, *save;
message_t *sendmsg;
- Log_info("Disconnect client ID %d addr %s port %d", client->sessionId,
+ Log_info("Disconnect session %d - %s@%s:%d",
+ client->sessionId,
+ client->playerName,
inet_ntoa(client->remote_tcp.sin_addr),
ntohs(client->remote_tcp.sin_port));
inet_ntoa(client->remote_tcp.sin_addr),
ntohs(client->remote_tcp.sin_port));
@@
-300,7
+307,7
@@
int Client_read(client_t *client)
do {
errno = 0;
if (!client->msgsize)
do {
errno = 0;
if (!client->msgsize)
- rc = SSL_read(client->ssl,
client->rxbuf
, 6 - client->rxcount);
+ rc = SSL_read(client->ssl,
&client->rxbuf[client->rxcount]
, 6 - client->rxcount);
else if (client->drainleft > 0)
rc = SSL_read(client->ssl, client->rxbuf, client->drainleft > BUFSIZE ? BUFSIZE : client->drainleft);
else
else if (client->drainleft > 0)
rc = SSL_read(client->ssl, client->rxbuf, client->drainleft > BUFSIZE ? BUFSIZE : client->drainleft);
else
@@
-312,8
+319,9
@@
int Client_read(client_t *client)
else {
client->rxcount += rc;
if (!client->msgsize && client->rxcount >= 6) {
else {
client->rxcount += rc;
if (!client->msgsize && client->rxcount >= 6) {
- uint32_t *msgLen = (uint32_t *) &client->rxbuf[2];
- client->msgsize = ntohl(*msgLen);
+ uint32_t msgLen;
+ memcpy(&msgLen, &client->rxbuf[2], sizeof(uint32_t));
+ client->msgsize = ntohl(msgLen);
}
if (client->msgsize > BUFSIZE - 6 && client->drainleft == 0) {
Log_warn("Too big message received (%d). Discarding.", client->msgsize);
}
if (client->msgsize > BUFSIZE - 6 && client->drainleft == 0) {
Log_warn("Too big message received (%d). Discarding.", client->msgsize);
@@
-346,7
+354,11
@@
int Client_read(client_t *client)
/* Hmm. This is where we end up when the client closes its connection.
* Kind of strange...
*/
/* Hmm. This is where we end up when the client closes its connection.
* Kind of strange...
*/
- Log_info("Connection closed by peer");
+ Log_info("Connection closed by peer. Session %d - %s@%s:%d",
+ client->sessionId,
+ client->playerName,
+ inet_ntoa(client->remote_tcp.sin_addr),
+ ntohs(client->remote_tcp.sin_port));
}
else {
Log_warn("SSL error: %d - Closing connection.", SSL_get_error(client->ssl, rc));
}
else {
Log_warn("SSL error: %d - Closing connection.", SSL_get_error(client->ssl, rc));
@@
-503,7
+515,12
@@
static bool_t checkDecrypt(client_t *client, const uint8_t *encrypted, uint8_t *
Timer_restart(&client->cryptState.tLastRequest);
sendmsg = Msg_create(CryptSetup);
Timer_restart(&client->cryptState.tLastRequest);
sendmsg = Msg_create(CryptSetup);
- Log_info("Requesting voice channel crypt resync");
+ Log_info("Requesting voice channel crypt resync. Session %d - %s@%s:%d",
+ client->sessionId,
+ client->playerName,
+ inet_ntoa(client->remote_tcp.sin_addr),
+ ntohs(client->remote_tcp.sin_port));
+
Client_send_message(client, sendmsg);
}
}
Client_send_message(client, sendmsg);
}
}
@@
-568,7
+585,11
@@
int Client_read_udp()
if (itr->remote_tcp.sin_addr.s_addr == from.sin_addr.s_addr) {
if (checkDecrypt(itr, encrypted, buffer, len)) {
itr->key = key;
if (itr->remote_tcp.sin_addr.s_addr == from.sin_addr.s_addr) {
if (checkDecrypt(itr, encrypted, buffer, len)) {
itr->key = key;
- Log_info("New UDP connection from %s port %d sessionId %d", inet_ntoa(from.sin_addr), ntohs(from.sin_port), itr->sessionId);
+ Log_info("New UDP connection from session %d - %s@%s:%d",
+ itr->sessionId,
+ itr->playerName,
+ inet_ntoa(from.sin_addr),
+ ntohs(from.sin_port));
memcpy(&itr->remote_udp, &from, sizeof(struct sockaddr_in));
break;
}
memcpy(&itr->remote_udp, &from, sizeof(struct sockaddr_in));
break;
}