rename player -> user

diff --git a/src/channel.c b/src/channel.c
index c308dc4d403959ab02ce68bc22ce05c2d8573ba3..c3ddda8377ed939b211778e153b3094498643a70 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -254,7 +254,7 @@ void Chan_addChannel(channel_t *parent, channel_t *ch)
 }
 
 
-int Chan_playerLeave(client_t *client)
+int Chan_userLeave(client_t *client)
 {
        channel_t *leaving = NULL;
        int leaving_id = -1;
@@ -270,20 +270,20 @@ int Chan_playerLeave(client_t *client)
        return leaving_id;
 }
 
-int Chan_playerJoin(channel_t *ch, client_t *client)
+int Chan_userJoin(channel_t *ch, client_t *client)
 {
        int leaving_id;
        
-       Log_debug("Add player %s to channel %s", client->playerName, ch->name); 
+       Log_debug("Add user %s to channel %s", client->username, ch->name); 
 
        /* Only allowed in one channel at a time */
-       leaving_id = Chan_playerLeave(client);
+       leaving_id = Chan_userLeave(client);
        list_add_tail(&client->chan_node, &ch->clients);
        client->channel = (void *)ch;
        return leaving_id;
 }
 
-int Chan_playerJoin_id(int channelid, client_t *client)
+int Chan_userJoin_id(int channelid, client_t *client)
 {
        channel_t *ch_itr = NULL;
        do {
@@ -294,10 +294,10 @@ int Chan_playerJoin_id(int channelid, client_t *client)
                return -1;
        }
        else
-               return Chan_playerJoin(ch_itr, client); 
+               return Chan_userJoin(ch_itr, client);   
 }
 
