"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/core/servers-setup.c" between
irssi-1.2.2.tar.gz and irssi-1.2.3.tar.gz

About: irssi is a terminal based IRC client that also supports SILC and ICB protocols via plugins.

servers-setup.c  (irssi-1.2.2):servers-setup.c  (irssi-1.2.3)
skipping to change at line 111 skipping to change at line 111
conn_set_ip(conn, sserver->own_host, conn_set_ip(conn, sserver->own_host,
&sserver->own_ip4, &sserver->own_ip6); &sserver->own_ip4, &sserver->own_ip6);
} }
if (sserver->chatnet != NULL && conn->chatnet == NULL) if (sserver->chatnet != NULL && conn->chatnet == NULL)
conn->chatnet = g_strdup(sserver->chatnet); conn->chatnet = g_strdup(sserver->chatnet);
if (sserver->password != NULL && conn->password == NULL) if (sserver->password != NULL && conn->password == NULL)
conn->password = g_strdup(sserver->password); conn->password = g_strdup(sserver->password);
if (sserver->no_proxy)
g_free_and_null(conn->proxy);
if (sserver->family != 0 && conn->family == 0)
conn->family = sserver->family;
if (sserver->address && !conn->address)
conn->address = g_strdup(sserver->address);
if (sserver->port > 0 && conn->port <= 0)
conn->port = sserver->port;
conn->use_tls = sserver->use_tls;
if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_c
ert[0] != '\0')
conn->tls_cert = g_strdup(sserver->tls_cert);
if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_p
key[0] != '\0')
conn->tls_pkey = g_strdup(sserver->tls_pkey);
if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_p
ass[0] != '\0')
conn->tls_pass = g_strdup(sserver->tls_pass);
conn->tls_verify = sserver->tls_verify;
if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->t
ls_cafile[0] != '\0')
conn->tls_cafile = g_strdup(sserver->tls_cafile);
if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->t
ls_capath[0] != '\0')
conn->tls_capath = g_strdup(sserver->tls_capath);
if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver-
>tls_ciphers[0] != '\0')
conn->tls_ciphers = g_strdup(sserver->tls_ciphers);
if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL &&
sserver->tls_pinned_cert[0] != '\0')
conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert);
if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL
&& sserver->tls_pinned_pubkey[0] != '\0')
conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey);
signal_emit("server setup fill reconn", 2, conn, sserver); signal_emit("server setup fill reconn", 2, conn, sserver);
} }
static void server_setup_fill(SERVER_CONNECT_REC *conn, static void server_setup_fill(SERVER_CONNECT_REC *conn,
const char *address, int port) const char *address, int port)
{ {
g_return_if_fail(conn != NULL); g_return_if_fail(conn != NULL);
g_return_if_fail(address != NULL); g_return_if_fail(address != NULL);
conn->type = module_get_uniq_id("SERVER CONNECT", 0); conn->type = module_get_uniq_id("SERVER CONNECT", 0);
skipping to change at line 162 skipping to change at line 191
} }
static void server_setup_fill_server(SERVER_CONNECT_REC *conn, static void server_setup_fill_server(SERVER_CONNECT_REC *conn,
SERVER_SETUP_REC *sserver) SERVER_SETUP_REC *sserver)
{ {
g_return_if_fail(IS_SERVER_CONNECT(conn)); g_return_if_fail(IS_SERVER_CONNECT(conn));
g_return_if_fail(IS_SERVER_SETUP(sserver)); g_return_if_fail(IS_SERVER_SETUP(sserver));
sserver->last_connect = time(NULL); sserver->last_connect = time(NULL);
if (sserver->no_proxy)
g_free_and_null(conn->proxy);
if (sserver->family != 0 && conn->family == 0)
conn->family = sserver->family;
if (sserver->port > 0 && conn->port <= 0)
conn->port = sserver->port;
conn->use_tls = sserver->use_tls;
if (conn->tls_cert == NULL && sserver->tls_cert != NULL && sserver->tls_c
ert[0] != '\0')
conn->tls_cert = g_strdup(sserver->tls_cert);
if (conn->tls_pkey == NULL && sserver->tls_pkey != NULL && sserver->tls_p
key[0] != '\0')
conn->tls_pkey = g_strdup(sserver->tls_pkey);
if (conn->tls_pass == NULL && sserver->tls_pass != NULL && sserver->tls_p
ass[0] != '\0')
conn->tls_pass = g_strdup(sserver->tls_pass);
conn->tls_verify = sserver->tls_verify;
if (conn->tls_cafile == NULL && sserver->tls_cafile != NULL && sserver->t
ls_cafile[0] != '\0')
conn->tls_cafile = g_strdup(sserver->tls_cafile);
if (conn->tls_capath == NULL && sserver->tls_capath != NULL && sserver->t
ls_capath[0] != '\0')
conn->tls_capath = g_strdup(sserver->tls_capath);
if (conn->tls_ciphers == NULL && sserver->tls_ciphers != NULL && sserver-
>tls_ciphers[0] != '\0')
conn->tls_ciphers = g_strdup(sserver->tls_ciphers);
if (conn->tls_pinned_cert == NULL && sserver->tls_pinned_cert != NULL &&
sserver->tls_pinned_cert[0] != '\0')
conn->tls_pinned_cert = g_strdup(sserver->tls_pinned_cert);
if (conn->tls_pinned_pubkey == NULL && sserver->tls_pinned_pubkey != NULL
&& sserver->tls_pinned_pubkey[0] != '\0')
conn->tls_pinned_pubkey = g_strdup(sserver->tls_pinned_pubkey);
server_setup_fill_reconn(conn, sserver); server_setup_fill_reconn(conn, sserver);
signal_emit("server setup fill server", 2, conn, sserver); signal_emit("server setup fill server", 2, conn, sserver);
} }
static void server_setup_fill_chatnet(SERVER_CONNECT_REC *conn, static void server_setup_fill_chatnet(SERVER_CONNECT_REC *conn,
CHATNET_REC *chatnet) CHATNET_REC *chatnet)
{ {
g_return_if_fail(IS_SERVER_CONNECT(conn)); g_return_if_fail(IS_SERVER_CONNECT(conn));
g_return_if_fail(IS_CHATNET(chatnet)); g_return_if_fail(IS_CHATNET(chatnet));
 End of changes. 2 change blocks. 
35 lines changed or deleted 37 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)