diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-10-21 16:06:50 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-10-21 16:06:50 +0000 |
| commit | 858a3b570ab4e402e7b0b8f383237ad4a5d13c41 (patch) | |
| tree | 98cc9cfa6f1a89378648fd97700f435390ad7f3b /src/include/utils | |
| parent | 56f96f56dfb0f084c0579af2893cab5719fb958f (diff) | |
| download | postgresql-858a3b570ab4e402e7b0b8f383237ad4a5d13c41.tar.gz | |
New CIDR type and fixed INET type, from D'Arcy.
Diffstat (limited to 'src/include/utils')
| -rw-r--r-- | src/include/utils/builtins.h | 8 | ||||
| -rw-r--r-- | src/include/utils/inet.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 9d9989a7c9..f6048b76b6 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.62 1998/10/20 23:03:20 momjian Exp $ + * $Id: builtins.h,v 1.63 1998/10/21 16:06:49 momjian Exp $ * * NOTES * This should normally only be included by fmgr.h. @@ -518,6 +518,9 @@ int inet_net_pton(int af, const char *src, void *dst, size_t size); char *inet_cidr_ntop(int af, const void *src, size_t len, int bits, char *dst, size_t size); int inet_cidr_pton(int af, const void *src, void *dst, size_t size, int *used); +/* cidr.c */ +inet *cidr_in(char *str); + /* inet.c */ inet *inet_in(char *str); char *inet_out(inet * addr); @@ -534,8 +537,9 @@ bool inet_supeq(inet * a1, inet * a2); int4 inet_cmp(inet * a1, inet * a2); text *inet_netmask(inet * addr); -int4 inet_masklen(inet * addr); +int4 inet_netmasklen(inet * addr); text *inet_broadcast(inet * addr); +text *inet_host(inet * addr); /* mac.c */ diff --git a/src/include/utils/inet.h b/src/include/utils/inet.h index 5b5546ffbf..ea87c6a5c5 100644 --- a/src/include/utils/inet.h +++ b/src/include/utils/inet.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: inet.h,v 1.1 1998/10/08 00:19:45 momjian Exp $ + * $Id: inet.h,v 1.2 1998/10/21 16:06:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,6 +21,7 @@ typedef struct { unsigned char family; unsigned char bits; + unsigned char type; union { unsigned int ipv4_addr; /* network byte order */ |