* tailing reliable realtime streaming feeder for inn
* conn.c - connection establishment and teardown
*
- * Copyright (C) 2010 Ian Jackson <ijackson@chiark.greenend.org.uk>
- *
- * 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * (I believe that when you compile and link this as part of the inn2
- * build, with the Makefile runes I have provided, all the libraries
- * and files which end up included in innduct are licence-compatible
- * with GPLv3. If not then please let me know. -Ian Jackson.)
+ * Copyright Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * and contributors; see LICENCE.txt.
+ * SPDX-License-Identifier: GPL-3.0-or-later
*/
#include "innduct.h"
LIST_REMOVE(conns,conn);
- char *m= xvasprintf(fmt,al);
- warn("C%d (now %d) connection failed requeueing " RCI_TRIPLE_FMT_BASE ": %s",
+ char *m= mvasprintf(fmt,al);
+ warn("C%d (now %d) connection failed "
+ "(requeueing " RCI_TRIPLE_FMT_BASE "): %s",
conn->fd, conns.count, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
free(m);
conn_idle_close(conn, "low volume");
}
+/*---------- reporting numbers of connections ----------*/
+
+static int conns_max_reported, conns_idle_reported;
+
+void notice_conns_more(const char *new_kind) {
+ if (conns.count > conns_max_reported) {
+ notice("up to %d connection(s) (%s)", conns.count, new_kind);
+ conns_max_reported= conns.count;
+ }
+}
+
+void notice_conns_fewer(void) {
+ if (!conns.count && !conns_idle_reported) {
+ notice("low volume, using intermittent connection");
+ conns_idle_reported= 1;
+ }
+}
+
+void notice_conns_stats(void) {
+ notice("currently %d connection(s)", conns.count);
+ conns_max_reported= conns.count;
+ conns_idle_reported= 0;
+}
+
/*---------- making new connections ----------*/
pid_t connecting_child;
#define CHK(field, val) \
if (h->cmsg_##field != val) { \
- crash("connect: child sent cmsg with cmsg_" #field "=%d, expected %d", \
- h->cmsg_##field, val); \
+ crash("connect: child sent cmsg with cmsg_" #field "=%ld, expected %ld", \
+ (long)h->cmsg_##field, (long)val); \
goto x; \
}
CHK(level, SOL_SOCKET);
loop->on_fd(loop, conn->fd, OOP_EXCEPTION, conn_exception, conn);
conn->rd= oop_rd_new_fd(loop,conn->fd, 0, 0); /* sets nonblocking, too */
if (!conn->fd) crash("oop_rd_new_fd conn failed (fd=%d)",conn->fd);
- int r= oop_rd_read(conn->rd, &peer_rd_style, NNTP_STRLEN,
+ int r= oop_rd_read(conn->rd, &peer_rd_style, NNTP_MAXLEN_COMMAND+1,
&peer_rd_ok, conn,
&peer_rd_err, conn);
if (r) syscrash("oop_rd_read for peer (fd=%d)",conn->fd);
LIST_ADDHEAD(conns, conn);
- notice("C%d (now %d) connected %s",
- conn->fd, conns.count, conn->stream ? "streaming" : "plain");
+ const char *streamdesc= conn->stream ? "streaming" : "plain";
+ info("C%d (now %d) connected %s", conn->fd, conns.count, streamdesc);
+ notice_conns_more(streamdesc);
connect_attempt_discard();
check_assign_articles();
if (!connecting_child) {
FILE *cn_from, *cn_to;
- char buf[NNTP_STRLEN+100];
+ char buf[NNTP_MAXLEN_COMMAND+100];
int exitstatus= CONNCHILD_ESTATUS_NOSTREAM;
xclose(socks[0], "(in child) parent's connection fdpass socket",0);
alarm(connection_setup_timeout);
- if (NNTPconnect((char*)remote_host, port, &cn_from, &cn_to, buf) < 0) {
+ buf[sizeof(buf)-1] = 0;
+ if (NNTPconnect(remote_host, port, &cn_from, &cn_to,
+ buf, sizeof(buf)-1) < 0) {
int l= strlen(buf);
int stripped=0;
while (l>0) {
default:
warn("connect: unexpected response to MODE STREAM: %.50s",
sanitise(buf,-1));
- exitstatus= 2;
+ exitstatus= CONNCHILD_ESTATUS_NOSTREAM;
break;
}
}