Changeset 252 for trunk/src/sh_forward.c

Timestamp:

Oct 12, 2009, 10:40:45 AM (15 years ago)

Author:

katerina

Message:

Add code to check for stale file records on close() and fclose(), fix sl_close() to handle open stream (ticket #163).

File:

• trunk/src/sh_forward.c (modified) (8 diffs)

trunk/src/sh_forward.c

@@ -1753 +1753 @@
                 }
 
-              (void) close (sockfd);
+              (void) sl_close_fd (FIL__, __LINE__, sockfd);
               memset(answer, 0, TRANS_BYTES + 256);
               MUNLOCK(answer, TRANS_BYTES + 256);
@@ -1763 +1763 @@
         }
 
-      (void) close (sockfd);
+      (void) sl_close_fd (FIL__, __LINE__, sockfd);
       memset(answer, 0, TRANS_BYTES + 256);
       MUNLOCK(answer, TRANS_BYTES + 256);
@@ -1775 +1775 @@
       
  
-  (void) close (sockfd);
+  (void) sl_close_fd (FIL__, __LINE__, sockfd);
   memset(answer, 0, 512);
   MUNLOCK(answer, 512);
@@ -2203 +2203 @@
   if (conn->fd != (-1))
     {
-      close (conn->fd);
+      sl_close_fd (FIL__, __LINE__, conn->fd);
       conn->fd            = -1;
     }
@@ -4681 +4681 @@
           newconn->fd    = -1;
           newconn->state = CONN_FREE;
-          close(rc);
+          sl_close_fd(FIL__, __LINE__, rc);
           SL_RETURN( (-1), _("sh_forward_accept"));
         }
@@ -4698 +4698 @@
           newconn->fd    = -1;
           newconn->state = CONN_FREE;
-          close(rc);
+          sl_close_fd(FIL__, __LINE__, rc);
           SL_RETURN( (-1), _("sh_forward_accept"));
         }
@@ -5780 +5780 @@
            */
           TPT(( 0, FIL__, __LINE__, _("msg=<close syslog socket>\n")));
-          close(syslog_sock);
+          sl_close_fd(FIL__, __LINE__, syslog_sock);
           syslog_sock = -1;
         }
@@ -5830 +5830 @@
       errnum = errno;
       sh_forward_printerr (_("syslog bind"), errnum, 514, __LINE__);
-      close(sock);
+      sl_close_fd(FIL__, __LINE__, sock);
       SL_RETURN((-1), _("create_syslog_socket"));
     }