bip/bip
bip
/
bip
3
0
Fork 1
Code Issues Pull Requests 2 Releases Activity

sanitize: configuration parsing

This commit is contained in:
Loïc Gomez 2022-01-09 19:23:41 +01:00 committed by Pierre-Louis Bonicoli
parent 9d6394679f
commit fbfae37d65
Signed by: pilou
GPG Key ID: 06914C4A5EDAA6DD
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/bip.c
View File

@ -539,16 +539,16 @@ static int add_connection(bip_t *bip, struct bipuser *user, list_t *data)
list_free(t->pdata); list_free(t->pdata);
break; break;
case LEX_AUTOJOIN_ON_KICK: case LEX_AUTOJOIN_ON_KICK:
l->autojoin_on_kick = t->ndata; l->autojoin_on_kick = (t->ndata > 0 ? 1 : 0);
break; break;
case LEX_FOLLOW_NICK: case LEX_FOLLOW_NICK:
l->follow_nick = t->ndata; l->follow_nick = (t->ndata > 0 ? 1 : 0);
break; break;
case LEX_IGN_FIRST_NICK: case LEX_IGN_FIRST_NICK:
l->ignore_first_nick = t->ndata; l->ignore_first_nick = (t->ndata > 0 ? 1 : 0);
break; break;
case LEX_IGNORE_CAPAB: case LEX_IGNORE_CAPAB:
l->ignore_server_capab = t->ndata; l->ignore_server_capab = (t->ndata > 0 ? 1 : 0);
break; break;
case LEX_AWAY_NICK: case LEX_AWAY_NICK:
MOVE_STRING(l->away_nick, t->pdata); MOVE_STRING(l->away_nick, t->pdata);
@ -561,7 +561,7 @@ static int add_connection(bip_t *bip, struct bipuser *user, list_t *data)
t->pdata = NULL; t->pdata = NULL;
break; break;
case LEX_LOG: case LEX_LOG:
l->log->log_to_file = t->ndata; l->log->log_to_file = (t->ndata > 0 ? 1 : 0);
break; break;
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
case LEX_SSL_CHECK_MODE: case LEX_SSL_CHECK_MODE:
@ -712,12 +712,12 @@ static int add_user(bip_t *bip, list_t *data, struct historical_directives *hds)
u->bip_use_notice = DEFAULT_BIP_USE_NOTICE; u->bip_use_notice = DEFAULT_BIP_USE_NOTICE;
} }
u->backlog = hds->backlog; u->backlog = (hds->backlog > 0 ? 1 : 0);
u->always_backlog = hds->always_backlog; u->always_backlog = (hds->always_backlog > 0 ? 1 : 0);
u->bl_msg_only = hds->bl_msg_only; u->bl_msg_only = (hds->bl_msg_only > 0 ? 1 : 0);
u->backlog_lines = hds->backlog_lines; u->backlog_lines = (hds->backlog_lines > 0 ? 1 : 0);
u->backlog_timestamp = hds->backlog_timestamp; u->backlog_timestamp = (hds->backlog_timestamp > 0 ? 1 : 0);
u->blreset_on_talk = hds->blreset_on_talk; u->blreset_on_talk = (hds->blreset_on_talk > 0 ? 1 : 0);
while ((t = list_remove_first(data))) { while ((t = list_remove_first(data))) {
switch (t->type) { switch (t->type) {
@ -725,7 +725,7 @@ static int add_user(bip_t *bip, list_t *data, struct historical_directives *hds)
MOVE_STRING(u->name, t->pdata); MOVE_STRING(u->name, t->pdata);
break; break;
case LEX_ADMIN: case LEX_ADMIN:
u->admin = t->ndata; u->admin = (t->ndata > 0 ? 1 : 0);
break; break;
case LEX_PASSWORD: case LEX_PASSWORD:
hash_binary(t->pdata, &u->password, &u->seed); hash_binary(t->pdata, &u->password, &u->seed);
@ -742,13 +742,13 @@ static int add_user(bip_t *bip, list_t *data, struct historical_directives *hds)
MOVE_STRING(u->default_realname, t->pdata); MOVE_STRING(u->default_realname, t->pdata);
break; break;
case LEX_ALWAYS_BACKLOG: case LEX_ALWAYS_BACKLOG:
u->always_backlog = t->ndata; u->always_backlog = (t->ndata > 0 ? 1 : 0);
break; break;
case LEX_BACKLOG: case LEX_BACKLOG:
u->backlog = t->ndata; u->backlog = (t->ndata > 0 ? 1 : 0);
break; break;
case LEX_BL_MSG_ONLY: case LEX_BL_MSG_ONLY:
u->bl_msg_only = t->ndata; u->bl_msg_only = (t->ndata > 0 ? 1 : 0);
break; break;
case LEX_BACKLOG_LINES: case LEX_BACKLOG_LINES:
u->backlog_lines = t->ndata; u->backlog_lines = t->ndata;
@ -760,13 +760,13 @@ static int add_user(bip_t *bip, list_t *data, struct historical_directives *hds)
u->backlog_timestamp = lex_backlog_timestamp(t->pdata); u->backlog_timestamp = lex_backlog_timestamp(t->pdata);
break; break;
case LEX_BLRESET_ON_TALK: case LEX_BLRESET_ON_TALK:
u->blreset_on_talk = t->ndata; u->blreset_on_talk = (t->ndata > 0 ? 1 : 0);
break; break;
case LEX_BLRESET_CONNECTION: case LEX_BLRESET_CONNECTION:
u->blreset_connection = t->ndata; u->blreset_connection = (t->ndata > 0 ? 1 : 0);
break; break;
case LEX_BIP_USE_NOTICE: case LEX_BIP_USE_NOTICE:
u->bip_use_notice = t->ndata; u->bip_use_notice = (t->ndata > 0 ? 1 : 0);
break; break;
case LEX_CONNECTION: case LEX_CONNECTION:
list_add_last(&connection_list, t->pdata); list_add_last(&connection_list, t->pdata);
@ -1008,7 +1008,7 @@ int fireup(bip_t *bip, FILE *conf)
MOVE_STRING(conf_ip, t->pdata); MOVE_STRING(conf_ip, t->pdata);
break; break;
case LEX_PORT: case LEX_PORT:
conf_port = t->ndata; conf_port = (unsigned short)t->ndata;
break; break;
case LEX_RECONN_TIMER: case LEX_RECONN_TIMER:
conf_reconn_timer = t->ndata; conf_reconn_timer = t->ndata;