mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-08-03 07:23:23 +02:00
945543d919
Regression tests for IPv6 operations added.
Documentation updated to document IPv6 bits.
Stop treating IPv4 as an "unsigned int" and IPv6 as an array of
characters. Instead, always use the array of characters so we
can have one function fits all. This makes bitncmp(), addressOK(),
and several other functions "just work" on both address families.
add family() function which returns integer 4 or 6 for IPv4 or
IPv6. (See examples below) Note that to add this new function
you will need to dump/initdb/reload or find the correct magic
to add the function to the postgresql function catalogs.
IPv4 addresses always sort before IPv6.
On disk we use AF_INET for IPv4, and AF_INET+1 for IPv6 addresses.
This prevents the need for a dump and reload, but lets IPv6 parsing
work on machines without AF_INET6.
To select all IPv4 addresses from a table:
select * from foo where family(addr) = 4 ...
Order by and other bits should all work.
Michael Graff
77 lines
2.2 KiB
C
77 lines
2.2 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* inet.h
|
|
* Declarations for operations on INET datatypes.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* $Id: inet.h,v 1.14 2003/06/24 22:21:23 momjian Exp $
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef INET_H
|
|
#define INET_H
|
|
|
|
/*
|
|
* This is the internal storage format for IP addresses
|
|
* (both INET and CIDR datatypes):
|
|
*/
|
|
typedef struct
|
|
{
|
|
unsigned char family;
|
|
unsigned char bits;
|
|
unsigned char type;
|
|
unsigned char ip_addr[16]; /* 128 bits of address */
|
|
} inet_struct;
|
|
|
|
/*
|
|
* Referencing all of the non-AF_INET types to AF_INET lets us work on
|
|
* machines which may not have the appropriate address family (like
|
|
* inet6 addresses when AF_INET6 isn't present) but doesn't cause a
|
|
* dump/reload requirement. Existing databases used AF_INET for the family
|
|
* type on disk.
|
|
*/
|
|
#define PGSQL_AF_INET (AF_INET + 0)
|
|
#define PGSQL_AF_INET6 (AF_INET + 1)
|
|
|
|
/*
|
|
* Both INET and CIDR addresses are represented within Postgres as varlena
|
|
* objects, ie, there is a varlena header (basically a length word) in front
|
|
* of the struct type depicted above.
|
|
*
|
|
* Although these types are variable-length, the maximum length
|
|
* is pretty short, so we make no provision for TOASTing them.
|
|
*/
|
|
typedef struct varlena inet;
|
|
|
|
|
|
/*
|
|
* This is the internal storage format for MAC addresses:
|
|
*/
|
|
typedef struct macaddr
|
|
{
|
|
unsigned char a;
|
|
unsigned char b;
|
|
unsigned char c;
|
|
unsigned char d;
|
|
unsigned char e;
|
|
unsigned char f;
|
|
} macaddr;
|
|
|
|
/*
|
|
* fmgr interface macros
|
|
*/
|
|
#define DatumGetInetP(X) ((inet *) DatumGetPointer(X))
|
|
#define InetPGetDatum(X) PointerGetDatum(X)
|
|
#define PG_GETARG_INET_P(n) DatumGetInetP(PG_GETARG_DATUM(n))
|
|
#define PG_RETURN_INET_P(x) return InetPGetDatum(x)
|
|
/* macaddr is a fixed-length pass-by-reference datatype */
|
|
#define DatumGetMacaddrP(X) ((macaddr *) DatumGetPointer(X))
|
|
#define MacaddrPGetDatum(X) PointerGetDatum(X)
|
|
#define PG_GETARG_MACADDR_P(n) DatumGetMacaddrP(PG_GETARG_DATUM(n))
|
|
#define PG_RETURN_MACADDR_P(x) return MacaddrPGetDatum(x)
|
|
|
|
#endif /* INET_H */
|