Commite47b93d

committed

The INET and CIDR types mistakenly compared 198.68.123.0/24 and

198.68.123.0/27 the same when indexing them.D'Arcy

1 parent8593e1f commite47b93dCopy full SHA for e47b93d

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 10 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.9 1999/05/25 16:12:11 momjian Exp $`
	`6`	`+ *$Id: network.c,v 1.10 1999/06/02 03:37:15 momjian Exp $`
`7`	`7`	`*Jon Postel RIP 16 Oct 1998`
`8`	`8`	`*/`
`9`	`9`
`@@ -306,8 +306,16 @@ network_cmp(inet a1, inet a2)`
`306`	`306`	`{`
`307`	`307`	`if (ntohl(ip_v4addr(a1))<ntohl(ip_v4addr(a2)))`
`308`	`308`	`return (-1);`
`309`		`-elseif (ntohl(ip_v4addr(a1))>ntohl(ip_v4addr(a2)))`
	`309`	`+`
	`310`	`+if (ntohl(ip_v4addr(a1))>ntohl(ip_v4addr(a2)))`
	`311`	`+return (1);`
	`312`	`+`
	`313`	`+if (ip_bits(a1)<ip_bits(a2))`
	`314`	`+return (-1);`
	`315`	`+`
	`316`	`+if (ip_bits(a1)>ip_bits(a2))`
`310`	`317`	`return (1);`
	`318`	`+`
`311`	`319`	`return0;`
`312`	`320`	`}`
`313`	`321`

Comments

(0)