aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

- Repair channels_rejoin_unavailable. Enabled by default,

Browse Source 
this retries joins that failed because of netsplits
  (channel temporarily unavailable (437), duplicate channel)
  A few servers abuse 437 for juped channels which should
  not be retried, you should disable channels_rejoin_unavailable
  if this is a problem.
- Display 437 and 407 numerics if channels_rejoin_unavailable
  is not enabled.

Bug #495


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4537 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Jilles Tjoelker 2007-06-03 13:08:47 +00:00 committed by jilles
parent 273152762f
commit c0674522ae
2 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/irc/core/channel-events.c
View File

@ -60,7 +60,8 @@ static void irc_server_event(IRC_SERVER_REC *server, const char *line)
indicate that the join failed. */ indicate that the join failed. */
params = event_get_params(line, 3, &numeric, NULL, &channel); params = event_get_params(line, 3, &numeric, NULL, &channel);
if (numeric[0] == '4') /* 437 is handled specially in src/irc/core/channel-rejoin.c */
if (numeric[0] == '4' && (numeric[1] != '3' || numeric[2] != '7'))
check_join_failure(server, channel); check_join_failure(server, channel);
g_free(params); g_free(params);
@ -117,21 +118,6 @@ static void event_duplicate_channel(IRC_SERVER_REC *server, const char *data)
g_free(params); g_free(params);
} }
static void event_target_unavailable(IRC_SERVER_REC *server, const char *data)
{
char *params, *channel;
g_return_if_fail(data != NULL);
params = event_get_params(data, 2, NULL, &channel);
if (ischannel(*channel)) {
/* channel is unavailable - try to join again a bit later */
check_join_failure(server, channel);
}
g_free(params);
}
static void channel_change_topic(IRC_SERVER_REC *server, const char *channel, static void channel_change_topic(IRC_SERVER_REC *server, const char *channel,
const char *topic, const char *setby, const char *topic, const char *setby,
time_t settime) time_t settime)
@ -385,7 +371,6 @@ void channel_events_init(void)
signal_add("event invite", (SIGNAL_FUNC) event_invite); signal_add("event invite", (SIGNAL_FUNC) event_invite);
signal_add("event 332", (SIGNAL_FUNC) event_topic_get); signal_add("event 332", (SIGNAL_FUNC) event_topic_get);
signal_add("event 333", (SIGNAL_FUNC) event_topic_info); signal_add("event 333", (SIGNAL_FUNC) event_topic_info);
signal_add_first("event 437", (SIGNAL_FUNC) event_target_unavailable); /* channel/nick unavailable */
} }
void channel_events_deinit(void) void channel_events_deinit(void)
@ -401,5 +386,4 @@ void channel_events_deinit(void)
signal_remove("event invite", (SIGNAL_FUNC) event_invite); signal_remove("event invite", (SIGNAL_FUNC) event_invite);
signal_remove("event 332", (SIGNAL_FUNC) event_topic_get); signal_remove("event 332", (SIGNAL_FUNC) event_topic_get);
signal_remove("event 333", (SIGNAL_FUNC) event_topic_info); signal_remove("event 333", (SIGNAL_FUNC) event_topic_info);
signal_remove("event 437", (SIGNAL_FUNC) event_target_unavailable); /* channel/nick unavailable */
} }

28
src/irc/core/channel-rejoin.c
View File

@ -68,20 +68,23 @@ static REJOIN_REC *rejoin_find(IRC_SERVER_REC *server, const char *channel)
#define channel_have_key(chan) \ #define channel_have_key(chan) \
((chan) != NULL && (chan)->key != NULL && (chan)->key[0] != '\0') ((chan) != NULL && (chan)->key != NULL && (chan)->key[0] != '\0')
static void channel_rejoin(IRC_SERVER_REC *server, const char *channel) static int channel_rejoin(IRC_SERVER_REC *server, const char *channel)
{ {
IRC_CHANNEL_REC *chanrec; IRC_CHANNEL_REC *chanrec;
REJOIN_REC *rec; REJOIN_REC *rec;
g_return_if_fail(IS_IRC_SERVER(server)); g_return_val_if_fail(IS_IRC_SERVER(server), 0);
g_return_if_fail(channel != NULL); g_return_val_if_fail(channel != NULL, 0);
if (!settings_get_bool("channels_rejoin_unavailable"))
return;
chanrec = irc_channel_find(server, channel); chanrec = irc_channel_find(server, channel);
if (chanrec == NULL || chanrec->joined) return; if (chanrec == NULL || chanrec->joined) return 0;
if (!settings_get_bool("channels_rejoin_unavailable")) {
chanrec->left = TRUE;
channel_destroy(CHANNEL(chanrec));
return 0;
}
rec = rejoin_find(server, channel); rec = rejoin_find(server, channel);
if (rec != NULL) { if (rec != NULL) {
/* already exists */ /* already exists */
@ -105,6 +108,7 @@ static void channel_rejoin(IRC_SERVER_REC *server, const char *channel)
chanrec->left = TRUE; chanrec->left = TRUE;
channel_destroy(CHANNEL(chanrec)); channel_destroy(CHANNEL(chanrec));
return 1;
} }
static void event_duplicate_channel(IRC_SERVER_REC *server, const char *data) static void event_duplicate_channel(IRC_SERVER_REC *server, const char *data)
@ -128,8 +132,9 @@ static void event_duplicate_channel(IRC_SERVER_REC *server, const char *data)
note that this same 407 is sent when trying to note that this same 407 is sent when trying to
create !!channel that already exists so we don't create !!channel that already exists so we don't
want to try rejoining then. */ want to try rejoining then. */
channel_rejoin(server, channel); if (channel_rejoin(server, channel)) {
signal_stop(); signal_stop();
}
} }
} }
@ -152,8 +157,9 @@ static void event_target_unavailable(IRC_SERVER_REC *server, const char *data)
} else { } else {
/* channel is unavailable - try to join again /* channel is unavailable - try to join again
a bit later */ a bit later */
channel_rejoin(server, channel); if (channel_rejoin(server, channel)) {
signal_stop(); signal_stop();
}
} }
} }