Commit6b9e742

committed

The macaddr datatype understands most formats of MAC address, except 12

hex digits with no separators, eg 00AABBCCDDEE. This is easily remediedwith the following patch (against 7.2.1):Mike Wyer

1 parentcd7be4d commit6b9e742Copy full SHA for 6b9e742

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`*PostgreSQL type definitions for MAC addresses.`
`3`	`3`	`*`
`4`		`- *$Header: /cvsroot/pgsql/src/backend/utils/adt/mac.c,v 1.22 2002/03/09 17:35:35 tgl Exp $`
	`4`	`+ *$Header: /cvsroot/pgsql/src/backend/utils/adt/mac.c,v 1.23 2002/06/15 19:39:33 momjian Exp $`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`	`#include"postgres.h"`
`@@ -46,6 +46,8 @@ macaddr_in(PG_FUNCTION_ARGS)`
`46`	`46`	`count=sscanf(str,"%2x%2x%2x-%2x%2x%2x",&a,&b,&c,&d,&e,&f);`
`47`	`47`	`if (count!=6)`
`48`	`48`	`count=sscanf(str,"%2x%2x.%2x%2x.%2x%2x",&a,&b,&c,&d,&e,&f);`
	`49`	`+if (count!=6)`
	`50`	`+count=sscanf(str,"%2x%2x%2x%2x%2x%2x",&a,&b,&c,&d,&e,&f);`
`49`	`51`
`50`	`52`	`if (count!=6)`
`51`	`53`	`elog(ERROR,"macaddr_in: error in parsing \"%s\"",str);`

Comments

(0)