]>
Commit | Line | Data |
---|---|---|
cd831bd7 | 1 | /* |
7a5ca864 FB |
2 | * Copyright (C) 2005 Anthony Liguori <[email protected]> |
3 | * | |
4 | * Network Block Device | |
5 | * | |
6 | * This program is free software; you can redistribute it and/or modify | |
7 | * it under the terms of the GNU General Public License as published by | |
8 | * the Free Software Foundation; under version 2 of the License. | |
9 | * | |
10 | * This program is distributed in the hope that it will be useful, | |
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
13 | * GNU General Public License for more details. | |
14 | * | |
15 | * You should have received a copy of the GNU General Public License | |
8167ee88 | 16 | * along with this program; if not, see <http://www.gnu.org/licenses/>. |
7a5ca864 FB |
17 | */ |
18 | ||
5a61cb60 | 19 | #include "qemu-common.h" |
7a5ca864 FB |
20 | #include "block_int.h" |
21 | #include "nbd.h" | |
22 | ||
7a5ca864 FB |
23 | #include <stdarg.h> |
24 | #include <stdio.h> | |
25 | #include <getopt.h> | |
26 | #include <err.h> | |
cd831bd7 | 27 | #include <sys/types.h> |
7a5ca864 FB |
28 | #include <sys/socket.h> |
29 | #include <netinet/in.h> | |
30 | #include <netinet/tcp.h> | |
31 | #include <arpa/inet.h> | |
cd831bd7 | 32 | #include <signal.h> |
2bff4b6f | 33 | #include <libgen.h> |
a517e88b | 34 | #include <pthread.h> |
cd831bd7 TS |
35 | |
36 | #define SOCKET_PATH "/var/lock/qemu-nbd-%s" | |
7a5ca864 | 37 | |
af49bbbe | 38 | static NBDExport *exp; |
b1d8e52e | 39 | static int verbose; |
a517e88b PB |
40 | static char *device; |
41 | static char *srcpath; | |
42 | static char *sockpath; | |
a61c6782 PB |
43 | static bool sigterm_reported; |
44 | static bool nbd_started; | |
45 | static int shared = 1; | |
46 | static int nb_fds; | |
7a5ca864 FB |
47 | |
48 | static void usage(const char *name) | |
49 | { | |
50 | printf( | |
51 | "Usage: %s [OPTIONS] FILE\n" | |
52 | "QEMU Disk Network Block Device Server\n" | |
53 | "\n" | |
c2e2872b | 54 | " -p, --port=PORT port to listen on (default `%d')\n" |
7a5ca864 FB |
55 | " -o, --offset=OFFSET offset into the image\n" |
56 | " -b, --bind=IFACE interface to bind to (default `0.0.0.0')\n" | |
cd831bd7 TS |
57 | " -k, --socket=PATH path to the unix socket\n" |
58 | " (default '"SOCKET_PATH"')\n" | |
7a5ca864 FB |
59 | " -r, --read-only export read-only\n" |
60 | " -P, --partition=NUM only expose partition NUM\n" | |
2f726488 TS |
61 | " -s, --snapshot use snapshot file\n" |
62 | " -n, --nocache disable host cache\n" | |
cd831bd7 TS |
63 | " -c, --connect=DEV connect FILE to the local NBD device DEV\n" |
64 | " -d, --disconnect disconnect the specified device\n" | |
3b05a8e9 | 65 | " -e, --shared=NUM device can be shared by NUM clients (default '1')\n" |
75818250 | 66 | " -t, --persistent don't exit on the last connection\n" |
7a5ca864 FB |
67 | " -v, --verbose display extra debugging information\n" |
68 | " -h, --help display this help and exit\n" | |
69 | " -V, --version output version information and exit\n" | |
70 | "\n" | |
71 | "Report bugs to <[email protected]>\n" | |
c2e2872b | 72 | , name, NBD_DEFAULT_PORT, "DEVICE"); |
7a5ca864 FB |
73 | } |
74 | ||
75 | static void version(const char *name) | |
76 | { | |
77 | printf( | |
315bc7aa | 78 | "%s version 0.0.1\n" |
7a5ca864 FB |
79 | "Written by Anthony Liguori.\n" |
80 | "\n" | |
81 | "Copyright (C) 2006 Anthony Liguori <[email protected]>.\n" | |
82 | "This is free software; see the source for copying conditions. There is NO\n" | |
83 | "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
315bc7aa | 84 | , name); |
7a5ca864 FB |
85 | } |
86 | ||
87 | struct partition_record | |
88 | { | |
89 | uint8_t bootable; | |
90 | uint8_t start_head; | |
91 | uint32_t start_cylinder; | |
92 | uint8_t start_sector; | |
93 | uint8_t system; | |
94 | uint8_t end_head; | |
95 | uint8_t end_cylinder; | |
96 | uint8_t end_sector; | |
97 | uint32_t start_sector_abs; | |
98 | uint32_t nb_sectors_abs; | |
99 | }; | |
100 | ||
101 | static void read_partition(uint8_t *p, struct partition_record *r) | |
102 | { | |
103 | r->bootable = p[0]; | |
104 | r->start_head = p[1]; | |
105 | r->start_cylinder = p[3] | ((p[2] << 2) & 0x0300); | |
106 | r->start_sector = p[2] & 0x3f; | |
107 | r->system = p[4]; | |
108 | r->end_head = p[5]; | |
109 | r->end_cylinder = p[7] | ((p[6] << 2) & 0x300); | |
110 | r->end_sector = p[6] & 0x3f; | |
111 | r->start_sector_abs = p[8] | p[9] << 8 | p[10] << 16 | p[11] << 24; | |
112 | r->nb_sectors_abs = p[12] | p[13] << 8 | p[14] << 16 | p[15] << 24; | |
113 | } | |
114 | ||
115 | static int find_partition(BlockDriverState *bs, int partition, | |
116 | off_t *offset, off_t *size) | |
117 | { | |
118 | struct partition_record mbr[4]; | |
119 | uint8_t data[512]; | |
120 | int i; | |
121 | int ext_partnum = 4; | |
cb7cf0e3 | 122 | int ret; |
7a5ca864 | 123 | |
cb7cf0e3 RO |
124 | if ((ret = bdrv_read(bs, 0, data, 1)) < 0) { |
125 | errno = -ret; | |
126 | err(EXIT_FAILURE, "error while reading"); | |
127 | } | |
7a5ca864 FB |
128 | |
129 | if (data[510] != 0x55 || data[511] != 0xaa) { | |
130 | errno = -EINVAL; | |
131 | return -1; | |
132 | } | |
133 | ||
134 | for (i = 0; i < 4; i++) { | |
135 | read_partition(&data[446 + 16 * i], &mbr[i]); | |
136 | ||
137 | if (!mbr[i].nb_sectors_abs) | |
138 | continue; | |
139 | ||
140 | if (mbr[i].system == 0xF || mbr[i].system == 0x5) { | |
141 | struct partition_record ext[4]; | |
142 | uint8_t data1[512]; | |
143 | int j; | |
144 | ||
cb7cf0e3 RO |
145 | if ((ret = bdrv_read(bs, mbr[i].start_sector_abs, data1, 1)) < 0) { |
146 | errno = -ret; | |
147 | err(EXIT_FAILURE, "error while reading"); | |
148 | } | |
7a5ca864 FB |
149 | |
150 | for (j = 0; j < 4; j++) { | |
151 | read_partition(&data1[446 + 16 * j], &ext[j]); | |
152 | if (!ext[j].nb_sectors_abs) | |
153 | continue; | |
154 | ||
155 | if ((ext_partnum + j + 1) == partition) { | |
156 | *offset = (uint64_t)ext[j].start_sector_abs << 9; | |
157 | *size = (uint64_t)ext[j].nb_sectors_abs << 9; | |
158 | return 0; | |
159 | } | |
160 | } | |
161 | ext_partnum += 4; | |
162 | } else if ((i + 1) == partition) { | |
163 | *offset = (uint64_t)mbr[i].start_sector_abs << 9; | |
164 | *size = (uint64_t)mbr[i].nb_sectors_abs << 9; | |
165 | return 0; | |
166 | } | |
167 | } | |
168 | ||
169 | errno = -ENOENT; | |
170 | return -1; | |
171 | } | |
172 | ||
bb345110 PB |
173 | static void termsig_handler(int signum) |
174 | { | |
a61c6782 PB |
175 | sigterm_reported = true; |
176 | qemu_notify_event(); | |
bb345110 PB |
177 | } |
178 | ||
a517e88b | 179 | static void *show_parts(void *arg) |
cd831bd7 | 180 | { |
a517e88b PB |
181 | int nbd; |
182 | ||
183 | /* linux just needs an open() to trigger | |
184 | * the partition table update | |
185 | * but remember to load the module with max_part != 0 : | |
186 | * modprobe nbd max_part=63 | |
187 | */ | |
188 | nbd = open(device, O_RDWR); | |
189 | if (nbd != -1) { | |
190 | close(nbd); | |
191 | } | |
192 | return NULL; | |
193 | } | |
cd831bd7 | 194 | |
a517e88b PB |
195 | static void *nbd_client_thread(void *arg) |
196 | { | |
197 | int fd = *(int *)arg; | |
198 | off_t size; | |
199 | size_t blocksize; | |
200 | uint32_t nbdflags; | |
201 | int sock; | |
202 | int ret; | |
203 | pthread_t show_parts_thread; | |
204 | ||
205 | do { | |
206 | sock = unix_socket_outgoing(sockpath); | |
207 | if (sock == -1) { | |
f1ef5555 | 208 | goto out; |
a517e88b PB |
209 | } |
210 | } while (sock == -1); | |
211 | ||
212 | ret = nbd_receive_negotiate(sock, NULL, &nbdflags, | |
213 | &size, &blocksize); | |
214 | if (ret == -1) { | |
215 | goto out; | |
216 | } | |
217 | ||
218 | ret = nbd_init(fd, sock, nbdflags, size, blocksize); | |
219 | if (ret == -1) { | |
220 | goto out; | |
221 | } | |
222 | ||
223 | /* update partition table */ | |
224 | pthread_create(&show_parts_thread, NULL, show_parts, NULL); | |
225 | ||
c1f8fdc3 PB |
226 | if (verbose) { |
227 | fprintf(stderr, "NBD device %s is now connected to %s\n", | |
228 | device, srcpath); | |
229 | } else { | |
230 | /* Close stderr so that the qemu-nbd process exits. */ | |
231 | dup2(STDOUT_FILENO, STDERR_FILENO); | |
232 | } | |
a517e88b PB |
233 | |
234 | ret = nbd_client(fd); | |
235 | if (ret) { | |
236 | goto out; | |
cd831bd7 | 237 | } |
a517e88b PB |
238 | close(fd); |
239 | kill(getpid(), SIGTERM); | |
240 | return (void *) EXIT_SUCCESS; | |
241 | ||
242 | out: | |
243 | kill(getpid(), SIGTERM); | |
244 | return (void *) EXIT_FAILURE; | |
cd831bd7 TS |
245 | } |
246 | ||
a61c6782 PB |
247 | static int nbd_can_accept(void *opaque) |
248 | { | |
249 | return nb_fds < shared; | |
250 | } | |
251 | ||
1743b515 | 252 | static void nbd_client_closed(NBDClient *client) |
a61c6782 | 253 | { |
1743b515 PB |
254 | nb_fds--; |
255 | qemu_notify_event(); | |
a61c6782 PB |
256 | } |
257 | ||
258 | static void nbd_accept(void *opaque) | |
259 | { | |
260 | int server_fd = (uintptr_t) opaque; | |
261 | struct sockaddr_in addr; | |
262 | socklen_t addr_len = sizeof(addr); | |
263 | ||
264 | int fd = accept(server_fd, (struct sockaddr *)&addr, &addr_len); | |
265 | nbd_started = true; | |
1743b515 | 266 | if (fd != -1 && nbd_client_new(exp, fd, nbd_client_closed)) { |
a61c6782 PB |
267 | nb_fds++; |
268 | } | |
269 | } | |
270 | ||
7a5ca864 FB |
271 | int main(int argc, char **argv) |
272 | { | |
273 | BlockDriverState *bs; | |
274 | off_t dev_offset = 0; | |
b90fb4b8 | 275 | uint32_t nbdflags = 0; |
cd831bd7 | 276 | bool disconnect = false; |
7a5ca864 | 277 | const char *bindto = "0.0.0.0"; |
c2e2872b | 278 | int port = NBD_DEFAULT_PORT; |
7a5ca864 | 279 | off_t fd_size; |
d6aa671f | 280 | const char *sopt = "hVb:o:p:rsnP:c:dvk:e:t"; |
7a5ca864 | 281 | struct option lopt[] = { |
660f11be BS |
282 | { "help", 0, NULL, 'h' }, |
283 | { "version", 0, NULL, 'V' }, | |
284 | { "bind", 1, NULL, 'b' }, | |
285 | { "port", 1, NULL, 'p' }, | |
286 | { "socket", 1, NULL, 'k' }, | |
287 | { "offset", 1, NULL, 'o' }, | |
288 | { "read-only", 0, NULL, 'r' }, | |
289 | { "partition", 1, NULL, 'P' }, | |
290 | { "connect", 1, NULL, 'c' }, | |
291 | { "disconnect", 0, NULL, 'd' }, | |
292 | { "snapshot", 0, NULL, 's' }, | |
293 | { "nocache", 0, NULL, 'n' }, | |
294 | { "shared", 1, NULL, 'e' }, | |
295 | { "persistent", 0, NULL, 't' }, | |
296 | { "verbose", 0, NULL, 'v' }, | |
297 | { NULL, 0, NULL, 0 } | |
7a5ca864 FB |
298 | }; |
299 | int ch; | |
300 | int opt_ind = 0; | |
301 | int li; | |
302 | char *end; | |
f5edb014 | 303 | int flags = BDRV_O_RDWR; |
7a5ca864 | 304 | int partition = -1; |
cd831bd7 | 305 | int ret; |
3b05a8e9 | 306 | int fd; |
75818250 | 307 | int persistent = 0; |
a517e88b | 308 | pthread_t client_thread; |
7a5ca864 | 309 | |
a517e88b PB |
310 | /* The client thread uses SIGTERM to interrupt the server. A signal |
311 | * handler ensures that "qemu-nbd -v -c" exits with a nice status code. | |
312 | */ | |
bb345110 | 313 | struct sigaction sa_sigterm; |
bb345110 PB |
314 | memset(&sa_sigterm, 0, sizeof(sa_sigterm)); |
315 | sa_sigterm.sa_handler = termsig_handler; | |
316 | sigaction(SIGTERM, &sa_sigterm, NULL); | |
317 | ||
7a5ca864 FB |
318 | while ((ch = getopt_long(argc, argv, sopt, lopt, &opt_ind)) != -1) { |
319 | switch (ch) { | |
320 | case 's': | |
2f726488 TS |
321 | flags |= BDRV_O_SNAPSHOT; |
322 | break; | |
323 | case 'n': | |
a6599793 | 324 | flags |= BDRV_O_NOCACHE | BDRV_O_CACHE_WB; |
7a5ca864 FB |
325 | break; |
326 | case 'b': | |
327 | bindto = optarg; | |
328 | break; | |
329 | case 'p': | |
330 | li = strtol(optarg, &end, 0); | |
331 | if (*end) { | |
b6353bea | 332 | errx(EXIT_FAILURE, "Invalid port `%s'", optarg); |
7a5ca864 FB |
333 | } |
334 | if (li < 1 || li > 65535) { | |
b6353bea | 335 | errx(EXIT_FAILURE, "Port out of range `%s'", optarg); |
7a5ca864 FB |
336 | } |
337 | port = (uint16_t)li; | |
338 | break; | |
339 | case 'o': | |
340 | dev_offset = strtoll (optarg, &end, 0); | |
341 | if (*end) { | |
b6353bea | 342 | errx(EXIT_FAILURE, "Invalid offset `%s'", optarg); |
7a5ca864 FB |
343 | } |
344 | if (dev_offset < 0) { | |
b6353bea | 345 | errx(EXIT_FAILURE, "Offset must be positive `%s'", optarg); |
7a5ca864 FB |
346 | } |
347 | break; | |
348 | case 'r': | |
b90fb4b8 | 349 | nbdflags |= NBD_FLAG_READ_ONLY; |
07108b29 | 350 | flags &= ~BDRV_O_RDWR; |
7a5ca864 FB |
351 | break; |
352 | case 'P': | |
353 | partition = strtol(optarg, &end, 0); | |
354 | if (*end) | |
b6353bea | 355 | errx(EXIT_FAILURE, "Invalid partition `%s'", optarg); |
7a5ca864 | 356 | if (partition < 1 || partition > 8) |
b6353bea | 357 | errx(EXIT_FAILURE, "Invalid partition %d", partition); |
7a5ca864 | 358 | break; |
cd831bd7 | 359 | case 'k': |
b32f6c28 PB |
360 | sockpath = optarg; |
361 | if (sockpath[0] != '/') | |
b6353bea | 362 | errx(EXIT_FAILURE, "socket path must be absolute\n"); |
cd831bd7 TS |
363 | break; |
364 | case 'd': | |
365 | disconnect = true; | |
366 | break; | |
367 | case 'c': | |
368 | device = optarg; | |
369 | break; | |
3b05a8e9 TS |
370 | case 'e': |
371 | shared = strtol(optarg, &end, 0); | |
372 | if (*end) { | |
b6353bea | 373 | errx(EXIT_FAILURE, "Invalid shared device number '%s'", optarg); |
3b05a8e9 TS |
374 | } |
375 | if (shared < 1) { | |
b6353bea | 376 | errx(EXIT_FAILURE, "Shared device number must be greater than 0\n"); |
3b05a8e9 TS |
377 | } |
378 | break; | |
75818250 TS |
379 | case 't': |
380 | persistent = 1; | |
381 | break; | |
7a5ca864 FB |
382 | case 'v': |
383 | verbose = 1; | |
384 | break; | |
385 | case 'V': | |
386 | version(argv[0]); | |
387 | exit(0); | |
388 | break; | |
389 | case 'h': | |
390 | usage(argv[0]); | |
391 | exit(0); | |
392 | break; | |
393 | case '?': | |
b6353bea | 394 | errx(EXIT_FAILURE, "Try `%s --help' for more information.", |
7a5ca864 FB |
395 | argv[0]); |
396 | } | |
397 | } | |
398 | ||
399 | if ((argc - optind) != 1) { | |
b6353bea | 400 | errx(EXIT_FAILURE, "Invalid number of argument.\n" |
7a5ca864 FB |
401 | "Try `%s --help' for more information.", |
402 | argv[0]); | |
403 | } | |
404 | ||
cd831bd7 TS |
405 | if (disconnect) { |
406 | fd = open(argv[optind], O_RDWR); | |
407 | if (fd == -1) | |
cb7cf0e3 | 408 | err(EXIT_FAILURE, "Cannot open %s", argv[optind]); |
cd831bd7 TS |
409 | |
410 | nbd_disconnect(fd); | |
411 | ||
412 | close(fd); | |
413 | ||
414 | printf("%s disconnected\n", argv[optind]); | |
415 | ||
416 | return 0; | |
417 | } | |
418 | ||
c1f8fdc3 PB |
419 | if (device && !verbose) { |
420 | int stderr_fd[2]; | |
421 | pid_t pid; | |
422 | int ret; | |
423 | ||
424 | if (qemu_pipe(stderr_fd) == -1) { | |
425 | err(EXIT_FAILURE, "Error setting up communication pipe"); | |
426 | } | |
427 | ||
428 | /* Now daemonize, but keep a communication channel open to | |
429 | * print errors and exit with the proper status code. | |
430 | */ | |
431 | pid = fork(); | |
432 | if (pid == 0) { | |
433 | close(stderr_fd[0]); | |
434 | ret = qemu_daemon(0, 0); | |
435 | ||
436 | /* Temporarily redirect stderr to the parent's pipe... */ | |
437 | dup2(stderr_fd[1], STDERR_FILENO); | |
438 | if (ret == -1) { | |
439 | err(EXIT_FAILURE, "Failed to daemonize"); | |
440 | } | |
441 | ||
442 | /* ... close the descriptor we inherited and go on. */ | |
443 | close(stderr_fd[1]); | |
444 | } else { | |
445 | bool errors = false; | |
446 | char *buf; | |
447 | ||
448 | /* In the parent. Print error messages from the child until | |
449 | * it closes the pipe. | |
450 | */ | |
451 | close(stderr_fd[1]); | |
452 | buf = g_malloc(1024); | |
453 | while ((ret = read(stderr_fd[0], buf, 1024)) > 0) { | |
454 | errors = true; | |
455 | ret = qemu_write_full(STDERR_FILENO, buf, ret); | |
456 | if (ret == -1) { | |
457 | exit(EXIT_FAILURE); | |
458 | } | |
459 | } | |
460 | if (ret == -1) { | |
461 | err(EXIT_FAILURE, "Cannot read from daemon"); | |
462 | } | |
463 | ||
464 | /* Usually the daemon should not print any message. | |
465 | * Exit with zero status in that case. | |
466 | */ | |
467 | exit(errors); | |
468 | } | |
469 | } | |
470 | ||
cd831bd7 | 471 | if (device) { |
a517e88b PB |
472 | /* Open before spawning new threads. In the future, we may |
473 | * drop privileges after opening. | |
474 | */ | |
475 | fd = open(device, O_RDWR); | |
476 | if (fd == -1) { | |
477 | err(EXIT_FAILURE, "Failed to open %s", device); | |
cb7cf0e3 RO |
478 | } |
479 | ||
b32f6c28 PB |
480 | if (sockpath == NULL) { |
481 | sockpath = g_malloc(128); | |
482 | snprintf(sockpath, 128, SOCKET_PATH, basename(device)); | |
cd831bd7 | 483 | } |
cd831bd7 TS |
484 | } |
485 | ||
802ddc37 PB |
486 | bdrv_init(); |
487 | atexit(bdrv_close_all); | |
488 | ||
489 | bs = bdrv_new("hda"); | |
490 | srcpath = argv[optind]; | |
491 | if ((ret = bdrv_open(bs, srcpath, flags, NULL)) < 0) { | |
492 | errno = -ret; | |
493 | err(EXIT_FAILURE, "Failed to bdrv_open '%s'", argv[optind]); | |
494 | } | |
495 | ||
496 | fd_size = bs->total_sectors * 512; | |
497 | ||
498 | if (partition != -1 && | |
499 | find_partition(bs, partition, &dev_offset, &fd_size)) { | |
500 | err(EXIT_FAILURE, "Could not find partition %d", partition); | |
501 | } | |
502 | ||
af49bbbe | 503 | exp = nbd_export_new(bs, dev_offset, fd_size, nbdflags); |
3b05a8e9 | 504 | |
b32f6c28 | 505 | if (sockpath) { |
a61c6782 | 506 | fd = unix_socket_incoming(sockpath); |
cd831bd7 | 507 | } else { |
a61c6782 | 508 | fd = tcp_socket_incoming(bindto, port); |
cd831bd7 TS |
509 | } |
510 | ||
a61c6782 | 511 | if (fd == -1) { |
7a5ca864 | 512 | return 1; |
a61c6782 | 513 | } |
f1ef5555 PB |
514 | |
515 | if (device) { | |
516 | int ret; | |
517 | ||
518 | ret = pthread_create(&client_thread, NULL, nbd_client_thread, &fd); | |
519 | if (ret != 0) { | |
520 | errx(EXIT_FAILURE, "Failed to create client thread: %s", | |
521 | strerror(ret)); | |
522 | } | |
523 | } else { | |
524 | /* Shut up GCC warnings. */ | |
525 | memset(&client_thread, 0, sizeof(client_thread)); | |
526 | } | |
527 | ||
a61c6782 PB |
528 | qemu_init_main_loop(); |
529 | qemu_set_fd_handler2(fd, nbd_can_accept, nbd_accept, NULL, | |
530 | (void *)(uintptr_t)fd); | |
7a5ca864 | 531 | |
3b05a8e9 | 532 | do { |
a61c6782 PB |
533 | main_loop_wait(false); |
534 | } while (!sigterm_reported && (persistent || !nbd_started || nb_fds > 0)); | |
7a5ca864 | 535 | |
af49bbbe | 536 | nbd_export_close(exp); |
b32f6c28 PB |
537 | if (sockpath) { |
538 | unlink(sockpath); | |
539 | } | |
7a5ca864 | 540 | |
a517e88b PB |
541 | if (device) { |
542 | void *ret; | |
543 | pthread_join(client_thread, &ret); | |
544 | exit(ret != NULL); | |
545 | } else { | |
546 | exit(EXIT_SUCCESS); | |
547 | } | |
7a5ca864 | 548 | } |