* Tell which file/line called getsock()

svn: 884

src/net.c

@@ -476,10 +476,10 @@ void setsock(int sock, int options)
 }
 
 #ifdef USE_IPV6
-int getsock(int options, int af_def)
+int real_getsock(int options, int af_def, char *fname, int line)
 {
 #else
-int getsock(int options)
+int real_getsock(int options, char *fname, int line)
 {
   int af_def = AF_INET;
 #endif /* USE_IPV6 */
@@ -490,7 +490,7 @@ int getsock(int options)
   if (sock >= 0)
     setsock(sock, options);
   else
-    putlog(LOG_MISC, "*", "Warning: Can't create new socket!");
+    putlog(LOG_MISC, "*", "Warning: Can't create new socket! (%s:%d)", fname, line);
   return sock;
 }
 

src/net.h

@@ -132,15 +132,16 @@ void cache_my_ip();
 void neterror(char *);
 void setsock(int, int);
 int allocsock(int, int);
-#ifdef CYGWIN_HACKS
-#  define getsock cygwin_sucks
-#endif /* CYGWIN_HACKS */
 
 #ifdef USE_IPV6
-int getsock(int, int);
+#define getsock(opt, af) real_getsock(opt, af, __FILE__, __LINE__)
+int real_getsock(int, int, char *, int);
 #else
-int getsock(int);
+#define getsock(opt) real_getsock(opt, __FILE__, __LINE)
+int real_getsock(int, char *, int);
 #endif /* USE_IPV6 */
+
+
 int sockprotocol(int);
 int hostprotocol(char *);
 char *hostnamefromip(unsigned long);