summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2014-03-31 20:37:03 -0400
committerirungentoo <irungentoo@gmail.com>2014-03-31 20:37:03 -0400
commit4f1e02bafa1f7ad27699859ebdd4073dbc1e934b (patch)
tree89efb5649dd345b1d7e287d991778fff5a097b51 /testing
parent27a7bf5b1e65f715ae2a7f8c76fa8761be389857 (diff)
tox_group_get_names now returns a list of name lengths along with the list of names.
TCP test now also tests pings.
Diffstat (limited to 'testing')
-rw-r--r--testing/nTox.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/testing/nTox.c b/testing/nTox.c
index 59d0c4c1..7af3124d 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -1020,7 +1020,8 @@ void print_groupchatpeers(Tox *m, int groupnumber)
1020 } 1020 }
1021 1021
1022 uint8_t names[num][TOX_MAX_NAME_LENGTH]; 1022 uint8_t names[num][TOX_MAX_NAME_LENGTH];
1023 tox_group_get_names(m, groupnumber, names, num); 1023 uint16_t lengths[num];
1024 tox_group_get_names(m, groupnumber, names, lengths, num);
1024 int i; 1025 int i;
1025 char numstr[16]; 1026 char numstr[16];
1026 char header[] = "[g]+ "; 1027 char header[] = "[g]+ ";
@@ -1030,7 +1031,7 @@ void print_groupchatpeers(Tox *m, int groupnumber)
1030 size_t len_total = header_len; 1031 size_t len_total = header_len;
1031 1032
1032 for (i = 0; i < num; ++i) { 1033 for (i = 0; i < num; ++i) {
1033 size_t len_name = strlen((char *)names[i]); 1034 size_t len_name = lengths[i];
1034 size_t len_num = sprintf(numstr, "%i: ", i); 1035 size_t len_num = sprintf(numstr, "%i: ", i);
1035 1036
1036 if (len_num + len_name + len_total + 3 >= STRING_LENGTH) { 1037 if (len_num + len_name + len_total + 3 >= STRING_LENGTH) {
@@ -1042,7 +1043,7 @@ void print_groupchatpeers(Tox *m, int groupnumber)
1042 1043
1043 strcpy(msg + len_total, numstr); 1044 strcpy(msg + len_total, numstr);
1044 len_total += len_num; 1045 len_total += len_num;
1045 strcpy(msg + len_total, (char *)names[i]); 1046 memcpy(msg + len_total, (char *)names[i], len_name);
1046 len_total += len_name; 1047 len_total += len_name;
1047 1048
1048 if (i < num - 1) { 1049 if (i < num - 1) {