sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-13 16:23:50 +03:00
Code Activity

r18426: use 'family' consistantly instead of mixing 'domain' and 'family'

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher
2006-09-12 14:59:08 +00:00
committed by Gerald (Jerry) Carter
parent 7670e9ae6e
commit 224f26602a
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/lib/socket_wrapper/socket_wrapper.c
View File

@@ -80,7 +80,7 @@ struct socket_info
{ {
int fd; int fd;
int domain; int family;
int type; int type;
int protocol; int protocol;
int bound; int bound;
@@ -430,20 +430,20 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
} }
_PUBLIC_ int swrap_socket(int domain, int type, int protocol) _PUBLIC_ int swrap_socket(int family, int type, int protocol)
{ {
struct socket_info *si; struct socket_info *si;
int fd; int fd;
if (!socket_wrapper_dir()) { if (!socket_wrapper_dir()) {
return real_socket(domain, type, protocol); return real_socket(family, type, protocol);
} }
switch (domain) { switch (family) {
case AF_INET: case AF_INET:
break; break;
case AF_UNIX: case AF_UNIX:
return real_socket(domain, type, protocol); return real_socket(family, type, protocol);
default: default:
errno = EAFNOSUPPORT; errno = EAFNOSUPPORT;
return -1; return -1;
@@ -455,7 +455,7 @@ _PUBLIC_ int swrap_socket(int domain, int type, int protocol)
si = calloc(1, sizeof(struct socket_info)); si = calloc(1, sizeof(struct socket_info));
si->domain = domain; si->family = family;
si->type = type; si->type = type;
si->protocol = protocol; si->protocol = protocol;
si->fd = fd; si->fd = fd;
@@ -492,14 +492,14 @@ _PUBLIC_ int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
fd = ret; fd = ret;
ret = sockaddr_convert_from_un(parent_si, &un_addr, un_addrlen, ret = sockaddr_convert_from_un(parent_si, &un_addr, un_addrlen,
parent_si->domain, addr, addrlen); parent_si->family, addr, addrlen);
if (ret == -1) return ret; if (ret == -1) return ret;
child_si = malloc(sizeof(struct socket_info)); child_si = malloc(sizeof(struct socket_info));
memset(child_si, 0, sizeof(*child_si)); memset(child_si, 0, sizeof(*child_si));
child_si->fd = fd; child_si->fd = fd;
child_si->domain = parent_si->domain; child_si->family = parent_si->family;
child_si->type = parent_si->type; child_si->type = parent_si->type;
child_si->protocol = parent_si->protocol; child_si->protocol = parent_si->protocol;
child_si->bound = 1; child_si->bound = 1;
@@ -508,7 +508,7 @@ _PUBLIC_ int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
if (ret == -1) return ret; if (ret == -1) return ret;
ret = sockaddr_convert_from_un(child_si, &un_my_addr, un_my_addrlen, ret = sockaddr_convert_from_un(child_si, &un_my_addr, un_my_addrlen,
child_si->domain, &my_addr, &my_addrlen); child_si->family, &my_addr, &my_addrlen);
if (ret == -1) return ret; if (ret == -1) return ret;
child_si->myname_len = my_addrlen; child_si->myname_len = my_addrlen;
@@ -691,12 +691,9 @@ _PUBLIC_ int swrap_getsockopt(int s, int level, int optname, void *optval, sockl
return real_getsockopt(s, level, optname, optval, optlen); return real_getsockopt(s, level, optname, optval, optlen);
} }
switch (si->domain) {
default:
errno = ENOPROTOOPT; errno = ENOPROTOOPT;
return -1; return -1;
} }
}
_PUBLIC_ int swrap_setsockopt(int s, int level, int optname, const void *optval, socklen_t optlen) _PUBLIC_ int swrap_setsockopt(int s, int level, int optname, const void *optval, socklen_t optlen)
{ {
@@ -710,7 +707,7 @@ _PUBLIC_ int swrap_setsockopt(int s, int level, int optname, const void *o
return real_setsockopt(s, level, optname, optval, optlen); return real_setsockopt(s, level, optname, optval, optlen);
} }
switch (si->domain) { switch (si->family) {
case AF_INET: case AF_INET:
return 0; return 0;
default: default:
@@ -737,7 +734,7 @@ _PUBLIC_ ssize_t swrap_recvfrom(int s, void *buf, size_t len, int flags, struct
return ret; return ret;
if (sockaddr_convert_from_un(si, &un_addr, un_addrlen, if (sockaddr_convert_from_un(si, &un_addr, un_addrlen,
si->domain, from, fromlen) == -1) { si->family, from, fromlen) == -1) {
return -1; return -1;
} }

2
source/lib/socket_wrapper/socket_wrapper.h
View File

@@ -19,7 +19,7 @@
#ifndef __SOCKET_WRAPPER_H__ #ifndef __SOCKET_WRAPPER_H__
#define __SOCKET_WRAPPER_H__ #define __SOCKET_WRAPPER_H__
int swrap_socket(int domain, int type, int protocol); int swrap_socket(int family, int type, int protocol);
int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen); int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen);
int swrap_connect(int s, const struct sockaddr *serv_addr, socklen_t addrlen); int swrap_connect(int s, const struct sockaddr *serv_addr, socklen_t addrlen);
int swrap_bind(int s, const struct sockaddr *myaddr, socklen_t addrlen); int swrap_bind(int s, const struct sockaddr *myaddr, socklen_t addrlen);