-bool_t Chan_playerJoin_id_test(int channelid)
+bool_t Chan_userJoin_id_test(int channelid)
 {
        channel_t *ch_itr = NULL;
        do {

diff --git a/src/channel.h b/src/channel.h
index cd916c29ebe59925594ed3f948c31919020c3db8..c092c56b46c9b809ec87c8a3917075a02952af0c 100644 (file)
--- a/src/channel.h
+++ b/src/channel.h
@@ -55,10 +55,10 @@ void Chan_addChannel(channel_t *parent, channel_t *sub);
 void Chan_removeChannel(channel_t *c);
 void Chan_addClient(channel_t *c, client_t *client);
 void Chan_removeClient(channel_t *c, client_t *client);
-int Chan_playerJoin(channel_t *ch, client_t *client);
-int Chan_playerJoin_id(int channelid, client_t *client);
-int Chan_playerLeave(client_t *client);
-bool_t Chan_playerJoin_id_test(int channelid);
+int Chan_userJoin(channel_t *ch, client_t *client);
+int Chan_userJoin_id(int channelid, client_t *client);
+int Chan_userLeave(client_t *client);
+bool_t Chan_userJoin_id_test(int channelid);
 channel_t *Chan_iterate(channel_t **channelpptr);
 channel_t *Chan_iterate_siblings(channel_t *parent, channel_t **channelpptr);
 channel_t *Chan_createChannel(const char *name, const char *desc);

diff --git a/src/client.c b/src/client.c
index 95b30aa3f4e9f562a518e81abbe7678fcbd8ca0a..baf6247d6ad1f644c16bf9e16fa59cc0e76b9650 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -91,7 +91,7 @@ void Client_janitor()
        list_iterate(itr, &clients) {
                client_t *c;
                c = list_get_entry(itr, client_t, node);
-               Log_debug("Client %s BW available %d", c->playerName, c->availableBandwidth);
+               Log_debug("Client %s BW available %d", c->username, c->availableBandwidth);
                c->availableBandwidth += maxBandwidth;
                if (c->availableBandwidth > bwTop)
                        c->availableBandwidth = bwTop;
@@ -230,7 +230,7 @@ void Client_free(client_t *client)
 
        if (client->authenticated) {
                int leave_id;
-               leave_id = Chan_playerLeave(client);
+               leave_id = Chan_userLeave(client);
                if (leave_id > 0) { /* Remove temp channel */
                        sendmsg = Msg_create(ChannelRemove);
                        sendmsg->payload.channelRemove->channel_id = leave_id;
@@ -255,8 +255,8 @@ void Client_free(client_t *client)
                free(client->release);
        if (client->os)
                free(client->os);                       
-       if (client->playerName)
-               free(client->playerName);
+       if (client->username)
+               free(client->username);
        if (client->context)
                free(client->context);
        free(client);
@@ -501,7 +501,7 @@ int Client_send_message_except(client_t *client, message_t *msg)
                if (itr != client) {
                        if (count++ > 0)
                                Msg_inc_ref(msg); /* One extra reference for each new copy */
-                       Log_debug("Msg %d to %s refcount %d",  msg->messageType, itr->playerName, msg->refcount);
+                       Log_debug("Msg %d to %s refcount %d",  msg->messageType, itr->username, msg->refcount);
                        Client_send_message(itr, msg);
                }
        }

diff --git a/src/client.h b/src/client.h
index 82792e9924312f9edb17b0065d0dbdadc7b0a54a..9b1e030e3056ed71a30ddf8ed12bae75c65d3f81 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -69,7 +69,7 @@ typedef struct {
        uint32_t rxcount, msgsize, drainleft, txcount, txsize;
        int sessionId;
        uint64_t key;
-       char *playerName;
+       char *username;
        bool_t authenticated, deaf, mute;
        char *os, *release;
        uint32_t version;

diff --git a/src/log.c b/src/log.c
index 8990c03cd448adab31cc5c7edfba21d1564dc81d..94f86a822503dda3bd18ed0aaab3661ee1b65d46 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -115,7 +115,7 @@ void Log_info_client(client_t *client, const char *logstring, ...)
        va_end(argp);
        offset += snprintf(&buf[offset], STRSIZE - offset, " - [%d] %s@%s:%d",
                                           client->sessionId,
-                                          client->playerName == NULL ? "" : client->playerName,
+                                          client->username == NULL ? "" : client->username,
                                           inet_ntoa(client->remote_tcp.sin_addr),
                                           ntohs(client->remote_tcp.sin_port));
        strcat(buf, "\n");

diff --git a/src/messagehandler.c b/src/messagehandler.c
index 3901eb31fa1eae0161f342e05c3a7a19afa8fb31..8d188652308c158f89862bf5ae53553c668f051d 100644 (file)
--- a/src/messagehandler.c
+++ b/src/messagehandler.c
@@ -79,18 +79,6 @@ void Mh_handle_message(client_t *client, message_t *msg)
        }       
        switch (msg->messageType) {
        case Authenticate:
-               /*
-                * 1. Check stuff, Serverreject if not ok
-                * 2. Setup UDP encryption -> MessageCryptSetup
-                * 3. (Enter channel)
-                * 4. MessageChannelAdd + MessageChannelDescUpdate for all channels
-                * 5. (MessageChannelLink)
-                * 6. MessageServerJoin
-                * 7. MessagePlayerMove
-                * 8. MessageServerJoin for all connected users
-                * 9. PlayerDeaf/PlayerMute/PlayerSelfMuteDeaf for all users it applies to
-                * 10. MessageServerSync
-                */
                                
                Log_debug("Authenticate message received");
                Log_debug("Username: %s", msg->payload.authenticate->username);
@@ -101,7 +89,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                while (Client_iterate(&client_itr) != NULL) {
                        if (!IS_AUTH(client_itr))
                                continue;
-                       if (client_itr->playerName && strncmp(client_itr->playerName, msg->payload.authenticate->username, MAX_TEXT) == 0) {
+                       if (client_itr->username && strncmp(client_itr->username, msg->payload.authenticate->username, MAX_TEXT) == 0) {
                                char buf[64];
                                sprintf(buf, "Username already in use");
                                Log_debug("Username already in use");
@@ -135,7 +123,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                }
                
                /* Name & password */
-               client->playerName = strdup(msg->payload.authenticate->username);                               
+               client->username = strdup(msg->payload.authenticate->username);                         
                
                /* Setup UDP encryption */
                CryptState_init(&client->cryptState);
@@ -153,7 +141,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                Client_send_message(client, sendmsg);
 
                /* Channel stuff */
-               Chan_playerJoin(defaultChan, client); /* Join default channel */
+               Chan_userJoin(defaultChan, client); /* Join default channel */
 
                /* Codec version */
                if (msg->payload.authenticate->n_celt_versions > MAX_CODECS)
@@ -210,7 +198,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                sendmsg->payload.userState->session = client->sessionId;
                sendmsg->payload.userState->has_user_id = true;
                sendmsg->payload.userState->user_id = client->sessionId;
-               sendmsg->payload.userState->name = strdup(client->playerName);
+               sendmsg->payload.userState->name = strdup(client->username);
                sendmsg->payload.userState->has_channel_id = true;
                sendmsg->payload.userState->channel_id = ((channel_t *)client->channel)->id;
                
@@ -223,7 +211,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                        sendmsg = Msg_create(UserState);
                        sendmsg->payload.userState->has_session = true;
                        sendmsg->payload.userState->session = client_itr->sessionId;
-                       sendmsg->payload.userState->name = strdup(client_itr->playerName);
+                       sendmsg->payload.userState->name = strdup(client_itr->username);
                        sendmsg->payload.userState->has_channel_id = true;
                        sendmsg->payload.userState->channel_id = ((channel_t *)client_itr->channel)->id;
 
@@ -250,7 +238,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                sendmsg->payload.serverSync->allow_html = true; /* Support this? */
                Client_send_message(client, sendmsg);
                
-               Log_info_client(client, "User %s authenticated", client->playerName);
+               Log_info_client(client, "User %s authenticated", client->username);
                break;
                
        case Ping:
@@ -324,9 +312,9 @@ void Mh_handle_message(client_t *client, message_t *msg)
                }
                if (msg->payload.userState->has_channel_id) {
                        int leave_id;
-                       if (!Chan_playerJoin_id_test(msg->payload.userState->channel_id))
+                       if (!Chan_userJoin_id_test(msg->payload.userState->channel_id))
                                break;
-                       leave_id = Chan_playerJoin_id(msg->payload.userState->channel_id, client);
+                       leave_id = Chan_userJoin_id(msg->payload.userState->channel_id, client);
                        if (leave_id > 0) {
                                Log_debug("Removing channel ID %d", leave_id);
                                sendmsg = Msg_create(ChannelRemove);
@@ -530,7 +518,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                sendmsg->payload.userState->channel_id = newchan->id;
                Client_send_message_except(NULL, sendmsg);
                
-               leave_id = Chan_playerJoin(newchan, client);
+               leave_id = Chan_userJoin(newchan, client);
                if (leave_id > 0) {
                        Log_debug("Removing channel ID %d", leave_id);
                        sendmsg = Msg_create(ChannelRemove);