New Adaptive BR algorithm, cleanups and fixes

8 files changed, 57 insertions, 45 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 4277f16a..4cd9e1d6 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -2239,7 +2239,7 @@ static void connection_status_cb(Messenger *m)
 }
 
 
-#ifdef LOGGING
+#ifdef TOX_LOGGER
 #define DUMPING_CLIENTS_FRIENDS_EVERY_N_SECONDS 60UL
 static time_t lastdump = 0;
 static char IDString[crypto_box_PUBLICKEYBYTES * 2 + 1];
@@ -2315,7 +2315,7 @@ void do_messenger(Messenger *m)
     do_friends(m);
     connection_status_cb(m);
 
-#ifdef LOGGING
+#ifdef TOX_LOGGER
 
     if (unix_time() > lastdump + DUMPING_CLIENTS_FRIENDS_EVERY_N_SECONDS) {
 
@@ -2414,7 +2414,7 @@ void do_messenger(Messenger *m)
         }
     }
 
-#endif /* LOGGING */
+#endif /* TOX_LOGGER */
 }
 
 /* new messenger format for load/save, more robust and forward compatible */
diff --git a/toxcore/assoc.c b/toxcore/assoc.c
index 44c4cc30..932adc76 100644
--- a/toxcore/assoc.c
+++ b/toxcore/assoc.c
@@ -878,9 +878,9 @@ void Assoc_self_client_id_changed(Assoc *assoc, const uint8_t *id)
     }
 }
 
-#ifdef LOGGING
+#ifdef TOX_LOGGER
 static char *idpart2str(uint8_t *id, size_t len);
-#endif /* LOGGING */
+#endif /* TOX_LOGGER */
 
 /* refresh buckets */
 void do_Assoc(Assoc *assoc, DHT *dht)
@@ -974,7 +974,7 @@ void kill_Assoc(Assoc *assoc)
     }
 }
 
-#ifdef LOGGING
+#ifdef TOX_LOGGER
 
 static char buffer[crypto_box_PUBLICKEYBYTES * 2 + 1];
 static char *idpart2str(uint8_t *id, size_t len)
@@ -1028,4 +1028,4 @@ void Assoc_status(const Assoc *assoc)
     }
 }
 
-#endif /* LOGGING */
+#endif /* TOX_LOGGER */
diff --git a/toxcore/assoc.h b/toxcore/assoc.h
index 1b4e1ff9..65a2745d 100644
--- a/toxcore/assoc.h
+++ b/toxcore/assoc.h
@@ -97,8 +97,8 @@ void do_Assoc(Assoc *assoc, DHT *dht);
 /* destroy */
 void kill_Assoc(Assoc *assoc);
 
-#ifdef LOGGING
+#ifdef TOX_LOGGER
 void Assoc_status(const Assoc *assoc);
-#endif /* LOGGING */
+#endif /* TOX_LOGGER */
 
 #endif /* !__ASSOC_H__ */
diff --git a/toxcore/logger.c b/toxcore/logger.c
index fc6a989a..f19f76b1 100644
--- a/toxcore/logger.c
+++ b/toxcore/logger.c
@@ -44,7 +44,7 @@
 #endif
 
 
