From b749aacbbb5ad45cda6be8605ad4a4f9105f9b32 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Tue, 29 Jan 2019 13:32:17 -0200
Subject: [PATCH] Adding SSL trace option Fixing trace window segfault.

---
 pw3270.cbp           | 70 ----------------------------------------------------------------------
 src/pw3270/actions.c |  7 +++++++
 src/pw3270/tools.c   |  2 ++
 src/pw3270/window.c  | 35 ++++++++++++++++++++++++++++++-----
 ui/98trace.xml       |  1 +
 5 files changed, 40 insertions(+), 75 deletions(-)

diff --git a/pw3270.cbp b/pw3270.cbp
index b4f9906..ddcd7f8 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -56,11 +56,6 @@
 		<Unit filename="android/Makefile" />
 		<Unit filename="android/jni/Android.mk" />
 		<Unit filename="android/jni/globals.h" />
-		<Unit filename="android/jni/main.cpp" />
-		<Unit filename="android/jni/misc.cpp" />
-		<Unit filename="android/jni/text.cpp" />
-		<Unit filename="android/src/br/com/bb/pw3270/PW3270Activity.java" />
-		<Unit filename="android/src/br/com/bb/pw3270/lib3270.java" />
 		<Unit filename="autogen.sh" />
 		<Unit filename="configure.ac" />
 		<Unit filename="man/man1/pw3270.1" />
@@ -101,26 +96,6 @@
 			<Option target="Debug" />
 			<Option target="Release" />
 		</Unit>
-		<Unit filename="src/java/sample/bbsample.java">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/sample/efglobe.java">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/sample/popup.java">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/terminal.java">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
-		<Unit filename="src/java/testprogram.java">
-			<Option target="Debug" />
-			<Option target="Release" />
-		</Unit>
 		<Unit filename="src/lib3270/3270ds.h" />
 		<Unit filename="src/lib3270/Makefile.in" />
 		<Unit filename="src/lib3270/ansic.h" />
@@ -170,20 +145,13 @@
 		<Unit filename="src/libpw3270cpp/session.cc" />
 		<Unit filename="src/libpw3270cpp/testprogram.cc" />
 		<Unit filename="src/loffice/Makefile.in" />
-		<Unit filename="src/loffice/connect.cc" />
 		<Unit filename="src/loffice/description.txt" />
 		<Unit filename="src/loffice/description.xml" />
 		<Unit filename="src/loffice/description.xml.in" />
-		<Unit filename="src/loffice/get.cc" />
 		<Unit filename="src/loffice/globals.hpp" />
-		<Unit filename="src/loffice/info.cc" />
-		<Unit filename="src/loffice/init.cc" />
 		<Unit filename="src/loffice/manifest.xml" />
 		<Unit filename="src/loffice/manifest.xml.in" />
 		<Unit filename="src/loffice/pw3270.idl" />
-		<Unit filename="src/loffice/service.cc" />
-		<Unit filename="src/loffice/set.cc" />
-		<Unit filename="src/loffice/testprogram.cc" />
 		<Unit filename="src/oxt/Makefile.in" />
 		<Unit filename="src/oxt/description.txt" />
 		<Unit filename="src/oxt/description.xml.in" />
@@ -191,14 +159,9 @@
 		<Unit filename="src/oxt/manifest.xml.in" />
 		<Unit filename="src/oxt/pw3270.idl" />
 		<Unit filename="src/php/Makefile.in" />
-		<Unit filename="src/php/get.cc" />
-		<Unit filename="src/php/init.cc" />
-		<Unit filename="src/php/main.cc" />
-		<Unit filename="src/php/misc.cc" />
 		<Unit filename="src/php/php.ini" />
 		<Unit filename="src/php/php3270.h" />
 		<Unit filename="src/php/sample.php" />
-		<Unit filename="src/php/set.cc" />
 		<Unit filename="src/plugins/dbus3270/Makefile.in" />
 		<Unit filename="src/plugins/dbus3270/daemon.c">
 			<Option compilerVar="CC" />
@@ -342,41 +305,8 @@
 		<Unit filename="src/pw3270/v3270/private.h" />
 		<Unit filename="src/pw3270/v3270/sources.mak" />
 		<Unit filename="src/pw3270/v3270ft/Makefile.in" />
