Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0a92c58

Browse files
committed
Sync inet formatting code with recent BIND releases. In particular,
fix bug with inconsistent selection of default mask length for"class D" addresses. Per report from Steve Atkins.
1 parent14f5c84 commit0a92c58

File tree

2 files changed

+71
-70
lines changed

2 files changed

+71
-70
lines changed

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

Lines changed: 34 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
11
/*
2-
* Copyright (c) 1996 by Internet Software Consortium.
2+
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
3+
* Copyright (c) 1996,1999 by Internet Software Consortium.
34
*
45
* Permission to use, copy, modify, and distribute this software for any
56
* purpose with or without fee is hereby granted, provided that the above
67
* copyright notice and this permission notice appear in all copies.
78
*
8-
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
9-
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
10-
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
11-
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
12-
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
13-
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
14-
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
15-
* SOFTWARE.
9+
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
10+
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11+
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
12+
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13+
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14+
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
15+
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1616
*
17-
* $PostgreSQL: pgsql/src/backend/utils/adt/inet_net_ntop.c,v 1.18 2003/11/29 19:51:58 pgsql Exp $
17+
* $PostgreSQL: pgsql/src/backend/utils/adt/inet_net_ntop.c,v 1.19 2005/02/01 00:59:09 tgl Exp $
1818
*/
1919

20+
#if defined(LIBC_SCCS)&& !defined(lint)
21+
staticconstcharrcsid[]="Id: inet_net_ntop.c,v 1.1.2.2 2004/03/09 09:17:27 marka Exp $";
22+
#endif
23+
2024
#include"postgres.h"
2125

26+
#include<sys/types.h>
2227
#include<sys/socket.h>
2328
#include<netinet/in.h>
2429
#include<arpa/inet.h>
2530

26-
#include<errno.h>
27-
2831
#include"utils/inet.h"
2932
#include"utils/builtins.h"
3033

34+
3135
#defineNS_IN6ADDRSZ 16
3236
#defineNS_INT16SZ 2
3337

@@ -81,7 +85,7 @@ inet_cidr_ntop(int af, const void *src, int bits, char *dst, size_t size)
8185
*pointer to dst, or NULL if an error occurred (check errno).
8286
* note:
8387
*network byte order assumed. this means 192.5.5.240/28 has
84-
*0x11110000 in its fourth octet.
88+
*0b11110000 in its fourth octet.
8589
* author:
8690
*Paul Vixie (ISC), July 1996
8791
*/
@@ -98,31 +102,36 @@ inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
98102
errno=EINVAL;
99103
return (NULL);
100104
}
105+
101106
if (bits==0)
102107
{
103108
if (size<sizeof"0")
104109
gotoemsgsize;
105110
*dst++='0';
111+
size--;
106112
*dst='\0';
107113
}
108114

109115
/* Format whole octets. */
110116
for (b=bits /8;b>0;b--)
111117
{
112-
if (size<sizeof".255")
118+
if (size <=sizeof"255.")
113119
gotoemsgsize;
114120
t=dst;
115-
if (dst!=odst)
116-
*dst++='.';
117121
dst+=SPRINTF((dst,"%u",*src++));
122+
if (b>1)
123+
{
124+
*dst++='.';
125+
*dst='\0';
126+
}
118127
size-= (size_t) (dst-t);
119128
}
120129

121130
/* Format partial octet. */
122131
b=bits %8;
123132
if (b>0)
124133
{
125-
if (size<sizeof".255")
134+
if (size <=sizeof".255")
126135
gotoemsgsize;
127136
t=dst;
128137
if (dst!=odst)
@@ -133,10 +142,9 @@ inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
133142
}
134143

135144
/* Format CIDR /width. */
136-
if (size<sizeof"/32")
145+
if (size <=sizeof"/32")
137146
gotoemsgsize;
138147
dst+=SPRINTF((dst,"/%u",bits));
139-
140148
return (odst);
141149

142150
emsgsize:
@@ -146,7 +154,7 @@ inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
146154

