Removing duplicated code. load_forwardfile() now uses create_url_spec()

[privoxy.git] / jbsockets.c

diff --git a/jbsockets.c b/jbsockets.c
index ee4f583..69f3e3a 100644 (file)
--- a/jbsockets.c
+++ b/jbsockets.c
@@ -1,4 +1,4 @@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1.1.1 2001/05/15 13:58:54 oes Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.3 2001/05/25 21:57:54 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jbsockets.c,v $
@@ -35,6 +35,13 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1.1.1 2001/05/15 13:58:54 oes
  *
  * Revisions   :
  *    $Log: jbsockets.c,v $
+ *    Revision 1.3  2001/05/25 21:57:54  jongfoster
+ *    Now gives a warning under Windows if you try to bind
+ *    it to a port that's already in use.
+ *
+ *    Revision 1.2  2001/05/17 23:01:01  oes
+ *     - Cleaned CRLF's from the sources and related files
+ *
  *    Revision 1.1.1.1  2001/05/15 13:58:54  oes
  *    Initial import of version 2.9.3 source tree
  *
@@ -227,7 +234,10 @@ int connect_to(char *host, int portnum, struct client_state *csp)
  *********************************************************************/
 int write_socket(int fd, const char *buf, int len)
 {
-   if (len <= 0) return(0);
+   if (len <= 0)
+   {
+      return(0);
+   }
 
    /* if (DEBUG(LOG)) fwrite(buf, n, 1, logfp); */
 
@@ -347,7 +357,15 @@ int bind_port(const char *hostnam, int portnum)
       return(-1);
    }
 
+#ifndef _WIN32
+   /*
+    * FIXME: This is not needed for Win32 - in fact, it stops
+    * duplicate instances of JunkBuster from being caught.
+    * Is this really needed under UNIX, or should it be taked out?
+    * -- Jon
+    */
    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one));
+#endif /* ndef _WIN32 */
 
    if (bind (fd, (struct sockaddr *)&inaddr, sizeof(inaddr)) < 0)
    {