projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trying to port statvfs call to BSD
[oweals/gnunet.git]
/
src
/
util
/
network.c
diff --git
a/src/util/network.c
b/src/util/network.c
index 37e40aa1a2244ec1d7b88f895c9d0684c99d9ca5..101e794d07c892827182455620e7d30dec5f2b88 100644
(file)
--- a/
src/util/network.c
+++ b/
src/util/network.c
@@
-41,14
+41,6
@@
struct GNUNET_NETWORK_Handle
#ifndef MINGW
int fd;
#ifndef MINGW
int fd;
-#ifndef LINUX
- /**
- * For UNIX domain listen sockets, underlying filename to be removed
- * on close.
- */
- char *filename;
-#endif
-
#else
SOCKET fd;
#endif
#else
SOCKET fd;
#endif
@@
-273,7
+265,10
@@
GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
if ( (ret == 0) && (address->sa_family == AF_UNIX))
{
const struct sockaddr_un *un = (const struct sockaddr_un*) address;
if ( (ret == 0) && (address->sa_family == AF_UNIX))
{
const struct sockaddr_un *un = (const struct sockaddr_un*) address;
- desc->filename = GNUNET_strdup (un->sun_path);
+ if (0 != unlink (un->sun_path))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink",
+ un->sun_path);
}
#endif
#endif
}
#endif
#endif
@@
-296,16
+291,6
@@
GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc)
SetErrnoFromWinsockError (WSAGetLastError ());
#else
ret = close (desc->fd);
SetErrnoFromWinsockError (WSAGetLastError ());
#else
ret = close (desc->fd);
-#ifndef LINUX
- if (NULL != desc->filename)
- {
- if (0 != unlink (desc->filename))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
- "unlink",
- desc->filename);
- GNUNET_free (desc->filename);
- }
-#endif
#endif
GNUNET_free (desc);
return (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;
#endif
GNUNET_free (desc);
return (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;