From 46d18f60766f997d0ca37c5937f58c0c06477932 Mon Sep 17 00:00:00 2001 From: fatbob313 Date: Sat, 16 Jan 2010 22:00:10 +0000 Subject: [PATCH] Make logging more uniform. Fix copyright year --- src/Makefile | 2 +- src/channel.c | 2 +- src/channel.h | 2 +- src/client.c | 31 +++++++++++++++++++++++++------ src/client.h | 2 +- src/conf.c | 2 +- src/conf.h | 2 +- src/crypt.c | 2 +- src/crypt.h | 2 +- src/log.c | 2 +- src/log.h | 2 +- src/main.c | 2 +- src/messagehandler.c | 12 ++++++++++-- src/messagehandler.h | 2 +- src/messages.c | 2 +- src/messages.h | 2 +- src/pds.c | 2 +- src/pds.h | 2 +- src/server.c | 13 ++++++++----- src/server.h | 2 +- src/ssl.c | 2 +- src/ssl.h | 2 +- src/timer.c | 2 +- src/timer.h | 2 +- src/voicetarget.c | 4 ++-- src/voicetarget.h | 4 ++-- 26 files changed, 68 insertions(+), 38 deletions(-) diff --git a/src/Makefile b/src/Makefile index f3856d9..95b8ed1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,7 +2,7 @@ SRCS:=client.c main.c messages.c pds.c server.c ssl.c log.c conf.c crypt.c \ timer.c messagehandler.c channel.c Mumble.pb-c.c voicetarget.c OBJS:=$(patsubst %.c, %.o, $(SRCS)) -#CFLAGS:=$(CFLAGS) -I. -I/data/export/proj/openssl/include/ -Wall -g -DDEBUG +CFLAGS:=$(CFLAGS) -I. -I/data/export/proj/openssl/include/ -Wall -g -DDEBUG #LDFLAGS:=$(LDFLAGS) -L/data/export/proj/openssl/lib/ -lcrypto -lssl -lconfig CFLAGS:=$(CFLAGS) -I. -Wall -g LDFLAGS:=$(LDFLAGS) -lcrypto -lssl -lconfig diff --git a/src/channel.c b/src/channel.c index 5476b1d..1c0b160 100644 --- a/src/channel.c +++ b/src/channel.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/channel.h b/src/channel.h index c889661..d63d532 100644 --- a/src/channel.h +++ b/src/channel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/client.c b/src/client.c index cb7452e..26daca8 100644 --- a/src/client.c +++ b/src/client.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. @@ -97,7 +97,11 @@ void Client_janitor() 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); } } @@ -208,7 +212,9 @@ void Client_free(client_t *client) 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)); @@ -347,7 +353,11 @@ int Client_read(client_t *client) /* 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)); @@ -504,7 +514,12 @@ static bool_t checkDecrypt(client_t *client, const uint8_t *encrypted, uint8_t * 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); } } @@ -569,7 +584,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; - 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; } diff --git a/src/client.h b/src/client.h index 1239e55..82792e9 100644 --- a/src/client.h +++ b/src/client.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/conf.c b/src/conf.c index 3068cd7..ae91b6e 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/conf.h b/src/conf.h index 5b08c39..c0a0825 100644 --- a/src/conf.h +++ b/src/conf.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/crypt.c b/src/crypt.c index 7d370d0..e69d34e 100644 --- a/src/crypt.c +++ b/src/crypt.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/crypt.h b/src/crypt.h index 0b35ac3..8e95fe2 100644 --- a/src/crypt.h +++ b/src/crypt.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/log.c b/src/log.c index 9eb5981..f4a0ea1 100644 --- a/src/log.c +++ b/src/log.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/log.h b/src/log.h index dd32342..c724158 100644 --- a/src/log.h +++ b/src/log.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/main.c b/src/main.c index d6342f1..6d48f6e 100644 --- a/src/main.c +++ b/src/main.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/messagehandler.c b/src/messagehandler.c index 089aec0..ceff99b 100644 --- a/src/messagehandler.c +++ b/src/messagehandler.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. @@ -51,6 +51,14 @@ static void sendServerReject(client_t *client, const char *reason, MumbleProto__ msg->payload.reject->type = type; msg->payload.reject->has_type = true; Client_send_message(client, msg); + + Log_info("Server reject reason: %s. Disconnecting session %d - %s@%s:%d", + reason, + client->sessionId, + client->playerName, + inet_ntoa(client->remote_tcp.sin_addr), + ntohs(client->remote_tcp.sin_port)); + } static void sendPermissionDenied(client_t *client, const char *reason) @@ -217,7 +225,7 @@ void Mh_handle_message(client_t *client, message_t *msg) sendmsg->payload.userState->has_channel_id = true; sendmsg->payload.userState->channel_id = ((channel_t *)client_itr->channel)->id; - /* XXX - check if self_* is correct */ + /* Only self_mute/deaf supported */ if (client_itr->deaf) { sendmsg->payload.userState->has_self_deaf = true; sendmsg->payload.userState->self_deaf = true; diff --git a/src/messagehandler.h b/src/messagehandler.h index ad11a59..727a2ec 100644 --- a/src/messagehandler.h +++ b/src/messagehandler.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/messages.c b/src/messages.c index b290257..b1e76f9 100644 --- a/src/messages.c +++ b/src/messages.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/messages.h b/src/messages.h index c163c62..4899a08 100644 --- a/src/messages.h +++ b/src/messages.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/pds.c b/src/pds.c index 3a57954..0563c53 100644 --- a/src/pds.c +++ b/src/pds.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/pds.h b/src/pds.h index d3f1274..8bb05ab 100644 --- a/src/pds.h +++ b/src/pds.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/server.c b/src/server.c index ff20f81..05bcba5 100644 --- a/src/server.c +++ b/src/server.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. @@ -44,12 +44,14 @@ #include "conf.h" #include "log.h" #include "timer.h" +#include "version.h" #define LISTEN_SOCK 0 #define TCP_SOCK 0 #define UDP_SOCK 1 -int udpsock; /* XXX restructure! */ +/* globals */ +int udpsock; bool_t shutdown_server; void Server_run() @@ -109,7 +111,8 @@ void Server_run() Timer_init(&janitorTimer); - Log_info("uMurmur voicechat server started -- http://code.google.com/p/umurmur/"); + Log_info("uMurmur version %s protocol version %d.%d.%d -- http://code.google.com/p/umurmur/", + UMURMUR_VERSION, PROTVER_MAJOR, PROTVER_MINOR, PROTVER_PATCH); /* Main server loop */ while (!shutdown_server) { @@ -146,8 +149,8 @@ void Server_run() tcpfd = accept(pollfds[LISTEN_SOCK].fd, (struct sockaddr*)&remote, &addrlen); fcntl(tcpfd, F_SETFL, O_NONBLOCK); setsockopt(tcpfd, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(int)); - Log_info("Connection from %s port %d\n", inet_ntoa(remote.sin_addr), - ntohs(remote.sin_port)); + Log_debug("Connection from %s port %d\n", inet_ntoa(remote.sin_addr), + ntohs(remote.sin_port)); Client_add(tcpfd, &remote); } diff --git a/src/server.h b/src/server.h index 9fd01b8..5eb1377 100644 --- a/src/server.h +++ b/src/server.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/ssl.c b/src/ssl.c index 1ef4892..a4c860f 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/ssl.h b/src/ssl.h index 4b8ac33..2c47f83 100644 --- a/src/ssl.h +++ b/src/ssl.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/timer.c b/src/timer.c index 53a63c9..8889109 100644 --- a/src/timer.c +++ b/src/timer.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/timer.h b/src/timer.h index e066937..b19c7d8 100644 --- a/src/timer.h +++ b/src/timer.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010, Martin Johansson +/* Copyright (C) 2009-2010, Martin Johansson Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/voicetarget.c b/src/voicetarget.c index 3a8e0fd..935139f 100644 --- a/src/voicetarget.c +++ b/src/voicetarget.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2009-2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. diff --git a/src/voicetarget.h b/src/voicetarget.h index fa8af04..0d2f051 100644 --- a/src/voicetarget.h +++ b/src/voicetarget.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009, Martin Johansson - Copyright (C) 2005-2009, Thorvald Natvig +/* Copyright (C) 2009-2010, Martin Johansson + Copyright (C) 2005-2010, Thorvald Natvig All rights reserved. -- 2.30.2