147155
/*
148156
* static char *
149-
*inet_net_ntop_ipv6(src, bits, fakebits, dst, size)
157+
*inet_cidr_ntop_ipv6(src, bits, fakebits, dst, size)
150158
*convert IPv6 network number from network to presentation format.
151159
*generates CIDR style result always. Picks the shortest representation
152160
*unless the IP is really IPv4.
@@ -173,7 +181,6 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
173181
tmp_zero_l;
174182
inti;
175183
intis_ipv4=0;
176-
intdouble_colon=0;
177184
unsignedcharinbuf[16];
178185
charoutbuf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255/128")];
179186
char*cp;
@@ -187,14 +194,12 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
187194
}
188195

189196
cp=outbuf;
190-
double_colon=0;
191197

192198
if (bits==0)
193199
{
194200
*cp++=':';
195201
*cp++=':';
196202
*cp='\0';
197-
double_colon=1;
198203
}
199204
else
200205
{
@@ -244,8 +249,8 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
244249
}
245250

246251
if (zero_l!=words&&zero_s==0&& ((zero_l==6)||
247-
((zero_l==5&&s[10]==0xff&&s[11]==0xff)||
248-
((zero_l==7&&s[14]!=0&&s[15]!=1)))))
252+
((zero_l==5&&s[10]==0xff&&s[11]==0xff)||
253+
((zero_l==7&&s[14]!=0&&s[15]!=1)))))
249254
is_ipv4=1;
250255

251256
/* Format whole words. */
@@ -257,10 +262,7 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
257262
if (p==zero_s)
258263
*cp++=':';
259264
if (p==words-1)
260-
{
261265
*cp++=':';
262-
double_colon=1;
263-
}
264266
s++;
265267
s++;
266268
continue;
@@ -286,18 +288,8 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
286288
}
287289
}
288290
}
289-
290-
if (!double_colon)
291-
{
292-
if (bits<128-32)
293-
cp+=SPRINTF((cp,"::"));
294-
elseif (bits<128-16)
295-
cp+=SPRINTF((cp,":0"));
296-
}
297-
298291
/* Format CIDR /width. */
299292
SPRINTF((cp,"/%u",bits));
300-
301293
if (strlen(outbuf)+1>size)
302294
gotoemsgsize;
303295
strcpy(dst,outbuf);
@@ -309,6 +301,7 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
309301
return (NULL);
310302
}
311303

