Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 858a3b5

Browse files
bmomjianbmomjian
committed
New CIDR type and fixed INET type, from D'Arcy.
1 parent 56f96f5 commit 858a3b5

File tree

7 files changed

+161
-29
lines changed

7 files changed

+161
-29
lines changed

‎src/backend/utils/adt/inet.c

Lines changed: 99 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
* PostgreSQL type definitions for the INET type. This
2+
* PostgreSQL type definitions for the INET type. This
33
* is for IP V4 CIDR notation, but prepared for V6: just
44
* add the necessary bits where the comments indicate.
55
*
6-
* $Id: inet.c,v 1.8 1998/10/21 04:25:25 momjian Exp $
6+
* $Id: inet.c,v 1.9 1998/10/21 16:06:45 momjian Exp $
77
* Jon Postel RIP 16 Oct 1998
88
*/
99

@@ -22,7 +22,7 @@
2222
#include <utils/builtins.h>
2323
#include <utils/inet.h>
2424

25-
static int v4bitncmp(unsigned int a1, unsigned int a2, int bits);
25+
static int v4bitncmp(unsigned int a1, unsigned int a2, int bits);
2626

2727
/*
2828
* Access macros. Add IPV6 support.
@@ -37,11 +37,14 @@ static int v4bitncmp(unsigned int a1, unsigned int a2, int bits);
3737
#define ip_bits(inetptr) \
3838
(((inet_struct *)VARDATA(inetptr))->bits)
3939

40+
#define ip_type(inetptr) \
41+
(((inet_struct *)VARDATA(inetptr))->type)
42+
4043
#define ip_v4addr(inetptr) \
4144
(((inet_struct *)VARDATA(inetptr))->addr.ipv4_addr)
4245

4346
/*
44-
* IP address reader.
47+
* INET address reader.
4548
*/
4649

4750
inet *
@@ -70,11 +73,12 @@ inet_in(char *src)
7073
+ ((char *) &ip_v4addr(dst) - (char *) VARDATA(dst))
7174
+ ip_addrsize(dst);
7275
ip_bits(dst) = bits;
76+
ip_type(dst) = 0;
7377
return (dst);
7478
}
7579

7680
/*
77-
* IP address output function.
81+
* INET address output function.
7882
*/
7983

8084
char *
@@ -99,6 +103,8 @@ inet_out(inet *src)
99103
elog(ERROR, "unknown address family (%d)", ip_family(src));
100104
return (NULL);
101105
}
106+
if (ip_type(src) == 0 && ip_bits(src) == 32 && (dst = strchr(tmp, '/')) != NULL)
107+
*dst = 0;
102108
dst = palloc(strlen(tmp) + 1);
103109
if (dst == NULL)
104110
{
@@ -109,6 +115,39 @@ inet_out(inet *src)
109115
return (dst);
110116
}
111117

118+
/*
119+
* CIDR uses all of INET's funcs, just has a separate input func.
120+
*/
121+
122+
inet *
123+
cidr_in(char *src)
124+
{
125+
int bits;
126+
inet *dst;
127+
128+
dst = palloc(VARHDRSZ + sizeof(inet_struct));
129+
if (dst == NULL)
130+
{
131+
elog(ERROR, "unable to allocate memory in cidr_in()");
132+
return (NULL);
133+
}
134+
/* First, try for an IP V4 address: */
135+
ip_family(dst) = AF_INET;
136+
bits = inet_net_pton(ip_family(dst), src, &ip_v4addr(dst), ip_addrsize(dst));
137+
if ((bits < 0) || (bits > 32))
138+
{
139+
/* Go for an IPV6 address here, before faulting out: */
140+
elog(ERROR, "could not parse \"%s\"", src);
141+
pfree(dst);
142+
return (NULL);
143+
}
144+
VARSIZE(dst) = VARHDRSZ
145+
+ ((char *) &ip_v4addr(dst) - (char *) VARDATA(dst))
146+
+ ip_addrsize(dst);
147+
ip_bits(dst) = bits;
148+
return (dst);
149+
}
150+
112151
/*
113152
* Boolean tests for magnitude. Add V4/V6 testing!
114153
*/
@@ -267,20 +306,23 @@ inet_cmp(inet *a1, inet *a2)
267306
}
268307

