1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
|
$NetBSD: patch-ae,v 1.2 2002/06/10 09:47:28 sakamoto Exp $
PATCH_SITES+= http://apps.v6.linux.or.jp/pub/Linux/IPv6-2/canna/
PATCHFILES+= Canna35b2-v6-20000602.diff.gz
PATCH_DIST_STRIP= -p1
(copied here for as the above patch does not apply cleanly
diff -ru lib/RKC/Imakefile lib/RKC/Imakefile
--- lib/RKC/Imakefile Tue Oct 22 21:26:34 1996
+++ lib/RKC/Imakefile Fri Jun 2 15:11:31 2000
@@ -11,7 +11,7 @@
LINTLIBS = ../RK/llib-lRK.ln
INCLUDES = -I$(CANNAROOT)/include
- DEFINES = $(SIGNAL_DEFINES) $(RKC_DEFINES) $(ENGINE_DEFS)
+ DEFINES = $(SIGNAL_DEFINES) $(RKC_DEFINES) $(ENGINE_DEFS) $(INET6_DEFS)
HEADER = rkc.h rkcw.h
OBJS = rkc.o convert.o wconvert.o wutil.o
diff -ru lib/RKC/wconvert.c lib/RKC/wconvert.c
--- lib/RKC/wconvert.c Wed Nov 27 16:22:30 1996
+++ lib/RKC/wconvert.c Fri Jun 2 15:01:34 2000
@@ -368,13 +368,46 @@
int number ;
char *hostname ;
{
+#ifdef INET6
+ struct addrinfo hints, *res0, *res;
+ struct servent *sp ;
+ char servbuf[NI_MAXSERV];
+#else
struct sockaddr_in inaddr; /* INET socket address. */
unsigned long hostinetaddr; /* result of inet_addr of arpa addr */
struct hostent *host_ptr, workhostbuf ;
struct servent *sp ;
int addrlen ;
char *h_addr_ptr;
+#endif
+#ifdef INET6
+ sp = getservbyname( IR_SERVICE_NAME, "tcp");
+ sprintf(servbuf, "%u", (sp ? ntohs(sp->s_port) : IR_DEFAULT_PORT) + number);
+ memset( &hints, 0, sizeof( hints ) );
+ hints.ai_family = PF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ if ( getaddrinfo( hostname, servbuf, &hints, &res0 ) ){
+ errno = EINVAL;
+ return( -1 );
+ }
+ for( res = res0 ; res ; res = res->ai_next ){
+ if( res->ai_family != PF_INET && res->ai_family != PF_INET6 )
+ continue;
+ if( (ServerFD = socket( res->ai_family, res->ai_socktype, res->ai_protocol )) < 0 )
+ continue;
+ errno = 0;
+ if( connect( ServerFD, res->ai_addr, res->ai_addrlen ) ){
+#ifdef nodef
+ perror("connect");
+#endif
+ close( ServerFD ) ;
+ ServerFD = -1;
+ continue;
+ }
+ }
+ freeaddrinfo( res0 );
+#else /* INET6 / !INET6 */
/* インターネットドメインで接続する。 */
if( (host_ptr = gethostbyname( hostname ) )
== (struct hostent *)NULL) {
@@ -423,8 +456,10 @@
perror("connect") ;
#endif
close( ServerFD ) ;
+ ServerFD = -1;
return( -1 ) ;
}
+#endif /* !INET6 */
return( ServerFD ) ;
}
#endif
diff -ru server/Imakefile server/Imakefile
--- server/Imakefile Wed Nov 27 16:25:24 1996
+++ server/Imakefile Fri Jun 2 14:52:47 2000
@@ -5,12 +5,12 @@
INSTUGIDFLAGS = -m 6555 $(cannaOwnerGroup)
#ifdef __EMX__
INSTFLAGS = $(INSTUGIDFLAGS)
- LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/RK.a
+ LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/RK.a $(INET6_LIBS)
#else
INSTFLAGS = -s $(INSTUGIDFLAGS)
- LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/libRK.a
+ LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/libRK.a $(INET6_LIBS)
#endif
- DEFINES = $(CANNASERVER_DEFINES)
+ DEFINES = $(CANNASERVER_DEFINES) $(INET6_DEFS)
INCLUDES = -I$(CANNAROOT)/include
IRSRCS = $(SRCS) $(HEADER)
diff -ru server/connection.c server/connection.c
--- server/connection.c Wed Nov 27 16:26:10 1996
+++ server/connection.c Fri Dec 1 11:52:10 2000
@@ -133,2 +133,63 @@
#ifdef USE_INET_SOCKET /* ＩＮＥＴドメインの作成 */
+#ifdef INET6
+static int open_inet6_socket ()
+{
+ extern int PortNumberPlus;
+ struct sockaddr_in6 in6sock;
+ struct servent *sp;
+ int retry, request;
+
+ /* /etc/servicesからポート番号を取得する */
+ if( (sp = getservbyname(IR_SERVICE_NAME ,"tcp")) == NULL )
+ {
+ ir_debug( Dmsg(5,"Warning: Port number not find on '/etc/services'.\n");)
+ ir_debug( Dmsg(5," Use %d as default.\n", IR_DEFAULT_PORT);)
+ }
+
+ if ((request = socket (AF_INET6, SOCK_STREAM, 0)) < 0)
+ {
+ ir_debug( Dmsg(5,"Warning: INET socket for server failed.\n");)
+ }
+ else
+ {
+#ifdef SO_REUSEADDR
+ {
+ int one = 1;
+ setsockopt(request, SOL_SOCKET, SO_REUSEADDR,
+ (char *)&one, sizeof(int));
+ }
+#endif
+ bzero ((char *)&in6sock, sizeof (in6sock));
+ in6sock.sin6_family = AF_INET6;
+ in6sock.sin6_port =
+ (sp ? ntohs(sp->s_port) : IR_DEFAULT_PORT) + PortNumberPlus;
+
+ ir_debug( Dmsg(5, "ポート番号:[%d]\n",htons(in6sock.sin6_port));)
+
+ in6sock.sin6_port = htons(in6sock.sin6_port);
+ in6sock.sin6_addr = in6addr_any;
+
+ retry = 0;
+ while ( bind(request, (struct sockaddr *)&in6sock, sizeof(in6sock)) < 0 )
+ {
+ ir_debug( Dmsg(5, "bind トライ回数[%d]\n",retry);)
+ if (++retry == 5){
+ ir_debug( Dmsg(5,"Warning: Server could not bind.\n");)
+ close(request);
+ request = -1; /* bind 失敗 */
+ break;
+ }
+ sleep (1);
+ }
+ if( retry != 5 ) {
+ if (listen (request, 5)){
+ ir_debug( Dmsg(5,"Warning: Server could not listen.\n");)
+ close(request);
+ request = -1; /* listen 失敗 */
+ }
+ }
+ }
+ return request;
+}
+#endif
static int open_inet_socket ()
@@ -200,2 +261,5 @@
int request;
+#if defined(USE_INET_SOCKET) && defined(INET6)
+ int inet6_ok = 0;
+#endif
@@ -222,2 +286,14 @@
#ifdef USE_INET_SOCKET /* ＩＮＥＴドメイン */
+#ifdef INET6
+ if ((request = open_inet6_socket ()) != -1)
+ {
+ inet6_ok++;
+ WellKnownConnections |= (1L << request);
+ ir_debug( Dmsg(3,"INET6 domain socket is created\n"); )
+ }
+ else
+ {
+ ir_debug( Dmsg(5,"Warning: INET6 domain not created.\n");)
+ }
+#endif
if ((request = open_inet_socket ()) != -1)
@@ -229,3 +305,9 @@
ir_debug( Dmsg(5,"Warning: INET domain not created.\n");)
+#ifdef INET6
+ if ( !inet6_ok ){
+ return 0; /* 作成に失敗 */
+ }
+#else
return 0; /* 作成に失敗 */
+#endif
}
@@ -609,6 +691,11 @@
{
+#ifdef INET6
+ struct sockaddr_storage from;
+#else
struct sockaddr_in from;
struct hostent *hp;
- char buf[MAXDATA], *inet_ntoa();
- int fromlen = sizeof( struct sockaddr_in ) ;
+ char *inet_ntoa();
+#endif
+ char buf[MAXDATA];
+ int fromlen = sizeof(from);
@@ -622,2 +709,15 @@
+#ifdef INET6
+#ifdef AF_UNIX
+ if (from.ss_family != AF_UNIX)
+#else
+ if (from.ss_family != AF_LOCAL)
+#endif
+ {
+ if (getnameinfo((struct sockaddr *)&from, fromlen, buf, sizeof(buf),
+ NULL, 0, 0) != 0) {
+ strcpy(buf, "invalid");
+ }
+ }
+#else
if( from.sin_family == AF_INET ) {
@@ -630,3 +730,5 @@
strncpy( buf, inet_ntoa( from.sin_addr ), MAXDATA-1 ) ;
- } else {
+ }
+#endif
+ else {
client->hostaddr = IR_UNIX_ADDRESS;
|
