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

Commit 61784c5

Browse files
tglsfdctglsfdc
committed
Change default output formatting for CIDR to be unabbreviated, per
recommendation from Paul Vixie. Add a new abbrev() function to produce abbreviated format as text. No forced initdb, but new function is not available unless you do an initdb or add the pg_proc row manually.
1 parent 13b78a2 commit 61784c5

File tree

6 files changed

+151
-91
lines changed

6 files changed

+151
-91
lines changed

‎doc/src/sgml/datatype.sgml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.44 2000/12/14 22:30:56 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.45 2000/12/22 18:00:24 tgl Exp $
33
-->
44

55
<chapter id="datatype">
@@ -1818,7 +1818,7 @@ January 8 04:05:06 1999 PST
18181818
class="parameter">x.x.x.x</replaceable> is an IP address and
18191819
<replaceable class="parameter">y</replaceable> is the number of
18201820
bits in the netmask. If the <replaceable
1821-
class="parameter">y</replaceable> part is left off, then the
1821+
class="parameter">/y</replaceable> part is left off, then the
18221822
netmask is 32, and the value represents just a single host.
18231823
On display, the <replaceable class="parameter">/y</replaceable>
18241824
portion is suppressed if the netmask is 32.
@@ -1837,7 +1837,7 @@ January 8 04:05:06 1999 PST
18371837
class="parameter">x.x.x.x/y</> where <replaceable
18381838
class="parameter">x.x.x.x</> is the network and <replaceable
18391839
class="parameter">y</> is the number of bits in the netmask. If
1840-
<replaceable class="parameter">y</> omitted, it is calculated
1840+
<replaceable class="parameter">y</> is omitted, it is calculated
18411841
using assumptions from the older classful numbering system, except
18421842
that it will be at least large enough to include all of the octets
18431843
written in the input.
@@ -1848,56 +1848,68 @@ January 8 04:05:06 1999 PST
18481848

18491849
<table tocentry="1">
18501850
<title><type>cidr</> Type Input Examples</title>
1851-
<tgroup cols="2">
1851+
<tgroup cols="3">
18521852
<thead>
18531853
<row>
18541854
<entry>CIDR Input</entry>
18551855
<entry>CIDR Displayed</entry>
1856+
<entry>abbrev(CIDR)</entry>
18561857
</row>
18571858
</thead>
18581859
<tbody>
18591860
<row>
18601861
<entry>192.168.100.128/25</entry>
18611862
<entry>192.168.100.128/25</entry>
1863+
<entry>192.168.100.128/25</entry>
18621864
</row>
18631865
<row>
18641866
<entry>192.168/24</entry>
1867+
<entry>192.168.0.0/24</entry>
18651868
<entry>192.168.0/24</entry>
18661869
</row>
18671870
<row>
18681871
<entry>192.168/25</entry>
18691872
<entry>192.168.0.0/25</entry>
1873+
<entry>192.168.0.0/25</entry>
18701874
</row>
18711875
<row>
18721876
<entry>192.168.1</entry>
1877+
<entry>192.168.1.0/24</entry>
18731878
<entry>192.168.1/24</entry>
18741879
</row>
18751880
<row>
18761881
<entry>192.168</entry>
1882+
<entry>192.168.0.0/24</entry>
18771883
<entry>192.168.0/24</entry>
18781884
</row>
18791885
<row>
18801886
<entry>128.1</entry>
1887+
<entry>128.1.0.0/16</entry>
18811888
<entry>128.1/16</entry>
18821889
</row>
18831890
<row>
18841891
<entry>128</entry>
1892+
<entry>128.0.0.0/16</entry>
18851893
<entry>128.0/16</entry>
18861894
</row>
18871895
<row>
18881896
<entry>128.1.2</entry>
1897+
<entry>128.1.2.0/24</entry>
18891898
<entry>128.1.2/24</entry>
18901899
</row>
18911900
<row>
18921901
<entry>10.1.2</entry>
1902+
<entry>10.1.2.0/24</entry>
18931903
<entry>10.1.2/24</entry>
18941904
</row>
18951905
<row>
18961906
<entry>10.1</entry>
1907+
<entry>10.1.0.0/16</entry>
18971908
<entry>10.1/16</entry>
18981909
</row>
18991910
<row>
19001911
<entry>10</entry>
1912+
<entry>10.0.0.0/8</entry>
19011913
<entry>10/8</entry>
19021914
</row>
19031915
</tbody>
@@ -1917,8 +1929,8 @@ January 8 04:05:06 1999 PST
19171929
<tip>
19181930
<para>
19191931
If you do not like the output format for <type>inet</type> or
1920-
<type>cidr</type> values, try the <function>host</>() and
1921-
<function>text</>() functions.
1932+
<type>cidr</type> values, try the <function>host</>(),
1933+
<function>text</>(), and <function>abbrev</>() functions.
19221934
</para>
19231935
</tip>
19241936
</para>

