Fix static build script

Due to recent core changes we now need to store a peer's
previous name instead of relying on API lookups via the
peer_id in the name change callback in order to display
the correct info

doc/toxic.conf.5

@@ -2,12 +2,12 @@
 .\"     Title: toxic.conf
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 2021-05-24
+.\"      Date: 2020-11-12
 .\"    Manual: Toxic Manual
 .\"    Source: toxic __VERSION__
 .\"  Language: English
 .\"
-.TH "TOXIC\&.CONF" "5" "2021\-05\-24" "toxic __VERSION__" "Toxic Manual"
+.TH "TOXIC\&.CONF" "5" "2020\-11\-12" "toxic __VERSION__" "Toxic Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -138,6 +138,11 @@ Show welcome message on startup\&. true or false
 Enable friend connection change notifications\&. true or false
 .RE
 .PP
+\fBshow_group_connection_msg\fR
+.RS 4
+Enable group connection change notifications (does not include quit messages)\&. true or false
+.RE
+.PP
 \fBnodelist_update_freq\fR
 .RS 4
 How often in days to update the DHT nodes list\&. (integer; 0 to disable)

doc/toxic.conf.5.asc

@@ -87,6 +87,9 @@ OPTIONS
     *show_connection_msg*;;
         Enable friend connection change notifications. true or false
 
+    *show_group_connection_msg*;;
+        Enable group connection change notifications (does not include quit messages). true or false
+
     *nodelist_update_freq*;;
         How often in days to update the DHT nodes list. (integer; 0 to disable)
 

misc/toxic.conf.example

