Commitdabc3f3

committed

Fix for netmask('x.x.x.x/0') is 255.255.255.255 instead of 0.0.0.0

This is because (-1) << 32 is -1 (Only intel arc. has been checked)Oleg Sharoiko

1 parent337ab80 commitdabc3f3Copy full SHA for dabc3f3

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ PARSER`
`48`	`48`	`* redesign INSERT ... SELECT to have two levels of target list`
`49`	`49`	`* -select * from pg_class where oid in (0,-1)`
`50`	`50`	`* have INTERSECT/EXCEPT prevent duplicates unless ALL is specified`
	`51`	`+* prevent primary key of nine columns(see TODO.detail/primary)`
`51`	`52`
`52`	`53`	`VIEWS`
`53`	`54`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*is for IP V4 CIDR notation, but prepared for V6: just`
`4`	`4`	`*add the necessary bits where the comments indicate.`
`5`	`5`	`*`
`6`		`- *$Id: network.c,v 1.15 1999/07/17 20:17:58 momjian Exp $`
	`6`	`+ *$Id: network.c,v 1.16 1999/09/2317:42:23 momjian Exp $`
`7`	`7`	`*Jon Postel RIP 16 Oct 1998`
`8`	`8`	`*/`
`9`	`9`
`@@ -448,7 +448,8 @@ network_netmask(inet *ip)`
`448`	`448`	`if (ip_family(ip)==AF_INET)`
`449`	`449`	`{`
`450`	`450`	`/* It's an IP V4 address: */`
`451`		`-intaddr=htonl((-1 << (32-ip_bits(ip)))&0xffffffff);`
	`451`	`+intaddr=htonl(ip_bits(ip) ?`
	`452`	`+(-1 << (32-ip_bits(ip)))&0xffffffff :0x00000000);`
`452`	`453`
`453`	`454`	`if (inet_net_ntop(AF_INET,&addr,32,tmp,sizeof(tmp))==NULL)`
`454`	`455`	`elog(ERROR,"unable to print netmask (%s)",strerror(errno));`

Comments

(0)