X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/1863a0f818b3fe4ae6e45ec175cdde5ffcfb463c..1f8c7ce5ca3ca09092ecce0efe73f2bd7bbc424b:/wsockd/wsockd.c

diff --git a/wsockd/wsockd.c b/wsockd/wsockd.c
index 4c228607..66fa4efc 100644
--- a/wsockd/wsockd.c
+++ b/wsockd/wsockd.c
@@ -1,8 +1,8 @@
 /*
- *  wsockd.c: charybdis websockets helper
+ *  wsockd.c: solanum websockets helper
  *  Copyright (C) 2007 Aaron Sethman <androsyn@ratbox.org>
  *  Copyright (C) 2007 ircd-ratbox development team
- *  Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
+ *  Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -106,6 +106,8 @@ typedef struct {
 	uint8_t payload_length_mask; // payload_length: 7, mask: 1
 } ws_frame_hdr_t;
 
+#define WEBSOCKET_FRAME_HDR_INIT ((ws_frame_hdr_t) { 0, 0 })
+
 typedef struct {
 	ws_frame_hdr_t header;
 	uint8_t payload_data[WEBSOCKET_MAX_UNEXTENDED_PAYLOAD_DATA_LENGTH];
@@ -120,6 +122,8 @@ typedef struct {
 	uint16_t payload_length_extended;
 } ws_frame_ext_t;
 
+#define WEBSOCKET_FRAME_EXT_INIT ((ws_frame_ext_t) { WEBSOCKET_FRAME_HDR_INIT, 0 })
+
 typedef struct {
 	ws_frame_hdr_t header;
 	uint64_t payload_length_extended;
@@ -173,18 +177,15 @@ 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)
 {
 	return;
 }
-#endif
 
 static void
 setup_signals()
 {
-#ifndef _WIN32
 	struct sigaction act;
 
 	act.sa_flags = 0;
@@ -207,20 +208,17 @@ setup_signals()
 
 	act.sa_handler = dummy_handler;
 	sigaction(SIGALRM, &act, 0);
-#endif
 }
 
 static int
 maxconn(void)
 {
-#if defined(RLIMIT_NOFILE) && defined(HAVE_SYS_RESOURCE_H)
 	struct rlimit limit;
 
 	if(!getrlimit(RLIMIT_NOFILE, &limit))
 	{
 		return limit.rlim_cur;
 	}
-#endif /* RLIMIT_FD_MAX */
 	return MAXCONNECTIONS;
 }
 
@@ -327,7 +325,7 @@ conn_mod_write(conn_t * conn, void *data, size_t len)
 static void
 conn_mod_write_short_frame(conn_t * conn, void *data, int len)
 {
-	ws_frame_hdr_t hdr;
+	ws_frame_hdr_t hdr = WEBSOCKET_FRAME_HDR_INIT;
 
 	ws_frame_set_opcode(&hdr, WEBSOCKET_OPCODE_TEXT_FRAME);
 	ws_frame_set_fin(&hdr, 1);
@@ -341,7 +339,7 @@ conn_mod_write_short_frame(conn_t * conn, void *data, int len)
 static void
 conn_mod_write_long_frame(conn_t * conn, void *data, int len)
 {
-	ws_frame_ext_t hdr;
+	ws_frame_ext_t hdr = WEBSOCKET_FRAME_EXT_INIT;
 
 	ws_frame_set_opcode(&hdr.header, WEBSOCKET_OPCODE_TEXT_FRAME);
 	ws_frame_set_fin(&hdr.header, 1);
@@ -362,7 +360,7 @@ conn_mod_write_frame(conn_t *conn, void *data, int len)
 	if (len < 123)
 	{
 		conn_mod_write_short_frame(conn, data, len);
-		return
+		return;
 	}
 
 	conn_mod_write_long_frame(conn, data, len);
@@ -947,7 +945,7 @@ int
 main(int argc, char **argv)
 {
 	const char *s_ctlfd, *s_pipe, *s_pid;
-	int ctlfd, pipefd, x, maxfd;
+	int ctlfd, pipefd, maxfd, x;
 	maxfd = maxconn();
 
 	s_ctlfd = getenv("CTL_FD");
@@ -957,7 +955,7 @@ main(int argc, char **argv)
 	if(s_ctlfd == NULL || s_pipe == NULL || s_pid == NULL)
 	{
 		fprintf(stderr,
-			"This is the charybdis wsockd for internal ircd use.\n");
+			"This is the solanum wsockd for internal ircd use.\n");
 		fprintf(stderr,
 			"You aren't supposed to run me directly. Exiting.\n");
 		exit(1);
@@ -966,8 +964,7 @@ main(int argc, char **argv)
 	ctlfd = atoi(s_ctlfd);
 	pipefd = atoi(s_pipe);
 	ppid = atoi(s_pid);
-	x = 0;
-#ifndef _WIN32
+
 	for(x = 0; x < maxfd; x++)
 	{
 		if(x != ctlfd && x != pipefd && x > 2)
@@ -986,7 +983,7 @@ main(int argc, char **argv)
 		if(x > 2)
 			close(x);
 	}
-#endif
+
 	setup_signals();
 	rb_lib_init(NULL, NULL, NULL, 0, maxfd, 1024, 4096);
 	rb_linebuf_init(4096);