Refactoring and centralizing auto-reconnect feature.

Perry Werneck
1 parent aba431be
Showing 5 changed files with 44 additions and 24 deletions Show diff stats
src/core/connect.c
src/core/host.c
src/core/telnet.c
src/include/internals.h
src/ssl/state.c
@@ -83,19 +83,15 @@
 	LIB3270_POPUP popup = {
 		.name = "CantConnect",
-		.title = _( "Connection failed" ),
+//		.title = _( "Connection failed" ),
 		.type = LIB3270_NOTIFY_INFO,
 		.summary = summary,
 		.body = message,
 		.label = _("Try again")
 	};
-//	if(hSession->cbk.popup_show(hSession,&popup,lib3270_get_toggle(hSession,LIB3270_TOGGLE_RECONNECT) && !hSession->auto_reconnect_inprogress) == 0) {
-	if(hSession->cbk.popup_show(hSession,&popup,!hSession->auto_reconnect_inprogress) == 0) {
-		// Schedule an automatic reconnection.
-		hSession->auto_reconnect_inprogress = 1;
-		(void) AddTimer(1000, hSession, lib3270_check_for_auto_reconnect);
-	}
+	if(hSession->cbk.popup_show(hSession,&popup,!hSession->auto_reconnect_inprogress) == 0)
+		lib3270_activate_auto_reconnect(hSession,1000);
  }
@@ -64,7 +64,7 @@
 /**
  * @brief Called from timer to attempt an automatic reconnection.
  */
-int lib3270_check_for_auto_reconnect(H3270 *hSession)
+static int check_for_auto_reconnect(H3270 *hSession)
 {
 	if(hSession->auto_reconnect_inprogress)
@@ -78,6 +78,27 @@ int lib3270_check_for_auto_reconnect(H3270 *hSession)
 	return 0;
 }
+/**
+ * @brief Activate auto-reconnect timer.
+ *
+ * @param hSession	TN3270 Session handle.
+ * @param msec		Time to reconnect.
+ *
+ * @return 0 if ok or error code if not.
+ *
+ * @retval EBUSY	Auto reconnect is already active.
+ */
+int lib3270_activate_auto_reconnect(H3270 *hSession, unsigned long msec)
+{
+	if(hSession->auto_reconnect_inprogress)
+		return EBUSY;
+
+	hSession->auto_reconnect_inprogress = 1;
+	(void) AddTimer(msec, hSession, check_for_auto_reconnect);
+
+	return 0;
+}
+
 LIB3270_EXPORT int lib3270_disconnect(H3270 *h)
 {
 	return host_disconnect(h,0);
@@ -95,12 +116,8 @@ int host_disconnect(H3270 *hSession, int failed)
 		trace("Disconnected (Failed: %d Reconnect: %d in_progress: %d)",failed,lib3270_get_toggle(hSession,LIB3270_TOGGLE_RECONNECT),hSession->auto_reconnect_inprogress);
-		if(failed && lib3270_get_toggle(hSession,LIB3270_TOGGLE_RECONNECT) && !hSession->auto_reconnect_inprogress)
-		{
-			/* Schedule an automatic reconnection. */
-			hSession->auto_reconnect_inprogress = 1;
-			(void) AddTimer(failed ? RECONNECT_ERR_MS : RECONNECT_MS, hSession, lib3270_check_for_auto_reconnect);
-		}
+		if(failed && lib3270_get_toggle(hSession,LIB3270_TOGGLE_RECONNECT))
+			lib3270_activate_auto_reconnect(hSession,failed ? RECONNECT_ERR_MS : RECONNECT_MS);
 		/*
 		 * Remember a disconnect from ANSI mode, to keep screen tracing
@@ -2223,12 +2223,11 @@ static const char * cmd(int c)
 		return nnn(c);
 }
-/*
- * opt
- *	Expands a TELNET option into a character string.
+/***
+ *
+ * @brief Expands a TELNET option into a character string.
  */
-static const char *
-opt(unsigned char c)
+static const char * opt(unsigned char c)
 {
 	if (TELOPT_OK(c))
 		return TELOPT(c);
@@ -753,11 +753,6 @@ LIB3270_INTERNAL int 	do_select(H3270 *h, unsigned int start, unsigned int end, 
 LIB3270_INTERNAL void	connection_failed(H3270 *hSession, const char *message);
-/**
- * @brief Called from timer to attempt an automatic reconnection.
- */
-LIB3270_INTERNAL int	lib3270_check_for_auto_reconnect(H3270 *hSession);
-
 #if defined(DEBUG)
 	#define CHECK_SESSION_HANDLE(x) check_session_handle(&x,__FUNCTION__);
 	LIB3270_INTERNAL void check_session_handle(H3270 **hSession, const char *fname);
@@ -766,6 +761,18 @@ LIB3270_INTERNAL int	lib3270_check_for_auto_reconnect(H3270 *hSession);
 	LIB3270_INTERNAL void check_session_handle(H3270 **hSession);
 #endif // DEBUG
+/**
+ * @brief Activate auto-reconnect timer.
+ *
+ * @param hSession	TN3270 Session handle.
+ * @param msec		Time to reconnect.
+ *
+ * @return 0 if ok or error code if not.
+ *
+ * @retval EBUSY	Auto reconnect is already active.
+ */
+LIB3270_INTERNAL int lib3270_activate_auto_reconnect(H3270 *hSession, unsigned long msec);
+
 LIB3270_INTERNAL int check_online_session(const H3270 *hSession);
 LIB3270_INTERNAL int check_offline_session(const H3270 *hSession);
@@ -78,6 +78,7 @@ void set_ssl_state(H3270 *hSession, LIB3270_SSL_STATE state)
 	hSession->ssl.state = state;
 	trace_dsn(hSession,"SSL state changes to %d\n",(int) state);
+	debug("SSL state changes to %d\n",(int) state);
 	hSession->cbk.update_ssl(hSession,hSession->ssl.state);
 }
	@@ -78,6 +78,7 @@ void set_ssl_state(H3270 *hSession, LIB3270_SSL_STATE state)		@@ -78,6 +78,7 @@ void set_ssl_state(H3270 *hSession, LIB3270_SSL_STATE state)
78		78
79	hSession->ssl.state = state;	79	hSession->ssl.state = state;
80	trace_dsn(hSession,"SSL state changes to %d\n",(int) state);	80	trace_dsn(hSession,"SSL state changes to %d\n",(int) state);
		81	+ debug("SSL state changes to %d\n",(int) state);
81		82
82	hSession->cbk.update_ssl(hSession,hSession->ssl.state);	83	hSession->cbk.update_ssl(hSession,hSession->ssl.state);
83	}	84	}