-		<Unit filename="src/pw3270/v3270ft/filelist.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="src/pw3270/v3270ft/genmarshal" />
-		<Unit filename="src/pw3270/v3270ft/get.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="src/pw3270/v3270ft/load.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="src/pw3270/v3270ft/misc.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="src/pw3270/v3270ft/private.h" />
-		<Unit filename="src/pw3270/v3270ft/save.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="src/pw3270/v3270ft/select.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="src/pw3270/v3270ft/set.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="src/pw3270/v3270ft/tables.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="src/pw3270/v3270ft/transfer.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="src/pw3270/v3270ft/v3270ft.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="src/pw3270/v3270ft/v3270ftprogress.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="src/pw3270/window.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/src/pw3270/actions.c b/src/pw3270/actions.c
index 1906439..9505dc8 100644
--- a/src/pw3270/actions.c
+++ b/src/pw3270/actions.c
@@ -363,6 +363,8 @@ static void lib3270_toggle_action(GtkToggleAction *action,GtkWidget *widget)
 {
 	LIB3270_TOGGLE toggle = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
 
+	trace("Action %s toggled on widget %p (id=%d)\n",gtk_action_get_name(GTK_ACTION(action)),widget,(int) toggle);
+
 	lib3270_trace_event(v3270_get_session(widget),"Action %s toggled on widget %p (id=%d)\n",gtk_action_get_name(GTK_ACTION(action)),widget,(int) toggle);
 
 	if(toggle == TOGGLE_GDKDEBUG)
@@ -438,6 +440,8 @@ static void action_set_toggle(GtkAction *action, GtkWidget *widget)
 {
 	LIB3270_TOGGLE id = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
 
+	trace("Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id);
+
 	lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id);
 	lib3270_set_toggle(v3270_get_session(widget),id,1);
 }
@@ -445,6 +449,9 @@ static void action_set_toggle(GtkAction *action, GtkWidget *widget)
 static void action_reset_toggle(GtkAction *action, GtkWidget *widget)
 {
 	LIB3270_TOGGLE id = (LIB3270_TOGGLE) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action),"toggle_id"));
+
+	trace("Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id);
+
 	lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p toggle=%d\n",gtk_action_get_name(action),widget,id);
 	lib3270_set_toggle(v3270_get_session(widget),id,0);
 }
diff --git a/src/pw3270/tools.c b/src/pw3270/tools.c
index 21248c3..1c9b9d8 100644
--- a/src/pw3270/tools.c
+++ b/src/pw3270/tools.c
@@ -136,6 +136,8 @@ LIB3270_EXPORT gboolean pw3270_set_toggle_by_name(GtkWidget *widget, const gchar
 	H3270 			* hSession	= pw3270_get_session(widget);
 	LIB3270_TOGGLE	  id		= lib3270_get_toggle_id(name);
 
+	trace("%s(%s) id=%u",__FUNCTION__,name,id);
+
 	if(!hSession || id == (LIB3270_TOGGLE) -1)
 		return FALSE;
 
diff --git a/src/pw3270/window.c b/src/pw3270/window.c
index 851f3ae..86f89fd 100644
--- a/src/pw3270/window.c
+++ b/src/pw3270/window.c
@@ -257,13 +257,36 @@
 	lib3270_set_toggle(hSession,LIB3270_TOGGLE_NETWORK_TRACE,0);
  }
 
+ struct trace_data
+ {
+	H3270	* hSession;
+	gchar	* text;
+ };
 
- static void trace_window(G_GNUC_UNUSED H3270 *hSession, G_GNUC_UNUSED void * userdata, const char *fmt, va_list args)
+ static gboolean bg_trace_window(struct trace_data *data)
  {
-	GtkWidget * widget = v3270_trace_new_from_session(hSession);
+	GtkWidget * widget = v3270_trace_new_from_session(data->hSession,data->text);
+
 	v3270_trace_set_destroy_on_close(widget,TRUE);
-	g_signal_connect(widget, "destroy", G_CALLBACK(trace_window_destroy), hSession);
-	gtk_widget_show(widget);
+
+	g_signal_connect(widget, "destroy", G_CALLBACK(trace_window_destroy), data->hSession);
+
+	gtk_widget_show_all(widget);
+
+	g_free(data->text);
+
+	return FALSE;
+ }
+
+ static void trace_window(G_GNUC_UNUSED H3270 *hSession, G_GNUC_UNUSED void * userdata, const char *fmt, va_list args)
+ {
+	struct trace_data * data = g_new0(struct trace_data,1);
+
+	data->hSession = hSession;
+	data->text = g_strdup_vprintf(fmt,args);
+
+	g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,(GSourceFunc) bg_trace_window, data, g_free);
+
  }
 
  GtkWidget * pw3270_new(const gchar *host, const gchar *systype, unsigned short colors)
@@ -292,7 +315,7 @@
 		if(*ptr)
 		{
 			pw3270_set_url(widget,ptr);
-			connct = pw3270_get_toggle(widget,LIB3270_TOGGLE_CONNECT_ON_STARTUP) ? TRUE : FALSE;
+//			connct = pw3270_get_toggle(widget,LIB3270_TOGGLE_CONNECT_ON_STARTUP) ? TRUE : FALSE;
 		}
 		g_free(ptr);
 	}
@@ -318,8 +341,10 @@
 
 	v3270_set_scaled_fonts(GTK_PW3270(widget)->terminal,get_boolean_from_config("terminal","sfonts",FALSE));
 
+	/*
 	if(connct)
 		pw3270_connect(widget);
+	*/
 
  	return widget;
  }
diff --git a/ui/98trace.xml b/ui/98trace.xml
index 0b9a1ba..aaa4bfc 100644
--- a/ui/98trace.xml
+++ b/ui/98trace.xml
@@ -37,6 +37,7 @@
 				<menuitem action='toggle' id='screentrace'	label='Trace screen contents' />
 				<menuitem action='toggle' id='nettrace' 	label='Trace network data flow' />
 				<menuitem action='toggle' id='eventtrace'	label='Trace user interface events' />
+				<menuitem action='toggle' id='ssltrace'		label='Trace SSL negotiation' />
 			</menu>
 			<menuitem action='toggle' id='fieldattr' label='Field Delimiters' />
 		</menu>
--
libgit2 0.21.2