src/server/safs/init.c

Fri, 20 Sep 2024 20:30:57 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Fri, 20 Sep 2024 20:30:57 +0200
changeset 561
e1c92c126557
parent 556
b036ccad4b49
permissions
-rw-r--r--

add more keep alive trace logging

17
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
3 *
44
3da1f7b6847f added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
4 * Copyright 2013 Olaf Wintermann. All rights reserved.
17
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
5 *
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
8 *
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 *
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
29 #include <dlfcn.h>
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
30 #include <cx/string.h>
92
382bff43c6eb fixed some includes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 90
diff changeset
31
382bff43c6eb fixed some includes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 90
diff changeset
32 #include "../daemon/func.h"
382bff43c6eb fixed some includes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 90
diff changeset
33 #include "../daemon/log.h"
556
b036ccad4b49 improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
34 #include "../daemon/config.h"
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
35
17
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
36 #include "init.h"
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
37
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
38 int init_test(pblock *pb, Session *sn, Request *rq) {
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
39 printf("init-test\n");
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
40 return REQ_PROCEED;
d2a97bbeb57d Added init.conf parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
41 }
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
42
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
43 int load_modules(pblock *pb, Session *sn, Request *rq) {
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
44 char *shlib = pblock_findval("shlib", pb);
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
45 char *funcs = pblock_findval("funcs", pb);
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
46
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
47 if(shlib == NULL || funcs == NULL) {
77
f1cff81e425a some fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 61
diff changeset
48 log_ereport(LOG_MISCONFIG, "load-modules: missing parameters");
60
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
49 if(!shlib && funcs) {
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
50 log_ereport(
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
51 LOG_MISCONFIG,
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
52 "load-modules: missing shlib parameter");
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
53 } else if(!shlib && !funcs) {
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
54 log_ereport(
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
55 LOG_MISCONFIG,
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
56 "load-modules: missing funcs parameter");
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
57 } else {
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
58 log_ereport(
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
59 LOG_MISCONFIG,
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
60 "load-modules: missing shlib and funcs parameters");
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
61 }
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
62 }
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
63
77
f1cff81e425a some fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 61
diff changeset
64 // load lib
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
65 void *lib = dlopen(shlib, RTLD_GLOBAL | RTLD_NOW);
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
66 if(lib == NULL) {
60
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
67 char *dlerr = dlerror();
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
68 fprintf(stderr, "Cannot load library %s %s\n", shlib, dlerr);
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
69
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 59
diff changeset
70 log_ereport(LOG_FAILURE, "Cannot load library %s: %s", shlib, dlerr);
59
ab25c0a231d0 some fixes and new public APIs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
71
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
72 return REQ_ABORTED;
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
73 }
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
74
77
f1cff81e425a some fixes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 61
diff changeset
75 // load function symbols
556
b036ccad4b49 improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
76 pool_handle_t *init_pool = cfg_get_init_pool();
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
77 int b = 0;
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
78 for(int i=0;;i++) {
84
afd57ce39ec9 added initial java plugin code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
79 if(funcs[i] == '-') {
afd57ce39ec9 added initial java plugin code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
80 funcs[i] = '_';
afd57ce39ec9 added initial java plugin code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
81 }
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
82 if(funcs[i] == ',' || funcs[i] == 0) {
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
83 if(funcs[i] == 0) {
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
84 b = 1;
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
85 }
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
86
556
b036ccad4b49 improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
87 // TODO: although this works fine, is not really clean to just
b036ccad4b49 improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
88 // destroy the string with random 0-bytes
b036ccad4b49 improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
89 // maybe use cxstr here
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
90 funcs[i] = 0;
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
91
84
afd57ce39ec9 added initial java plugin code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
92 // we have a function name
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
93 void *sym = dlsym(lib, funcs);
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
94 if(sym == NULL) {
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
95 fprintf(stderr, "Cannot load symbol %s\n", funcs);
84
afd57ce39ec9 added initial java plugin code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
96 dlclose(lib);
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
97 return REQ_ABORTED;
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
98 }
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
99 struct FuncStruct fc;
140
93247a579184 fixes missing FuncStruct initialization in load_modules
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 92
diff changeset
100 ZERO(&fc, sizeof(struct FuncStruct));
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
101 fc.func = (FuncPtr)sym;
556
b036ccad4b49 improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
102 fc.name = pool_strdup(init_pool, funcs);
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
103 add_function(&fc);
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
104
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
105 if(b) {
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
106 break;
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
107 }
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
108
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
109 funcs += i + 1;
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
110 i = 0;
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
111 }
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
112 }
84
afd57ce39ec9 added initial java plugin code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 77
diff changeset
113
90
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
114 // if exists, execute nsapi_module_init
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
115 void *sym = dlsym(lib, "nsapi_module_init");
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
116 if(sym) {
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
117 /*
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
118 * We remove shlib and funcs from the pblock. The module init function
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
119 * gets all remaining parameters.
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
120 */
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
121 pblock_remove("shlib", pb);
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
122 pblock_remove("funcs", pb);
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
123
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
124 FuncPtr init_func = (FuncPtr)sym;
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
125 int ret = init_func(pb, NULL, NULL);
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
126 if(ret != REQ_PROCEED && ret != REQ_NOACTION) {
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
127 log_ereport(
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
128 LOG_FAILURE,
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
129 "nsapi_module_init for module %s failed",
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
130 shlib);
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
131 return REQ_ABORTED;
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
132 }
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
133 }
279f343bbf6c load_modules supports nsapi module init functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 84
diff changeset
134
20
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
135 return REQ_PROCEED;
7b235fa88008 Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 17
diff changeset
136 }

mercurial