Allow a user to /BIP JUMP [-f] [other_conn] (within their list).

This can be useful when a connection is very slow to reconnect and the
user wants to force an immediate reconnection.

Also:
- fix message when JUMPing on some already reconnecting link
- add find_link() method
- add reconnect timer info if any (else display 0s)
- add -f flag to reset reconnect timer

Signed-off-by: Loïc Gomez <bip@animanova.fr>

Makefile.am

@@ -3,7 +3,7 @@ if COND_WANT_TESTS
 endif
 SUBDIRS = src . $(MAYBE_TESTS)
 
-dist_man_MANS = bip.1 bip.conf.5 bipmkpw.1
+dist_man_MANS = bip.1 bip.conf.5 bipmkpw.1 bipgenconfig.1
 
 examplesdir = $(prefix)/share/doc/bip/examples/
 dist_examples_DATA = samples/bip.conf samples/bip.vim

bip.conf.5

@@ -146,7 +146,7 @@ Defines the delay between each logfiles sync to the disk. Must be a non null
 positive integer.
 
 .TP
-\fBreconn_timer\fP (default: \fB120\fP)
+\fBreconn_timer\fP (default: \fB30\fP)
 Defines the initial delay (in seconds) before a reconnection attempt.
 The delay increases with the number of attempts:
 delay = reconn_timer * number of attempts
@@ -227,7 +227,7 @@ This option should of course not be enabled if \fBbacklog_lines\fP is 0 !
 If you still want to do so, don't forget to \fB/BIP BLRESET\fP sometimes.
 
 .TP
-\fBbacklog_lines\fP (default: \fB10\fP)
+\fBbacklog_lines\fP (default: \fB0\fP)
 If set to 0, BIP will replay all the logs since last client disconnect. Else,
 it'll replay exactly \fBbacklog_lines\fP lines on each channel and privates.
 Be aware that BIP will replay \fBbacklog_lines\fP lines of all privates, even

samples/bip.conf

@@ -86,7 +86,7 @@
 # Sets the initial delay (in seconds) before a reconnection attempt.
 # The delay increases with the number of attempts:
 # delay = reconn_timer * number of attempts
-#reconn_timer = 120;
+#reconn_timer = 30;
 
 # Network definition, a name and server info
 #network {

scripts/bipgenconfig

@@ -119,7 +119,7 @@ my %optdesc = (
 			'optional' => 1,
 			'depends' => 'log', 'depval' => 'true',
 			'desc' => 'Do you want to activate backlog {play back logs} system ?' },
-		'backlog_lines' => { 'type' => 'i', 'adv' => 0, 'default' => '10',
+		'backlog_lines' => { 'type' => 'i', 'adv' => 0, 'default' => '0',
 			'optional' => 1,
 			'depends' => 'backlog', 'depval' => 'true',
 			'desc' => 'How much line do you want bip to play back upon client connect' .

src/bip.c

@@ -708,13 +708,18 @@ struct link *find_link(const char *link_name, struct bipuser *bu)
 {
 	list_iterator_t it;
 
+	// Immediately return NULL when bip user (bu) is NULL
+	if (!bu) {
+		return NULL;
+	}
+
 	for (list_it_init(&_bip->link_list, &it); list_it_item(&it);
 	     list_it_next(&it)) {
 		struct link *lnk = list_it_item(&it);
 		if (!lnk)
 			continue;
 		// Only lookup in optionally specified user links
-		if (bu && bu != lnk->user)
+		if (bu != lnk->user)
 			continue;
 
 		if (strcmp(link_name, lnk->name) == 0)
@@ -2109,10 +2114,10 @@ void adm_bip_help(struct link_client *ic, int admin, const char *subhelp)
 		bip_notify(ic, "/BIP JUMP [-f] [conn_name]:");
 		bip_notify(ic, "  Jump to next server in current network.");
 		bip_notify(ic,
-			   "  If conn_name is set, jump to next server in "
-			   "conn_name network instead.");
+			   "  If [conn_name] is set, jump to next server in "
+			   "[conn_name] network instead.");
 		bip_notify(ic,
-			   "  If -f flag is used, also resets reconnect "
+			   "  If [-f] flag is used, also resets reconnect "
 			   "timer.");
 	} else if (strcasecmp(subhelp, "BLRESET") == 0) {
 		bip_notify(ic, "/BIP BLRESET :");

src/defaults.h

@@ -19,7 +19,7 @@
 #define DEFAULT_BACKLOG 1
 #define DEFAULT_ALWAYS_BACKLOG 0
 #define DEFAULT_BL_MSG_ONLY 0
-#define DEFAULT_BACKLOG_LINES 10
+#define DEFAULT_BACKLOG_LINES 0
 #define DEFAULT_BACKLOG_TIMESTAMP BLTSTime
 #define DEFAULT_BLRESET_ON_TALK 0
 #define DEFAULT_BLRESET_CONNECTION 0
@@ -29,6 +29,6 @@
 #define DEFAULT_LOG_LEVEL LOG_INFO
 #define DEFAULT_LOG_FORMAT "%u/%n/%Y-%m/%c.%d.log"
 #define DEFAULT_BIP_USE_NOTICE 0
-#define DEFAULT_RECONN_TIMER 120
+#define DEFAULT_RECONN_TIMER 30
 
 #endif /* DEFAULTS_H */