diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/memdebug.c | 27 | ||||
-rw-r--r-- | lib/memdebug.h | 13 |
2 files changed, 40 insertions, 0 deletions
diff --git a/lib/memdebug.c b/lib/memdebug.c index 8dbad1b73..cbd860ec1 100644 --- a/lib/memdebug.c +++ b/lib/memdebug.c @@ -43,6 +43,14 @@ #include <curl/curl.h> +#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__) +#include <winsock.h> +#else /* some kind of unix */ +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#endif + #define _MPRINTF_REPLACE #include <curl/mprintf.h> #include "urldata.h" @@ -50,6 +58,8 @@ #include <string.h> #include <stdlib.h> +/* DONT include memdebug.h here! */ + /* * Note that these debug functions are very simple and they are meant to * remain so. For advanced analysis, record a log file and write perl scripts @@ -115,4 +125,21 @@ void curl_dofree(void *ptr, int line, char *source) source, line, ptr); } +int curl_socket(int domain, int type, int protocol, int line, char *source) +{ + int sockfd=(socket)(domain, type, protocol); + fprintf(logfile?logfile:stderr, "FD %s:%d socket() = %d\n", + source, line, sockfd); + return sockfd; +} + +/* this is our own defined way to close sockets on *ALL* platforms */ +int curl_sclose(int sockfd, int line, char *source) +{ + int res=sclose(sockfd); + fprintf(logfile?logfile:stderr, "FD %s:%d sclose(%d)\n", + source, line, sockfd); + return sockfd; +} + #endif /* MALLOCDEBUG */ diff --git a/lib/memdebug.h b/lib/memdebug.h index a0d670088..21330a0b2 100644 --- a/lib/memdebug.h +++ b/lib/memdebug.h @@ -1,13 +1,26 @@ #ifdef MALLOCDEBUG +/* memory functions */ void *curl_domalloc(size_t size, int line, char *source); void *curl_dorealloc(void *ptr, size_t size, int line, char *source); void curl_dofree(void *ptr, int line, char *source); char *curl_dostrdup(char *str, int line, char *source); void curl_memdebug(char *logname); +/* file descriptor manipulators */ +int curl_socket(int domain, int type, int protocol, int, char *); +int curl_sclose(int sockfd, int, char *); + /* Set this symbol on the command-line, recompile all lib-sources */ #define strdup(ptr) curl_dostrdup(ptr, __LINE__, __FILE__) #define malloc(size) curl_domalloc(size, __LINE__, __FILE__) #define realloc(ptr,size) curl_dorealloc(ptr, size, __LINE__, __FILE__) #define free(ptr) curl_dofree(ptr, __LINE__, __FILE__) + +#define socket(domain,type,protocol)\ + curl_socket(domain,type,protocol,__LINE__,__FILE__) + +/* sclose is probably already defined, redefine it! */ +#undef sclose +#define sclose(sockfd) curl_sclose(sockfd,__LINE__,__FILE__) + #endif |