Add DCC passive-first + NAT mapping prefs

Add configurable stale-link ping checks

plugins/fishlim/fish.c

@@ -91,27 +91,13 @@ static const signed char fish_unbase64[256] = {
 #include <openssl/provider.h>
 static OSSL_PROVIDER *legacy_provider;
 static OSSL_PROVIDER *default_provider;
-static OSSL_LIB_CTX *ossl_ctx;
 #endif
 
 int fish_init(void)
 {
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-    ossl_ctx = OSSL_LIB_CTX_new();
+    legacy_provider = OSSL_PROVIDER_load(NULL, "legacy");
-    if (!ossl_ctx)
+    default_provider = OSSL_PROVIDER_load(NULL, "default");
-        return 0;
-
-    legacy_provider = OSSL_PROVIDER_load(ossl_ctx, "legacy");
-    if (!legacy_provider) {
-        fish_deinit();
-        return 0;
-    }
-
-    default_provider = OSSL_PROVIDER_load(ossl_ctx, "default");
-    if (!default_provider) {
-        fish_deinit();
-        return 0;
-    }
 #endif
     return 1;
 }
@@ -129,10 +115,6 @@ void fish_deinit(void)
         default_provider = NULL;
     }
 
-    if (ossl_ctx) {
-        OSSL_LIB_CTX_free(ossl_ctx);
-        ossl_ctx = NULL;
-    }
 #endif
 }
 
@@ -278,7 +260,9 @@ char *fish_cipher(const char *plaintext, size_t plaintext_len, const char *key,
         }
 
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-        cipher = EVP_CIPHER_fetch(ossl_ctx, "BF-CBC", NULL);
+        cipher = EVP_CIPHER_fetch(NULL, "BF-CBC", NULL);
+        if (!cipher)
+            cipher = (EVP_CIPHER *) EVP_bf_cbc();
 #else
         cipher = (EVP_CIPHER *) EVP_bf_cbc();
 #endif