269308
text *
270-
inet_netmask(inet *ip)
309+
inet_host(inet *ip)
271310
{
272-
text *ret;
273-
int len;
311+
text *ret;
312+
int len;
274313
char *ptr,
275314
tmp[sizeof("255.255.255.255/32")];
276315

316+
if (ip_type(ip))
317+
{
318+
elog(ERROR, "CIDR type has no host part");
319+
return NULL;
320+
}
321+
277322
if (ip_family(ip) == AF_INET)
278323
{
279324
/* It's an IP V4 address: */
280-
int addr = htonl((-1 << (32 - ip_bits(ip))) & 0xffffffff);
281-
282-
/* a little wasteful by why reinvent the wheel? */
283-
if (inet_net_ntop(AF_INET, &addr, 32, tmp, sizeof(tmp)) < 0)
325+
if (inet_net_ntop(AF_INET, &ip_v4addr(ip), 32, tmp, sizeof(tmp)) < 0)
284326
{
285327
elog(ERROR, "unable to print netmask (%s)", strerror(errno));
286328
return (NULL);
@@ -298,7 +340,7 @@ inet_netmask(inet *ip)
298340
ret = palloc(len);
299341
if (ret == NULL)
300342
{
301-
elog(ERROR, "unable to allocate memory in inet_netmask()");
343+
elog(ERROR, "unable to allocate memory in inet_host()");
302344
return (NULL);
303345
}
304346
VARSIZE(ret) = len;
@@ -307,23 +349,24 @@ inet_netmask(inet *ip)
307349
}
308350

309351
int4
310-
inet_masklen(inet *ip)
352+
inet_netmasklen(inet *ip)
311353
{
312354
return ip_bits(ip);
313355
}
314356

315357
text *
316358
inet_broadcast(inet *ip)
317359
{
318-
text *ret;
319-
int len;
360+
text *ret;
361+
int len;
320362
char *ptr,
321363
tmp[sizeof("255.255.255.255/32")] = "Hello";
322364

323365
if (ip_family(ip) == AF_INET)
324366
{
325367
/* It's an IP V4 address: */
326-
int addr = htonl(ntohl(ip_v4addr(ip)) | (0xffffffff >> ip_bits(ip)));
368+
int addr = htonl(ntohl(ip_v4addr(ip)) | (0xffffffff >> ip_bits(ip)));
369+
327370
/* int addr = htonl(ip_v4addr(ip) | (0xffffffff >> ip_bits(ip))); */
328371

329372
if (inet_net_ntop(AF_INET, &addr, 32, tmp, sizeof(tmp)) < 0)
@@ -352,6 +395,45 @@ inet_broadcast(inet *ip)
352395
return (ret);
353396
}
354397

398+
text *
399+
inet_netmask(inet *ip)
400+
{
401+
text *ret;
402+
int len;
403+
char *ptr,
404+
tmp[sizeof("255.255.255.255/32")];
405+
406+
if (ip_family(ip) == AF_INET)
407+
{
408+
/* It's an IP V4 address: */
409+
int addr = htonl((-1 << (32 - ip_bits(ip))) & 0xffffffff);
410+
411+
if (inet_net_ntop(AF_INET, &addr, 32, tmp, sizeof(tmp)) < 0)
412+
{
413+
elog(ERROR, "unable to print netmask (%s)", strerror(errno));
414+
return (NULL);
415+
}
416+
}
417+
else
418+
{
419+
/* Go for an IPV6 address here, before faulting out: */
420+
elog(ERROR, "unknown address family (%d)", ip_family(ip));
421+
return (NULL);
422+
}
423+
if ((ptr = strchr(tmp, '/')) != NULL)
424+
*ptr = 0;
425+
len = VARHDRSZ + strlen(tmp);
426+
ret = palloc(len);
427+
if (ret == NULL)
428+
{
429+
elog(ERROR, "unable to allocate memory in inet_netmask()");
430+
return (NULL);
431+
}
432+
VARSIZE(ret) = len;
433+
strcpy(VARDATA(ret), tmp);
434+
return (ret);
435+
}
436+
355437
/*
356438
* Bitwise comparison for V4 addresses. Add V6 implementation!
357439
*/
@@ -372,4 +454,3 @@ v4bitncmp(unsigned int a1, unsigned int a2, int bits)
372454
return (1);
373455
return (0);
374456
}
375-

‎src/include/catalog/pg_opclass.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_opclass.h,v 1.13 1998/10/08 00:19:38 momjian Exp $
10+
* $Id: pg_opclass.h,v 1.14 1998/10/21 16:06:46 momjian Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -111,5 +111,7 @@ DATA(insert OID = 810 ( macaddr_ops 829 ));
111111
DESCR("");
112112
DATA(insert OID = 935 ( inet_ops 869 ));
113113
DESCR("");
114+
DATA(insert OID = 652 ( inet_ops 650 ));
115+
DESCR("");
114116

115117
#endif /* PG_OPCLASS_H */

‎src/include/catalog/pg_operator.h

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_operator.h,v 1.40 1998/10/08 00:19:39 momjian Exp $
10+
* $Id: pg_operator.h,v 1.41 1998/10/21 16:06:46 momjian Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -643,7 +643,7 @@ DATA(insert OID = 1223 ( "<=" PGUID 0 b t f 829 829 16 1225 1224 0 0 macadd
643643
DATA(insert OID = 1224 ( ">" PGUID 0 b t f 829 829 16 1222 1223 0 0 macaddr_gt intltsel intltjoinsel ));
644644
DATA(insert OID = 1225 ( ">=" PGUID 0 b t f 829 829 16 1223 1222 0 0 macaddr_ge intltsel intltjoinsel ));
645645

646-
/* IP type */
646+
/* INET type */
647647
DATA(insert OID = 1201 ( "=" PGUID 0 b t t 869 869 16 1201 1202 0 0 inet_eq eqsel eqjoinsel ));
648648
DATA(insert OID = 1202 ( "<>" PGUID 0 b t f 869 869 16 1202 1201 0 0 inet_ne neqsel neqjoinsel ));
649649
DATA(insert OID = 1203 ( "<" PGUID 0 b t f 869 869 16 1205 1206 0 0 inet_lt intltsel intltjoinsel ));
@@ -655,6 +655,18 @@ DATA(insert OID = 932 ( "<<=" PGUID 0 b t f 869 869 16 934 933 0 0 in
655655
DATA(insert OID = 933 ( ">>" PGUID 0 b t f 869 869 16 931 932 0 0 inet_sup intltsel intltjoinsel ));
656656
DATA(insert OID = 934 ( ">>=" PGUID 0 b t f 869 869 16 932 931 0 0 inet_supeq intltsel intltjoinsel ));
657657

658+
/* CIDR type */
659+
DATA(insert OID = 820 ( "=" PGUID 0 b t t 650 650 16 820 821 0 0 inet_eq eqsel eqjoinsel ));
660+
DATA(insert OID = 821 ( "<>" PGUID 0 b t f 650 650 16 821 820 0 0 inet_ne neqsel neqjoinsel ));
661+
DATA(insert OID = 822 ( "<" PGUID 0 b t f 650 650 16 824 825 0 0 inet_lt intltsel intltjoinsel ));
662+
DATA(insert OID = 823 ( "<=" PGUID 0 b t f 650 650 16 825 824 0 0 inet_le intltsel intltjoinsel ));
663+
DATA(insert OID = 824 ( ">" PGUID 0 b t f 650 650 16 822 823 0 0 inet_gt intltsel intltjoinsel ));
664+
DATA(insert OID = 825 ( ">=" PGUID 0 b t f 650 650 16 823 822 0 0 inet_ge intltsel intltjoinsel ));
665+
DATA(insert OID = 826 ( "<<" PGUID 0 b t f 650 650 16 828 1004 0 0 inet_sub intltsel intltjoinsel ));
666+
DATA(insert OID = 827 ( "<<=" PGUID 0 b t f 650 650 16 1004 828 0 0 inet_subeq intltsel intltjoinsel ));
667+
DATA(insert OID = 828 ( ">>" PGUID 0 b t f 650 650 16 826 827 0 0 inet_sup intltsel intltjoinsel ));
668+
DATA(insert OID = 1004 ( ">>=" PGUID 0 b t f 650 650 16 827 826 0 0 inet_supeq intltsel intltjoinsel ));
669+
658670

659671
/*
660672
* function prototypes

‎src/include/catalog/pg_proc.h

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: pg_proc.h,v 1.74 1998/10/20 23:03:19 momjian Exp $
9+
* $Id: pg_proc.h,v 1.75 1998/10/21 16:06:47 momjian Exp $
1010
*
1111
* NOTES
1212
* The script catalog/genbki.sh reads this file and generates .bki
@@ -2068,12 +2068,17 @@ DESCR("less-equal-greater");
20682068
DATA(insert OID = 837 ( macaddr_manuf PGUID 11 f t f 1 f 25 "829" 100 0 0 100 foo bar ));
20692069
DESCR("MAC manufacturer");
20702070

2071-
/* for ip type support */
2071+
/* for inet type support */
20722072
DATA(insert OID = 910 ( inet_in PGUID 11 f t f 1 f 869 "0" 100 0 0 100 foo bar ));
20732073
DESCR("(internal)");
20742074
DATA(insert OID = 911 ( inet_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar ));
20752075
DESCR("(internal)");
20762076

2077+
/* for cidr type support */
2078+
DATA(insert OID = 1267 ( cidr_in PGUID 11 f t f 1 f 650 "0" 100 0 0 100 foo bar ));
2079+
DESCR("(internal)");
2080+
2081+
/* these are used for both inet and cidr */
20772082
DATA(insert OID = 920 ( inet_eq PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 foo bar ));
20782083
DESCR("equal");
20792084
DATA(insert OID = 921 ( inet_lt PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 foo bar ));
@@ -2097,12 +2102,36 @@ DESCR("is-supernet");
20972102
DATA(insert OID = 930 ( inet_supeq PGUID 11 f t f 2 f 16 "869 869" 100 0 0 100 foo bar ));
20982103
DESCR("is-supernet-or-equal");
20992104

2105+
/* inet/cidr base versions */
21002106
DATA(insert OID = 940 ( inet_netmask PGUID 11 f t f 1 f 25 "869" 100 0 0 100 foo bar ));
21012107
DESCR("netmask of inet address");
2102-
DATA(insert OID = 941 ( inet_masklen PGUID 11 f t f 1 f 23 "869" 100 0 0 100 foo bar ));
2108+
DATA(insert OID = 941 ( inet_netmasklen PGUID 11 f t f 1 f 23 "869" 100 0 0 100 foo bar ));
21032109
DESCR("netmask length");
21042110
DATA(insert OID = 945 ( inet_broadcast PGUID 11 f t f 1 f 25 "869" 100 0 0 100 foo bar ));
21052111
DESCR("broadcast address");
2112+
DATA(insert OID = 682 ( inet_host PGUID 11 f t f 1 f 25 "869" 100 0 0 100 foo bar ));
2113+
DESCR("host address");
2114+
2115+
/* inet versions */
2116+
DATA(insert OID = 940 ( netmask PGUID 14 f t f 1 f 25 "869" 100 0 0 100 "select inet_netmask($1)" - ));
2117+
DESCR("netmask of address");
2118+
DATA(insert OID = 941 ( netmasklen PGUID 14 f t f 1 f 23 "869" 100 0 0 100 "select inet_netmasklen($1)" - ));
2119+
DESCR("netmask length");
2120+
DATA(insert OID = 945 ( broadcast PGUID 14 f t f 1 f 25 "869" 100 0 0 100 "select inet_broadcast($1)" - ));
2121+
DESCR("broadcast address");
2122+
DATA(insert OID = 682 ( host PGUID 14 f t f 1 f 25 "869" 100 0 0 100 "select inet_host($1)" - ));
2123+
DESCR("host address");
2124+
2125+
/* cidr versions */
2126+
DATA(insert OID = 940 ( netmask PGUID 14 f t f 1 f 25 "650" 100 0 0 100 "select inet_netmask($1)" - ));
2127+
DESCR("netmask of address");
2128+
DATA(insert OID = 941 ( netmasklen PGUID 14 f t f 1 f 23 "650" 100 0 0 100 "select inet_netmasklen($1)" - ));
2129+
DESCR("netmask length");
2130+
DATA(insert OID = 945 ( broadcast PGUID 14 f t f 1 f 25 "650" 100 0 0 100 "select inet_broadcast($1)" - ));
2131+
DESCR("broadcast address");
2132+
DATA(insert OID = 682 ( host PGUID 14 f t f 1 f 25 "650" 100 0 0 100 "select inet_host($1)" - ));
2133+
DESCR("host address");
2134+
21062135

21072136

21082137
/*

‎src/include/catalog/pg_type.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_type.h,v 1.49 1998/10/08 00:19:42 momjian Exp $
10+
* $Id: pg_type.h,v 1.50 1998/10/21 16:06:48 momjian Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -301,7 +301,9 @@ DATA(insert OID = 791 ( _money PGUID -1 -1 f b t \054 0 790 array_in array
301301
DATA(insert OID = 829 ( macaddr PGUID 6 -1 f b t \054 0 0 macaddr_in macaddr_out macaddr_in macaddr_out i _null_ ));
302302
DESCR("MAC address");
303303
DATA(insert OID = 869 ( inet PGUID -1 -1 f b t \054 0 0 inet_in inet_out inet_in inet_out i _null_ ));
304-
DESCR("IP address");
304+
DESCR("Host address");
305+
DATA(insert OID = 650 ( cidr PGUID -1 -1 f b t \054 0 0 cidr_in inet_out cidr_in inet_out i _null_ ));
306+
DESCR("Network address");
305307

306308
/* OIDS 900 - 999 */
307309

@@ -340,6 +342,7 @@ DESCR("access control list");
340342
DATA(insert OID = 1034 ( _aclitem PGUID -1 -1 f b t \054 0 1033 array_in array_out array_in array_out i _null_ ));
341343
DATA(insert OID = 1040 ( _macaddr PGUID -1 -1 f b t \054 0 829 array_in array_out array_in array_out i _null_ ));
342344
DATA(insert OID = 1041 ( _inet PGUID -1 -1 f b t \054 0 869 array_in array_out array_in array_out i _null_ ));
345+
DATA(insert OID = 651 ( _cidr PGUID -1 -1 f b t \054 0 650 array_in array_out array_in array_out i _null_ ));
343346
DATA(insert OID = 1042 ( bpchar PGUID -1 -1 f b t \054 0 18 bpcharin bpcharout bpcharin bpcharout i _null_ ));
344347
DESCR("blank-padded characters, length specifed when created");
345348
#define BPCHAROID 1042

‎src/include/utils/builtins.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: builtins.h,v 1.62 1998/10/20 23:03:20 momjian Exp $
9+
* $Id: builtins.h,v 1.63 1998/10/21 16:06:49 momjian Exp $
1010
*
1111
* NOTES
1212
* 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);
518518
char *inet_cidr_ntop(int af, const void *src, size_t len, int bits, char *dst, size_t size);
519519
int inet_cidr_pton(int af, const void *src, void *dst, size_t size, int *used);
520520

521+
/* cidr.c */
522+
inet *cidr_in(char *str);
523+
521524
/* inet.c */
522525
inet *inet_in(char *str);
523526
char *inet_out(inet * addr);
@@ -534,8 +537,9 @@ bool inet_supeq(inet * a1, inet * a2);
534537
int4 inet_cmp(inet * a1, inet * a2);
535538

536539
text *inet_netmask(inet * addr);
537-
int4 inet_masklen(inet * addr);
540+
int4 inet_netmasklen(inet * addr);
538541
text *inet_broadcast(inet * addr);
542+
text *inet_host(inet * addr);
539543

540544

541545
/* mac.c */

0 commit comments

Comments
 (0)