sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

r19177: merge from samba4:

Browse Source 
fix the standalone build of socket_wrapper by not using
samba's DLIST_ macros

metze
(This used to be commit bc7b2e8db8)
This commit is contained in:
Stefan Metzmacher 2006-10-08 21:50:22 +00:00 committed by Gerald (Jerry) Carter
parent e4e3dc064d
commit ebc2f440e7
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
source3/lib/socket_wrapper/socket_wrapper.c
View File

@ -46,10 +46,6 @@
#include "system/network.h"
#include "system/filesys.h"
#ifndef _DLINKLIST_H
#include "lib/util/dlinklist.h"
#endif
#ifdef malloc
#undef malloc
#endif
@ -74,10 +70,39 @@
#include <string.h>
#include <stdio.h>
#error "dlinklist.h missing"
#endif
#define SWRAP_DLIST_ADD(list,item) do { \
if (!(list)) { \
(item)->prev = NULL; \
(item)->next = NULL; \
(list) = (item); \
} else { \
(item)->prev = NULL; \
(item)->next = (list); \
(list)->prev = (item); \
(list) = (item); \
} \
} while (0)
#define SWRAP_DLIST_REMOVE(list,item) do { \
if ((list) == (item)) { \
(list) = (item)->next; \
if (list) { \
(list)->prev = NULL; \
} \
} else { \
if ((item)->prev) { \
(item)->prev->next = (item)->next; \
} \
if ((item)->next) { \
(item)->next->prev = (item)->prev; \
} \
} \
(item)->prev = NULL; \
(item)->next = NULL; \
} while (0)
/* LD_PRELOAD doesn't work yet, so REWRITE_CALLS is all we support
* for now */
#define REWRITE_CALLS
@ -1072,7 +1097,7 @@ _PUBLIC_ int swrap_socket(int family, int type, int protocol)
si->protocol = protocol;
si->fd = fd;
DLIST_ADD(sockets, si);
SWRAP_DLIST_ADD(sockets, si);
return si->fd;
}
@ -1141,7 +1166,7 @@ _PUBLIC_ int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
child_si->peername_len = *addrlen;
child_si->peername = sockaddr_dup(addr, *addrlen);
DLIST_ADD(sockets, child_si);
SWRAP_DLIST_ADD(sockets, child_si);
swrap_dump_packet(child_si, addr, SWRAP_ACCEPT_SEND, NULL, 0);
swrap_dump_packet(child_si, addr, SWRAP_ACCEPT_RECV, NULL, 0);
@ -1541,7 +1566,7 @@ _PUBLIC_ int swrap_close(int fd)
return real_close(fd);
}
DLIST_REMOVE(sockets, si);
SWRAP_DLIST_REMOVE(sockets, si);
if (si->myname && si->peername) {
swrap_dump_packet(si, NULL, SWRAP_CLOSE_SEND, NULL, 0);