vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into authd-framework-2

Browse source
This commit is contained in:
Elizabeth Myers 2016-03-26 16:40:28 -05:00
parent 6ced6a1f1a de8b3b7174
commit e2e34c3212
3 changed files with 184 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ircd/authd.c
View file

@ -114,6 +114,39 @@ parse_authd_reply(rb_helper * helper)
}
dns_results_callback(parv[1], parv[2], parv[3], parv[4]);
break;
case 'W':
if(parc != 3)
{
ilog(L_MAIN, "authd sent a result with wrong number of arguments: got %d", parc);
restart_authd();
return;
}
switch(*parv[2])
{
case 'D':
sendto_realops_snomask(SNO_DEBUG, L_ALL, "authd debug: %s", parv[3]);
break;
case 'I':
sendto_realops_snomask(SNO_GENERAL, L_ALL, "authd info: %s", parv[3]);
inotice("authd info: %s", parv[3]);
break;
case 'W':
sendto_realops_snomask(SNO_GENERAL, L_ALL, "authd WARNING: %s", parv[3]);
iwarn("authd warning: %s", parv[3]);
break;
case 'C':
sendto_realops_snomask(SNO_GENERAL, L_ALL, "authd CRITICAL: %s", parv[3]);
ierror("authd critical: %s", parv[3]);
break;
default:
sendto_realops_snomask(SNO_GENERAL, L_ALL, "authd sent us an unknown oper notice type (%s): %s", parv[2], parv[3]);
ilog(L_MAIN, "authd unknown oper notice type (%s): %s", parv[2], parv[3]);
break;
}
/* NOTREACHED */
break;
case 'X':
case 'Y':
case 'Z':

1
ircd/sslproc.c
View file

@ -809,7 +809,6 @@ start_zlib_session(void *data)
rb_fde_t *F[2];
rb_fde_t *xF1, *xF2;
char *buf;
char buf2[9];
void *recvq_start;
size_t hdr = (sizeof(uint8_t) * 2) + sizeof(uint32_t);

186
wsockd/wsockd.c
View file

