* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
* USA
- *
- * $Id$
*/
static void conn_plain_read_shutdown_cb(rb_fde_t *fd, void *data);
static void mod_cmd_write_queue(mod_ctl_t * ctl, const void *data, size_t len);
static const char *remote_closed = "Remote host closed the connection";
-static int ssl_ok;
+static bool ssl_ok;
static int certfp_method = RB_SSL_CERTFP_METH_SHA1;
#ifdef HAVE_LIBZ
-static int zlib_ok = 1;
+static bool zlib_ok = true;
#else
-static int zlib_ok = 0;
+static bool zlib_ok = false;
#endif
return;
snprintf(outstat, sizeof(outstat), "S %s %llu %llu %llu %llu", odata,
- conn->plain_out, conn->mod_in, conn->plain_in, conn->mod_out);
+ (unsigned long long)conn->plain_out,
+ (unsigned long long)conn->mod_in,
+ (unsigned long long)conn->plain_in,
+ (unsigned long long)conn->mod_out);
conn->plain_out = 0;
conn->plain_in = 0;
conn->mod_in = 0;
uint32_t id = buf_to_uint32(&ctlb->buf[1]);
uint32_t newid = buf_to_uint32(&ctlb->buf[5]);
conn_t *conn = conn_find_by_id(id);
+ lrb_assert(conn != NULL);
+ if(conn == NULL)
+ {
+ uint8_t buf[256];
+ int len;
+
+ buf[0] = 'D';
+ uint32_to_buf(&buf[1], newid);
+ sprintf((char *) &buf[5], "connid %d does not exist", id);
+ len = (strlen((char *) &buf[5]) + 1) + 5;
+ mod_cmd_write_queue(ctl, buf, len);
+
+ return;
+ }
rb_dlinkDelete(&conn->node, connid_hash(conn->id));
SetZipSSL(conn);
conn->id = newid;
mod_cmd_write_queue(ctl, useless, strlen(useless));
}
+static void
+send_version(mod_ctl_t * ctl)
+{
+ char version[256] = { 'V', 0 };
+ strncpy(&version[1], rb_lib_version(), sizeof(version) - 2);
+ mod_cmd_write_queue(ctl, version, strlen(version));
+}
+
static void
send_nozlib_support(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb)
{
if(s_ctlfd == NULL || s_pipe == NULL || s_pid == NULL)
{
fprintf(stderr,
- "This is ircd-ratbox ssld. You know you aren't supposed to run me directly?\n");
+ "This is the charybdis ssld for internal ircd use.\n");
fprintf(stderr,
- "You get an Id tag for this: $Id$\n");
- fprintf(stderr, "Have a nice life\n");
+ "You aren't supposed to run me directly. Exiting.\n");
exit(1);
}
rb_event_add("check_handshake_flood", check_handshake_flood, NULL, 10);
read_pipe_ctl(mod_ctl->F_pipe, NULL);
mod_read_ctl(mod_ctl->F, mod_ctl);
+ send_version(mod_ctl);
if(!zlib_ok && !ssl_ok)
{
/* this is really useless... */