Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 02:53:02 +01:00
Code Issues Projects Releases Wiki Activity

fix magic numbers

Browse Source
This commit is contained in:
Jfreegman 2013-08-08 04:51:58 -04:00
parent 90acd2dfef
commit 297ee1ecaa
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chat.c
View File

@ -16,7 +16,7 @@
typedef struct { typedef struct {
int friendnum; int friendnum;
char line[256]; char line[MAX_STR_SIZE];
size_t pos; size_t pos;
WINDOW* history; WINDOW* history;
WINDOW* linewin; WINDOW* linewin;
@ -178,9 +178,9 @@ void execute(ToxWindow *self, ChatContext *ctx, char *cmd)
} }
else if (!strcmp(cmd, "/myid")) { else if (!strcmp(cmd, "/myid")) {
char id[32*2 + 1] = {0}; char id[KEY_SIZE_BYTES*2+1] = {0};
int i; int i;
for (i = 0; i < 32; i++) { for (i = 0; i < KEY_SIZE_BYTES; i++) {
char xx[3]; char xx[3];
snprintf(xx, sizeof(xx), "%02x", self_public_key[i] & 0xff); snprintf(xx, sizeof(xx), "%02x", self_public_key[i] & 0xff);
strcat(id, xx); strcat(id, xx);

2
main.c
View File

@ -37,7 +37,7 @@ void on_request(uint8_t *public_key, uint8_t *data, uint16_t length)
wprintw(prompt->window, "\nFriend request from:\n"); wprintw(prompt->window, "\nFriend request from:\n");
int i; int i;
for (i = 0; i < 32; ++i) { for (i = 0; i < KEY_SIZE_BYTES; ++i) {
wprintw(prompt->window, "%02x", public_key[i] & 0xff); wprintw(prompt->window, "%02x", public_key[i] & 0xff);
} }

24
prompt.c
View File

@ -12,12 +12,12 @@
#include "windows.h" #include "windows.h"
uint8_t pending_requests[256][CLIENT_ID_SIZE]; // XXX uint8_t pending_requests[MAX_STR_SIZE][CLIENT_ID_SIZE]; // XXX
uint8_t num_requests=0; // XXX uint8_t num_requests=0; // XXX
extern void on_friendadded(int friendnumber); extern void on_friendadded(int friendnumber);
static void print_usage(ToxWindow *self); static void print_usage(ToxWindow *self);
static char prompt_buf[256] = {0}; static char prompt_buf[MAX_STR_SIZE] = {0};
static int prompt_buf_pos = 0; static int prompt_buf_pos = 0;
// XXX: // XXX:
@ -43,7 +43,7 @@ unsigned char *hex_string_to_bin(char hex_string[])
static void execute(ToxWindow *self, char *u_cmd) static void execute(ToxWindow *self, char *u_cmd)
{ {
int newlines = 0; int newlines = 0;
char cmd[256] = {0}; char cmd[MAX_STR_SIZE] = {0};
int i; int i;
for (i = 0; i < strlen(prompt_buf); ++i) { for (i = 0; i < strlen(prompt_buf); ++i) {
if (u_cmd[i] == '\n') if (u_cmd[i] == '\n')
@ -53,9 +53,9 @@ static void execute(ToxWindow *self, char *u_cmd)
} }
int leading_spc = 0; int leading_spc = 0;
for (i = 0; i < 256 && isspace(cmd[i]); ++i) for (i = 0; i < MAX_STR_SIZE && isspace(cmd[i]); ++i)
leading_spc++; leading_spc++;
memmove(cmd, cmd + leading_spc, 256 - leading_spc); memmove(cmd, cmd + leading_spc, MAX_STR_SIZE - leading_spc);
int cmd_end = strlen(cmd); int cmd_end = strlen(cmd);
while (cmd_end > 0 && cmd_end--) while (cmd_end > 0 && cmd_end--)
@ -109,7 +109,7 @@ static void execute(ToxWindow *self, char *u_cmd)
} }
dht.port = htons(atoi(port)); dht.port = htons(atoi(port));
uint32_t resolved_address = resolve_addr(ip); uintKEY_SIZE_BYTES_t resolved_address = resolve_addr(ip);
if (resolved_address == 0) { if (resolved_address == 0) {
return; return;
} }
@ -121,9 +121,9 @@ static void execute(ToxWindow *self, char *u_cmd)
} }
else if (!strncmp(cmd, "add ", strlen("add "))) { else if (!strncmp(cmd, "add ", strlen("add "))) {
uint8_t id_bin[32]; uint8_t id_bin[KEY_SIZE_BYTES];
char xx[3]; char xx[3];
uint32_t x; uintKEY_SIZE_BYTES_t x;
char *id = strchr(cmd, ' '); char *id = strchr(cmd, ' ');
if (id == NULL) { if (id == NULL) {
wprintw(self->window, "Invalid syntax.\n"); wprintw(self->window, "Invalid syntax.\n");
@ -136,12 +136,12 @@ static void execute(ToxWindow *self, char *u_cmd)
msg++; msg++;
} }
else msg = ""; else msg = "";
if (strlen(id) != 2*32) { if (strlen(id) != 2*KEY_SIZE_BYTES) {
wprintw(self->window, "Invalid ID length.\n"); wprintw(self->window, "Invalid ID length.\n");
return; return;
} }
int i; int i;
for (i = 0; i < 32; ++i) { for (i = 0; i < KEY_SIZE_BYTES; ++i) {
xx[0] = id[2*i]; xx[0] = id[2*i];
xx[1] = id[2*i+1]; xx[1] = id[2*i+1];
xx[2] = '\0'; xx[2] = '\0';
@ -251,9 +251,9 @@ static void execute(ToxWindow *self, char *u_cmd)
} }
else if (!strcmp(cmd, "myid")) { else if (!strcmp(cmd, "myid")) {
char id[32*2 + 1] = {0}; char id[KEY_SIZE_BYTES*2 + 1] = {0};
size_t i; size_t i;
for (i = 0; i < 32; ++i) { for (i = 0; i < KEY_SIZE_BYTES; ++i) {
char xx[3]; char xx[3];
snprintf(xx, sizeof(xx), "%02x", self_public_key[i] & 0xff); snprintf(xx, sizeof(xx), "%02x", self_public_key[i] & 0xff);
strcat(id, xx); strcat(id, xx);

2
windows.h
View File

@ -5,6 +5,8 @@
#include <stdbool.h> #include <stdbool.h>
#define TOXWINDOWS_MAX_NUM 32 #define TOXWINDOWS_MAX_NUM 32
#define MAX_FRIENDS_NUM 100 #define MAX_FRIENDS_NUM 100
#define MAX_STR_SIZE 256
#define KEY_SIZE_BYTES 32
/* number of permanent default windows */ /* number of permanent default windows */
#define N_DEFAULT_WINS 2 #define N_DEFAULT_WINS 2