Download as
Browse Code »

Commit dff8b36d75a17b1c6581e940ca4e50eb83957398

Authored by Perry Werneck
1 parent 9192562c
Exists in master and in 1 other branch develop

Fixing connect issue.

Showing 7 changed files with 13 additions and 6 deletions   Show diff stats
client/src/session/remote/actions.cc
  Diff comments   View file @dff8b36
@@ -102,7 +102,7 @@ @@ -102,7 +102,7 @@
102 .call(); 102 .call();
103 103
104 if(seconds) 104 if(seconds)
105 - this->waitForReady(seconds); 105 + this->waitForConnectionState(CONNECTED_TN3270E,seconds);
106 106
107 } 107 }
108 108
client/src/testprogram/testprogram.cc
  Diff comments   View file @dff8b36
@@ -171,7 +171,6 @@ @@ -171,7 +171,6 @@
171 TN3270::Host host{session}; 171 TN3270::Host host{session};
172 172
173 host.connect(); 173 host.connect();
174 - host.wait(TN3270::CONNECTED_TN3270E);  
175 174
176 { 175 {
177 auto start = time(nullptr); 176 auto start = time(nullptr);
server/src/core/methods/methods.c
  Diff comments   View file @dff8b36
@@ -80,7 +80,7 @@ int ipc3270_method_call(GObject *object, const gchar *method_name, GVariant *req @@ -80,7 +80,7 @@ int ipc3270_method_call(GObject *object, const gchar *method_name, GVariant *req
80 size_t ix; 80 size_t ix;
81 H3270 * hSession = ipc3270_get_session(object); 81 H3270 * hSession = ipc3270_get_session(object);
82 82
83 - debug("%s(%s,request=%p,response=%p)",__FUNCTION__,method_name,request,response); 83 + debug("%s(%s,request=%p,response=%p,error=%p)",__FUNCTION__,method_name,request,response,*error);
84 84
85 lib3270_write_event_trace(hSession,"Method %s called on session %c\n",method_name,lib3270_get_session_id(hSession)); 85 lib3270_write_event_trace(hSession,"Method %s called on session %c\n",method_name,lib3270_get_session_id(hSession));
86 86
@@ -90,7 +90,7 @@ int ipc3270_method_call(GObject *object, const gchar *method_name, GVariant *req @@ -90,7 +90,7 @@ int ipc3270_method_call(GObject *object, const gchar *method_name, GVariant *req
90 90
91 int rc = methods[ix].call(object,request,response,error); 91 int rc = methods[ix].call(object,request,response,error);
92 92
93 - debug("rc=%d",rc); 93 + debug("rc=%d error=%p",rc,*error);
94 94
95 if(rc) 95 if(rc)
96 ipc3270_set_error(object,rc,error); 96 ipc3270_set_error(object,rc,error);
server/src/core/methods/wait.c
  Diff comments   View file @dff8b36
@@ -119,7 +119,8 @@ int ipc3270_method_wait_for_ready(GObject *session, GVariant *request, GObject * @@ -119,7 +119,8 @@ int ipc3270_method_wait_for_ready(GObject *session, GVariant *request, GObject *
119 int ipc3270_method_wait_for_cstate(GObject *session, GVariant *request, GObject *response, GError G_GNUC_UNUSED(**error)) { 119 int ipc3270_method_wait_for_cstate(GObject *session, GVariant *request, GObject *response, GError G_GNUC_UNUSED(**error)) {
120 guint seconds = 1; 120 guint seconds = 1;
121 guint cstate = 0; 121 guint cstate = 0;
122 - g_variant_get(request, "(uu)", &seconds); 122 + g_variant_get(request, "(uu)", &cstate, &seconds);
  123 + debug("cstate=%u seconds=%u",cstate,seconds);
123 ipc3270_response_append_int32(response,lib3270_wait_for_cstate(ipc3270_get_session(session),(LIB3270_CSTATE) cstate, seconds)); 124 ipc3270_response_append_int32(response,lib3270_wait_for_cstate(ipc3270_get_session(session),(LIB3270_CSTATE) cstate, seconds));
124 return 0; 125 return 0;
125 } 126 }
server/src/core/windows/pipesource.c
  Diff comments   View file @dff8b36
@@ -110,6 +110,8 @@ static void process_input(IPC3270_PIPE_SOURCE *source, DWORD cbRead) { @@ -110,6 +110,8 @@ static void process_input(IPC3270_PIPE_SOURCE *source, DWORD cbRead) {
110 g_autoptr (GVariant) response = NULL; 110 g_autoptr (GVariant) response = NULL;
111 g_autoptr (GVariant) parameters = ipc3270_unpack(source->buffer, &request_type); 111 g_autoptr (GVariant) parameters = ipc3270_unpack(source->buffer, &request_type);
112 112
  113 + debug("************ error=%p",error);
  114 +
113 if(parameters) { 115 if(parameters) {
114 116
115 // Process query 117 // Process query
@@ -129,9 +131,12 @@ static void process_input(IPC3270_PIPE_SOURCE *source, DWORD cbRead) { @@ -129,9 +131,12 @@ static void process_input(IPC3270_PIPE_SOURCE *source, DWORD cbRead) {
129 131
130 debug("Parameters: %p", parameters); 132 debug("Parameters: %p", parameters);
131 debug("rsp: %p", rsp); 133 debug("rsp: %p", rsp);
  134 + debug("Error=%p",error);
132 135
133 ipc3270_method_call(source->object, request_name, parameters, rsp, &error); 136 ipc3270_method_call(source->object, request_name, parameters, rsp, &error);
134 137
  138 + debug("Error=%p",error);
  139 +
135 if(ipc3270_response_has_values(rsp)) 140 if(ipc3270_response_has_values(rsp))
136 response = ipc3270_response_steal_value(rsp); 141 response = ipc3270_response_steal_value(rsp);
137 142
server/src/core/windows/response.c
  Diff comments   View file @dff8b36
@@ -93,6 +93,8 @@ GObject * ipc3270_response_new() { @@ -93,6 +93,8 @@ GObject * ipc3270_response_new() {
93 93
94 void ipc3270_response_append_int32(GObject *object, gint32 value) { 94 void ipc3270_response_append_int32(GObject *object, gint32 value) {
95 95
  96 + debug("%s(%d)",__FUNCTION__,value);
  97 +
96 ipc3270Response * response = IPC3270_RESPONSE(object); 98 ipc3270Response * response = IPC3270_RESPONSE(object);
97 99
98 if(response->value) 100 if(response->value)
server/src/testprogram/testprogram.c
  Diff comments   View file @dff8b36
@@ -213,7 +213,7 @@ @@ -213,7 +213,7 @@
213 if(url) { 213 if(url) {
214 214
215 v3270_set_url(terminal,url); 215 v3270_set_url(terminal,url);
216 - v3270_reconnect(terminal); 216 + //v3270_reconnect(terminal);
217 217
218 gchar * title = g_strdup_printf("%s - %s", v3270_get_session_name(terminal), url); 218 gchar * title = g_strdup_printf("%s - %s", v3270_get_session_name(terminal), url);
219 gtk_window_set_title(GTK_WINDOW(window), title); 219 gtk_window_set_title(GTK_WINDOW(window), title);