‎doc/src/sgml/func.sgml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.45 2000/12/19 17:35:46 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.46 2000/12/22 18:00:24 tgl Exp $ -->
22

33
<chapter id="functions">
44
<title>Functions and Operators</title>
@@ -2432,7 +2432,7 @@ Not defined by this name. Implements the intersection operator '#'
24322432
<entry>cidr</entry>
24332433
<entry>extract network part of address</entry>
24342434
<entry>network('192.168.1.5/24')</entry>
2435-
<entry>192.168.1/24</entry>
2435+
<entry>192.168.1.0/24</entry>
24362436
</row>
24372437
<row>
24382438
<entry>text(inet)</entry>
@@ -2441,15 +2441,22 @@ Not defined by this name. Implements the intersection operator '#'
24412441
<entry>text(inet '192.168.1.5')</entry>
24422442
<entry>192.168.1.5/32</entry>
24432443
</row>
2444+
<row>
2445+
<entry>abbrev(inet)</entry>
2446+
<entry>text</entry>
2447+
<entry>extract abbreviated display as text</entry>
2448+
<entry>abbrev(cidr '10.1.0.0/16')</entry>
2449+
<entry>10.1/16</entry>
2450+
</row>
24442451
</tbody>
24452452
</tgroup>
24462453
</table>
24472454

24482455
<para>
24492456
All of the functions for <type>inet</type> can be applied to
2450-
<type>cidr</type> values as well. The <function>host</>() and
2451-
<function>text</>() functions are primarily intended to offer
2452-
alternative display formats.
2457+
<type>cidr</type> values as well. The <function>host</>(),
2458+
<function>text</>(), and <function>abbrev</>() functions are primarily
2459+
intended to offer alternative display formats.
24532460
</para>
24542461

24552462
<para>

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

Lines changed: 50 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* is for IP V4 CIDR notation, but prepared for V6: just
44
* add the necessary bits where the comments indicate.
55
*
6-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/network.c,v 1.27 2000/11/25 21:30:54 tgl Exp $
6+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/network.c,v 1.28 2000/12/22 18:00:20 tgl Exp $
77
*
88
* Jon Postel RIP 16 Oct 1998
99
*/
@@ -111,19 +111,24 @@ inet_out(PG_FUNCTION_ARGS)
111111
inet *src = PG_GETARG_INET_P(0);
112112
char tmp[sizeof("255.255.255.255/32")];
113113
char *dst;
114+
int len;
114115

115116
if (ip_family(src) == AF_INET)
116117
{
117118
/* It's an IP V4 address: */
118-
if (ip_type(src))
119-
dst = inet_cidr_ntop(AF_INET, &ip_v4addr(src), ip_bits(src),
120-
tmp, sizeof(tmp));
121-
else
122-
dst = inet_net_ntop(AF_INET, &ip_v4addr(src), ip_bits(src),
123-
tmp, sizeof(tmp));
124-
119+
/* Use inet style for both inet and cidr, since we don't want
120+
* abbreviated CIDR style here.
121+
*/
122+
dst = inet_net_ntop(AF_INET, &ip_v4addr(src), ip_bits(src),
123+
tmp, sizeof(tmp));
125124
if (dst == NULL)
126125
elog(ERROR, "unable to print address (%s)", strerror(errno));
126+
/* For CIDR, add /n if not present */
127+
if (ip_type(src) && strchr(tmp, '/') == NULL)
128+
{
129+
len = strlen(tmp);
130+
snprintf(tmp + len, sizeof(tmp) - len, "/%u", ip_bits(src));
131+
}
127132
}
128133
else
129134
/* Go for an IPV6 address here, before faulting out: */
@@ -375,17 +380,50 @@ network_show(PG_FUNCTION_ARGS)
375380
/* force display of 32 bits, regardless of masklen... */
376381
if (inet_net_ntop(AF_INET, &ip_v4addr(ip), 32, tmp, sizeof(tmp)) == NULL)
377382
elog(ERROR, "unable to print host (%s)", strerror(errno));
383+
/* Add /n if not present (which it won't be) */
384+
if (strchr(tmp, '/') == NULL)
385+
{
386+
len = strlen(tmp);
387+
snprintf(tmp + len, sizeof(tmp) - len, "/%u", ip_bits(ip));
388+
}
378389
}
379390
else
380391
/* Go for an IPV6 address here, before faulting out: */
381392
elog(ERROR, "unknown address family (%d)", ip_family(ip));
382393

