Hi,
see subject, patch attached.
Christof
--
http://cmeerw.org sip:cmeerw at cmeerw.org
mailto:cmeerw at cmeerw.org xmpp:cmeerw at cmeerw.org
diff -ur jabberd-2.1.16.orig/etc/s2s.xml.dist.in jabberd-2.1.16/etc/s2s.xml.dist.in
--- jabberd-2.1.16.orig/etc/s2s.xml.dist.in 2007-08-31 02:24:28.000000000 +0200
+++ jabberd-2.1.16/etc/s2s.xml.dist.in 2007-09-23 21:30:49.000000000 +0200
@@ -121,6 +121,16 @@
</local>
+ <!-- input/output settings -->
+ <io>
+ <!-- Maximum number of file descriptors. Note that the number of
+ possible connections will be slightly less than this, because
+ s2s itself can use some on its own. If the supply of file
+ descriptors is exhausted, new incoming connections will be
+ denied (default: 1024) -->
+ <max_fds>1024</max_fds>
+ </io>
+
<!-- Timed checks -->
<check>
<!-- Interval between checks.
diff -ur jabberd-2.1.16.orig/s2s/main.c jabberd-2.1.16/s2s/main.c
--- jabberd-2.1.16.orig/s2s/main.c 2007-08-31 02:24:28.000000000 +0200
+++ jabberd-2.1.16/s2s/main.c 2007-09-23 21:30:49.000000000 +0200
@@ -140,6 +140,8 @@
if (s2s->local_pemfile != NULL)
log_debug(ZONE,"loaded local pemfile for peer s2s connections");
+ s2s->io_max_fds = j_atoi(config_get_one(s2s->config, "io.max_fds", 0), 1024);
+
s2s->check_interval = j_atoi(config_get_one(s2s->config, "check.interval", 0), 60);
s2s->check_queue = j_atoi(config_get_one(s2s->config, "check.queue", 0), 60);
s2s->check_keepalive = j_atoi(config_get_one(s2s->config, "check.keepalive", 0), 0);
@@ -514,7 +516,7 @@
s2s->sx_db = sx_env_plugin(s2s->sx_env, s2s_db_init);
- s2s->mio = mio_new(MIO_MAXFD);
+ s2s->mio = mio_new(s2s->io_max_fds);
s2s->retry_left = s2s->retry_init;
_s2s_router_connect(s2s);
Only in jabberd-2.1.16/s2s: main.c.orig
diff -ur jabberd-2.1.16.orig/s2s/s2s.h jabberd-2.1.16/s2s/s2s.h
--- jabberd-2.1.16.orig/s2s/s2s.h 2007-09-11 17:35:38.000000000 +0200
+++ jabberd-2.1.16/s2s/s2s.h 2007-09-23 21:30:49.000000000 +0200
@@ -106,6 +106,9 @@
/** verify-mode */
int local_verify_mode;
+ /** max file descriptors */
+ int io_max_fds;
+
/** time checks */
int check_interval;
int check_queue;
_______________________________________________
Jabberd2 mailing list
[email protected]
http://lists.xiaoka.com/listinfo.cgi/jabberd2-xiaoka.com
