tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
sunrpc: move address copy/cmp/convert routines and prototypes from clnt.h to addr.h
These routines are used by server and client code, so having them in a
separate header would be best.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
authored by
Jeff Layton
and committed by
J. Bruce Fields
5976687a
155a345a
+191
-163
+1
-1
fs/lockd/clntlock.c
+1
-1
fs/lockd/clntlock.c
+1
fs/lockd/host.c
+1
fs/lockd/host.c
+1
fs/lockd/mon.c
+1
fs/lockd/mon.c
+1
-1
fs/lockd/svcsubs.c
+1
-1
fs/lockd/svcsubs.c
+2
fs/nfs/dns_resolve.c
+2
fs/nfs/dns_resolve.c
···
10
10
11
11
#include <linux/module.h>
12
12
#include <linux/sunrpc/clnt.h>
13
+
#include <linux/sunrpc/addr.h>
13
14
#include <linux/dns_resolver.h>
14
15
#include "dns_resolve.h"
15
16
···
43
42
#include <linux/seq_file.h>
44
43
#include <linux/inet.h>
45
44
#include <linux/sunrpc/clnt.h>
45
+
#include <linux/sunrpc/addr.h>
46
46
#include <linux/sunrpc/cache.h>
47
47
#include <linux/sunrpc/svcauth.h>
48
48
#include <linux/sunrpc/rpc_pipe_fs.h>
+1
fs/nfs/nfs4client.c
+1
fs/nfs/nfs4client.c
+1
fs/nfs/nfs4filelayoutdev.c
+1
fs/nfs/nfs4filelayoutdev.c
+1
fs/nfs/nfs4namespace.c
+1
fs/nfs/nfs4namespace.c
+1
fs/nfs/super.c
+1
fs/nfs/super.c
+1
-1
fs/nfsd/fault_inject.c
+1
-1
fs/nfsd/fault_inject.c
+1
-1
fs/nfsd/nfs4state.c
+1
-1
fs/nfsd/nfs4state.c
+1
-1
fs/nfsd/nfscache.c
+1
-1
fs/nfsd/nfscache.c
+1
-1
fs/nfsd/nfsctl.c
+1
-1
fs/nfsd/nfsctl.c
+170
include/linux/sunrpc/addr.h
+170
include/linux/sunrpc/addr.h
···
1
+
/*
2
+
* linux/include/linux/sunrpc/addr.h
3
+
*
4
+
* Various routines for copying and comparing sockaddrs and for
5
+
* converting them to and from presentation format.
6
+
*/
7
+
#ifndef _LINUX_SUNRPC_ADDR_H
8
+
#define _LINUX_SUNRPC_ADDR_H
9
+
10
+
#include <linux/socket.h>
11
+
#include <linux/in.h>
12
+
#include <linux/in6.h>
13
+
#include <net/ipv6.h>
14
+
15
+
size_t rpc_ntop(const struct sockaddr *, char *, const size_t);
16
+
size_t rpc_pton(struct net *, const char *, const size_t,
17
+
struct sockaddr *, const size_t);
18
+
char * rpc_sockaddr2uaddr(const struct sockaddr *, gfp_t);
19
+
size_t rpc_uaddr2sockaddr(struct net *, const char *, const size_t,
20
+
struct sockaddr *, const size_t);
21
+
22
+
static inline unsigned short rpc_get_port(const struct sockaddr *sap)
23
+
{
24
+
switch (sap->sa_family) {
25
+
case AF_INET:
26
+
return ntohs(((struct sockaddr_in *)sap)->sin_port);
27
+
case AF_INET6:
28
+
return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
29
+
}
30
+
return 0;
31
+
}
32
+
33
+
static inline void rpc_set_port(struct sockaddr *sap,
34
+
const unsigned short port)
35
+
{
36
+
switch (sap->sa_family) {
37
+
case AF_INET:
38
+
((struct sockaddr_in *)sap)->sin_port = htons(port);
39
+
break;
40
+
case AF_INET6:
41
+
((struct sockaddr_in6 *)sap)->sin6_port = htons(port);
42
+
break;
43
+
}
44
+
}
45
+
46
+
#define IPV6_SCOPE_DELIMITER '%'
47
+
#define IPV6_SCOPE_ID_LEN sizeof("%nnnnnnnnnn")
48
+
49
+
static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
50
+
const struct sockaddr *sap2)
51
+
{
52
+
const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sap1;
53
+
const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sap2;
54
+
55
+
return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
56
+
}
57
+
58
+
static inline bool __rpc_copy_addr4(struct sockaddr *dst,
59
+
const struct sockaddr *src)
60
+
{
61
+
const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
62
+
struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
63
+
64
+
dsin->sin_family = ssin->sin_family;
65
+
dsin->sin_addr.s_addr = ssin->sin_addr.s_addr;
66
+
return true;
67
+
}
68
+
69
+
#if IS_ENABLED(CONFIG_IPV6)
70
+
static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
71
+
const struct sockaddr *sap2)
72
+
{
73
+
const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1;
74
+
const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
75
+
76
+
if (!ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr))
77
+
return false;
78
+
else if (ipv6_addr_type(&sin1->sin6_addr) & IPV6_ADDR_LINKLOCAL)
79
+
return sin1->sin6_scope_id == sin2->sin6_scope_id;
80
+
81
+
return true;
82
+
}
83
+
84
+
static inline bool __rpc_copy_addr6(struct sockaddr *dst,
85
+
const struct sockaddr *src)
86
+
{
87
+
const struct sockaddr_in6 *ssin6 = (const struct sockaddr_in6 *) src;
88
+
struct sockaddr_in6 *dsin6 = (struct sockaddr_in6 *) dst;
89
+
90
+
dsin6->sin6_family = ssin6->sin6_family;
91
+
dsin6->sin6_addr = ssin6->sin6_addr;
92
+
dsin6->sin6_scope_id = ssin6->sin6_scope_id;
93
+
return true;
94
+
}
95
+
#else /* !(IS_ENABLED(CONFIG_IPV6) */
96
+
static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
97
+
const struct sockaddr *sap2)
98
+
{
99
+
return false;
100
+
}
101
+
102
+
static inline bool __rpc_copy_addr6(struct sockaddr *dst,
103
+
const struct sockaddr *src)
104
+
{
105
+
return false;
106
+
}
107
+
#endif /* !(IS_ENABLED(CONFIG_IPV6) */
108
+
109
+
/**
110
+
* rpc_cmp_addr - compare the address portion of two sockaddrs.
111
+
* @sap1: first sockaddr
112
+
* @sap2: second sockaddr
113
+
*
114
+
* Just compares the family and address portion. Ignores port, but
115
+
* compares the scope if it's a link-local address.
116
+
*
117
+
* Returns true if the addrs are equal, false if they aren't.
118
+
*/
119
+
static inline bool rpc_cmp_addr(const struct sockaddr *sap1,
120
+
const struct sockaddr *sap2)
121
+
{
122
+
if (sap1->sa_family == sap2->sa_family) {
123
+
switch (sap1->sa_family) {
124
+
case AF_INET:
125
+
return __rpc_cmp_addr4(sap1, sap2);
126
+
case AF_INET6:
127
+
return __rpc_cmp_addr6(sap1, sap2);
128
+
}
129
+
}
130
+
return false;
131
+
}
132
+
133
+
/**
134
+
* rpc_copy_addr - copy the address portion of one sockaddr to another
135
+
* @dst: destination sockaddr
136
+
* @src: source sockaddr
137
+
*
138
+
* Just copies the address portion and family. Ignores port, scope, etc.
139
+
* Caller is responsible for making certain that dst is large enough to hold
140
+
* the address in src. Returns true if address family is supported. Returns
141
+
* false otherwise.
142
+
*/
143
+
static inline bool rpc_copy_addr(struct sockaddr *dst,
144
+
const struct sockaddr *src)
145
+
{
146
+
switch (src->sa_family) {
147
+
case AF_INET:
148
+
return __rpc_copy_addr4(dst, src);
149
+
case AF_INET6:
150
+
return __rpc_copy_addr6(dst, src);
151
+
}
152
+
return false;
153
+
}
154
+
155
+
/**
156
+
* rpc_get_scope_id - return scopeid for a given sockaddr
157
+
* @sa: sockaddr to get scopeid from
158
+
*
159
+
* Returns the value of the sin6_scope_id for AF_INET6 addrs, or 0 if
160
+
* not an AF_INET6 address.
161
+
*/
162
+
static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
163
+
{
164
+
if (sa->sa_family != AF_INET6)
165
+
return 0;
166
+
167
+
return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
168
+
}
169
+
170
+
#endif /* _LINUX_SUNRPC_ADDR_H */
-155
include/linux/sunrpc/clnt.h
-155
include/linux/sunrpc/clnt.h
···
165
165
const char *rpc_peeraddr2str(struct rpc_clnt *, enum rpc_display_format_t);
166
166
int rpc_localaddr(struct rpc_clnt *, struct sockaddr *, size_t);
167
167
168
-
size_t rpc_ntop(const struct sockaddr *, char *, const size_t);
169
-
size_t rpc_pton(struct net *, const char *, const size_t,
170
-
struct sockaddr *, const size_t);
171
-
char * rpc_sockaddr2uaddr(const struct sockaddr *, gfp_t);
172
-
size_t rpc_uaddr2sockaddr(struct net *, const char *, const size_t,
173
-
struct sockaddr *, const size_t);
174
-
175
-
static inline unsigned short rpc_get_port(const struct sockaddr *sap)
176
-
{
177
-
switch (sap->sa_family) {
178
-
case AF_INET:
179
-
return ntohs(((struct sockaddr_in *)sap)->sin_port);
180
-
case AF_INET6:
181
-
return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
182
-
}
183
-
return 0;
184
-
}
185
-
186
-
static inline void rpc_set_port(struct sockaddr *sap,
187
-
const unsigned short port)
188
-
{
189
-
switch (sap->sa_family) {
190
-
case AF_INET:
191
-
((struct sockaddr_in *)sap)->sin_port = htons(port);
192
-
break;
193
-
case AF_INET6:
194
-
((struct sockaddr_in6 *)sap)->sin6_port = htons(port);
195
-
break;
196
-
}
197
-
}
198
-
199
-
#define IPV6_SCOPE_DELIMITER '%'
200
-
#define IPV6_SCOPE_ID_LEN sizeof("%nnnnnnnnnn")
201
-
202
-
static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
203
-
const struct sockaddr *sap2)
204
-
{
205
-
const struct sockaddr_in *sin1 = (const struct sockaddr_in *)sap1;
206
-
const struct sockaddr_in *sin2 = (const struct sockaddr_in *)sap2;
207
-
208
-
return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
209
-
}
210
-
211
-
static inline bool __rpc_copy_addr4(struct sockaddr *dst,
212
-
const struct sockaddr *src)
213
-
{
214
-
const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
215
-
struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
216
-
217
-
dsin->sin_family = ssin->sin_family;
218
-
dsin->sin_addr.s_addr = ssin->sin_addr.s_addr;
219
-
return true;
220
-
}
221
-
222
-
#if IS_ENABLED(CONFIG_IPV6)
223
-
static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
224
-
const struct sockaddr *sap2)
225
-
{
226
-
const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sap1;
227
-
const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
228
-
229
-
if (!ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr))
230
-
return false;
231
-
else if (ipv6_addr_type(&sin1->sin6_addr) & IPV6_ADDR_LINKLOCAL)
232
-
return sin1->sin6_scope_id == sin2->sin6_scope_id;
233
-
234
-
return true;
235
-
}
236
-
237
-
static inline bool __rpc_copy_addr6(struct sockaddr *dst,
238
-
const struct sockaddr *src)
239
-
{
240
-
const struct sockaddr_in6 *ssin6 = (const struct sockaddr_in6 *) src;
241
-
struct sockaddr_in6 *dsin6 = (struct sockaddr_in6 *) dst;
242
-
243
-
dsin6->sin6_family = ssin6->sin6_family;
244
-
dsin6->sin6_addr = ssin6->sin6_addr;
245
-
dsin6->sin6_scope_id = ssin6->sin6_scope_id;
246
-
return true;
247
-
}
248
-
#else /* !(IS_ENABLED(CONFIG_IPV6) */
249
-
static inline bool __rpc_cmp_addr6(const struct sockaddr *sap1,
250
-
const struct sockaddr *sap2)
251
-
{
252
-
return false;
253
-
}
254
-
255
-
static inline bool __rpc_copy_addr6(struct sockaddr *dst,
256
-
const struct sockaddr *src)
257
-
{
258
-
return false;
259
-
}
260
-
#endif /* !(IS_ENABLED(CONFIG_IPV6) */
261
-
262
-
/**
263
-
* rpc_cmp_addr - compare the address portion of two sockaddrs.
264
-
* @sap1: first sockaddr
265
-
* @sap2: second sockaddr
266
-
*
267
-
* Just compares the family and address portion. Ignores port, but
268
-
* compares the scope if it's a link-local address.
269
-
*
270
-
* Returns true if the addrs are equal, false if they aren't.
271
-
*/
272
-
static inline bool rpc_cmp_addr(const struct sockaddr *sap1,
273
-
const struct sockaddr *sap2)
274
-
{
275
-
if (sap1->sa_family == sap2->sa_family) {
276
-
switch (sap1->sa_family) {
277
-
case AF_INET:
278
-
return __rpc_cmp_addr4(sap1, sap2);
279
-
case AF_INET6:
280
-
return __rpc_cmp_addr6(sap1, sap2);
281
-
}
282
-
}
283
-
return false;
284
-
}
285
-
286
-
/**
287
-
* rpc_copy_addr - copy the address portion of one sockaddr to another
288
-
* @dst: destination sockaddr
289
-
* @src: source sockaddr
290
-
*
291
-
* Just copies the address portion and family. Ignores port, scope, etc.
292
-
* Caller is responsible for making certain that dst is large enough to hold
293
-
* the address in src. Returns true if address family is supported. Returns
294
-
* false otherwise.
295
-
*/
296
-
static inline bool rpc_copy_addr(struct sockaddr *dst,
297
-
const struct sockaddr *src)
298
-
{
299
-
switch (src->sa_family) {
300
-
case AF_INET:
301
-
return __rpc_copy_addr4(dst, src);
302
-
case AF_INET6:
303
-
return __rpc_copy_addr6(dst, src);
304
-
}
305
-
return false;
306
-
}
307
-
308
-
/**
309
-
* rpc_get_scope_id - return scopeid for a given sockaddr
310
-
* @sa: sockaddr to get scopeid from
311
-
*
312
-
* Returns the value of the sin6_scope_id for AF_INET6 addrs, or 0 if
313
-
* not an AF_INET6 address.
314
-
*/
315
-
static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
316
-
{
317
-
if (sa->sa_family != AF_INET6)
318
-
return 0;
319
-
320
-
return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
321
-
}
322
-
323
168
#endif /* __KERNEL__ */
324
169
#endif /* _LINUX_SUNRPC_CLNT_H */
+2
-1
net/sunrpc/addr.c
+2
-1
net/sunrpc/addr.c
+1
net/sunrpc/clnt.c
+1
net/sunrpc/clnt.c
+1
net/sunrpc/rpcb_clnt.c
+1
net/sunrpc/rpcb_clnt.c
+1
-1
net/sunrpc/svcauth_unix.c
+1
-1
net/sunrpc/svcauth_unix.c
···
6
6
#include <linux/sunrpc/svcsock.h>
7
7
#include <linux/sunrpc/svcauth.h>
8
8
#include <linux/sunrpc/gss_api.h>
9
+
#include <linux/sunrpc/addr.h>
9
10
#include <linux/err.h>
10
11
#include <linux/seq_file.h>
11
12
#include <linux/hash.h>
···
18
17
#include <linux/user_namespace.h>
19
18
#define RPCDBG_FACILITY RPCDBG_AUTH
20
19
21
-
#include <linux/sunrpc/clnt.h>
22
20
23
21
#include "netns.h"
24
22
+1
net/sunrpc/xprtrdma/transport.c
+1
net/sunrpc/xprtrdma/transport.c