304+
312305
/*
313306
* char *
314307
* inet_net_ntop(af, src, bits, dst, size)
@@ -368,7 +361,7 @@ inet_net_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
368361
/* Always format all four octets, regardless of mask length. */
369362
for (b=len;b>0;b--)
370363
{
371-
if (size<sizeof".255")
364+
if (size <=sizeof".255")
372365
gotoemsgsize;
373366
t=dst;
374367
if (dst!=odst)
@@ -380,7 +373,7 @@ inet_net_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
380373
/* don't print masklen if 32 bits */
381374
if (bits!=32)
382375
{
383-
if (size<sizeof"/32")
376+
if (size <=sizeof"/32")
384377
gotoemsgsize;
385378
dst+=SPRINTF((dst,"/%u",bits));
386379
}
@@ -401,7 +394,7 @@ decoct(const u_char *src, int bytes, char *dst, size_t size)
401394

402395
for (b=1;b <=bytes;b++)
403396
{
404-
if (size<sizeof"255.")
397+
if (size <=sizeof"255.")
405398
return (0);
406399
t=dst;
407400
dst+=SPRINTF((dst,"%u",*src++));

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

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,47 @@
11
/*
2-
* Copyright (c) 1996 by Internet Software Consortium.
2+
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
3+
* Copyright (c) 1996,1999 by Internet Software Consortium.
34
*
45
* Permission to use, copy, modify, and distribute this software for any
56
* purpose with or without fee is hereby granted, provided that the above
67
* copyright notice and this permission notice appear in all copies.
78
*
8-
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
9-
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
10-
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
11-
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
12-
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
13-
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
14-
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
15-
* SOFTWARE.
9+
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
10+
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11+
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
12+
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13+
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14+
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
15+
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1616
*
17-
* $PostgreSQL: pgsql/src/backend/utils/adt/inet_net_pton.c,v 1.19 2004/10/07 15:21:53 momjian Exp $
17+
* $PostgreSQL: pgsql/src/backend/utils/adt/inet_net_pton.c,v 1.20 2005/02/01 00:59:09 tgl Exp $
1818
*/
1919

20+
#if defined(LIBC_SCCS)&& !defined(lint)
21+
staticconstcharrcsid[]="Id: inet_net_pton.c,v 1.4.2.3 2004/03/17 00:40:11 marka Exp $";
22+
#endif
23+
2024
#include"postgres.h"
2125

26+
#include<sys/types.h>
2227
#include<sys/socket.h>
2328
#include<netinet/in.h>
2429
#include<arpa/inet.h>
25-
2630
#include<assert.h>
2731
#include<ctype.h>
28-
#include<errno.h>
2932

3033
#include"utils/inet.h"
31-
3234
#include"utils/builtins.h"
3335

36+
3437
staticintinet_net_pton_ipv4(constchar*src,u_char*dst);
3538
staticintinet_cidr_pton_ipv4(constchar*src,u_char*dst,size_tsize);
3639
staticintinet_net_pton_ipv6(constchar*src,u_char*dst);
3740
staticintinet_cidr_pton_ipv6(constchar*src,u_char*dst,size_tsize);
3841

42+
3943
/*
40-
*staticint
44+
* int
4145
* inet_net_pton(af, src, dst, size)
4246
*convert network number from presentation to network format.
4347
*accepts hex octets, hex strings, decimal octets, and /CIDR.
@@ -85,19 +89,18 @@ inet_net_pton(int af, const char *src, void *dst, size_t size)
8589
*not an IPv4 network specification.
8690
* note:
8791
*network byte order assumed. this means 192.5.5.240/28 has
88-
*0x11110000 in its fourth octet.
92+
*0b11110000 in its fourth octet.
8993
* author:
9094
*Paul Vixie (ISC), June 1996
9195
*/
9296
staticint
9397
inet_cidr_pton_ipv4(constchar*src,u_char*dst,size_tsize)
9498
{
95-
staticconstchar
96-
xdigits[]="0123456789abcdef",
97-
digits[]="0123456789";
99+
staticconstcharxdigits[]="0123456789abcdef";
100+
staticconstchardigits[]="0123456789";
98101
intn,
99102
ch,
100-
tmp,
103+
tmp=0,
101104
dirty,
102105
bits;
103106
constu_char*odst=dst;
@@ -107,10 +110,9 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, size_t size)
107110
&&isxdigit((unsignedchar)src[1]))
108111
{
109112
/* Hexadecimal: Eat nybble string. */
110-
if (size <=0)
113+
if (size <=0U)
111114
gotoemsgsize;
112115
dirty=0;
113-
tmp=0;
114116
src++;/* skip x or X. */
115117
while ((ch=*src++)!='\0'&&isxdigit((unsignedchar)ch))
116118
{
@@ -124,15 +126,15 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, size_t size)
124126
tmp= (tmp <<4) |n;
125127
if (++dirty==2)
126128
{
127-
if (size-- <=0)
129+
if (size-- <=0U)
128130
gotoemsgsize;
129131
*dst++= (u_char)tmp;
130132
dirty=0;
131133
}
132134
}
133135
if (dirty)
134136
{/* Odd trailing nybble? */
135-
if (size-- <=0)
137+
if (size-- <=0U)
136138
gotoemsgsize;
137139
*dst++= (u_char) (tmp <<4);
138140
}
@@ -153,7 +155,7 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, size_t size)
153155
gotoenoent;
154156
}while ((ch=*src++)!='\0'&&
155157
isdigit((unsignedchar)ch));
156-
if (size-- <=0)
158+
if (size-- <=0U)
157159
gotoemsgsize;
158160
*dst++= (u_char)tmp;
159161
if (ch=='\0'||ch=='/')
@@ -200,22 +202,28 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, size_t size)
200202
if (*odst >=240)/* Class E */
201203
bits=32;
202204
elseif (*odst >=224)/* Class D */
203-
bits=4;
205+
bits=8;
204206
elseif (*odst >=192)/* Class C */
205207
bits=24;
206208
elseif (*odst >=128)/* Class B */
207209
bits=16;
208-
else
209-
/* Class A */
210+
else/* Class A */
210211
bits=8;
211212
/* If imputed mask is narrower than specified octets, widen. */
212-
if (bits>=8&&bits< ((dst-odst)*8))
213+
if (bits< ((dst-odst)*8))
213214
bits= (dst-odst)*8;
215+
216+
/*
217+
* If there are no additional bits specified for a class D address
218+
* adjust bits to 4.
219+
*/
220+
if (bits==8&&*odst==224)
221+
bits=4;
214222
}
215223
/* Extend network to cover the actual mask. */
216224
while (bits> ((dst-odst)*8))
217225
{
218-
if (size-- <=0)
226+
if (size-- <=0U)
219227
gotoemsgsize;
220228
*dst++='\0';
221229
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp