Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
5dfcbdde
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,发现更多精彩内容 >>
提交
5dfcbdde
编写于
11月 25, 2000
作者:
T
Tom Lane
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix some portability bugs I'd introduced into inet/cidr code ---
shifting by the word width is not defined by ANSI C...
上级
bbea3643
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
36 addition
and
6 deletion
+36
-6
src/backend/utils/adt/network.c
src/backend/utils/adt/network.c
+36
-6
未找到文件。
src/backend/utils/adt/network.c
浏览文件 @
5dfcbdde
...
...
@@ -3,7 +3,7 @@
* is for IP V4 CIDR notation, but prepared for V6: just
* add the necessary bits where the comments indicate.
*
* $Header: /cvsroot/pgsql/src/backend/utils/adt/network.c,v 1.2
6 2000/11/10 20:13:25
tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/network.c,v 1.2
7 2000/11/25 21:30:54
tgl Exp $
*
* Jon Postel RIP 16 Oct 1998
*/
...
...
@@ -418,7 +418,13 @@ network_broadcast(PG_FUNCTION_ARGS)
/* It's an IP V4 address: */
unsigned
long
mask
=
0xffffffff
;
mask
>>=
ip_bits
(
ip
);
/* Shifting by 32 or more bits does not yield portable results,
* so don't try it.
*/
if
(
ip_bits
(
ip
)
<
32
)
mask
>>=
ip_bits
(
ip
);
else
mask
=
0
;
ip_v4addr
(
dst
)
=
htonl
(
ntohl
(
ip_v4addr
(
ip
))
|
mask
);
}
...
...
@@ -451,7 +457,13 @@ network_network(PG_FUNCTION_ARGS)
/* It's an IP V4 address: */
unsigned
long
mask
=
0xffffffff
;
mask
<<=
(
32
-
ip_bits
(
ip
));
/* Shifting by 32 or more bits does not yield portable results,
* so don't try it.
*/
if
(
ip_bits
(
ip
)
>
0
)
mask
<<=
(
32
-
ip_bits
(
ip
));
else
mask
=
0
;
ip_v4addr
(
dst
)
=
htonl
(
ntohl
(
ip_v4addr
(
ip
))
&
mask
);
}
...
...
@@ -484,7 +496,13 @@ network_netmask(PG_FUNCTION_ARGS)
/* It's an IP V4 address: */
unsigned
long
mask
=
0xffffffff
;
mask
<<=
(
32
-
ip_bits
(
ip
));
/* Shifting by 32 or more bits does not yield portable results,
* so don't try it.
*/
if
(
ip_bits
(
ip
)
>
0
)
mask
<<=
(
32
-
ip_bits
(
ip
));
else
mask
=
0
;
ip_v4addr
(
dst
)
=
htonl
(
mask
);
...
...
@@ -512,7 +530,13 @@ v4bitncmp(unsigned long a1, unsigned long a2, int bits)
{
unsigned
long
mask
;
mask
=
(
0xFFFFFFFFL
<<
(
32
-
bits
))
&
0xFFFFFFFFL
;
/* Shifting by 32 or more bits does not yield portable results,
* so don't try it.
*/
if
(
bits
>
0
)
mask
=
(
0xFFFFFFFFL
<<
(
32
-
bits
))
&
0xFFFFFFFFL
;
else
mask
=
0
;
a1
=
ntohl
(
a1
);
a2
=
ntohl
(
a2
);
if
((
a1
&
mask
)
<
(
a2
&
mask
))
...
...
@@ -530,7 +554,13 @@ v4addressOK(unsigned long a1, int bits)
{
unsigned
long
mask
;
mask
=
(
0xFFFFFFFFL
<<
(
32
-
bits
))
&
0xFFFFFFFFL
;
/* Shifting by 32 or more bits does not yield portable results,
* so don't try it.
*/
if
(
bits
>
0
)
mask
=
(
0xFFFFFFFFL
<<
(
32
-
bits
))
&
0xFFFFFFFFL
;
else
mask
=
0
;
a1
=
ntohl
(
a1
);
if
((
a1
&
mask
)
==
a1
)
return
true
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录