@ -82,7 +82,6 @@ typedef struct _conn
uint64_t plain_in;
uint64_t plain_out;
uint8_t flags;
void *stream;
} conn_t;
#define FLAG_CORK 0x01
@ -112,6 +111,8 @@ typedef struct _conn
static rb_dlink_list connid_hash_table[CONN_HASH_SIZE];
static rb_dlink_list dead_list;
static void conn_plain_read_shutdown_cb(rb_fde_t *fd, void *data);
#ifndef _WIN32
static void
dummy_handler(int sig)
@ -208,6 +209,87 @@ clean_dead_conns(void *unused)
dead_list.tail = dead_list.head = NULL;
}
static void
mod_write_ctl(rb_fde_t *F, void *data)
{
mod_ctl_t *ctl = data;
mod_ctl_buf_t *ctl_buf;
rb_dlink_node *ptr, *next;
int retlen, x;
RB_DLINK_FOREACH_SAFE(ptr, next, ctl->writeq.head)
{
ctl_buf = ptr->data;
retlen = rb_send_fd_buf(ctl->F, ctl_buf->F, ctl_buf->nfds, ctl_buf->buf,
ctl_buf->buflen, ppid);
if(retlen > 0)
{
rb_dlinkDelete(ptr, &ctl->writeq);
for(x = 0; x < ctl_buf->nfds; x++)
rb_close(ctl_buf->F[x]);
rb_free(ctl_buf->buf);
rb_free(ctl_buf);
}
if(retlen == 0 || (retlen < 0 && !rb_ignore_errno(errno)))
exit(0);
}
if(rb_dlink_list_length(&ctl->writeq) > 0)
rb_setselect(ctl->F, RB_SELECT_WRITE, mod_write_ctl, ctl);
}
static void
mod_cmd_write_queue(mod_ctl_t * ctl, const void *data, size_t len)
{
mod_ctl_buf_t *ctl_buf;
ctl_buf = rb_malloc(sizeof(mod_ctl_buf_t));
ctl_buf->buf = rb_malloc(len);
ctl_buf->buflen = len;
memcpy(ctl_buf->buf, data, len);
ctl_buf->nfds = 0;
rb_dlinkAddTail(ctl_buf, &ctl_buf->node, &ctl->writeq);
mod_write_ctl(ctl->F, ctl);
}
static void
close_conn(conn_t * conn, int wait_plain, const char *fmt, ...)
{
va_list ap;
char reason[128]; /* must always be under 250 bytes */
uint8_t buf[256];
int len;
if(IsDead(conn))
return;
rb_rawbuf_flush(conn->modbuf_out, conn->mod_fd);
rb_rawbuf_flush(conn->plainbuf_out, conn->plain_fd);
rb_close(conn->mod_fd);
SetDead(conn);
rb_dlinkDelete(&conn->node, connid_hash(conn->id));
if(!wait_plain || fmt == NULL)
{
rb_close(conn->plain_fd);
rb_dlinkAdd(conn, &conn->node, &dead_list);
return;
}
rb_setselect(conn->plain_fd, RB_SELECT_READ, conn_plain_read_shutdown_cb, conn);
rb_setselect(conn->plain_fd, RB_SELECT_WRITE, NULL, NULL);
va_start(ap, fmt);
vsnprintf(reason, sizeof(reason), fmt, ap);
va_end(ap);
buf[0] = 'D';
uint32_to_buf(&buf[1], conn->id);
rb_strlcpy((char *) &buf[5], reason, sizeof(buf) - 5);
len = (strlen(reason) + 1) + 5;
mod_cmd_write_queue(conn->ctl, buf, len);
}
static conn_t *
make_conn(mod_ctl_t * ctl, rb_fde_t *mod_fd, rb_fde_t *plain_fd)
{
@ -218,7 +300,6 @@ make_conn(mod_ctl_t * ctl, rb_fde_t *mod_fd, rb_fde_t *plain_fd)
conn->mod_fd = mod_fd;
conn->plain_fd = plain_fd;
conn->id = -1;
conn->stream = NULL;
rb_set_nb(mod_fd);
rb_set_nb(plain_fd);
return conn;
@ -235,7 +316,72 @@ cleanup_bad_message(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb)
}
static void
wsock_process_accept(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb)
conn_mod_handshake_cb(rb_fde_t *fd, void *data)
{
char inbuf[READBUF_SIZE];
conn_t *conn = data;
int length = 0;
if (conn == NULL)
return;
if (IsDead(conn))
return;
while (1)
{
if (IsDead(conn))
return;
length = rb_read(conn->plain_fd, inbuf, sizeof(inbuf));
if (length == 0 || (length < 0 && !rb_ignore_errno(errno)))
{
close_conn(conn, NO_WAIT, "Connection closed");
return;
}
}
}
static void
conn_mod_read_cb(rb_fde_t *fd, void *data)
{
}
static void
conn_plain_read_cb(rb_fde_t *fd, void *data)
{
}
static void
conn_plain_read_shutdown_cb(rb_fde_t *fd, void *data)
{
char inbuf[READBUF_SIZE];
conn_t *conn = data;
int length = 0;
if(conn == NULL)
return;
while(1)
{
length = rb_read(conn->plain_fd, inbuf, sizeof(inbuf));
if(length == 0 || (length < 0 && !rb_ignore_errno(errno)))
{
rb_close(conn->plain_fd);
rb_dlinkAdd(conn, &conn->node, &dead_list);
return;
}
if(length < 0)
{
rb_setselect(conn->plain_fd, RB_SELECT_READ, conn_plain_read_shutdown_cb, conn);
return;
}
}
}
static void
wsock_process(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb)
{
conn_t *conn;
uint32_t id;
@ -252,7 +398,7 @@ wsock_process_accept(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb)
if(rb_get_type(conn->plain_fd) == RB_FD_UNKNOWN)
rb_set_type(conn->plain_fd, RB_FD_SOCKET);
// XXX todo
conn_mod_handshake_cb(conn->mod_fd, conn);
}
static void
@ -274,7 +420,7 @@ mod_process_cmd_recv(mod_ctl_t * ctl)
cleanup_bad_message(ctl, ctl_buf);
break;
}
wsock_process_accept(ctl, ctl_buf);
wsock_process(ctl, ctl_buf);
break;
}
default:
@ -326,36 +472,6 @@ mod_read_ctl(rb_fde_t *F, void *data)
rb_setselect(ctl->F, RB_SELECT_READ, mod_read_ctl, ctl);
}
static void
mod_write_ctl(rb_fde_t *F, void *data)
{
mod_ctl_t *ctl = data;
mod_ctl_buf_t *ctl_buf;
rb_dlink_node *ptr, *next;
int retlen, x;
RB_DLINK_FOREACH_SAFE(ptr, next, ctl->writeq.head)
{
ctl_buf = ptr->data;
retlen = rb_send_fd_buf(ctl->F, ctl_buf->F, ctl_buf->nfds, ctl_buf->buf,
ctl_buf->buflen, ppid);
if(retlen > 0)
{
rb_dlinkDelete(ptr, &ctl->writeq);
for(x = 0; x < ctl_buf->nfds; x++)
rb_close(ctl_buf->F[x]);
rb_free(ctl_buf->buf);
rb_free(ctl_buf);
}
if(retlen == 0 || (retlen < 0 && !rb_ignore_errno(errno)))
exit(0);
}
if(rb_dlink_list_length(&ctl->writeq) > 0)
rb_setselect(ctl->F, RB_SELECT_WRITE, mod_write_ctl, ctl);
}
static void
read_pipe_ctl(rb_fde_t *F, void *data)
{