-struct logger {
+struct Logger {
     FILE *log_file;
     LOG_LEVEL level;
     uint64_t start_time; /* Time when lib loaded */
@@ -87,7 +87,7 @@ char *strtime(char *dest, size_t max_len)
  */
 Logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id)
 {
-#ifndef LOGGING /* Disabled */
+#ifndef TOX_LOGGER /* Disabled */
     return NULL;
 #endif
 
@@ -96,7 +96,7 @@ Logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id)
     if (!retu)
         return NULL;
 
-    if ( pthread_mutex_init(retu->mutex, NULL) != 0 ) {
+    if (pthread_mutex_init(retu->mutex, NULL) != 0) {
         free(retu);
         return NULL;
     }
@@ -110,7 +110,7 @@ Logger *logger_new (const char *file_name, LOG_LEVEL level, const char *id)
 
     if (!(retu->tstr = calloc(16, sizeof (char))) ||
             !(retu->posstr = calloc(300, sizeof (char))) ||
-            !(retu->msg = calloc(4096, sizeof (char))) )
+            !(retu->msg = calloc(4096, sizeof (char))))
         goto FAILURE;
 
     if (id) {
@@ -147,7 +147,7 @@ FAILURE:
 
 void logger_kill(Logger *log)
 {
-#ifndef LOGGING /* Disabled */
+#ifndef TOX_LOGGER /* Disabled */
     return;
 #endif
 
@@ -160,7 +160,7 @@ void logger_kill(Logger *log)
     free(log->posstr);
     free(log->msg);
 
-    if (fclose(log->log_file) != 0 )
+    if (fclose(log->log_file) != 0)
         perror("Could not close log file");
 
     pthread_mutex_unlock(log->mutex);
@@ -177,7 +177,7 @@ void logger_kill_global(void)
 
 void logger_set_global(Logger *log)
 {
-#ifndef LOGGING /* Disabled */
+#ifndef TOX_LOGGER /* Disabled */
     return;
 #endif
 
@@ -186,7 +186,7 @@ void logger_set_global(Logger *log)
 
 Logger *logger_get_global(void)
 {
-#ifndef LOGGING /* Disabled */
+#ifndef TOX_LOGGER /* Disabled */
     return NULL;
 #endif
 
@@ -195,7 +195,7 @@ Logger *logger_get_global(void)
 
 void logger_write (Logger *log, LOG_LEVEL level, const char *file, int line, const char *format, ...)
 {
-#ifndef LOGGING /* Disabled */
+#ifndef TOX_LOGGER /* Disabled */
     return;
 #endif
 
diff --git a/toxcore/logger.h b/toxcore/logger.h
index 0513b32c..4d3e3b54 100644
--- a/toxcore/logger.h
+++ b/toxcore/logger.h
@@ -43,7 +43,7 @@ typedef enum {
     LOG_ERROR
 } LOG_LEVEL;
 
-typedef struct logger Logger;
+typedef struct Logger Logger;
 
 /**
  * Set 'level' as the lowest printable level. If id == NULL, random number is used.
@@ -66,21 +66,22 @@ void logger_write (Logger *log, LOG_LEVEL level, const char *file, int line, con
 
 
 /* To do some checks or similar only when logging, use this */
-#ifdef LOGGING
+#ifdef TOX_LOGGER
 #   define LOGGER_SCOPE(__SCOPE_DO__) do { __SCOPE_DO__ } while(0)
 #   define LOGGER_WRITE(log, level, format, ...) \
-            logger_write(log, level, __FILE__, __LINE__, format, ##__VA_ARGS__ )
+            logger_write(log, level, __FILE__, __LINE__, format, ##__VA_ARGS__)
 #else
+/* #   warning "Logging disabled" */
 #   define LOGGER_SCOPE(__SCOPE_DO__) do {} while(0)
 #   define LOGGER_WRITE(log, level, format, ...) do {} while(0)
-#endif /* LOGGING */
+#endif /* TOX_LOGGER */
 
 /* To log with an logger */
-#define LOGGER_TRACE_(log, format, ...) LOGGER_WRITE(log, LOG_TRACE, format, ##__VA_ARGS__ )
-#define LOGGER_DEBUG_(log, format, ...) LOGGER_WRITE(log, LOG_DEBUG, format, ##__VA_ARGS__ )
-#define LOGGER_INFO_(log, format, ...) LOGGER_WRITE(log, LOG_INFO, format, ##__VA_ARGS__ )
-#define LOGGER_WARNING_(log, format, ...) LOGGER_WRITE(log, LOG_WARNING, format, ##__VA_ARGS__ )
-#define LOGGER_ERROR_(log, format, ...) LOGGER_WRITE(log, LOG_ERROR, format, ##__VA_ARGS__ )
+#define LOGGER_TRACE_(log, format, ...) LOGGER_WRITE(log, LOG_TRACE, format, ##__VA_ARGS__)
+#define LOGGER_DEBUG_(log, format, ...) LOGGER_WRITE(log, LOG_DEBUG, format, ##__VA_ARGS__)
+#define LOGGER_INFO_(log, format, ...) LOGGER_WRITE(log, LOG_INFO, format, ##__VA_ARGS__)
+#define LOGGER_WARNING_(log, format, ...) LOGGER_WRITE(log, LOG_WARNING, format, ##__VA_ARGS__)
+#define LOGGER_ERROR_(log, format, ...) LOGGER_WRITE(log, LOG_ERROR, format, ##__VA_ARGS__)
 
 /* To log with the global logger */
 #define LOGGER_TRACE(format, ...) LOGGER_TRACE_(NULL, format, ##__VA_ARGS__)
diff --git a/toxcore/network.c b/toxcore/network.c
index 22ee4202..965e65f9 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -266,7 +266,7 @@ uint64_t current_time_monotonic(void)
 }
 
 /* In case no logging */
-#ifndef LOGGING
+#ifndef TOX_LOGGER
 #define loglogdata(__message__, __buffer__, __buflen__, __ip_port__, __res__)
 #else
 #define data_0(__buflen__, __buffer__) __buflen__ > 4 ? ntohl(*(uint32_t *)&__buffer__[1]) : 0
@@ -287,7 +287,7 @@ uint64_t current_time_monotonic(void)
                  __buffer__[0], __message__, (size_t)__res__, (!__res__ ? '!' : '>'), __buflen__, \
                  ip_ntoa(&((__ip_port__).ip)), ntohs((__ip_port__).port), 0, "OK", data_0(__buflen__, __buffer__), data_1(__buflen__, __buffer__));
 
-#endif /* LOGGING */
+#endif /* TOX_LOGGER */
 
 /* Basic network functions:
  * Function to send packet(data) of length length to ip_port.
@@ -615,9 +615,9 @@ Networking_Core *new_networking_ex(IP ip, uint16_t port_from, uint16_t port_to,
     }
 
     if (ip.family == AF_INET6) {
-#ifdef LOGGING
+#ifdef TOX_LOGGER
         int is_dualstack =
-#endif /* LOGGING */
+#endif /* TOX_LOGGER */
             set_socket_dualstack(temp->sock);
         LOGGER_DEBUG( "Dual-stack socket: %s",
                       is_dualstack ? "enabled" : "Failed to enable, won't be able to receive from/send to IPv4 addresses" );
@@ -628,9 +628,9 @@ Networking_Core *new_networking_ex(IP ip, uint16_t port_from, uint16_t port_to,
         mreq.ipv6mr_multiaddr.s6_addr[ 1] = 0x02;
         mreq.ipv6mr_multiaddr.s6_addr[15] = 0x01;
         mreq.ipv6mr_interface = 0;
-#ifdef LOGGING
+#ifdef TOX_LOGGER
         int res =
-#endif /* LOGGING */
+#endif /* TOX_LOGGER */
             setsockopt(temp->sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (char *)&mreq, sizeof(mreq));
 
         LOGGER_DEBUG(res < 0 ? "Failed to activate local multicast membership. (%u, %s)" :
diff --git a/toxcore/util.c b/toxcore/util.c
index 5865a172..81fa84c6 100644
--- a/toxcore/util.c
+++ b/toxcore/util.c
@@ -234,14 +234,6 @@ bool rb_read(RingBuffer *b, void **p)
     b->start = (b->start + 1) % b->size;
     return true;
 }
-void rb_clear(RingBuffer *b)
-{
-    while (!rb_empty(b)) {
-        void *p;
-        rb_read(b, &p);
-        free(p);
-    }
-}
 RingBuffer *rb_new(int size)
 {
     RingBuffer *buf = calloc(sizeof(RingBuffer), 1);
@@ -257,11 +249,28 @@ RingBuffer *rb_new(int size)
 
     return buf;
 }
-void rb_free(RingBuffer *b)
+void rb_kill(RingBuffer *b)
 {
     if (b) {
-        rb_clear(b);
         free(b->data);
         free(b);
     }
 }
+uint16_t rb_size(const RingBuffer* b)
+{ 
+    if (rb_empty(b))
+        return 0;
+    
+    return
+    b->end > b->start ?
+        b->end - b->start :
+        (b->size - b->start) + b->end;
+}
+uint16_t rb_data(const RingBuffer* b, void** dest)
+{
+    uint16_t i = 0;
+    for (; i < rb_size(b); i++)
+        dest[i] = b->data[(b->start + i) % b->size];
+    
+    return i;
+}
diff --git a/toxcore/util.h b/toxcore/util.h
index 7670a80f..7cf63178 100644
--- a/toxcore/util.h
+++ b/toxcore/util.h
@@ -64,7 +64,9 @@ bool rb_full(const RingBuffer *b);
 bool rb_empty(const RingBuffer *b);
 void* rb_write(RingBuffer* b, void* p);
 bool rb_read(RingBuffer* b, void** p);
-void rb_clear(RingBuffer *b);
 RingBuffer *rb_new(int size);
-void rb_free(RingBuffer *b);
+void rb_kill(RingBuffer *b);
+uint16_t rb_size(const RingBuffer *b);
+uint16_t rb_data(const RingBuffer* b, void** dest);
+
 #endif /* __UTIL_H__ */