sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 00:02:53 -04:00
Code Issues Projects Releases Wiki Activity

Fix some portability bugs I'd introduced into inet/cidr code ---

Browse Source 
shifting by the word width is not defined by ANSI C...
This commit is contained in:
Tom Lane 2000-11-25 21:30:54 +00:00
parent bbea3643a3
commit 5dfcbdde70
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/backend/utils/adt/network.c
View File

@ -3,7 +3,7 @@
* is for IP V4 CIDR notation, but prepared for V6: just * is for IP V4 CIDR notation, but prepared for V6: just
* add the necessary bits where the comments indicate. * add the necessary bits where the comments indicate.
* *
* $Header: /cvsroot/pgsql/src/backend/utils/adt/network.c,v 1.26 2000/11/10 20:13:25 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/network.c,v 1.27 2000/11/25 21:30:54 tgl Exp $
* *
* Jon Postel RIP 16 Oct 1998 * Jon Postel RIP 16 Oct 1998
*/ */
@ -418,7 +418,13 @@ network_broadcast(PG_FUNCTION_ARGS)
/* It's an IP V4 address: */ /* It's an IP V4 address: */
unsigned long mask = 0xffffffff; unsigned long mask = 0xffffffff;
/* 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); mask >>= ip_bits(ip);
else
mask = 0;
ip_v4addr(dst) = htonl(ntohl(ip_v4addr(ip)) | mask); ip_v4addr(dst) = htonl(ntohl(ip_v4addr(ip)) | mask);
} }
@ -451,7 +457,13 @@ network_network(PG_FUNCTION_ARGS)
/* It's an IP V4 address: */ /* It's an IP V4 address: */
unsigned long mask = 0xffffffff; unsigned long mask = 0xffffffff;
/* 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)); mask <<= (32 - ip_bits(ip));
else
mask = 0;
ip_v4addr(dst) = htonl(ntohl(ip_v4addr(ip)) & mask); ip_v4addr(dst) = htonl(ntohl(ip_v4addr(ip)) & mask);
} }
@ -484,7 +496,13 @@ network_netmask(PG_FUNCTION_ARGS)
/* It's an IP V4 address: */ /* It's an IP V4 address: */
unsigned long mask = 0xffffffff; unsigned long mask = 0xffffffff;
/* 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)); mask <<= (32 - ip_bits(ip));
else
mask = 0;
ip_v4addr(dst) = htonl(mask); ip_v4addr(dst) = htonl(mask);
@ -512,7 +530,13 @@ v4bitncmp(unsigned long a1, unsigned long a2, int bits)
{ {
unsigned long mask; unsigned long mask;
/* Shifting by 32 or more bits does not yield portable results,
* so don't try it.
*/
if (bits > 0)
mask = (0xFFFFFFFFL << (32 - bits)) & 0xFFFFFFFFL; mask = (0xFFFFFFFFL << (32 - bits)) & 0xFFFFFFFFL;
else
mask = 0;
a1 = ntohl(a1); a1 = ntohl(a1);
a2 = ntohl(a2); a2 = ntohl(a2);
if ((a1 & mask) < (a2 & mask)) if ((a1 & mask) < (a2 & mask))
@ -530,7 +554,13 @@ v4addressOK(unsigned long a1, int bits)
{ {
unsigned long mask; unsigned long mask;
/* Shifting by 32 or more bits does not yield portable results,
* so don't try it.
*/
if (bits > 0)
mask = (0xFFFFFFFFL << (32 - bits)) & 0xFFFFFFFFL; mask = (0xFFFFFFFFL << (32 - bits)) & 0xFFFFFFFFL;
else
mask = 0;
a1 = ntohl(a1); a1 = ntohl(a1);
if ((a1 & mask) == a1) if ((a1 & mask) == a1)
return true; return true;