svn commit: samba r18426 - in
branches/SAMBA_4_0/source/lib/socket_wrapper: .
metze at samba.org
metze at samba.org
Tue Sep 12 14:59:08 GMT 2006
Author: metze
Date: 2006-09-12 14:59:08 +0000 (Tue, 12 Sep 2006)
New Revision: 18426
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18426
Log:
use 'family' consistantly instead of mixing 'domain' and 'family'
metze
Modified:
branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.h
Changeset:
Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c 2006-09-12 14:45:24 UTC (rev 18425)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c 2006-09-12 14:59:08 UTC (rev 18426)
@@ -80,7 +80,7 @@
{
int fd;
- int domain;
+ int family;
int type;
int protocol;
int bound;
@@ -430,20 +430,20 @@
}
-_PUBLIC_ int swrap_socket(int domain, int type, int protocol)
+_PUBLIC_ int swrap_socket(int family, int type, int protocol)
{
struct socket_info *si;
int fd;
if (!socket_wrapper_dir()) {
- return real_socket(domain, type, protocol);
+ return real_socket(family, type, protocol);
}
- switch (domain) {
+ switch (family) {
case AF_INET:
break;
case AF_UNIX:
- return real_socket(domain, type, protocol);
+ return real_socket(family, type, protocol);
default:
errno = EAFNOSUPPORT;
return -1;
@@ -455,7 +455,7 @@
si = calloc(1, sizeof(struct socket_info));
- si->domain = domain;
+ si->family = family;
si->type = type;
si->protocol = protocol;
si->fd = fd;
@@ -492,14 +492,14 @@
fd = ret;
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;
child_si = malloc(sizeof(struct socket_info));
memset(child_si, 0, sizeof(*child_si));
child_si->fd = fd;
- child_si->domain = parent_si->domain;
+ child_si->family = parent_si->family;
child_si->type = parent_si->type;
child_si->protocol = parent_si->protocol;
child_si->bound = 1;
@@ -508,7 +508,7 @@
if (ret == -1) return ret;
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;
child_si->myname_len = my_addrlen;
@@ -691,11 +691,8 @@
return real_getsockopt(s, level, optname, optval, optlen);
}
- switch (si->domain) {
- default:
- errno = ENOPROTOOPT;
- return -1;
- }
+ errno = ENOPROTOOPT;
+ return -1;
}
_PUBLIC_ int swrap_setsockopt(int s, int level, int optname, const void *optval, socklen_t optlen)
@@ -710,7 +707,7 @@
return real_setsockopt(s, level, optname, optval, optlen);
}
- switch (si->domain) {
+ switch (si->family) {
case AF_INET:
return 0;
default:
@@ -737,7 +734,7 @@
return ret;
if (sockaddr_convert_from_un(si, &un_addr, un_addrlen,
- si->domain, from, fromlen) == -1) {
+ si->family, from, fromlen) == -1) {
return -1;
}
Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.h
===================================================================
--- branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.h 2006-09-12 14:45:24 UTC (rev 18425)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.h 2006-09-12 14:59:08 UTC (rev 18426)
@@ -19,7 +19,7 @@
#ifndef __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_connect(int s, const struct sockaddr *serv_addr, socklen_t addrlen);
int swrap_bind(int s, const struct sockaddr *myaddr, socklen_t addrlen);
More information about the samba-cvs
mailing list