Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
99308891
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
99308891
编写于
6月 23, 2003
作者:
B
Bruce Momjian
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove references to sa_family_t, except when SOCKADDR_STORAGE requires
it. Also handle __ss_family as a synonym for ss_family. Kurt Roeckx
上级
6403a672
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
156 addition
and
11 deletion
+156
-11
config/c-library.m4
config/c-library.m4
+14
-1
configure
configure
+121
-0
configure.in
configure.in
+2
-1
src/include/libpq/pqcomm.h
src/include/libpq/pqcomm.h
+7
-1
src/include/pg_config.h.in
src/include/pg_config.h.in
+6
-0
src/port/getaddrinfo.c
src/port/getaddrinfo.c
+6
-8
未找到文件。
config/c-library.m4
浏览文件 @
99308891
# Macros that test various C library quirks
# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.2
1 2003/06/12 16:05:10 tgl
Exp $
# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.2
2 2003/06/23 23:51:59 momjian
Exp $
# PGAC_VAR_INT_TIMEZONE
...
...
@@ -110,6 +110,19 @@ AC_DEFUN([PGAC_STRUCT_SOCKADDR_STORAGE],
#endif
])])# PGAC_STRUCT_SOCKADDR_STORAGE
# PGAC_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
# --------------------------------------
# This checks if the struct sockaddr has a proper ss_family and not an
# __ss_family as rfc2553 defined.
AC_DEFUN([PGAC_STRUCT_SOCKADDR_STORAGE_SS_FAMILY],
[AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family,
struct sockaddr_storage.__ss_family], [], [],
[#include <sys/types.h>
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
])])# PGAC_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
# PGAC_STRUCT_ADDRINFO
# -----------------------
...
...
configure
浏览文件 @
99308891
...
...
@@ -9869,6 +9869,127 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
fi
echo
"
$as_me
:
$LINENO
: checking for struct sockaddr_storage.ss_family"
>
&5
echo
$ECHO_N
"checking for struct sockaddr_storage.ss_family...
$ECHO_C
"
>
&6
if
test
"
${
ac_cv_member_struct_sockaddr_storage_ss_family
+set
}
"
=
set
;
then
echo
$ECHO_N
"(cached)
$ECHO_C
"
>
&6
else
cat
>
conftest.
$ac_ext
<<
_ACEOF
#line
$LINENO
"configure"
#include "confdefs.h"
#include <sys/types.h>
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
static struct sockaddr_storage ac_aggr;
if (ac_aggr.ss_family)
return 0;
;
return 0;
}
_ACEOF
rm
-f
conftest.
$ac_objext
if
{
(
eval echo
"
$as_me
:
$LINENO
:
\"
$ac_compile
\"
"
)
>
&5
(
eval
$ac_compile
)
2>&5
ac_status
=
$?
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
(
exit
$ac_status
)
;
}
&&
{
ac_try
=
'test -s conftest.$ac_objext'
{
(
eval echo
"
$as_me
:
$LINENO
:
\"
$ac_try
\"
"
)
>
&5
(
eval
$ac_try
)
2>&5
ac_status
=
$?
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
(
exit
$ac_status
)
;
}
;
}
;
then
ac_cv_member_struct_sockaddr_storage_ss_family
=
yes
else
echo
"
$as_me
: failed program was:"
>
&5
cat
conftest.
$ac_ext
>
&5
ac_cv_member_struct_sockaddr_storage_ss_family
=
no
fi
rm
-f
conftest.
$ac_objext
conftest.
$ac_ext
fi
echo
"
$as_me
:
$LINENO
: result:
$ac_cv_member_struct_sockaddr_storage_ss_family
"
>
&5
echo
"
${
ECHO_T
}
$ac_cv_member_struct_sockaddr_storage_ss_family
"
>
&6
if
test
$ac_cv_member_struct_sockaddr_storage_ss_family
=
yes
;
then
cat
>>
confdefs.h
<<
_ACEOF
#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
_ACEOF
fi
echo
"
$as_me
:
$LINENO
: checking for struct sockaddr_storage.__ss_family"
>
&5
echo
$ECHO_N
"checking for struct sockaddr_storage.__ss_family...
$ECHO_C
"
>
&6
if
test
"
${
ac_cv_member_struct_sockaddr_storage___ss_family
+set
}
"
=
set
;
then
echo
$ECHO_N
"(cached)
$ECHO_C
"
>
&6
else
cat
>
conftest.
$ac_ext
<<
_ACEOF
#line
$LINENO
"configure"
#include "confdefs.h"
#include <sys/types.h>
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
static struct sockaddr_storage ac_aggr;
if (ac_aggr.__ss_family)
return 0;
;
return 0;
}
_ACEOF
rm
-f
conftest.
$ac_objext
if
{
(
eval echo
"
$as_me
:
$LINENO
:
\"
$ac_compile
\"
"
)
>
&5
(
eval
$ac_compile
)
2>&5
ac_status
=
$?
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
(
exit
$ac_status
)
;
}
&&
{
ac_try
=
'test -s conftest.$ac_objext'
{
(
eval echo
"
$as_me
:
$LINENO
:
\"
$ac_try
\"
"
)
>
&5
(
eval
$ac_try
)
2>&5
ac_status
=
$?
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
(
exit
$ac_status
)
;
}
;
}
;
then
ac_cv_member_struct_sockaddr_storage___ss_family
=
yes
else
echo
"
$as_me
: failed program was:"
>
&5
cat
conftest.
$ac_ext
>
&5
ac_cv_member_struct_sockaddr_storage___ss_family
=
no
fi
rm
-f
conftest.
$ac_objext
conftest.
$ac_ext
fi
echo
"
$as_me
:
$LINENO
: result:
$ac_cv_member_struct_sockaddr_storage___ss_family
"
>
&5
echo
"
${
ECHO_T
}
$ac_cv_member_struct_sockaddr_storage___ss_family
"
>
&6
if
test
$ac_cv_member_struct_sockaddr_storage___ss_family
=
yes
;
then
cat
>>
confdefs.h
<<
_ACEOF
#define HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY 1
_ACEOF
fi
echo
"
$as_me
:
$LINENO
: checking for struct addrinfo"
>
&5
...
...
configure.in
浏览文件 @
99308891
dnl Process this file with autoconf to produce a configure script.
dnl $Header: /cvsroot/pgsql/configure.in,v 1.26
6 2003/06/18 16:04:15
momjian Exp $
dnl $Header: /cvsroot/pgsql/configure.in,v 1.26
7 2003/06/23 23:51:59
momjian Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
...
...
@@ -778,6 +778,7 @@ PGAC_STRUCT_TIMEZONE
PGAC_UNION_SEMUN
PGAC_STRUCT_SOCKADDR_UN
PGAC_STRUCT_SOCKADDR_STORAGE
PGAC_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
PGAC_STRUCT_ADDRINFO
AC_CHECK_TYPES([struct cmsgcred, struct fcred, struct sockcred], [], [],
...
...
src/include/libpq/pqcomm.h
浏览文件 @
99308891
...
...
@@ -9,7 +9,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: pqcomm.h,v 1.8
6 2003/06/12 07:36:51
momjian Exp $
* $Id: pqcomm.h,v 1.8
7 2003/06/23 23:51:59
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -65,6 +65,12 @@ struct sockaddr_storage {
* _SS_MAXSIZE value minus size of ss_family
* __ss_pad1, __ss_align fields is 112 */
};
#elif !defined(HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY)
# ifdef HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY
# define ss_family __ss_family
# else
# error struct sockaddr_storage does not provide an ss_family member
# endif
#endif
typedef
struct
{
...
...
src/include/pg_config.h.in
浏览文件 @
99308891
...
...
@@ -423,6 +423,12 @@
/* Define to 1 if the system has the type `struct sockaddr_storage'. */
#undef HAVE_STRUCT_SOCKADDR_STORAGE
/* Define to 1 if `ss_family' is member of `struct sockaddr_storage'. */
#undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
/* Define to 1 if `__ss_family' is member of `struct sockaddr_storage'. */
#undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY
/* Define to 1 if the system has the type `struct sockaddr_un'. */
#undef HAVE_STRUCT_SOCKADDR_UN
...
...
src/port/getaddrinfo.c
浏览文件 @
99308891
...
...
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/port/getaddrinfo.c,v 1.
8 2003/06/14 18:20:33
momjian Exp $
* $Header: /cvsroot/pgsql/src/port/getaddrinfo.c,v 1.
9 2003/06/23 23:52:00
momjian Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -220,7 +220,6 @@ getnameinfo(const struct sockaddr *sa, int salen,
char
*
node
,
int
nodelen
,
char
*
service
,
int
servicelen
,
int
flags
)
{
sa_family_t
family
;
int
ret
=
-
1
;
/* Invalid arguments. */
...
...
@@ -236,9 +235,8 @@ getnameinfo(const struct sockaddr *sa, int salen,
return
EAI_FAIL
;
}
family
=
sa
->
sa_family
;
#ifdef HAVE_IPV6
if
(
family
==
AF_INET6
)
if
(
sa
->
sa_
family
==
AF_INET6
)
{
return
EAI_FAMILY
;
}
...
...
@@ -246,13 +244,13 @@ getnameinfo(const struct sockaddr *sa, int salen,
if
(
service
)
{
if
(
family
==
AF_INET
)
if
(
sa
->
sa_
family
==
AF_INET
)
{
ret
=
snprintf
(
service
,
servicelen
,
"%d"
,
ntohs
(((
struct
sockaddr_in
*
)
sa
)
->
sin_port
));
}
#ifdef HAVE_UNIX_SOCKETS
else
if
(
family
==
AF_UNIX
)
else
if
(
sa
->
sa_
family
==
AF_UNIX
)
{
ret
=
snprintf
(
service
,
servicelen
,
"%s"
,
((
struct
sockaddr_un
*
)
sa
)
->
sun_path
);
...
...
@@ -266,14 +264,14 @@ getnameinfo(const struct sockaddr *sa, int salen,
if
(
node
)
{
if
(
family
==
AF_INET
)
if
(
sa
->
sa_
family
==
AF_INET
)
{
char
*
p
;
p
=
inet_ntoa
(((
struct
sockaddr_in
*
)
sa
)
->
sin_addr
);
ret
=
snprintf
(
node
,
nodelen
,
"%s"
,
p
);
}
#ifdef HAVE_UNIX_SOCKETS
else
if
(
family
==
AF_UNIX
)
else
if
(
sa
->
sa_
family
==
AF_UNIX
)
{
ret
=
snprintf
(
node
,
nodelen
,
"%s"
,
"localhost"
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录