projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract function Client_find_by_fd().
[umurmur.git]
/
src
/
client.c
diff --git
a/src/client.c
b/src/client.c
index 579a1b66ed1f694223f4805cbd897e4cc99791ac..d61de2b00a0297adda0f300a2ed750395998bac4 100644
(file)
--- a/
src/client.c
+++ b/
src/client.c
@@
-54,6
+54,7
@@
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);
+static client_t *Client_find_by_fd(int fd);
void Client_free(client_t *client);
declare_list(clients);
void Client_free(client_t *client);
declare_list(clients);
@@
-224,8
+225,7
@@
void recheckCodecVersions(client_t *connectingClient)
}
}
if (!found) {
}
}
if (!found) {
- cd = Memory_safeMalloc(1, sizeof(codec_t));
- memset(cd, 0, sizeof(codec_t));
+ cd = Memory_safeCalloc(1, sizeof(codec_t));
init_list_entry(&cd->node);
cd->codec = codec_itr->codec;
cd->count = 1;
init_list_entry(&cd->node);
cd->codec = codec_itr->codec;
cd->count = 1;
@@
-400,16
+400,12
@@
void Client_free(client_t *client)
SSLi_free(client->ssl);
close(client->tcpfd);
clientcount--;
SSLi_free(client->ssl);
close(client->tcpfd);
clientcount--;
- if (client->release)
- free(client->release);
- if (client->os)
- free(client->os);
- if (client->os_version)
- free(client->os_version);
- if (client->username)
- free(client->username);
- if (client->context)
- free(client->context);
+
+ free(client->release);
+ free(client->os);
+ free(client->os_version);
+ free(client->username);
+ free(client->context);
free(client);
if (authenticatedLeft)
free(client);
if (authenticatedLeft)
@@
-431,17
+427,27
@@
void Client_disconnect_all()
}
}
}
}
-
int Client_read
_fd(int fd)
+
client_t *Client_find_by
_fd(int fd)
{
struct dlist *itr;
{
struct dlist *itr;
- client_t *client = NULL;
list_iterate(itr, &clients) {
list_iterate(itr, &clients) {
- if (fd == list_get_entry(itr, client_t, node)->tcpfd) {
- client = list_get_entry(itr, client_t, node);
- break;
+ client_t *client = list_get_entry(itr, client_t, node);
+
+ if (client->tcpfd == fd) {
+ return client;
}
}
}
}
+
+ return NULL;
+}
+
+int Client_read_fd(int fd)
+{
+ client_t *client;
+
+ client = Client_find_by_fd(fd);
+
if (client != NULL)
return Client_read(client);
else
if (client != NULL)
return Client_read(client);
else
@@
-543,15
+549,10
@@
int Client_read(client_t *client)
int Client_write_fd(int fd)
{
int Client_write_fd(int fd)
{
- struct dlist *itr;
- client_t *client = NULL;
+ client_t *client;
+
+ client = Client_find_by_fd(fd);
- list_iterate(itr, &clients) {
- if(fd == list_get_entry(itr, client_t, node)->tcpfd) {
- client = list_get_entry(itr, client_t, node);
- break;
- }
- }
if (client != NULL)
return Client_write(client);
else
if (client != NULL)
return Client_write(client);
else
@@
-684,22
+685,15
@@
void Client_textmessage(client_t *client, char *text)
int Client_send_message_except(client_t *client, message_t *msg)
{
client_t *itr = NULL;
int Client_send_message_except(client_t *client, message_t *msg)
{
client_t *itr = NULL;
- int count = 0;
- Msg_inc_ref(msg); /* Make sure a reference is held during the whole iteration. */
while (Client_iterate(&itr) != NULL) {
if (itr != client) {
while (Client_iterate(&itr) != NULL) {
if (itr != client) {
- if (count++ > 0)
- Msg_inc_ref(msg); /* One extra reference for each new copy */
+ Msg_inc_ref(msg); /* One extra reference for each new copy */
Log_debug("Msg %d to %s refcount %d", msg->messageType, itr->username, msg->refcount);
Client_send_message(itr, msg);
}
}
Log_debug("Msg %d to %s refcount %d", msg->messageType, itr->username, msg->refcount);
Client_send_message(itr, msg);
}
}
- Msg_free(msg); /* Free our reference to the message */
-
- if (count == 0)
- Msg_free(msg); /* If only 1 client is connected then no message is passed
- * to Client_send_message(). Free it here. */
+ Msg_free(msg); /* Consume caller's reference. */
return 0;
}
return 0;
}
@@
-707,22
+701,15
@@
int Client_send_message_except(client_t *client, message_t *msg)
int Client_send_message_except_ver(client_t *client, message_t *msg, uint32_t version)
{
client_t *itr = NULL;
int Client_send_message_except_ver(client_t *client, message_t *msg, uint32_t version)
{
client_t *itr = NULL;
- int count = 0;
- Msg_inc_ref(msg); /* Make sure a reference is held during the whole iteration. */
while (Client_iterate(&itr) != NULL) {
if (itr != client) {
while (Client_iterate(&itr) != NULL) {
if (itr != client) {
- if (count++ > 0)
- Msg_inc_ref(msg); /* One extra reference for each new copy */
+ Msg_inc_ref(msg); /* One extra reference for each new copy */
Log_debug("Msg %d to %s refcount %d", msg->messageType, itr->username, msg->refcount);
Client_send_message_ver(itr, msg, version);
}
}
Log_debug("Msg %d to %s refcount %d", msg->messageType, itr->username, msg->refcount);
Client_send_message_ver(itr, msg, version);
}
}
- Msg_free(msg); /* Free our reference to the message */
-
- if (count == 0)
- Msg_free(msg); /* If only 1 client is connected then no message is passed
- * to Client_send_message(). Free it here. */
+ Msg_free(msg); /* Consume caller's reference. */
return 0;
}
return 0;
}
@@
-896,7
+883,7
@@
int Client_voiceMsg(client_t *client, uint8_t *data, int len)
int offset, packetsize;
voicetarget_t *vt;
int offset, packetsize;
voicetarget_t *vt;
- channel_t *ch =
(channel_t *)
client->channel;
+ channel_t *ch = client->channel;
struct dlist *itr;
if (!client->authenticated || client->mute || client->self_mute || ch->silent)
struct dlist *itr;
if (!client->authenticated || client->mute || client->self_mute || ch->silent)