383-
/* Add /n if not present */
384-
if (strchr(tmp, '/') == NULL)
394+
/* Return string as a text datum */
395+
len = strlen(tmp);
396+
ret = (text *) palloc(len + VARHDRSZ);
397+
VARATT_SIZEP(ret) = len + VARHDRSZ;
398+
memcpy(VARDATA(ret), tmp, len);
399+
PG_RETURN_TEXT_P(ret);
400+
}
401+
402+
Datum
403+
network_abbrev(PG_FUNCTION_ARGS)
404+
{
405+
inet *ip = PG_GETARG_INET_P(0);
406+
text *ret;
407+
char *dst;
408+
int len;
409+
char tmp[sizeof("255.255.255.255/32")];
410+
411+
if (ip_family(ip) == AF_INET)
385412
{
386-
len = strlen(tmp);
387-
snprintf(tmp + len, sizeof(tmp) - len, "/%u", ip_bits(ip));
413+
/* It's an IP V4 address: */
414+
if (ip_type(ip))
415+
dst = inet_cidr_ntop(AF_INET, &ip_v4addr(ip), ip_bits(ip),
416+
tmp, sizeof(tmp));
417+
else
418+
dst = inet_net_ntop(AF_INET, &ip_v4addr(ip), ip_bits(ip),
419+
tmp, sizeof(tmp));
420+
421+
if (dst == NULL)
422+
elog(ERROR, "unable to print address (%s)", strerror(errno));
388423
}
424+
else
425+
/* Go for an IPV6 address here, before faulting out: */
426+
elog(ERROR, "unknown address family (%d)", ip_family(ip));
389427

390428
/* Return string as a text datum */
391429
len = strlen(tmp);

‎src/include/catalog/pg_proc.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_proc.h,v 1.180 2000/12/21 20:48:16 petere Exp $
10+
* $Id: pg_proc.h,v 1.181 2000/12/22 18:00:17 tgl Exp $
1111
*
1212
* NOTES
1313
* The script catalog/genbki.sh reads this file and generates .bki
@@ -2294,6 +2294,8 @@ DATA(insert OID = 930 ( network_supeq PGUID 12 f t t t 2 f 16 "869 869" 100 0
22942294
DESCR("is-supernet-or-equal");
22952295

22962296
/* inet/cidr functions */
2297+
DATA(insert OID = 605 ( abbrev PGUID 12 f t t t 1 f 25 "869" 100 0 0 100 network_abbrev - ));
2298+
DESCR("abbreviated display of inet/cidr value");
22972299
DATA(insert OID = 683 ( network PGUID 12 f t t t 1 f 650 "869" 100 0 0 100 network_network - ));
22982300
DESCR("network part of address");
22992301
DATA(insert OID = 696 ( netmask PGUID 12 f t t t 1 f 869 "869" 100 0 0 100 network_netmask - ));

‎src/include/utils/builtins.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: builtins.h,v 1.144 2000/12/08 23:57:00 tgl Exp $
10+
* $Id: builtins.h,v 1.145 2000/12/22 18:00:18 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -508,6 +508,7 @@ extern Datum network_masklen(PG_FUNCTION_ARGS);
508508
extern Datum network_broadcast(PG_FUNCTION_ARGS);
509509
extern Datum network_host(PG_FUNCTION_ARGS);
510510
extern Datum network_show(PG_FUNCTION_ARGS);
511+
extern Datum network_abbrev(PG_FUNCTION_ARGS);
511512

512513
/* mac.c */
513514
extern Datum macaddr_in(PG_FUNCTION_ARGS);

0 commit comments

Comments
 (0)