diff options
Diffstat (limited to 'testing/irc_syncbot.c')
-rw-r--r-- | testing/irc_syncbot.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/testing/irc_syncbot.c b/testing/irc_syncbot.c index b879e4eb..2d326c4b 100644 --- a/testing/irc_syncbot.c +++ b/testing/irc_syncbot.c | |||
@@ -163,9 +163,15 @@ void send_irc_group(Tox *tox, uint8_t *msg, uint16_t len) | |||
163 | uint8_t req[len]; | 163 | uint8_t req[len]; |
164 | unsigned int i; | 164 | unsigned int i; |
165 | 165 | ||
166 | unsigned int spaces = 0; | ||
167 | |||
166 | for (i = 0; i < (len - 1); ++i) { | 168 | for (i = 0; i < (len - 1); ++i) { |
167 | if (msg[i + 1] == ':') { | 169 | if (msg[i + 1] == ' ') { |
168 | break; | 170 | ++spaces; |
171 | } else { | ||
172 | if (spaces >= 3 && msg[i + 1] == ':') { | ||
173 | break; | ||
174 | } | ||
169 | } | 175 | } |
170 | 176 | ||
171 | req[i] = msg[i + 1]; | 177 | req[i] = msg[i + 1]; |
@@ -227,11 +233,6 @@ Tox *init_tox(int argc, char *argv[]) | |||
227 | tox_callback_group_message(tox, ©_groupmessage, 0); | 233 | tox_callback_group_message(tox, ©_groupmessage, 0); |
228 | tox_callback_group_action(tox, ©_groupmessage, 0); | 234 | tox_callback_group_action(tox, ©_groupmessage, 0); |
229 | 235 | ||
230 | uint16_t port = atoi(argv[argvoffset + 2]); | ||
231 | unsigned char *binary_string = hex_string_to_bin(argv[argvoffset + 3]); | ||
232 | tox_bootstrap(tox, argv[argvoffset + 1], port, binary_string, 0); | ||
233 | free(binary_string); | ||
234 | |||
235 | char temp_id[128]; | 236 | char temp_id[128]; |
236 | printf("\nEnter the address of irc_syncbots master (38 bytes HEX format):\n"); | 237 | printf("\nEnter the address of irc_syncbots master (38 bytes HEX format):\n"); |
237 | 238 | ||
@@ -239,6 +240,11 @@ Tox *init_tox(int argc, char *argv[]) | |||
239 | exit (1); | 240 | exit (1); |
240 | } | 241 | } |
241 | 242 | ||
243 | uint16_t port = atoi(argv[argvoffset + 2]); | ||
244 | unsigned char *binary_string = hex_string_to_bin(argv[argvoffset + 3]); | ||
245 | tox_bootstrap(tox, argv[argvoffset + 1], port, binary_string, 0); | ||
246 | free(binary_string); | ||
247 | |||
242 | uint8_t *bin_id = hex_string_to_bin(temp_id); | 248 | uint8_t *bin_id = hex_string_to_bin(temp_id); |
243 | uint32_t num = tox_friend_add(tox, bin_id, (uint8_t *)"Install Gentoo", sizeof("Install Gentoo") - 1, 0); | 249 | uint32_t num = tox_friend_add(tox, bin_id, (uint8_t *)"Install Gentoo", sizeof("Install Gentoo") - 1, 0); |
244 | free(bin_id); | 250 | free(bin_id); |