* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
*
- * $Id: sslproc.c 25677 2008-07-06 04:21:42Z androsyn $
+ * $Id$
*/
#include <ratbox_lib.h>
#include "stdinc.h"
+
+
#include "s_conf.h"
#include "logger.h"
#include "listener.h"
#define ZIPSTATS_TIME 60
static void collect_zipstats(void *unused);
-static void ssl_read_ctl(rb_fde_t *F, void *data);
+static void ssl_read_ctl(rb_fde_t * F, void *data);
static int ssld_count;
-static char tmpbuf[READBUF_SIZE];
+static char tmpbuf[READBUF_SIZE];
static char nul = '\0';
#define MAXPASSFD 4
uint8_t dead;
};
-static void send_new_ssl_certs_one(ssl_ctl_t *ctl, const char *ssl_cert, const char *ssl_private_key, const char *ssl_dh_params);
-static void send_init_prng(ssl_ctl_t *ctl, prng_seed_t seedtype, const char *path);
+static void send_new_ssl_certs_one(ssl_ctl_t * ctl, const char *ssl_cert,
+ const char *ssl_private_key, const char *ssl_dh_params);
+static void send_init_prng(ssl_ctl_t * ctl, prng_seed_t seedtype, const char *path);
static rb_dlink_list ssl_daemons;
-static inline int32_t buf_to_int32(char *buf)
+static inline int32_t
+buf_to_int32(char *buf)
{
int32_t x;
memcpy(&x, buf, sizeof(x));
return x;
}
-static inline void int32_to_buf(char *buf, int32_t x)
+static inline void
+int32_to_buf(char *buf, int32_t x)
{
memcpy(buf, &x, sizeof(x));
return;
}
-static inline uint16_t buf_to_uint16(char *buf)
+static inline uint16_t
+buf_to_uint16(char *buf)
{
uint16_t x;
memcpy(&x, buf, sizeof(x));
return x;
}
-static inline void uint16_to_buf(char *buf, uint16_t x)
+static inline void
+uint16_to_buf(char *buf, uint16_t x)
{
memcpy(buf, &x, sizeof(x));
return;
static ssl_ctl_t *
-allocate_ssl_daemon(rb_fde_t *F, rb_fde_t *P, int pid)
+allocate_ssl_daemon(rb_fde_t * F, rb_fde_t * P, int pid)
{
ssl_ctl_t *ctl;
-
+
if(F == NULL || pid < 0)
return NULL;
- ctl = rb_malloc(sizeof(ssl_ctl_t));
+ ctl = rb_malloc(sizeof(ssl_ctl_t));
ctl->F = F;
ctl->P = P;
ctl->pid = pid;
}
static void
-free_ssl_daemon(ssl_ctl_t *ctl)
+free_ssl_daemon(ssl_ctl_t * ctl)
{
rb_dlink_node *ptr;
ssl_ctl_buf_t *ctl_buf;
int x;
if(ctl->cli_count)
return;
-
+
RB_DLINK_FOREACH(ptr, ctl->readq.head)
{
ctl_buf = ptr->data;
for(x = 0; x < ctl_buf->nfds; x++)
- rb_close(ctl_buf->F[x]);
+ rb_close(ctl_buf->F[x]);
rb_free(ctl_buf->buf);
- rb_free(ctl_buf);
+ rb_free(ctl_buf);
}
RB_DLINK_FOREACH(ptr, ctl->writeq.head)
continue;
ctl->dead = 1;
ssld_count--;
- kill(ctl->pid, SIGKILL);
+ rb_kill(ctl->pid, SIGKILL);
}
}
static void
-ssl_dead(ssl_ctl_t *ctl)
+ssl_dead(ssl_ctl_t * ctl)
{
if(ctl->dead)
return;
-
+
ctl->dead = 1;
ssld_count--;
- kill(ctl->pid, SIGKILL); /* make sure the process is really gone */
+ rb_kill(ctl->pid, SIGKILL); /* make sure the process is really gone */
ilog(L_MAIN, "ssld helper died - attempting to restart");
sendto_realops_snomask(SNO_GENERAL, L_ALL, "ssld helper died - attempting to restart");
start_ssldaemon(1, ServerInfo.ssl_cert, ServerInfo.ssl_private_key, ServerInfo.ssl_dh_params);
}
static void
-ssl_do_pipe(rb_fde_t *F, void *data)
+ssl_do_pipe(rb_fde_t * F, void *data)
{
int retlen;
ssl_ctl_t *ctl = data;
{
rb_fde_t *F1, *F2;
rb_fde_t *P1, *P2;
+#ifdef _WIN32
+ const char *suffix = ".exe";
+#else
+ const char *suffix = "";
+#endif
+
char fullpath[PATH_MAX + 1];
char fdarg[6];
const char *parv[2];
char buf[128];
+ char s_pid[10];
pid_t pid;
int started = 0, i;
if(ssld_spin_count > 20 && (rb_current_time() - last_spin < 5))
{
ilog(L_MAIN, "ssld helper is spinning - will attempt to restart in 1 minute");
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "ssld helper is spinning - will attempt to restart in 1 minute");
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "ssld helper is spinning - will attempt to restart in 1 minute");
rb_event_add("restart_ssld_event", restart_ssld_event, NULL, 60);
ssld_wait = 1;
return 0;
ssld_spin_count++;
last_spin = rb_current_time();
+
if(ssld_path == NULL)
{
- rb_snprintf(fullpath, sizeof(fullpath), "%s/ssld", BINPATH);
-
+ rb_snprintf(fullpath, sizeof(fullpath), "%s/ssld%s", BINPATH, suffix);
+
if(access(fullpath, X_OK) == -1)
{
- rb_snprintf(fullpath, sizeof(fullpath), "%s/bin/ssld", ConfigFileEntry.dpath);
+ rb_snprintf(fullpath, sizeof(fullpath), "%s/bin/ssld%s",
+ ConfigFileEntry.dpath, suffix);
if(access(fullpath, X_OK) == -1)
{
- ilog(L_MAIN, "Unable to execute ssld in %s/bin or %s", ConfigFileEntry.dpath, BINPATH);
- return 0 ;
+ ilog(L_MAIN,
+ "Unable to execute ssld%s in %s/bin or %s",
+ ConfigFileEntry.dpath, suffix, BINPATH);
+ return 0;
}
}
ssld_path = rb_strdup(fullpath);
}
-
rb_strlcpy(buf, "-ircd ssld daemon helper", sizeof(buf));
parv[0] = buf;
parv[1] = NULL;
for(i = 0; i < count; i++)
{
ssl_ctl_t *ctl;
- rb_socketpair(AF_UNIX, SOCK_DGRAM, 0, &F1, &F2, "SSL/TLS handle passing socket");
+ if(rb_socketpair(AF_UNIX, SOCK_DGRAM, 0, &F1, &F2, "SSL/TLS handle passing socket") == -1)
+ {
+ ilog(L_MAIN, "Unable to create ssld - rb_socketpair failed: %s", strerror(errno));
+ return started;
+ }
+
rb_set_buffers(F1, READBUF_SIZE);
rb_set_buffers(F2, READBUF_SIZE);
rb_snprintf(fdarg, sizeof(fdarg), "%d", rb_get_fd(F2));
- setenv("CTL_FD", fdarg, 1);
- rb_pipe(&P1, &P2, "SSL/TLS pipe");
+ rb_setenv("CTL_FD", fdarg, 1);
+ if(rb_pipe(&P1, &P2, "SSL/TLS pipe") == -1)
+ {
+ ilog(L_MAIN, "Unable to create ssld - rb_pipe failed: %s", strerror(errno));
+ return started;
+ }
rb_snprintf(fdarg, sizeof(fdarg), "%d", rb_get_fd(P1));
- setenv("CTL_PIPE", fdarg, 1);
-
- pid = rb_spawn_process(ssld_path, (const char **)parv);
+ rb_setenv("CTL_PIPE", fdarg, 1);
+ rb_snprintf(s_pid, sizeof(s_pid), "%d", (int)getpid());
+ rb_setenv("CTL_PPID", s_pid, 1);
+#ifdef _WIN32
+ SetHandleInformation((HANDLE) rb_get_fd(F2), HANDLE_FLAG_INHERIT, 1);
+ SetHandleInformation((HANDLE) rb_get_fd(P1), HANDLE_FLAG_INHERIT, 1);
+#endif
+
+ pid = rb_spawn_process(ssld_path, (const char **) parv);
if(pid == -1)
{
ilog(L_MAIN, "Unable to create ssld: %s\n", strerror(errno));
send_init_prng(ctl, RB_PRNG_DEFAULT, NULL);
}
if(ssl_ok && ssl_cert != NULL && ssl_private_key != NULL)
- send_new_ssl_certs_one(ctl, ssl_cert, ssl_private_key, ssl_dh_params != NULL ? ssl_dh_params : "");
+ send_new_ssl_certs_one(ctl, ssl_cert, ssl_private_key,
+ ssl_dh_params != NULL ? ssl_dh_params : "");
ssl_read_ctl(ctl->F, ctl);
ssl_do_pipe(P2, ctl);
+
}
- return started;
+ return started;
}
static void
-ssl_process_zipstats(ssl_ctl_t *ctl, ssl_ctl_buf_t *ctl_buf)
+ssl_process_zipstats(ssl_ctl_t * ctl, ssl_ctl_buf_t * ctl_buf)
{
struct Client *server;
struct ZipStats *zips;
int parc;
- char *parv[6];
- parc = rb_string_to_array(ctl_buf->buf, parv, 6);
+ char *parv[7];
+ parc = rb_string_to_array(ctl_buf->buf, parv, 6);
server = find_server(NULL, parv[1]);
if(server == NULL || server->localClient == NULL || !IsCapable(server, CAP_ZIP))
return;
if(server->localClient->zipstats == NULL)
server->localClient->zipstats = rb_malloc(sizeof(struct ZipStats));
-
+
zips = server->localClient->zipstats;
zips->in += strtoull(parv[2], NULL, 10);
zips->in_wire += strtoull(parv[3], NULL, 10);
zips->out += strtoull(parv[4], NULL, 10);
zips->out_wire += strtoull(parv[5], NULL, 10);
-
+
if(zips->in > 0)
- zips->in_ratio = ((double)(zips->in - zips->in_wire) / (double) zips->in) * 100.00;
+ zips->in_ratio = ((double) (zips->in - zips->in_wire) / (double) zips->in) * 100.00;
else
zips->in_ratio = 0;
-
+
if(zips->out > 0)
- zips->out_ratio = ((double)(zips->out - zips->out_wire) / (double) zips->out) * 100.00;
+ zips->out_ratio = ((double) (zips->out - zips->out_wire) / (double) zips->out) * 100.00;
else
zips->out_ratio = 0;
}
static void
-ssl_process_dead_fd(ssl_ctl_t *ctl, ssl_ctl_buf_t *ctl_buf)
+ssl_process_dead_fd(ssl_ctl_t * ctl, ssl_ctl_buf_t * ctl_buf)
{
struct Client *client_p;
char reason[256];
int32_t fd;
if(ctl_buf->buflen < 6)
- return; /* bogus message..drop it.. XXX should warn here */
-
+ return; /* bogus message..drop it.. XXX should warn here */
+
fd = buf_to_int32(&ctl_buf->buf[1]);
rb_strlcpy(reason, &ctl_buf->buf[5], sizeof(reason));
client_p = find_cli_fd_hash(fd);
if(client_p == NULL)
return;
+ if(IsAnyServer(client_p) || IsRegistered(client_p))
+ {
+ /* read any last moment ERROR, QUIT or the like -- jilles */
+ if (!strcmp(reason, "Remote host closed the connection"))
+ read_packet(client_p->localClient->F, client_p);
+ if (IsAnyDead(client_p))
+ return;
+ }
if(IsAnyServer(client_p))
{
sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) && !IsServer(client_p) ? L_NETWIDE : L_ALL, "ssld error for %s: %s", client_p->name, reason);
exit_client(client_p, client_p, &me, reason);
}
-
static void
-ssl_process_zip_ready(ssl_ctl_t *ctl, ssl_ctl_buf_t *ctl_buf)
+ssl_process_certfp(ssl_ctl_t * ctl, ssl_ctl_buf_t * ctl_buf)
{
struct Client *client_p;
int32_t fd;
+ uint8_t *certfp;
+ char *certfp_string;
+ int i;
+
+ if(ctl_buf->buflen != 5 + RB_SSL_CERTFP_LEN)
+ return; /* bogus message..drop it.. XXX should warn here */
- if(ctl_buf->buflen < 5)
- return; /* bogus message..drop it.. XXX should warn here */
-
fd = buf_to_int32(&ctl_buf->buf[1]);
+ certfp = (uint8_t *)&ctl_buf->buf[5];
client_p = find_cli_fd_hash(fd);
if(client_p == NULL)
return;
-
- /* Now start sending the data that should be compressed. */
- // ClearCork(client_p);
- send_pop_queue(client_p);
- /* Start reading uncompressed data. */
- read_packet(client_p->localClient->F, client_p);
+ rb_free(client_p->certfp);
+ certfp_string = rb_malloc(RB_SSL_CERTFP_LEN * 2 + 1);
+ for(i = 0; i < RB_SSL_CERTFP_LEN; i++)
+ rb_snprintf(certfp_string + 2 * i, 3, "%02x",
+ certfp[i]);
+ client_p->certfp = certfp_string;
}
-
static void
-ssl_process_cmd_recv(ssl_ctl_t *ctl)
+ssl_process_cmd_recv(ssl_ctl_t * ctl)
{
static const char *cannot_setup_ssl = "ssld cannot setup ssl, check your certificates and private key";
static const char *no_ssl_or_zlib = "ssld has neither SSL/TLS or zlib support killing all sslds";
- rb_dlink_node *ptr, *next;
+ rb_dlink_node *ptr, *next;
ssl_ctl_buf_t *ctl_buf;
if(ctl->dead)
return;
RB_DLINK_FOREACH_SAFE(ptr, next, ctl->readq.head)
{
- ctl_buf = ptr->data;
- switch(*ctl_buf->buf)
+ ctl_buf = ptr->data;
+ switch (*ctl_buf->buf)
{
- case 'N':
- ssl_ok = 0; /* ssld says it can't do ssl/tls */
- break;
- case 'D':
- ssl_process_dead_fd(ctl, ctl_buf);
- break;
- case 'S':
- ssl_process_zipstats(ctl, ctl_buf);
- break;
- case 'I':
- ssl_ok = 0;
- ilog(L_MAIN, cannot_setup_ssl);
- sendto_realops_snomask(SNO_GENERAL, L_ALL, cannot_setup_ssl);
- case 'U':
- zlib_ok = 0;
- ssl_ok = 0;
- ilog(L_MAIN, no_ssl_or_zlib);
- sendto_realops_snomask(SNO_GENERAL, L_ALL, no_ssl_or_zlib);
- ssl_killall();
- break;
- case 'R':
- ssl_process_zip_ready(ctl, ctl_buf);
- break;
- case 'z':
- zlib_ok = 0;
- break;
- default:
- ilog(L_MAIN, "Received invalid command from ssld: %s", ctl_buf->buf);
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "Received invalid command from ssld");
- break;
+ case 'N':
+ ssl_ok = 0; /* ssld says it can't do ssl/tls */
+ break;
+ case 'D':
+ ssl_process_dead_fd(ctl, ctl_buf);
+ break;
+ case 'F':
+ ssl_process_certfp(ctl, ctl_buf);
+ break;
+ case 'S':
+ ssl_process_zipstats(ctl, ctl_buf);
+ break;
+ case 'I':
+ ssl_ok = 0;
+ ilog(L_MAIN, cannot_setup_ssl);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL, cannot_setup_ssl);
+ case 'U':
+ zlib_ok = 0;
+ ssl_ok = 0;
+ ilog(L_MAIN, no_ssl_or_zlib);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL, no_ssl_or_zlib);
+ ssl_killall();
+ break;
+ case 'z':
+ zlib_ok = 0;
+ break;
+ default:
+ ilog(L_MAIN, "Received invalid command from ssld: %s", ctl_buf->buf);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL, "Received invalid command from ssld");
+ break;
}
rb_dlinkDelete(ptr, &ctl->readq);
rb_free(ctl_buf->buf);
static void
-ssl_read_ctl(rb_fde_t *F, void *data)
+ssl_read_ctl(rb_fde_t * F, void *data)
{
ssl_ctl_buf_t *ctl_buf;
ssl_ctl_t *ctl = data;
ctl_buf->buf = rb_malloc(READSIZE);
retlen = rb_recv_fd_buf(ctl->F, ctl_buf->buf, READSIZE, ctl_buf->F, 4);
ctl_buf->buflen = retlen;
- if(retlen <= 0) {
+ if(retlen <= 0)
+ {
rb_free(ctl_buf->buf);
rb_free(ctl_buf);
}
else
rb_dlinkAddTail(ctl_buf, &ctl_buf->node, &ctl->readq);
- } while(retlen > 0);
-
+ }
+ while(retlen > 0);
+
if(retlen == 0 || (retlen < 0 && !rb_ignore_errno(errno)))
{
ssl_dead(ctl);
return;
- }
+ }
ssl_process_cmd_recv(ctl);
rb_setselect(ctl->F, RB_SELECT_READ, ssl_read_ctl, ctl);
}
{
ssl_ctl_t *ctl, *lowest = NULL;
rb_dlink_node *ptr;
-
+
RB_DLINK_FOREACH(ptr, ssl_daemons.head)
{
ctl = ptr->data;
if(ctl->dead)
continue;
- if(lowest == NULL) {
+ if(lowest == NULL)
+ {
lowest = ctl;
continue;
}
if(ctl->cli_count < lowest->cli_count)
lowest = ctl;
}
- return(lowest);
+ return (lowest);
}
static void
-ssl_write_ctl(rb_fde_t *F, void *data)
+ssl_write_ctl(rb_fde_t * F, void *data)
{
ssl_ctl_t *ctl = data;
ssl_ctl_buf_t *ctl_buf;
{
ctl_buf = ptr->data;
/* in theory unix sock_dgram shouldn't ever short write this.. */
- retlen = rb_send_fd_buf(ctl->F, ctl_buf->F, ctl_buf->nfds, ctl_buf->buf, ctl_buf->buflen);
+ retlen = rb_send_fd_buf(ctl->F, ctl_buf->F, ctl_buf->nfds, ctl_buf->buf, ctl_buf->buflen, ctl->pid);
if(retlen > 0)
{
rb_dlinkDelete(ptr, &ctl->writeq);
rb_close(ctl_buf->F[x]);
rb_free(ctl_buf->buf);
rb_free(ctl_buf);
-
+
}
if(retlen == 0 || (retlen < 0 && !rb_ignore_errno(errno)))
{
ssl_dead(ctl);
return;
- } else {
+ }
+ else
+ {
rb_setselect(ctl->F, RB_SELECT_WRITE, ssl_write_ctl, ctl);
}
}
}
static void
-ssl_cmd_write_queue(ssl_ctl_t *ctl, rb_fde_t **F, int count, const void *buf, size_t buflen)
+ssl_cmd_write_queue(ssl_ctl_t * ctl, rb_fde_t ** F, int count, const void *buf, size_t buflen)
{
ssl_ctl_buf_t *ctl_buf;
- int x;
+ int x;
/* don't bother */
if(ctl->dead)
return;
-
+
ctl_buf = rb_malloc(sizeof(ssl_ctl_buf_t));
ctl_buf->buf = rb_malloc(buflen);
memcpy(ctl_buf->buf, buf, buflen);
ctl_buf->buflen = buflen;
-
+
for(x = 0; x < count && x < MAXPASSFD; x++)
{
- ctl_buf->F[x] = F[x];
+ ctl_buf->F[x] = F[x];
}
ctl_buf->nfds = count;
rb_dlinkAddTail(ctl_buf, &ctl_buf->node, &ctl->writeq);
static void
-send_new_ssl_certs_one(ssl_ctl_t *ctl, const char *ssl_cert, const char *ssl_private_key, const char *ssl_dh_params)
+send_new_ssl_certs_one(ssl_ctl_t * ctl, const char *ssl_cert, const char *ssl_private_key, const char *ssl_dh_params)
{
size_t len;
- len = strlen(ssl_cert) + strlen(ssl_private_key) + strlen(ssl_dh_params) + 5;
+ len = strlen(ssl_cert) + strlen(ssl_private_key) + strlen(ssl_dh_params) + 5;
if(len > sizeof(tmpbuf))
{
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Parameters for send_new_ssl_certs_one too long (%zu > %zu) to pass to ssld, not sending...",
- len, sizeof(tmpbuf));
- ilog(L_MAIN, "Parameters for send_new_ssl_certs_one too long (%zu > %zu) to pass to ssld, not sending...",
- len, sizeof(tmpbuf));
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "Parameters for send_new_ssl_certs_one too long (%zu > %zu) to pass to ssld, not sending...",
+ len, sizeof(tmpbuf));
+ ilog(L_MAIN,
+ "Parameters for send_new_ssl_certs_one too long (%zu > %zu) to pass to ssld, not sending...",
+ len, sizeof(tmpbuf));
return;
}
- len = rb_snprintf(tmpbuf, sizeof(tmpbuf), "K%c%s%c%s%c%s%c", nul, ssl_cert, nul, ssl_private_key, nul, ssl_dh_params, nul);
+ len = rb_snprintf(tmpbuf, sizeof(tmpbuf), "K%c%s%c%s%c%s%c", nul, ssl_cert, nul,
+ ssl_private_key, nul, ssl_dh_params, nul);
ssl_cmd_write_queue(ctl, NULL, 0, tmpbuf, len);
}
static void
-send_init_prng(ssl_ctl_t *ctl, prng_seed_t seedtype, const char *path)
+send_init_prng(ssl_ctl_t * ctl, prng_seed_t seedtype, const char *path)
{
size_t len;
const char *s;
len = strlen(s) + 3;
if(len > sizeof(tmpbuf))
{
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Parameters for send_init_prng too long (%zd > %zd) to pass to ssld, not sending...",
- len, sizeof(tmpbuf));
- ilog(L_MAIN, "Parameters for send_init_prng too long (%zd > %zd) to pass to ssld, not sending...",
- len, sizeof(tmpbuf));
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "Parameters for send_init_prng too long (%zd > %zd) to pass to ssld, not sending...",
+ len, sizeof(tmpbuf));
+ ilog(L_MAIN,
+ "Parameters for send_init_prng too long (%zd > %zd) to pass to ssld, not sending...",
+ len, sizeof(tmpbuf));
return;
-
- }
+
+ }
len = rb_snprintf(tmpbuf, sizeof(tmpbuf), "I%c%s%c", seed, s, nul);
ssl_cmd_write_queue(ctl, NULL, 0, tmpbuf, len);
}
RB_DLINK_FOREACH(ptr, ssl_daemons.head)
{
ssl_ctl_t *ctl = ptr->data;
- send_new_ssl_certs_one(ctl, ssl_cert, ssl_private_key, ssl_dh_params);
+ send_new_ssl_certs_one(ctl, ssl_cert, ssl_private_key, ssl_dh_params);
}
}
-ssl_ctl_t *
-start_ssld_accept(rb_fde_t *sslF, rb_fde_t *plainF, int32_t id)
+ssl_ctl_t *
+start_ssld_accept(rb_fde_t * sslF, rb_fde_t * plainF, int32_t id)
{
rb_fde_t *F[2];
ssl_ctl_t *ctl;
}
ssl_ctl_t *
-start_ssld_connect(rb_fde_t *sslF, rb_fde_t *plainF, int32_t id)
+start_ssld_connect(rb_fde_t * sslF, rb_fde_t * plainF, int32_t id)
{
rb_fde_t *F[2];
ssl_ctl_t *ctl;
ctl = which_ssld();
ctl->cli_count++;
ssl_cmd_write_queue(ctl, F, 2, buf, sizeof(buf));
- return ctl;
+ return ctl;
}
-void
-ssld_decrement_clicount(ssl_ctl_t *ctl)
+void
+ssld_decrement_clicount(ssl_ctl_t * ctl)
{
if(ctl == NULL)
return;
void
start_zlib_session(void *data)
{
- struct Client *server = (struct Client *)data;
+ struct Client *server = (struct Client *) data;
uint16_t recvqlen;
uint8_t level;
void *xbuf;
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(int32_t);
server->localClient->event = NULL;
recvqlen = rb_linebuf_len(&server->localClient->buf_recvq);
-
+
len = recvqlen + hdr;
if(len > READBUF_SIZE)
{
- rb_free(buf);
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "ssld - attempted to pass message of %zd len, max len %d, giving up", len, READBUF_SIZE);
+ sendto_realops_snomask(SNO_GENERAL, L_ALL,
+ "ssld - attempted to pass message of %zd len, max len %d, giving up",
+ len, READBUF_SIZE);
ilog(L_MAIN, "ssld - attempted to pass message of %zd len, max len %d, giving up", len, READBUF_SIZE);
exit_client(server, server, server, "ssld readbuf exceeded");
return;
}
- buf = rb_malloc(len);
+ buf = rb_malloc(len);
level = ConfigFileEntry.compression_level;
int32_to_buf(&buf[1], rb_get_fd(server->localClient->F));
- buf[5] = (char)level;
+ buf[5] = (char) level;
- recvq_start = &buf[6];
+ recvq_start = &buf[6];
server->localClient->zipstats = rb_malloc(sizeof(struct ZipStats));
xbuf = recvq_start;
{
cpylen = rb_linebuf_get(&server->localClient->buf_recvq, xbuf, left, LINEBUF_PARTIAL, LINEBUF_RAW);
left -= cpylen;
- xbuf += cpylen;
- } while(cpylen > 0);
+ xbuf = (void *) (((uintptr_t) xbuf) + cpylen);
+ }
+ while(cpylen > 0);
/* Pass the socket to ssld. */
*buf = 'Z';
- rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF1, &xF2, "Initial zlib socketpairs");
+ if(rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF1, &xF2, "Initial zlib socketpairs") == -1)
+ {
+ sendto_realops_snomask(SNO_GENERAL, L_ALL, "Error creating zlib socketpair - %s", strerror(errno));
+ ilog(L_MAIN, "Error creating zlib socketpairs - %s", strerror(errno));
+ exit_client(server, server, server, "Error creating zlib socketpair");
+ return;
+ }
+
+ if(IsSSL(server))
+ {
+ /* tell ssld the new connid for the ssl part*/
+ buf2[0] = 'Y';
+ int32_to_buf(&buf2[1], rb_get_fd(server->localClient->F));
+ int32_to_buf(&buf2[5], rb_get_fd(xF2));
+ ssl_cmd_write_queue(server->localClient->ssl_ctl, NULL, 0, buf2, sizeof(buf2));
+ }
- F[0] = server->localClient->F;
+
+ F[0] = server->localClient->F;
F[1] = xF1;
- del_from_cli_fd_hash(server);
+ del_from_cli_fd_hash(server);
server->localClient->F = xF2;
/* need to redo as what we did before isn't valid now */
int32_to_buf(&buf[1], rb_get_fd(server->localClient->F));
add_to_cli_fd_hash(server);
- server->localClient->ssl_ctl = which_ssld();
- server->localClient->ssl_ctl->cli_count++;
- ssl_cmd_write_queue(server->localClient->ssl_ctl, F, 2, buf, len);
+
+ server->localClient->z_ctl = which_ssld();
+ server->localClient->z_ctl->cli_count++;
+ ssl_cmd_write_queue(server->localClient->z_ctl, F, 2, buf, len);
rb_free(buf);
}
id = rb_get_fd(target_p->localClient->F);
int32_to_buf(&buf[1], rb_get_fd(target_p->localClient->F));
- rb_strlcpy(odata, target_p->name, (sizeof(buf)-len));
- len += strlen(odata) + 1; /* Get the \0 as well */
- ssl_cmd_write_queue(target_p->localClient->ssl_ctl, NULL, 0, buf, len);
+ rb_strlcpy(odata, target_p->name, (sizeof(buf) - len));
+ len += strlen(odata) + 1; /* Get the \0 as well */
+ ssl_cmd_write_queue(target_p->localClient->z_ctl, NULL, 0, buf, len);
}
}
}
ctl = ptr->data;
if(ctl->dead && !ctl->cli_count)
{
- free_ssl_daemon(ctl);
+ free_ssl_daemon(ctl);
}
}
}
return ssld_count;
}
-void init_ssld(void)
+void
+init_ssld(void)
{
rb_event_addish("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
rb_event_addish("cleanup_dead_ssld", cleanup_dead_ssl, NULL, 1200);
}
-
projects / irc / rqf / shadowircd.git / blobdiff