diff options
Diffstat (limited to 'testing/nTox.c')
-rw-r--r-- | testing/nTox.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/testing/nTox.c b/testing/nTox.c index 87a87007..caa7d45c 100644 --- a/testing/nTox.c +++ b/testing/nTox.c | |||
@@ -51,8 +51,7 @@ unsigned char * hex_string_to_bin(char hex_string[]) | |||
51 | unsigned char * val = malloc(strlen(hex_string)); | 51 | unsigned char * val = malloc(strlen(hex_string)); |
52 | char * pos = hex_string; | 52 | char * pos = hex_string; |
53 | int i=0; | 53 | int i=0; |
54 | while(i < strlen(hex_string)) | 54 | while(i < strlen(hex_string)) { |
55 | { | ||
56 | sscanf(pos,"%2hhx",&val[i]); | 55 | sscanf(pos,"%2hhx",&val[i]); |
57 | pos+=2; | 56 | pos+=2; |
58 | i++; | 57 | i++; |
@@ -190,6 +189,7 @@ void do_refresh() | |||
190 | clrtoeol(); | 189 | clrtoeol(); |
191 | refresh(); | 190 | refresh(); |
192 | } | 191 | } |
192 | |||
193 | void print_request(uint8_t * public_key, uint8_t * data, uint16_t length) | 193 | void print_request(uint8_t * public_key, uint8_t * data, uint16_t length) |
194 | { | 194 | { |
195 | new_lines("[i] received friend request"); | 195 | new_lines("[i] received friend request"); |
@@ -205,6 +205,7 @@ void print_request(uint8_t * public_key, uint8_t * data, uint16_t length) | |||
205 | new_lines(numchar); | 205 | new_lines(numchar); |
206 | } | 206 | } |
207 | } | 207 | } |
208 | |||
208 | void print_message(int friendnumber, uint8_t * string, uint16_t length) | 209 | void print_message(int friendnumber, uint8_t * string, uint16_t length) |
209 | { | 210 | { |
210 | char name[MAX_NAME_LENGTH]; | 211 | char name[MAX_NAME_LENGTH]; |
@@ -220,6 +221,7 @@ void print_message(int friendnumber, uint8_t * string, uint16_t length) | |||
220 | sprintf(msg, "[%d] %s <%s> %s", friendnumber, temp, name, string); // someone please fix this | 221 | sprintf(msg, "[%d] %s <%s> %s", friendnumber, temp, name, string); // someone please fix this |
221 | new_lines(msg); | 222 | new_lines(msg); |
222 | } | 223 | } |
224 | |||
223 | void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) { | 225 | void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) { |
224 | char name[MAX_NAME_LENGTH]; | 226 | char name[MAX_NAME_LENGTH]; |
225 | getname(friendnumber, (uint8_t*)name); | 227 | getname(friendnumber, (uint8_t*)name); |
@@ -227,6 +229,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) { | |||
227 | sprintf(msg, "[i] [%d] %s is now known as %s.", friendnumber, name, string); | 229 | sprintf(msg, "[i] [%d] %s is now known as %s.", friendnumber, name, string); |
228 | new_lines(msg); | 230 | new_lines(msg); |
229 | } | 231 | } |
232 | |||
230 | void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) { | 233 | void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) { |
231 | char name[MAX_NAME_LENGTH]; | 234 | char name[MAX_NAME_LENGTH]; |
232 | getname(friendnumber, (uint8_t*)name); | 235 | getname(friendnumber, (uint8_t*)name); |
@@ -234,6 +237,7 @@ void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) { | |||
234 | sprintf(msg, "[i] [%d] %s's status changed to %s.", friendnumber, name, string); | 237 | sprintf(msg, "[i] [%d] %s's status changed to %s.", friendnumber, name, string); |
235 | new_lines(msg); | 238 | new_lines(msg); |
236 | } | 239 | } |
240 | |||
237 | void load_key(){ | 241 | void load_key(){ |
238 | FILE *data_file = NULL; | 242 | FILE *data_file = NULL; |
239 | if ((data_file = fopen("data","r"))) { | 243 | if ((data_file = fopen("data","r"))) { |
@@ -260,6 +264,7 @@ void load_key(){ | |||
260 | } | 264 | } |
261 | fclose(data_file); | 265 | fclose(data_file); |
262 | } | 266 | } |
267 | |||
263 | int main(int argc, char *argv[]) | 268 | int main(int argc, char *argv[]) |
264 | { | 269 | { |
265 | if (argc < 4) { | 270 | if (argc < 4) { |
@@ -317,9 +322,7 @@ int main(int argc, char *argv[]) | |||
317 | DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3])); | 322 | DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3])); |
318 | nodelay(stdscr, TRUE); | 323 | nodelay(stdscr, TRUE); |
319 | while(true) { | 324 | while(true) { |
320 | 325 | if (on == 0 && DHT_isconnected()) { | |
321 | if (on == 0 && DHT_isconnected()) | ||
322 | { | ||
323 | new_lines("[i] connected to DHT\n[i] define username with /n"); | 326 | new_lines("[i] connected to DHT\n[i] define username with /n"); |
324 | on = 1; | 327 | on = 1; |
325 | } | 328 | } |