Module Name: src
Committed By: pooka
Date: Thu Jan 27 18:05:16 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
Set server reconnection timeout to infinite. There probably need
to be some toggle eventually, but for now I'm optimizing the default
for my firefox use ;)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/librumphijack/hijack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.21 src/lib/librumphijack/hijack.c:1.22
--- src/lib/librumphijack/hijack.c:1.21 Wed Jan 26 18:48:32 2011
+++ src/lib/librumphijack/hijack.c Thu Jan 27 18:05:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.21 2011/01/26 18:48:32 christos Exp $ */
+/* $NetBSD: hijack.c,v 1.22 2011/01/27 18:05:16 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: hijack.c,v 1.21 2011/01/26 18:48:32 christos Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.22 2011/01/27 18:05:16 pooka Exp $");
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -187,7 +187,6 @@
static void __attribute__((constructor))
rcinit(void)
{
- int (*rumpcinit)(void);
void **rumpcdlsym;
void *hand;
unsigned i, j;
@@ -195,8 +194,6 @@
hand = dlopen("librumpclient.so", RTLD_LAZY|RTLD_GLOBAL);
if (!hand)
err(1, "cannot open librumpclient.so");
- rumpcinit = dlsym(hand, "rumpclient_init");
- _DIAGASSERT(rumpcinit);
rumpcdlsym = dlsym(hand, "rumpclient_dlsym");
*rumpcdlsym = hijackdlsym;
@@ -229,8 +226,9 @@
syscnames[j].scm_rumpname);
}
- if (rumpcinit() == -1)
+ if (rumpclient_init() == -1)
err(1, "rumpclient init");
+ rumpclient_setconnretry(RUMPCLIENT_RETRYCONN_INFTIME);
}
/* XXX: need runtime selection. low for now due to FD_SETSIZE */
