diff options
| author | Geert Hauwaerts <geert@hauwaerts.be> | 2014-12-03 16:58:35 +0100 |
|---|---|---|
| committer | Geert Hauwaerts <geert@hauwaerts.be> | 2014-12-03 16:58:35 +0100 |
| commit | c01e026c73bb0a030e2d104e73db70c1b2795512 (patch) | |
| tree | 31ae8fb04cdd9272a5b81891442ccfc0db575afa /src | |
| parent | 8c477f498a2556a2bd37ac5afacc1fc999ea7153 (diff) | |
| parent | 86d263dd7dd39bbb768284fb6b586d1979a821cd (diff) | |
| download | irssi-c01e026c73bb0a030e2d104e73db70c1b2795512.zip | |
Merge pull request #178 from guiniol/master
Correctly parse unix sockets servers in the config
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/servers-reconnect.c | 3 | ||||
| -rw-r--r-- | src/core/servers-setup.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c index 0a08b461..d99a5405 100644 --- a/src/core/servers-reconnect.c +++ b/src/core/servers-reconnect.c @@ -253,6 +253,9 @@ static void sig_reconnect(SERVER_REC *server) conn->port = server->connrec->port; conn->password = g_strdup(server->connrec->password); + if (strchr(conn->address, '/') != NULL) + conn->unix_socket = TRUE; + server_reconnect_add(conn, (server->connect_time == 0 ? time(NULL) : server->connect_time) + reconnect_time); server_connect_unref(conn); diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c index 0819ff1a..27d9f1f0 100644 --- a/src/core/servers-setup.c +++ b/src/core/servers-setup.c @@ -122,6 +122,9 @@ static void server_setup_fill(SERVER_CONNECT_REC *conn, conn->address = g_strdup(address); if (port > 0) conn->port = port; + if (strchr(address, '/') != NULL) + conn->unix_socket = TRUE; + if (!conn->nick) conn->nick = g_strdup(settings_get_str("nick")); conn->username = g_strdup(settings_get_str("user_name")); conn->realname = g_strdup(settings_get_str("real_name")); |