1 files changed, 18 insertions, 17 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index e0ef5a28..bec3a250 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1700,7 +1700,7 @@ int m_msi_packet(Messenger *m, int32_t friendnumber, uint8_t *data, uint16_t len
     return write_cryptpacket_id(m, friendnumber, PACKET_ID_MSI, data, length);
 }
 
-static int handle_custom_user_packet(void *object, int friend_num, uint8_t *packet, uint16_t length)
+static int handle_custom_lossy_packet(void *object, int friend_num, uint8_t *packet, uint16_t length)
 {
     Messenger *m = object;
 
@@ -1715,8 +1715,8 @@ static int handle_custom_user_packet(void *object, int friend_num, uint8_t *pack
 }
 
 
-int custom_user_packet_registerhandler(Messenger *m, int32_t friendnumber, uint8_t byte,
-                                       int (*packet_handler_callback)(void *object, uint8_t *data, uint32_t len), void *object)
+int custom_lossy_packet_registerhandler(Messenger *m, int32_t friendnumber, uint8_t byte,
+                                        int (*packet_handler_callback)(void *object, uint8_t *data, uint32_t len), void *object)
 {
     if (friend_not_valid(m, friendnumber))
         return -1;
@@ -1732,7 +1732,7 @@ int custom_user_packet_registerhandler(Messenger *m, int32_t friendnumber, uint8
     return 0;
 }
 
-int send_custom_user_packet(Messenger *m, int32_t friendnumber, uint8_t *data, uint32_t length)
+int send_custom_lossy_packet(Messenger *m, int32_t friendnumber, uint8_t *data, uint32_t length)
 {
     if (friend_not_valid(m, friendnumber))
         return -1;
@@ -1782,7 +1782,7 @@ static int handle_new_connections(void *object, New_Connection *n_c)
         int id = accept_crypto_connection(m->net_crypto, n_c);
         connection_status_handler(m->net_crypto, id, &handle_status, m, friend_id);
         connection_data_handler(m->net_crypto, id, &handle_packet, m, friend_id);
-        connection_lossy_data_handler(m->net_crypto, id, &handle_custom_user_packet, m, friend_id);
+        connection_lossy_data_handler(m->net_crypto, id, &handle_custom_lossy_packet, m, friend_id);
         m->friendlist[friend_id].crypt_connection_id = id;
         set_friend_status(m, friend_id, FRIEND_CONFIRMED);
         return 0;
@@ -2208,7 +2208,7 @@ static int friend_new_connection(Messenger *m, int32_t friendnumber, uint8_t *re
     m->friendlist[friendnumber].crypt_connection_id = id;
     connection_status_handler(m->net_crypto, id, &handle_status, m, friendnumber);
     connection_data_handler(m->net_crypto, id, &handle_packet, m, friendnumber);
-    connection_lossy_data_handler(m->net_crypto, id, &handle_custom_user_packet, m, friendnumber);
+    connection_lossy_data_handler(m->net_crypto, id, &handle_custom_lossy_packet, m, friendnumber);
     return 0;
 }
 
@@ -2229,7 +2229,7 @@ void do_friends(Messenger *m)
                 m->friendlist[i].friendrequest_lastsent = temp_time;
             }
         }
-        
+
         if (m->friendlist[i].status == FRIEND_REQUESTED
                 || m->friendlist[i].status == FRIEND_CONFIRMED) { /* friend is not online. */
             if (m->friendlist[i].status == FRIEND_REQUESTED) {
@@ -2341,7 +2341,7 @@ void do_messenger(Messenger *m)
 #ifdef LOGGING
 
     if (unix_time() > lastdump + DUMPING_CLIENTS_FRIENDS_EVERY_N_SECONDS) {
-        
+
 #ifdef ENABLE_ASSOC_DHT
         Assoc_status(m->dht->assoc);
 #endif
@@ -2371,11 +2371,11 @@ void do_messenger(Messenger *m)
                         last_pinged = 999;
 
                     LOGGER_INFO("C[%2u] %s:%u [%3u] %s",
-                                 client, ip_ntoa(&assoc->ip_port.ip), ntohs(assoc->ip_port.port),
-                                 last_pinged, ID2String(cptr->client_id));
+                                client, ip_ntoa(&assoc->ip_port.ip), ntohs(assoc->ip_port.port),
+                                last_pinged, ID2String(cptr->client_id));
                 }
         }
-        
+
 
         uint32_t friend, dhtfriend;
 
@@ -2425,8 +2425,8 @@ void do_messenger(Messenger *m)
                     ping_lastrecv = 999;
 
                 LOGGER_INFO("F[%2u:%2u] <%s> %02i [%03u] %s",
-                             dht2m[friend], friend, msgfptr->name, msgfptr->crypt_connection_id,
-                             ping_lastrecv, ID2String(msgfptr->client_id));
+                            dht2m[friend], friend, msgfptr->name, msgfptr->crypt_connection_id,
+                            ping_lastrecv, ID2String(msgfptr->client_id));
             } else {
                 LOGGER_INFO("F[--:%2u] %s", friend, ID2String(dhtfptr->client_id));
             }
@@ -2442,15 +2442,16 @@ void do_messenger(Messenger *m)
 
                         if (last_pinged > 999)
                             last_pinged = 999;
-                        
+
                         LOGGER_INFO("F[%2u] => C[%2u] %s:%u [%3u] %s",
-                                     friend, client, ip_ntoa(&assoc->ip_port.ip),
-                                     ntohs(assoc->ip_port.port), last_pinged,
-                                     ID2String(cptr->client_id));
+                                    friend, client, ip_ntoa(&assoc->ip_port.ip),
+                                    ntohs(assoc->ip_port.port), last_pinged,
+                                    ID2String(cptr->client_id));
                     }
             }
         }
     }
+
 #endif /* LOGGING */
 }