@@ -56,6 +56,9 @@ ui = {
   // true to show friend connection change messages on the home screen
   show_connection_msg=true;
 
+  // true to show peer connection change messages in groups (setting to false does not include user quit messages)
+  show_group_connection_msg=true;
+
   // How often in days to update the DHT nodes list. (0 to disable updates)
   nodeslist_update_freq=7;
 

script/build-minimal-static-toxic.sh

@@ -114,7 +114,6 @@ apk add \
     libsodium-dev \
     libsodium-static \
     linux-headers \
-    msgpack-c-dev \
     ncurses-dev \
     ncurses-static \
     ncurses-terminfo \
@@ -137,20 +136,27 @@ mkdir -p "$BUILD_DIR"
 cd "$BUILD_DIR"
 
 # The git hash of the c-toxcore version we're using
-TOXCORE_VERSION="v0.2.16"
+TOXCORE_VERSION="02996f06850fb565fa5520cb4e1daa8c616b41c1"
 
-# The sha256sum of the c-toxcore tarball for TOXCORE_VERSION
-TOXCORE_HASH="653aa42654b607f0940cecfac873e9ce55605119a90d1dc454d1090ff6ca29c0"
+TOXCORE_FILENAME="toxcore-$TOXCORE_VERSION.tar.gz"
 
-TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz"
-
-wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/TokTok/c-toxcore/archive/$TOXCORE_VERSION.tar.gz"
-check_sha256 "$TOXCORE_HASH" "$TOXCORE_FILENAME"
+wget --timeout=10 -O "$TOXCORE_FILENAME" "https://github.com/JFreegman/toxcore/archive/$TOXCORE_VERSION.tar.gz"
 tar -o -xf "$TOXCORE_FILENAME"
 rm "$TOXCORE_FILENAME"
-cd c-toxcore*
+
+cd toxcore*
+mkdir -p "third_party" && cd "third_party"
+
+CMP_VERSION="074e0df43e8a61ea938c4f77f65d1fbccc0c3bf9"
+CMP_FILENAME="cmp-$CMP_VERSION.tar.gz"
+wget --timeout=10 -O "$CMP_FILENAME" "https://github.com/TokTok/cmp/archive/$CMP_VERSION.tar.gz"
+tar -o -xf "$CMP_FILENAME"
+
+mv cmp\-*/* "cmp/"
+cd ..
 
 cmake -B_build -H. \
+      -DUSE_TEST_NETWORK=ON \
       -DENABLE_STATIC=ON \
       -DENABLE_SHARED=OFF \
       -DCMAKE_BUILD_TYPE=Release \

src/bootstrap.c

@@ -593,14 +593,15 @@ int load_DHT_nodeslist(void)
     memcpy(node->ip4, TESTNET_IP, sizeof(TESTNET_IP));
 
     struct Node *node2 = &Nodes.list[1];
-    node2->have_ip6 = true;
+    node2->have_ip4 = true;
     node2->port = TESTNET_PORT2;
     memcpy(node2->key, TESTNET_KEY2, sizeof(TESTNET_KEY2));
-    memcpy(node2->ip6, TESTNET_IP2, sizeof(TESTNET_IP2));
+    memcpy(node2->ip4, TESTNET_IP2, sizeof(TESTNET_IP2));
 
     Nodes.count = 2;
 
 #if 0
+
     if (thread_data.active) {
         return -1;
     }
@@ -623,6 +624,7 @@ int load_DHT_nodeslist(void)
         thread_data.active = false;
         return -5;
     }
+
 #endif
 
     return 0;

src/chat.c

@@ -134,7 +134,7 @@ static void set_self_typingstatus(ToxWindow *self, Tox *m, bool is_typing)
 
     ChatContext *ctx = self->chatwin;
 
-    TOX_ERR_SET_TYPING err;
+    Tox_Err_Set_Typing err;
     tox_self_set_typing(m, self->num, is_typing, &err);
 
     if (err != TOX_ERR_SET_TYPING_OK) {

src/game_base.c

@@ -1129,7 +1129,7 @@ int game_packet_send(const GameData *game, const uint8_t *data, size_t length, G
     memcpy(packet + 1 + GAME_PACKET_HEADER_SIZE, data, length);
     packet_length += length;
 
-    TOX_ERR_FRIEND_CUSTOM_PACKET err;
+    Tox_Err_Friend_Custom_Packet err;
 
     if (!tox_friend_send_lossless_packet(game->tox, game->friend_number, packet, packet_length, &err)) {
         fprintf(stderr, "failed to send game packet: error %d\n", err);

src/groupchat_commands.c

@@ -90,20 +90,20 @@ void cmd_ignore(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[
         return;
     }
 
-    Tox_Err_Group_Toggle_Ignore err;
-    tox_group_toggle_ignore(m, self->num, peer_id, true, &err);
+    Tox_Err_Group_Set_Ignore err;
+    tox_group_set_ignore(m, self->num, peer_id, true, &err);
 
     switch (err) {
-        case TOX_ERR_GROUP_TOGGLE_IGNORE_OK: {
+        case TOX_ERR_GROUP_SET_IGNORE_OK: {
             break;
         }
 
-        case TOX_ERR_GROUP_TOGGLE_IGNORE_SELF: {
+        case TOX_ERR_GROUP_SET_IGNORE_SELF: {
             line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You cannot ignore yourself.");
             return;
         }
 
-        case TOX_ERR_GROUP_TOGGLE_IGNORE_PEER_NOT_FOUND: {
+        case TOX_ERR_GROUP_SET_IGNORE_PEER_NOT_FOUND: {
             line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "The specified nick or public key is invalid.");
             return;
         }
@@ -791,20 +791,20 @@ void cmd_unignore(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
         return;
     }
 
-    Tox_Err_Group_Toggle_Ignore err;
-    tox_group_toggle_ignore(m, self->num, peer_id, false, &err);
+    Tox_Err_Group_Set_Ignore err;
+    tox_group_set_ignore(m, self->num, peer_id, false, &err);
 
     switch (err) {
-        case TOX_ERR_GROUP_TOGGLE_IGNORE_OK: {
+        case TOX_ERR_GROUP_SET_IGNORE_OK: {
             break;
         }
 
-        case TOX_ERR_GROUP_TOGGLE_IGNORE_SELF: {
+        case TOX_ERR_GROUP_SET_IGNORE_SELF: {
             line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "You cannot unignore yourself.");
             return;
         }
 
-        case TOX_ERR_GROUP_TOGGLE_IGNORE_PEER_NOT_FOUND: {
+        case TOX_ERR_GROUP_SET_IGNORE_PEER_NOT_FOUND: {
             line_info_add(self, false, NULL, NULL, SYS_MSG, 0, 0, "The specified nick or public key is invalid.");
             return;
         }

src/groupchats.c

@@ -68,7 +68,7 @@ static int max_groupchat_index = 0;
 extern struct user_settings *user_settings;
 extern struct Winthread Winthread;
 
-#define GROUP_SIDEBAR_OFFSET 2    /* Offset for the peer number box at the top of the statusbar */
+#define GROUP_SIDEBAR_OFFSET 3    /* Offset for the peer number box at the top of the statusbar */
 
 /* groupchat command names used for tab completion. */
 static const char *group_cmd_list[] = {
@@ -991,7 +991,9 @@ static void groupchat_onGroupPeerJoin(ToxWindow *self, Tox *m, uint32_t groupnum
             ++chat->max_idx;
         }
 
-        if (timed_out(chat->time_connected, 7)) {   /* ignore join messages when we first connect to the group */
+        if (timed_out(chat->time_connected, 60)
+                && user_settings->show_group_connection_msg ==
+                SHOW_GROUP_CONNECTION_MSG_ON) {   /* ignore join messages when we first connect to the group */
             line_info_add(self, true, peer->name, NULL, CONNECTION, 0, GREEN, "has joined the room");
 
             write_to_log("has joined the room", peer->name, self->chatwin->log, true);
@@ -1027,14 +1029,16 @@ void groupchat_onGroupPeerExit(ToxWindow *self, Tox *m, uint32_t groupnumber, ui
         if (length > 0) {
             line_info_add(self, true, name, NULL, DISCONNECTION, 0, RED, "[Quit]: %s", part_message);
             snprintf(log_str, sizeof(log_str), "has left the room (%s)", part_message);
-        } else {
+            write_to_log(log_str, name, self->chatwin->log, true);
+            sound_notify(self, silent, NT_WNDALERT_2, NULL);
+        } else if (user_settings->show_group_connection_msg == SHOW_GROUP_CONNECTION_MSG_ON) {
             const char *exit_string = get_group_exit_string(exit_type);
             line_info_add(self, true, name, NULL, DISCONNECTION, 0, RED, "[%s]", exit_string);
             snprintf(log_str, sizeof(log_str), "[%s]", exit_string);
+            write_to_log(log_str, name, self->chatwin->log, true);
+            sound_notify(self, silent, NT_WNDALERT_2, NULL);
         }
 
-        write_to_log(log_str, name, self->chatwin->log, true);
-        sound_notify(self, silent, NT_WNDALERT_2, NULL);
     }
 
     int peer_index = get_peer_index(groupnumber, peer_id);
@@ -1372,7 +1376,7 @@ static void send_group_message(ToxWindow *self, Tox *m, uint32_t groupnumber, co
 
     Tox_Err_Group_Send_Message err;
 
-    if (!tox_group_send_message(m, groupnumber, type, (uint8_t *) msg, strlen(msg), &err)) {
+    if (!tox_group_send_message(m, groupnumber, type, (uint8_t *) msg, strlen(msg), NULL, &err)) {
         if (err == TOX_ERR_GROUP_SEND_MESSAGE_PERMISSIONS) {
             const Tox_Group_Role role = tox_group_self_get_role(m, groupnumber, NULL);
 
@@ -1669,14 +1673,15 @@ static void groupchat_onDraw(ToxWindow *self, Tox *m)
         mvwhline(ctx->sidebar, 1, 1, ACS_HLINE, SIDEBAR_WIDTH - 1);
         wattroff(ctx->sidebar, COLOR_PAIR(BLUE));
 
-        int maxlines = y2 - GROUP_SIDEBAR_OFFSET - CHATBOX_HEIGHT;
-        uint32_t i, offset = 0;
+        const int maxlines = y2 - GROUP_SIDEBAR_OFFSET - CHATBOX_HEIGHT;
+        uint32_t offset = 0;
 
         pthread_mutex_lock(&Winthread.lock);
-        uint32_t max_idx = chat->max_idx;
+        const uint32_t max_idx = chat->max_idx;
+        const uint32_t start = chat->side_pos;
         pthread_mutex_unlock(&Winthread.lock);
 
-        for (i = 0; i < max_idx && i < maxlines; ++i) {
+        for (uint32_t i = start; i < max_idx && offset < maxlines; ++i) {
             pthread_mutex_lock(&Winthread.lock);
 
             if (!chat->peer_list[i].active) {
@@ -1686,22 +1691,21 @@ static void groupchat_onDraw(ToxWindow *self, Tox *m)
 
             wmove(ctx->sidebar, offset + 2, 1);
 
-            int p = i + chat->side_pos;
-            int maxlen_offset = chat->peer_list[p].role == TOX_GROUP_ROLE_USER ? 2 : 3;
+            const int maxlen_offset = chat->peer_list[i].role == TOX_GROUP_ROLE_USER ? 2 : 3;
 
             /* truncate nick to fit in side panel without modifying list */
             char tmpnck[TOX_MAX_NAME_LENGTH];
-            int maxlen = SIDEBAR_WIDTH - maxlen_offset;
+            const int maxlen = SIDEBAR_WIDTH - maxlen_offset;
 
-            memcpy(tmpnck, chat->peer_list[p].name, maxlen);
+            memcpy(tmpnck, chat->peer_list[i].name, maxlen);
 
             tmpnck[maxlen] = '\0';
 
             int namecolour = WHITE;
 
-            if (chat->peer_list[p].status == TOX_USER_STATUS_AWAY) {
+            if (chat->peer_list[i].status == TOX_USER_STATUS_AWAY) {
                 namecolour = YELLOW;
-            } else if (chat->peer_list[p].status == TOX_USER_STATUS_BUSY) {
+            } else if (chat->peer_list[i].status == TOX_USER_STATUS_BUSY) {
                 namecolour = RED;
             }
 
@@ -1709,13 +1713,13 @@ static void groupchat_onDraw(ToxWindow *self, Tox *m)
             const char *rolesig = "";
             int rolecolour = WHITE;
 
-            if (chat->peer_list[p].role == TOX_GROUP_ROLE_FOUNDER) {
+            if (chat->peer_list[i].role == TOX_GROUP_ROLE_FOUNDER) {
                 rolesig = "&";
                 rolecolour = BLUE;
-            } else if (chat->peer_list[p].role == TOX_GROUP_ROLE_MODERATOR) {
+            } else if (chat->peer_list[i].role == TOX_GROUP_ROLE_MODERATOR) {
                 rolesig = "+";
                 rolecolour = GREEN;
-            } else if (chat->peer_list[p].role == TOX_GROUP_ROLE_OBSERVER) {
+            } else if (chat->peer_list[i].role == TOX_GROUP_ROLE_OBSERVER) {
                 rolesig = "-";
                 rolecolour = MAGENTA;
             }

src/help.c

@@ -186,7 +186,6 @@ static void help_draw_global(ToxWindow *self)
     wprintw(win, "  /nick <nick>               : Set your nickname\n");
     wprintw(win, "  /nospam <value>            : Change part of your Tox ID to stop spam\n");
     wprintw(win, "  /log <on> or <off>         : Enable/disable logging\n");
-    wprintw(win, "  /conference <type>         : Create a conference where type: text | audio\n");
     wprintw(win, "  /myid                      : Print your Tox ID\n");
     wprintw(win, "  /group <name>              : Create a new group chat\n");
 #ifdef GAMES

src/line_info.c

@@ -144,11 +144,14 @@ static struct line_info *line_info_ret_queue(struct history *hst)
  */
 static int print_n_chars(WINDOW *win, const wchar_t *s, size_t n, int max_y)
 {
+    // we use an array to represent a single wchar in order to get around an ncurses
+    // bug with waddnwstr() that overreads the memory address by one byte when
+    // supplied with a single wchar.
+    wchar_t ch[2] = {0};
     bool newline = false;
-    wchar_t ch;
 
-    for (size_t i = 0; i < n && (ch = s[i]); ++i) {
-        if (ch == L'\n') {
+    for (size_t i = 0; i < n && (ch[0] = s[i]); ++i) {
+        if (ch[0] == L'\n') {
             newline = true;
 
             int x;
@@ -165,11 +168,11 @@ static int print_n_chars(WINDOW *win, const wchar_t *s, size_t n, int max_y)
 
         if (win) {
 #ifdef HAVE_WIDECHAR
-            waddnwstr(win, &ch, 1);
+            waddnwstr(win, ch, 1);
 #else
             char b;
 
-            if (wcstombs(&b, &ch, sizeof(char)) != 1) {
+            if (wcstombs(&b, ch, sizeof(char)) != 1) {
                 continue;
             }
 

src/message_queue.c

@@ -48,7 +48,7 @@ void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type,
         return;
     }
 
-    struct cqueue_msg *new_m = malloc(sizeof(struct cqueue_msg));
+    struct cqueue_msg *new_m = calloc(1, sizeof(struct cqueue_msg));
 
     if (new_m == NULL) {
         exit_toxic_err("failed in cqueue_message", FATALERR_MEMORY);
@@ -62,6 +62,7 @@ void cqueue_add(struct chat_queue *q, const char *msg, size_t len, uint8_t type,
     new_m->time_added = get_unix_time();
     new_m->receipt = -1;
     new_m->next = NULL;
+    new_m->noread_flag = false;
 
     if (q->root == NULL) {
         new_m->prev = NULL;
@@ -203,7 +204,7 @@ void cqueue_try_send(ToxWindow *self, Tox *m)
             return;
         }
 
-        TOX_ERR_FRIEND_SEND_MESSAGE err;
+        Tox_Err_Friend_Send_Message err;
         Tox_Message_Type type = msg->type == OUT_MSG ? TOX_MESSAGE_TYPE_NORMAL : TOX_MESSAGE_TYPE_ACTION;
         uint32_t receipt = tox_friend_send_message(m, self->num, type, (uint8_t *) msg->message, msg->len, &err);
 

src/python_api.c

@@ -20,9 +20,10 @@
  *
  */
 
+#include "api.h"
+
 #ifdef PYTHON
 #include <Python.h>
-#include "api.h"
 
 #include "execute.h"
 

src/settings.c

@@ -63,6 +63,7 @@ static struct ui_strings {
     const char *show_typing_other;
     const char *show_welcome_msg;
     const char *show_connection_msg;
+    const char *show_group_connection_msg;
     const char *nodeslist_update_freq;
     const char *autosave_freq;
 
@@ -99,6 +100,7 @@ static struct ui_strings {
     "show_typing_other",
     "show_welcome_msg",
     "show_connection_msg",
+    "show_group_connection_msg",
     "nodeslist_update_freq",
     "autosave_freq",
     "line_join",
@@ -136,6 +138,7 @@ static void ui_defaults(struct user_settings *settings)
     settings->show_typing_other = SHOW_TYPING_ON;
     settings->show_welcome_msg = SHOW_WELCOME_MSG_ON;
     settings->show_connection_msg = SHOW_CONNECTION_MSG_ON;
+    settings->show_group_connection_msg = SHOW_GROUP_CONNECTION_MSG_ON;
     settings->nodeslist_update_freq = 1;
     settings->autosave_freq = 600;
 
@@ -405,6 +408,7 @@ int settings_load(struct user_settings *s, const char *patharg)
         config_setting_lookup_bool(setting, ui_strings.show_typing_other, &s->show_typing_other);
         config_setting_lookup_bool(setting, ui_strings.show_welcome_msg, &s->show_welcome_msg);
         config_setting_lookup_bool(setting, ui_strings.show_connection_msg, &s->show_connection_msg);
+        config_setting_lookup_bool(setting, ui_strings.show_group_connection_msg, &s->show_group_connection_msg);
 
         config_setting_lookup_int(setting, ui_strings.history_size, &s->history_size);
         config_setting_lookup_int(setting, ui_strings.notification_timeout, &s->notification_timeout);

src/settings.h

@@ -54,6 +54,7 @@ struct user_settings {
     int show_typing_other; /* boolean */
     int show_welcome_msg;  /* boolean */
     int show_connection_msg;  /* boolean */
+    int show_group_connection_msg;  /* boolean */
     int nodeslist_update_freq;  /* int (<= 0 to disable updates) */
     int autosave_freq; /* int (<= 0 to disable autosave) */
 
@@ -122,6 +123,9 @@ enum settings_values {
     SHOW_CONNECTION_MSG_OFF = 0,
     SHOW_CONNECTION_MSG_ON = 1,
 
+    SHOW_GROUP_CONNECTION_MSG_OFF = 0,
+    SHOW_GROUP_CONNECTION_MSG_ON = 1,
+
     DFLT_HST_SIZE = 700,
 
     MPLEX_OFF = 0,

src/toxic.c

@@ -37,6 +37,7 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <termios.h>
 #include <time.h>
@@ -267,12 +268,21 @@ void cb_toxcore_logger(Tox *m, TOX_LOG_LEVEL level, const char *file, uint32_t l
         fp = stderr;
     }
 
-    const time_t t = time(NULL);
-    struct tm *tmp = gmtime(&t);
-    char timestamp[200];
-    strftime(timestamp, sizeof(timestamp), "%F %T", tmp);
+    struct timeval tv;
+
+    gettimeofday(&tv, NULL);
+
+    struct tm tmp;
+
+    gmtime_r(&tv.tv_sec, &tmp);
+
+    char timestamp[200];
+
+    strftime(timestamp, sizeof(timestamp), "%F %T", &tmp);
+
+    fprintf(fp, "%c %s.%06ld %s:%u(%s) - %s\n", tox_log_level_show(level)[0], timestamp, tv.tv_usec, file, line, func,
+            message);
 
-    fprintf(fp, "[%c] %s %s:%u(%s) - %s\n", tox_log_level_show(level)[0], timestamp, file, line, func, message);
     fflush(fp);
 }
 

src/toxic.h

@@ -152,7 +152,7 @@ void on_group_invite(Tox *m, uint32_t friendnumber, const uint8_t *invite_data,
                      const uint8_t *group_name,
                      size_t group_name_length, void *userdata);
 void on_group_message(Tox *m, uint32_t groupnumber, uint32_t peernumber, TOX_MESSAGE_TYPE type,
-                      const uint8_t *message, size_t length, void *userdata);
+                      const uint8_t *message, size_t length, uint32_t message_id, void *userdata);
 void on_group_private_message(Tox *m, uint32_t groupnumber, uint32_t peernumber, TOX_MESSAGE_TYPE type,
                               const uint8_t *message, size_t length,
                               void *userdata);

src/windows.c

@@ -395,8 +395,10 @@ void on_group_invite(Tox *m, uint32_t friendnumber, const uint8_t *invite_data,
 }
 
 void on_group_message(Tox *m, uint32_t groupnumber, uint32_t peer_id, TOX_MESSAGE_TYPE type,
-                      const uint8_t *message, size_t length, void *userdata)
+                      const uint8_t *message, size_t length, uint32_t message_id, void *userdata)
 {
+    UNUSED_VAR(message_id);
+
     char msg[MAX_STR_SIZE + 1];
     length = copy_tox_str(msg, sizeof(msg), (const char *) message, length);