NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitc5336a8

committed

netmask() and hostmask() functions should return maximum-length masklen,

per gripe from Joe Sunday.

1 parent3e5da0a commitc5336a8Copy full SHA for c5336a8

File tree

1 file changed

-17

lines changed

src/backend/utils/adt
- network.c

1 file changed

-17

lines changed

`‎src/backend/utils/adt/network.c‎`

Lines changed: 5 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`*PostgreSQL type definitions for the INET and CIDR types.`
`3`	`3`	`*`
`4`		`- *$PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.48 2003/11/29 19:51:59 pgsql Exp $`
	`4`	`+ *$PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.49 2003/12/01 18:50:19 tgl Exp $`
`5`	`5`	`*`
`6`	`6`	`*Jon Postel RIP 16 Oct 1998`
`7`	`7`	`*/`
`@@ -315,8 +315,8 @@ inet_set_masklen(PG_FUNCTION_ARGS)`
`315`	`315`	`errmsg("invalid mask length: %d",bits)));`
`316`	`316`
`317`	`317`	`/* clone the original data */`
`318`		`-dst= (inet*)palloc(VARHDRSZ+sizeof(inet_struct));`
`319`		`-memcpy(dst,src,VARHDRSZ+sizeof(inet_struct));`
	`318`	`+dst= (inet*)palloc(VARSIZE(src));`
	`319`	`+memcpy(dst,src,VARSIZE(src));`
`320`	`320`
`321`	`321`	`ip_bits(dst)=bits;`
`322`	`322`
`@@ -658,19 +658,13 @@ network_network(PG_FUNCTION_ARGS)`
`658`	`658`	`inet*dst;`
`659`	`659`	`intbyte;`
`660`	`660`	`intbits;`
`661`		`-intmaxbytes;`
`662`	`661`	`unsignedcharmask;`
`663`	`662`	`unsignedchar*a,`
`664`	`663`	`*b;`
`665`	`664`
`666`	`665`	`/* make sure any unused bits are zeroed */`
`667`	`666`	`dst= (inet*)palloc0(VARHDRSZ+sizeof(inet_struct));`
`668`	`667`
`669`		`-if (ip_family(ip)==PGSQL_AF_INET)`
`670`		`-maxbytes=4;`
`671`		`-else`
`672`		`-maxbytes=16;`
`673`		`-`
`674`	`668`	`bits=ip_bits(ip);`
`675`	`669`	`a=ip_addr(ip);`
`676`	`670`	`b=ip_addr(dst);`
`@@ -710,18 +704,12 @@ network_netmask(PG_FUNCTION_ARGS)`
`710`	`704`	`inet*dst;`
`711`	`705`	`intbyte;`
`712`	`706`	`intbits;`
`713`		`-intmaxbytes;`
`714`	`707`	`unsignedcharmask;`
`715`	`708`	`unsignedchar*b;`
`716`	`709`
`717`	`710`	`/* make sure any unused bits are zeroed */`
`718`	`711`	`dst= (inet*)palloc0(VARHDRSZ+sizeof(inet_struct));`
`719`	`712`
`720`		`-if (ip_family(ip)==PGSQL_AF_INET)`
`721`		`-maxbytes=4;`
`722`		`-else`
`723`		`-maxbytes=16;`
`724`		`-`
`725`	`713`	`bits=ip_bits(ip);`
`726`	`714`	`b=ip_addr(dst);`
`727`	`715`
`@@ -744,7 +732,7 @@ network_netmask(PG_FUNCTION_ARGS)`
`744`	`732`	`}`
`745`	`733`
`746`	`734`	`ip_family(dst)=ip_family(ip);`
`747`		`-ip_bits(dst)=ip_bits(ip);`
	`735`	`+ip_bits(dst)=ip_maxbits(ip);`
`748`	`736`	`ip_type(dst)=0;`
`749`	`737`	`VARATT_SIZEP(dst)=VARHDRSZ`
`750`	`738`	`+ ((char)ip_addr(dst)- (char)VARDATA(dst))`
`@@ -794,7 +782,7 @@ network_hostmask(PG_FUNCTION_ARGS)`
`794`	`782`	`}`
`795`	`783`
`796`	`784`	`ip_family(dst)=ip_family(ip);`
`797`		`-ip_bits(dst)=ip_bits(ip);`
	`785`	`+ip_bits(dst)=ip_maxbits(ip);`
`798`	`786`	`ip_type(dst)=0;`
`799`	`787`	`VARATT_SIZEP(dst)=VARHDRSZ`
`800`	`788`	`+ ((char)ip_addr(dst)- (char)VARDATA(dst))`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc5336a8

File tree

1 file changed

1 file changed

`‎src/backend/utils/adt/network.c‎`

0 commit comments