diff options
| author | Jilles Tjoelker <jilles@irssi.org> | 2007-05-25 23:27:27 +0000 |
|---|---|---|
| committer | jilles <jilles@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2007-05-25 23:27:27 +0000 |
| commit | f8eada63c77e6785141d5bb0e0da967bf358c247 (patch) | |
| tree | 018145878a351fc57fe5afac7f8878099ce8e649 | |
| parent | 4f98e29bab6e61cbbfd0fd28ab530629c454d3f8 (diff) | |
| download | irssi-f8eada63c77e6785141d5bb0e0da967bf358c247.zip | |
Pick up host changes on charybdis and ircu servers (396 numeric).
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4523 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | src/fe-common/irc/fe-events-numeric.c | 2 | ||||
| -rw-r--r-- | src/irc/core/irc-servers.c | 35 |
2 files changed, 37 insertions, 0 deletions
diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c index 7e290452..9ec72198 100644 --- a/src/fe-common/irc/fe-events-numeric.c +++ b/src/fe-common/irc/fe-events-numeric.c @@ -628,6 +628,7 @@ void fe_events_numeric_init(void) signal_add("event 364", (SIGNAL_FUNC) event_received); signal_add("event 365", (SIGNAL_FUNC) event_received); signal_add("event 381", (SIGNAL_FUNC) event_received); + signal_add("event 396", (SIGNAL_FUNC) event_received); signal_add("event 421", (SIGNAL_FUNC) event_received); signal_add("event 432", (SIGNAL_FUNC) event_received); signal_add("event 436", (SIGNAL_FUNC) event_received); @@ -696,6 +697,7 @@ void fe_events_numeric_deinit(void) signal_remove("event 364", (SIGNAL_FUNC) event_received); signal_remove("event 365", (SIGNAL_FUNC) event_received); signal_remove("event 381", (SIGNAL_FUNC) event_received); + signal_remove("event 396", (SIGNAL_FUNC) event_received); signal_remove("event 421", (SIGNAL_FUNC) event_received); signal_remove("event 432", (SIGNAL_FUNC) event_received); signal_remove("event 436", (SIGNAL_FUNC) event_received); diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c index 3313cb01..701bc321 100644 --- a/src/irc/core/irc-servers.c +++ b/src/irc/core/irc-servers.c @@ -696,6 +696,39 @@ static void event_channels_formed(IRC_SERVER_REC *server, const char *data) g_free(params); } +static void event_hosthidden(IRC_SERVER_REC *server, const char *data) +{ + char *params, *newhost, *p, *newuserhost; + + g_return_if_fail(server != NULL); + + params = event_get_params(data, 2, NULL, &newhost); + /* do a sanity check */ + if (!strchr(newhost, '*') && !strchr(newhost, '?') && + !strchr(newhost, '!') && !strchr(newhost, '#') && + !strchr(newhost, '&') && !strchr(newhost, ' ') && + *newhost != '\0' && *newhost != '@' && + *newhost != ':' && *newhost != '-' && + newhost[strlen(newhost) - 1] != '-') { + if (strchr(newhost, '@')) { + newuserhost = g_strdup(newhost); + g_free(server->userhost); + server->userhost = newuserhost; + } else if (server->userhost != NULL) { + /* no user@, only process if we know the user@ + * already + */ + p = strchr(server->userhost, '@'); + if (p == NULL) + p = server->userhost; + newuserhost = g_strdup_printf("%.*s@%s", (int)(p - server->userhost), server->userhost, newhost); + g_free(server->userhost); + server->userhost = newuserhost; + } + } + g_free(params); +} + static void event_server_banned(IRC_SERVER_REC *server, const char *data) { g_return_if_fail(server != NULL); @@ -792,6 +825,7 @@ void irc_servers_init(void) signal_add_last("event 376", (SIGNAL_FUNC) event_end_of_motd); signal_add_last("event 422", (SIGNAL_FUNC) event_end_of_motd); /* no motd */ signal_add("event 254", (SIGNAL_FUNC) event_channels_formed); + signal_add("event 396", (SIGNAL_FUNC) event_hosthidden); signal_add("event 465", (SIGNAL_FUNC) event_server_banned); signal_add("event error", (SIGNAL_FUNC) event_error); signal_add("event ping", (SIGNAL_FUNC) event_ping); @@ -817,6 +851,7 @@ void irc_servers_deinit(void) signal_remove("event 376", (SIGNAL_FUNC) event_end_of_motd); signal_remove("event 422", (SIGNAL_FUNC) event_end_of_motd); /* no motd */ signal_remove("event 254", (SIGNAL_FUNC) event_channels_formed); + signal_remove("event 396", (SIGNAL_FUNC) event_hosthidden); signal_remove("event 465", (SIGNAL_FUNC) event_server_banned); signal_remove("event error", (SIGNAL_FUNC) event_error); signal_remove("event ping", (SIGNAL_FUNC) event_ping); |