mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-23 06:55:13 +01:00
Code Issues Projects Releases Wiki Activity

irc: get much less chatty.

Browse source 
We're going to wean off IRC, but as a quick fix, only announce 0-60 seconds
after we see a join, or every 6 hours.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2016-10-21 12:04:41 +10:30
parent 6da448b797
commit 144c40afd0
3 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
daemon/irc_announce.c
View file

@ -93,12 +93,18 @@ static void announce(struct ircstate *state)
}
tal_free(ctx);
new_reltimer(state->dstate, state, time_from_sec(60), announce, state);
/* By default we announce every 6 hours, otherwise when someone joins */
log_debug(state->log, "Setting long announce time: 6 hours");
state->dstate->announce = new_reltimer(state->dstate, state,
time_from_sec(3600 * 6),
announce, state);
}
/* Reconnect to IRC server upon disconnection. */
static void handle_irc_disconnect(struct ircstate *state)
{
/* Stop announcing. */
state->dstate->announce = tal_free(state->dstate->announce);
new_reltimer(state->dstate, state, state->reconnect_timeout, irc_connect, state);
}
@ -221,6 +227,19 @@ static void handle_irc_command(struct ircstate *istate, const struct irccommand
// Add our node to the node_map for completeness
add_node(istate->dstate, &dstate->id,
dstate->external_ip, dstate->portnum);
} else if (streq(cmd->command, "JOIN")) {
unsigned int delay;
/* Throw away any existing announce timer, and announce within
* 60 seconds. */
dstate->announce = tal_free(dstate->announce);
delay = pseudorand(60000000);
log_debug(istate->log, "Setting new announce time %u sec",
delay / 1000000);
dstate->announce = new_reltimer(dstate, istate,
time_from_usec(delay),
announce, istate);
}
}
@ -251,6 +270,6 @@ void setup_irc_connection(struct lightningd_state *dstate)
"N%.12s",
pubkey_to_hexstr(state, dstate->secpctx, &dstate->id) + 1);
/* We will see our own JOIN message, which will trigger announce */
irc_connect(state);
announce(state);
}

2
daemon/lightningd.c
View file

@ -339,6 +339,8 @@ static struct lightningd_state *lightningd_state(void)
dstate->bitcoin_req_running = false;
dstate->nodes = empty_node_map(dstate);
dstate->reexec = NULL;
dstate->external_ip = NULL;
dstate->announce = NULL;
return dstate;
}

3
daemon/lightningd.h
View file

@ -136,5 +136,8 @@ struct lightningd_state {
/* IP/hostname to be announced for incoming connections */
char *external_ip;
/* Announce timer. */
struct oneshot *announce;
};
#endif /* LIGHTNING_DAEMON_LIGHTNING_H */