@@ -286,7 +270,9 @@ char *fish_cipher(const char *plaintext, size_t plaintext_len, const char *key,
     } else if (mode == EVP_CIPH_ECB_MODE) {
 
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
-        cipher = EVP_CIPHER_fetch(ossl_ctx, "BF-ECB", NULL);
+        cipher = EVP_CIPHER_fetch(NULL, "BF-ECB", NULL);
+        if (!cipher)
+            cipher = (EVP_CIPHER *) EVP_bf_ecb();
 #else
         cipher = (EVP_CIPHER *) EVP_bf_ecb();
 #endif

plugins/fishlim/plugin_zoitechat.c

@@ -421,7 +421,7 @@ static int handle_keyx_notice(char *word[], char *word_eol[], void *userdata) {
             zoitechat_commandf(ph, "quote NOTICE %s :DH1080_FINISH %s%s", sender, pub_key, (mode == FISH_CBC_MODE) ? " CBC" : "");
             g_free(pub_key);
         } else {
-            zoitechat_print(ph, "Failed to generate keys");
+            zoitechat_printf(ph, "Failed to generate keys");
             goto cleanup;
         }
     } else if (!strcmp (dh_message, "DH1080_FINISH")) {
@@ -446,7 +446,7 @@ static int handle_keyx_notice(char *word[], char *word_eol[], void *userdata) {
         zoitechat_printf(ph, "Stored new key for %s (%s)", sender, fish_modes[mode]);
         g_free(secret_key);
     } else {
-        zoitechat_print(ph, "Failed to create secret key!");
+        zoitechat_printf(ph, "Failed to create secret key!");
     }
 
 cleanup:
@@ -548,7 +548,7 @@ static int handle_keyx(char *word[], char *word_eol[], void *userdata) {
     }
 
     if ((query_ctx && ctx_type != 3) || (!query_ctx && !irc_is_query(target))) {
-        zoitechat_print(ph, "You can only exchange keys with individuals");
+        zoitechat_printf(ph, "You can only exchange keys with individuals");
         return ZOITECHAT_EAT_ALL;
     }
 
@@ -560,7 +560,7 @@ static int handle_keyx(char *word[], char *word_eol[], void *userdata) {
 
         g_free(pub_key);
     } else {
-        zoitechat_print(ph, "Failed to generate keys");
+        zoitechat_printf(ph, "Failed to generate keys");
     }
 
     return ZOITECHAT_EAT_ALL;
@@ -577,7 +577,7 @@ static int handle_crypt_topic(char *word[], char *word_eol[], void *userdata) {
     GSList *encrypted_list;
 
     if (!*topic) {
-        zoitechat_print(ph, usage_topic);
+        zoitechat_printf(ph, "%s", usage_topic);
         return ZOITECHAT_EAT_ALL;
     }
 
@@ -624,7 +624,7 @@ static int handle_crypt_notice(char *word[], char *word_eol[], void *userdata) {
     GSList *encrypted_list, *encrypted_item;
 
     if (!*target || !*notice) {
-        zoitechat_print(ph, usage_notice);
+        zoitechat_printf(ph, "%s", usage_notice);
         return ZOITECHAT_EAT_ALL;
     }
 
@@ -676,7 +676,7 @@ static int handle_crypt_msg(char *word[], char *word_eol[], void *userdata) {
     GSList *encrypted_list, *encrypted_item;
 
     if (!*target || !*message) {
-        zoitechat_print(ph, usage_msg);
+        zoitechat_printf(ph, "%s", usage_msg);
         return ZOITECHAT_EAT_ALL;
     }
 
@@ -805,11 +805,15 @@ int zoitechat_plugin_init(zoitechat_plugin *plugin_handle,
     zoitechat_hook_server_attrs(ph, "TOPIC", ZOITECHAT_PRI_NORM, handle_incoming, NULL);
     zoitechat_hook_server_attrs(ph, "332", ZOITECHAT_PRI_NORM, handle_incoming, NULL);
 
-    if (!fish_init())
+    if (!fish_init()) {
+        zoitechat_printf(ph, "FiSHLiM failed to initialize crypto backend");
         return 0;
+    }
 
-    if (!dh1080_init())
+    if (!dh1080_init()) {
+        zoitechat_printf(ph, "FiSHLiM failed to initialize DH1080");
         return 0;
+    }
 
     pending_exchanges = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 

readme.md

@@ -31,12 +31,19 @@
 <br />
 
 
-ZoiteChat is an HexChat based IRC client for Windows and UNIX-like operating systems.  
+ZoiteChat is a GTK3 IRC client based on HexChat, available for Windows and UNIX-like operating systems.  
-See [IRCHelp.org](http://irchelp.org) for information about IRC in general.  
-For more information on ZoiteChat please read our [documentation](https://docs.zoitechat.org/):
-- [Downloads](https://zoitechat.org/download)
 
-- [Troubleshooting](troubleshooting.md)
+Features include HexChat-compatible Python, Perl and Lua scripting support, a plugin API,
+multiple server/channel windows, spell checking, multiple authentication methods including SASL,
+and customizable notifications.
+
+See [IRCHelp.org](http://irchelp.org) for information about IRC in general.  
+
+For more information on ZoiteChat:
+
+- [Main Documentation](https://docs.zoitechat.org/) and [FAQ](https://docs.zoitechat.org/en/latest/faq.html)
+
+- [Downloads](https://zoitechat.org/download.php)
 
 
 ---

src/common/cfgfiles.c

@@ -390,6 +390,9 @@ const struct prefs vars[] =
 	{"dcc_permissions", P_OFFINT (hex_dcc_permissions), TYPE_INT},
 	{"dcc_port_first", P_OFFINT (hex_dcc_port_first), TYPE_INT},
 	{"dcc_port_last", P_OFFINT (hex_dcc_port_last), TYPE_INT},
+	{"dcc_nat_lease", P_OFFINT (hex_dcc_nat_lease), TYPE_INT},
+	{"dcc_nat_map", P_OFFINT (hex_dcc_nat_map), TYPE_BOOL},
+	{"dcc_passive_prefer", P_OFFINT (hex_dcc_passive_prefer), TYPE_BOOL},
 	{"dcc_remove", P_OFFINT (hex_dcc_remove), TYPE_BOOL},
 	{"dcc_save_nick", P_OFFINT (hex_dcc_save_nick), TYPE_BOOL},
 	{"dcc_send_fillspaces", P_OFFINT (hex_dcc_send_fillspaces), TYPE_BOOL},
@@ -447,6 +450,7 @@ const struct prefs vars[] =
 	{"gui_tab_layout", P_OFFINT (hex_gui_tab_layout), TYPE_INT},
 	{"gui_tab_closebuttons", P_OFFINT (hex_gui_tab_closebuttons), TYPE_BOOL},
 	{"gui_tab_middleclose", P_OFFINT (hex_gui_tab_middleclose), TYPE_BOOL},
+	{"gui_mouse_scroll_speed", P_OFFINT (hex_gui_mouse_scroll_speed), TYPE_INT},
 	{"gui_tab_newtofront", P_OFFINT (hex_gui_tab_newtofront), TYPE_INT},
 	{"gui_tab_pos", P_OFFINT (hex_gui_tab_pos), TYPE_INT},
 	{"gui_tab_scrollchans", P_OFFINT (hex_gui_tab_scrollchans), TYPE_BOOL},
@@ -548,6 +552,10 @@ const struct prefs vars[] =
 #endif
 	{"net_bind_host", P_OFFSET (hex_net_bind_host), TYPE_STR},
 	{"net_ping_timeout", P_OFFINT (hex_net_ping_timeout), TYPE_INT, zoitechat_reinit_timers},
+	{"net_lag_check", P_OFFINT (hex_net_lag_check), TYPE_INT, zoitechat_reinit_timers},
+	{"net_keepalive_idle", P_OFFINT (hex_net_keepalive_idle), TYPE_INT},
+	{"net_keepalive_interval", P_OFFINT (hex_net_keepalive_interval), TYPE_INT},
+	{"net_keepalive_count", P_OFFINT (hex_net_keepalive_count), TYPE_INT},
 	{"net_proxy_auth", P_OFFINT (hex_net_proxy_auth), TYPE_BOOL},
 	{"net_proxy_host", P_OFFSET (hex_net_proxy_host), TYPE_STR},
 	{"net_proxy_pass", P_OFFSET (hex_net_proxy_pass), TYPE_STR},
@@ -757,6 +765,7 @@ load_default_config(void)
 	prefs.hex_away_show_once = 1;
 	prefs.hex_away_track = 1;
 	prefs.hex_dcc_auto_resume = 1;
+	prefs.hex_dcc_passive_prefer = 1;
 #ifndef WIN32
 	prefs.hex_dcc_fast_send = 1;
 #endif
@@ -783,6 +792,7 @@ load_default_config(void)
 	prefs.hex_gui_tab_server = 1;
 	prefs.hex_gui_tab_sort = 1;
 	prefs.hex_gui_tab_scrollchans = 1;
+	prefs.hex_gui_mouse_scroll_speed = 10;
 	prefs.hex_gui_topicbar = 1;
 	prefs.hex_gui_transparency = 255;
 	prefs.hex_gui_tray = 1;
@@ -829,6 +839,7 @@ load_default_config(void)
 	prefs.hex_dcc_permissions = 0600;
 	prefs.hex_dcc_stall_timeout = 60;
 	prefs.hex_dcc_timeout = 180;
+	prefs.hex_dcc_nat_lease = 1800;
 	prefs.hex_flood_ctcp_num = 5;
 	prefs.hex_flood_ctcp_time = 30;
 	prefs.hex_flood_msg_num = 5;
@@ -858,6 +869,10 @@ load_default_config(void)
 	prefs.hex_irc_ban_type = 1;
 	prefs.hex_irc_join_delay = 5;
 	prefs.hex_net_ping_timeout = 60;
+	prefs.hex_net_lag_check = 60;
+	prefs.hex_net_keepalive_idle = 60;
+	prefs.hex_net_keepalive_interval = 20;
+	prefs.hex_net_keepalive_count = 3;
 	prefs.hex_net_reconnect_delay = 10;
 	prefs.hex_notify_timeout = 15;
 	prefs.hex_text_max_indent = 256;

src/common/dcc.c

@@ -87,6 +87,41 @@ static gboolean dcc_read (GIOChannel *, GIOCondition, struct DCC *);
 static gboolean dcc_read_ack (GIOChannel *source, GIOCondition condition, struct DCC *dcc);
 static int dcc_check_timeouts (void);
 
+
+static int
+nat_map_run (int add, int port, int proto, int lease)
+{
+	char cmd[512];
+	int status = 0;
+		if (add)
+		g_snprintf (cmd, sizeof (cmd), "upnpc -a 127.0.0.1 %d %d TCP %d >/dev/null 2>&1", port, port, lease);
+	else
+		g_snprintf (cmd, sizeof (cmd), "upnpc -d %d TCP >/dev/null 2>&1", port);
+	if (!g_spawn_command_line_sync (cmd, NULL, NULL, &status, NULL))
+		return FALSE;
+	return status == 0;
+}
+
+static void
+dcc_nat_unmap (struct DCC *dcc)
+{
+	if (!dcc->map_port)
+		return;
+	nat_map_run (0, dcc->map_port, dcc->type, 0);
+	dcc->map_port = 0;
+	dcc->map_next_refresh = 0;
+}
+
+static void
+dcc_nat_refresh (struct DCC *dcc)
+{
+	if (!dcc->map_port || prefs.hex_dcc_nat_lease <= 0)
+		return;
+	if (time (0) < dcc->map_next_refresh)
+		return;
+	if (nat_map_run (1, dcc->map_port, dcc->type, prefs.hex_dcc_nat_lease))
+		dcc->map_next_refresh = time (0) + prefs.hex_dcc_nat_lease / 2;
+}
 static int new_id(void)
 {
 	static int id = 0;
@@ -254,7 +289,8 @@ dcc_check_timeouts (void)
 		switch (dcc->dccstat)
 		{
 		case STAT_ACTIVE:
-			dcc_calc_cps (dcc);
+				dcc_calc_cps (dcc);
+			dcc_nat_refresh (dcc);
 			fe_dcc_update (dcc);
 
 			if (dcc->type == TYPE_SEND || dcc->type == TYPE_RECV)
@@ -390,6 +426,7 @@ dcc_close (struct DCC *dcc, enum dcc_state dccstat, int destroy)
 	}
 
 	dcc_remove_from_sum (dcc);
+	dcc_nat_unmap (dcc);
 
 	if (dcc->fp != -1)
 	{
@@ -1698,6 +1735,11 @@ dcc_listen_init (struct DCC *dcc, session *sess)
 	getsockname (dcc->sok, (struct sockaddr *) &SAddr, &len);
 
 	dcc->port = ntohs (SAddr.sin_port);
+	if (prefs.hex_dcc_nat_map && nat_map_run (1, dcc->port, dcc->type, prefs.hex_dcc_nat_lease))
+	{
+		dcc->map_port = dcc->port;
+		dcc->map_next_refresh = time (0) + prefs.hex_dcc_nat_lease / 2;
+	}
 
 	dcc->addr = dcc_get_my_address (sess);
 
@@ -1846,8 +1888,19 @@ dcc_send (struct session *sess, char *to, char *filename, gint64 maxcps, int pas
 		return;
 	}
 
-	if (passive || dcc_listen_init (dcc, sess))
+	if ((passive || prefs.hex_dcc_passive_prefer) || dcc_listen_init (dcc, sess))
 	{
+		if (passive || prefs.hex_dcc_passive_prefer)
+		{
+			guint32 offer_addr = dcc_get_my_address (sess);
+			struct sockaddr_in saddr;
+			socklen_t slen = sizeof (saddr);
+			memset (&saddr, 0, sizeof (saddr));
+			getsockname (dcc->serv->sok, (struct sockaddr *) &saddr, &slen);
+			if (offer_addr == 0)
+				offer_addr = prefs.local_ip != 0xffffffff ? prefs.local_ip : saddr.sin_addr.s_addr;
+			dcc->addr = ntohl (offer_addr);
+		}
 		char havespaces = 0;
 		while (*filename)
 		{
@@ -1868,13 +1921,13 @@ dcc_send (struct session *sess, char *to, char *filename, gint64 maxcps, int pas
 		} else
 			fe_dcc_add (dcc);
 
-		if (passive)
+			if (passive || prefs.hex_dcc_passive_prefer)
 		{
 			dcc->pasvid = new_id();
 			g_snprintf (outbuf, sizeof (outbuf), (havespaces) ?
-					"DCC SEND \"%s\" 199 0 %" G_GUINT64_FORMAT " %d" :
+					"DCC SEND \"%s\" %u 0 %" G_GUINT64_FORMAT " %d" :
-					"DCC SEND %s 199 0 %" G_GUINT64_FORMAT " %d",
+					"DCC SEND %s %u 0 %" G_GUINT64_FORMAT " %d",
-					file_part (dcc->file),
+					file_part (dcc->file), dcc->addr,
 					dcc->size, dcc->pasvid);
 		}
 		else
@@ -2292,8 +2345,19 @@ dcc_chat (struct session *sess, char *nick, int passive)
 	dcc->dccstat = STAT_QUEUED;
 	dcc->type = TYPE_CHATSEND;
 	dcc->nick = g_strdup (nick);
-	if (passive || dcc_listen_init (dcc, sess))
+	if ((passive || prefs.hex_dcc_passive_prefer) || dcc_listen_init (dcc, sess))
 	{
+		if (passive || prefs.hex_dcc_passive_prefer)
+		{
+			guint32 offer_addr = dcc_get_my_address (sess);
+			struct sockaddr_in saddr;
+			socklen_t slen = sizeof (saddr);
+			memset (&saddr, 0, sizeof (saddr));
+			getsockname (dcc->serv->sok, (struct sockaddr *) &saddr, &slen);
+			if (offer_addr == 0)
+				offer_addr = prefs.local_ip != 0xffffffff ? prefs.local_ip : saddr.sin_addr.s_addr;
+			dcc->addr = ntohl (offer_addr);
+		}
 		if (prefs.hex_gui_autoopen_chat)
 		{
 			if (fe_dcc_open_chat_win (TRUE))	/* already open? add only */
@@ -2301,11 +2365,11 @@ dcc_chat (struct session *sess, char *nick, int passive)
 		} else
 			fe_dcc_add (dcc);
 
-		if (passive)
+		if (passive || prefs.hex_dcc_passive_prefer)
 		{
 			dcc->pasvid = new_id ();
-			g_snprintf (outbuf, sizeof (outbuf), "DCC CHAT chat 199 %d %d",
+			g_snprintf (outbuf, sizeof (outbuf), "DCC CHAT chat %u 0 %d",
-						 dcc->port, dcc->pasvid);
+						 dcc->addr, dcc->pasvid);
 		} else
 		{
 			g_snprintf (outbuf, sizeof (outbuf), "DCC CHAT chat %u %d",

src/common/dcc.h

@@ -55,6 +55,9 @@ struct DCC
 	int wiotag;						/* writing/sending io tag */
 	int port;
 	int pasvid;						/* mIRC's passive DCC id */
+	int map_port;
+	int map_proto;
+	int map_next_refresh;
 	gint64 cps;
 	int resume_error;
 	int resume_errno;

src/common/network.c

@@ -34,6 +34,9 @@
 
 #ifndef WIN32
 #include <unistd.h>
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
 #endif
 
 #define WANTSOCKET
@@ -43,6 +46,9 @@
 
 #define NETWORK_PRIVATE
 #include "network.h"
+#include "zoitechat.h"
+
+extern struct zoitechatprefs prefs;
 
 #define RAND_INT(n) ((int)(rand() / (RAND_MAX + 1.0) * (n)))
 
@@ -58,6 +64,27 @@ net_set_socket_options (int sok)
 	setsockopt (sok, SOL_SOCKET, SO_REUSEADDR, (char *) &sw, sizeof (sw));
 	sw = 1;
 	setsockopt (sok, SOL_SOCKET, SO_KEEPALIVE, (char *) &sw, sizeof (sw));
+#ifdef TCP_KEEPIDLE
+	{
+		int keepidle = prefs.hex_net_keepalive_idle;
+		if (keepidle > 0)
+			setsockopt (sok, IPPROTO_TCP, TCP_KEEPIDLE, (char *) &keepidle, sizeof (keepidle));
+	}
+#endif
+#ifdef TCP_KEEPINTVL
+	{
+		int keepintvl = prefs.hex_net_keepalive_interval;
+		if (keepintvl > 0)
+			setsockopt (sok, IPPROTO_TCP, TCP_KEEPINTVL, (char *) &keepintvl, sizeof (keepintvl));
+	}
+#endif
+#ifdef TCP_KEEPCNT
+	{
+		int keepcnt = prefs.hex_net_keepalive_count;
+		if (keepcnt > 0)
+			setsockopt (sok, IPPROTO_TCP, TCP_KEEPCNT, (char *) &keepcnt, sizeof (keepcnt));
+	}
+#endif
 }
 
 char *

src/common/zoitechat.c

@@ -379,6 +379,7 @@ lag_check (void)
 	char tbuf[128];
 	time_t now = time (0);
 	time_t lag;
+	time_t ping_age;
 
 	tim = make_ping_time ();
 
@@ -388,7 +389,7 @@ lag_check (void)
 		if (serv->connected && serv->end_of_motd)
 		{
 			lag = now - serv->ping_recv;
-			if (prefs.hex_net_ping_timeout != 0 && lag > prefs.hex_net_ping_timeout && lag > 0)
+			if (serv->lag_sent && prefs.hex_net_ping_timeout != 0 && lag > prefs.hex_net_ping_timeout && lag > 0)
 			{
 				sprintf (tbuf, "%" G_GINT64_FORMAT, (gint64) lag);
 				EMIT_SIGNAL (XP_TE_PINGTIMEOUT, serv->server_session, tbuf, NULL,
@@ -398,11 +399,11 @@ lag_check (void)
 			}
 			else
 			{
-				g_snprintf (tbuf, sizeof (tbuf), "LAG%lu", tim);
+				ping_age = now - serv->ping_recv;
-				serv->p_ping (serv, "", tbuf);
+				if (!serv->lag_sent && prefs.hex_net_lag_check > 0 && ping_age >= prefs.hex_net_lag_check)
-				
-				if (!serv->lag_sent)
 				{
+					g_snprintf (tbuf, sizeof (tbuf), "LAG%lu", tim);
+					serv->p_ping (serv, "", tbuf);
 					serv->lag_sent = tim;
 					fe_set_lag (serv, -1);
 				}
@@ -525,7 +526,7 @@ zoitechat_reinit_timers (void)
 	if ((prefs.hex_net_ping_timeout != 0 || prefs.hex_gui_lagometer)
 	    && lag_check_tag == 0)
 	{
-		lag_check_tag = fe_timeout_add_seconds (30, zoitechat_lag_check, NULL);
+		lag_check_tag = fe_timeout_add_seconds (1, zoitechat_lag_check, NULL);
 	}
 	else if ((!prefs.hex_net_ping_timeout && !prefs.hex_gui_lagometer)
 					 && lag_check_tag != 0)

src/common/zoitechat.h

@@ -117,6 +117,8 @@ struct zoitechatprefs
 	unsigned int hex_dcc_remove;
 	unsigned int hex_dcc_save_nick;
 	unsigned int hex_dcc_send_fillspaces;
+	unsigned int hex_dcc_passive_prefer;
+	unsigned int hex_dcc_nat_map;
 	unsigned int hex_gui_autoopen_chat;
 	unsigned int hex_gui_autoopen_dialog;
 	unsigned int hex_gui_autoopen_recv;
@@ -241,6 +243,7 @@ struct zoitechatprefs
 	int hex_dcc_permissions;
 	int hex_dcc_port_first;
 	int hex_dcc_port_last;
+	int hex_dcc_nat_lease;
 	int hex_dcc_stall_timeout;
 	int hex_dcc_timeout;
 	int hex_flood_ctcp_num;				/* flood */
@@ -267,6 +270,7 @@ struct zoitechatprefs
 	int hex_gui_tab_layout;
 	int hex_gui_tab_closebuttons;
 	int hex_gui_tab_middleclose;
+	int hex_gui_mouse_scroll_speed;
 	int hex_gui_tab_newtofront;
 	int hex_gui_tab_pos;
 	int hex_gui_tab_small;
@@ -289,6 +293,10 @@ struct zoitechatprefs
 	int hex_irc_join_delay;
 	int hex_irc_notice_pos;
 	int hex_net_ping_timeout;
+	int hex_net_lag_check;
+	int hex_net_keepalive_idle;
+	int hex_net_keepalive_interval;
+	int hex_net_keepalive_count;
 	int hex_net_proxy_port;
 	int hex_net_proxy_type;				/* 0=disabled, 1=wingate 2=socks4, 3=socks5, 4=http */
 	int hex_net_proxy_use;				/* 0=all 1=IRC_ONLY 2=DCC_ONLY */

src/fe-gtk/chanview-tabs.c

@@ -305,12 +305,14 @@ static gboolean
 tab_scroll_cb (GtkWidget *widget, GdkEventScroll *event, gpointer cv)
 {
 	int direction = cv_scroll_direction (event);
+	int i;
 
 	if (prefs.hex_gui_tab_scrollchans)
 	{
 		if (direction != 0)
 		{
-			mg_switch_page (1, direction);
+			for (i = 0; i < cv_scroll_step_count (); i++)
+				mg_switch_page (1, direction);
 			return TRUE;
 		}
 	}
@@ -318,12 +320,14 @@ tab_scroll_cb (GtkWidget *widget, GdkEventScroll *event, gpointer cv)
 	{
 		if (direction < 0)
 		{
-			tab_scroll_left_up_clicked (widget, cv);
+			for (i = 0; i < cv_scroll_step_count (); i++)
+				tab_scroll_left_up_clicked (widget, cv);
 			return TRUE;
 		}
 		else if (direction > 0)
 		{
-			tab_scroll_right_down_clicked (widget, cv);
+			for (i = 0; i < cv_scroll_step_count (); i++)
+				tab_scroll_right_down_clicked (widget, cv);
 			return TRUE;
 		}
 	}

src/fe-gtk/chanview-tree.c

@@ -112,9 +112,11 @@ cv_tree_scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, gpointer user
 	if (prefs.hex_gui_tab_scrollchans)
 	{
 		int direction = cv_scroll_direction (event);
+		int i;
 
 		if (direction != 0)
-			mg_switch_page (1, direction);
+			for (i = 0; i < cv_scroll_step_count (); i++)
+				mg_switch_page (1, direction);
 
 		return direction != 0;
 	}

src/fe-gtk/chanview.c

@@ -126,6 +126,15 @@ cv_scroll_direction (GdkEventScroll *event)
 	}
 }
 
+static int
+cv_scroll_step_count (void)
+{
+	int speed = prefs.hex_gui_mouse_scroll_speed;
+	if (speed < 1)
+		speed = 1;
+	return (speed + 9) / 10;
+}
+
 
 /* ======= TABS ======= */
 

src/fe-gtk/maingui.c

@@ -2705,7 +2705,6 @@ mg_changui_destroy (session *sess)
                 /* it fixes: Gdk-CRITICAL **: gdk_colormap_get_screen: */
                 /*           assertion `GDK_IS_COLORMAP (cmap)' failed */
                 ret = sess->gui->window;
-                g_free (sess->gui);
                 sess->gui = NULL;
         }
         return ret;
@@ -2727,13 +2726,17 @@ mg_link_irctab (session *sess, int focus)
                 return;
         }
 
+        session_gui *old_gui;
+
         mg_unpopulate (sess);
+        old_gui = sess->gui;
         win = mg_changui_destroy (sess);
         mg_changui_new (sess, sess->res, 1, focus);
         /* the buffer is now attached to a different widget */
         ((xtext_buffer *)sess->res->buffer)->xtext = (GtkXText *)sess->gui->xtext;
         if (win)
                 gtk_widget_destroy (win);
+        g_free (old_gui);
 }
 
 void

src/fe-gtk/setup.c

@@ -193,6 +193,7 @@ static const setting appearance_advanced_settings[] =
         {ST_HEADER,     N_("Advanced"),0,0,0},
         {ST_EFILE, N_ ("Background image:"), P_OFFSETNL (hex_text_background), 0, 0, sizeof prefs.hex_text_background},
         {ST_HSCALE, N_("Window opacity:"), P_OFFINTNL(hex_gui_transparency),0,0,0},
+        {ST_HSCALE, N_("Mouse wheel scroll speed (Slower ← → Faster):"), P_OFFINTNL(hex_gui_mouse_scroll_speed), 0, 0, 100},
 
         {ST_END, 0, 0, 0, 0, 0}
 };
@@ -582,6 +583,7 @@ static const setting advanced_settings[] =
         {ST_TOGGLE,     N_("Display lists in compact mode"), P_OFFINTNL(hex_gui_compact), N_("Use less spacing between user list/channel tree rows."), 0, 0},
         {ST_TOGGLE,     N_("Use server time if supported"), P_OFFINTNL(hex_irc_cap_server_time), N_("Display timestamps obtained from server if it supports the time-server extension."), 0, 0},
         {ST_TOGGLE,     N_("Automatically reconnect to servers on disconnect"), P_OFFINTNL(hex_net_auto_reconnect), 0, 0, 1},
+        {ST_NUMBER,     N_("Lag check interval:"), P_OFFINTNL(hex_net_lag_check), 0, (const char **)N_("seconds."), 9999},
         {ST_NUMBER,     N_("Auto reconnect delay:"), P_OFFINTNL(hex_net_reconnect_delay), 0, 0, 9999},
         {ST_NUMBER,     N_("Auto join delay:"), P_OFFINTNL(hex_irc_join_delay), 0, 0, 9999},
         {ST_MENU,       N_("Ban Type:"), P_OFFINTNL(hex_irc_ban_type), N_("Attempt to use this banmask when banning or quieting. (requires irc_who_join)"), bantypemenu, 0},
@@ -648,6 +650,9 @@ static const setting network_settings[] =
         {ST_NUMBER,     N_("First DCC listen port:"), P_OFFINTNL(hex_dcc_port_first), 0, 0, 65535},
         {ST_NUMBER,     N_("Last DCC listen port:"), P_OFFINTNL(hex_dcc_port_last), 0, 
                 (const char **)N_("!Leave ports at zero for full range."), 65535},
+        {ST_TOGGLE, N_("Prefer passive DCC"), P_OFFINTNL(hex_dcc_passive_prefer), 0, 0, 0},
+        {ST_TOGGLE, N_("Try UPnP/NAT-PMP/PCP mapping"), P_OFFINTNL(hex_dcc_nat_map), 0, 0, 0},
+        {ST_NUMBER, N_("NAT mapping lease (sec):"), P_OFFINTNL(hex_dcc_nat_lease), 0, 0, 86400},
 
         {ST_HEADER,     N_("Proxy Server"), 0, 0, 0, 0},
         {ST_ENTRY,      N_("Hostname:"), P_OFFSETNL(hex_net_proxy_host), 0, 0, sizeof prefs.hex_net_proxy_host},
@@ -655,6 +660,11 @@ static const setting network_settings[] =
         {ST_MENU,       N_("Type:"), P_OFFINTNL(hex_net_proxy_type), 0, proxytypes, 0},
         {ST_MENU,       N_("Use proxy for:"), P_OFFINTNL(hex_net_proxy_use), 0, proxyuse, 0},
 
+        {ST_HEADER,     N_("Connection Health"), 0, 0, 0, 0},
+        {ST_NUMBER,     N_("TCP keepalive idle:"), P_OFFINTNL(hex_net_keepalive_idle), 0, (const char **)N_("seconds."), 7200},
+        {ST_NUMBER,     N_("TCP keepalive interval:"), P_OFFINTNL(hex_net_keepalive_interval), 0, (const char **)N_("seconds."), 600},
+        {ST_NUMBER,     N_("TCP keepalive probes:"), P_OFFINTNL(hex_net_keepalive_count), 0, 0, 20},
+
         {ST_HEADER,     N_("Proxy Authentication"), 0, 0, 0, 0},
         {ST_TOGGLE,     N_("Use authentication (HTTP or SOCKS5 only)"), P_OFFINTNL(hex_net_proxy_auth), 0, 0, 0},
         {ST_ENTRY,      N_("Username:"), P_OFFSETNL(hex_net_proxy_user), 0, 0, sizeof prefs.hex_net_proxy_user},

src/fe-gtk/xtext.c

@@ -2938,19 +2938,41 @@ gtk_xtext_scroll (GtkWidget *widget, GdkEventScroll *event)
 {
 	GtkXText *xtext = GTK_XTEXT (widget);
 	gfloat new_value;
+	gfloat step;
+	gdouble dx;
+	gdouble dy;
+	int direction = 0;
+	int speed = prefs.hex_gui_mouse_scroll_speed;
 
-	if (event->direction == GDK_SCROLL_UP)		/* mouse wheel pageUp */
+	if (speed < 1)
+		speed = 1;
+	step = (xtext_adj_get_page_increment (xtext->adj) * speed) / 100.0f;
+
+	if (event->direction == GDK_SCROLL_SMOOTH &&
+		gdk_event_get_scroll_deltas ((GdkEvent *)event, &dx, &dy))
+	{
+		if (dy > 0)
+			direction = 1;
+		else if (dy < 0)
+			direction = -1;
+	}
+	else if (event->direction == GDK_SCROLL_UP)
+		direction = -1;
+	else if (event->direction == GDK_SCROLL_DOWN)
+		direction = 1;
+
+	if (direction < 0)
 	{
 		new_value = xtext_adj_get_value (xtext->adj) -
-			(xtext_adj_get_page_increment (xtext->adj) / 10);
+			step;
 		if (new_value < xtext_adj_get_lower (xtext->adj))
 			new_value = xtext_adj_get_lower (xtext->adj);
 		xtext_adj_set_value (xtext->adj, new_value);
 	}
-	else if (event->direction == GDK_SCROLL_DOWN)	/* mouse wheel pageDn */
+	else if (direction > 0)
 	{
 		new_value = xtext_adj_get_value (xtext->adj) +
-			(xtext_adj_get_page_increment (xtext->adj) / 10);
+			step;
 		if (new_value > (xtext_adj_get_upper (xtext->adj) -
 			xtext_adj_get_page_size (xtext->adj)))
 			new_value = xtext_adj_get_upper (xtext->adj) -
@@ -2958,7 +2980,7 @@ gtk_xtext_scroll (GtkWidget *widget, GdkEventScroll *event)
 		xtext_adj_set_value (xtext->adj, new_value);
 	}
 
-	return FALSE;
+	return direction != 0;
 }
 
 static void