Changeset 18920 for trunk/FACT++/dim/src/dna.c

Timestamp:

10/18/17 13:54:41 (7 years ago)

Author:

tbretz

Message:

Updated to v20r20 - This also includes some minor fixes, I requested.

File:

• trunk/FACT++/dim/src/dna.c (modified) (5 diffs)

trunk/FACT++/dim/src/dna.c

@@ -16 +16 @@
 #define DNA
 #include <dim.h>
+#include <time.h>
 
 /* global definitions */
@@ -353 +354 @@
         tcpip_code = dna_write_bytes(conn_id, &test_pkt, READ_HEADER_SIZE,0);
         if(tcpip_failure(tcpip_code)) {
-                 /* Connection lost. Signal upper layer ? */
+/* Connection lost. Signal upper layer ? No -> creates a deadlock in the Timer Thread*/
+/*
                 if(dna_connp->read_ast)
                         dna_connp->read_ast(conn_id, NULL, 0, STA_DISC);
+*/
                 return;
         }
@@ -624 +627 @@
         time_t oldest;
         int oldesti = 0;
+/*
         extern time_t time();
+*/
 
         if(type == 0)
@@ -822 +827 @@
         if (tcpip_failure(tcpip_code))
         {
+                if(src_type == SRC_DIS)
+                        strcpy(src_type_str,"Server");
+                else if(src_type == SRC_DIC)
+                        strcpy(src_type_str,"Client");
+                else
+                        strcpy(src_type_str,"Unknown type");
                 dim_print_date_time();
-                printf(" Client Establishing Connection: Couldn't write to Conn %3d : Server %s@%s\n",conn_id,
-                        Net_conns[conn_id].task, Net_conns[conn_id].node);
-                fflush(stdout);
+                sprintf(str," %s Establishing Connection: Couldn't write to Conn %3d : Server %s@%s\n",
+                                src_type_str, conn_id, Net_conns[conn_id].task, Net_conns[conn_id].node);
+                if (!strcmp(server_task, "DIM_DNS"))
+                        dna_report_error(conn_id, tcpip_code, str, DIM_ERROR, DIMDNSCNERR);
+                else
+                        dna_report_error(conn_id, tcpip_code, str, DIM_ERROR, DIMTCPCNERR);
                 dna_close(conn_id);
                 return(0);
@@ -841 +855 @@
                     dna_report_error(conn_id, -1,
                                      "Write timeout, disconnecting from", DIM_ERROR, DIMTCPWRTMO);
-                        if(!find_pend_conn(Net_conns[conn_id].node, Net_conns[conn_id].task, 0, 0, 1))
+                        if (!find_pend_conn(Net_conns[conn_id].node, Net_conns[conn_id].task, 0, 0, 1))
+                        {
                                 ins_pend_conn(Net_conns[conn_id].node, Net_conns[conn_id].task, 0, 0, 1, time(NULL));
+                        }
                 }
                 release_conn(conn_id);