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 235 236 237 238 239 240 241
|
Experimental support for dynamically loading templates. Low-level template handling is unchanged;
main programs call dlopen_templates() at appropriate times. If template set has changed, the old
one is unloaded first.
--- /dev/null
+++ b/shared/dlopen_templates.c
@@ -0,0 +1,34 @@
+#include <dlfcn.h>
+#include "shared.h"
+
+struct template_map_index template_map_index[] = {
+ {NIL, NIL, NIL},
+ {NIL, NIL, NIL}
+};
+
+struct template_map_index *
+dlopen_templates(const char *set, const char *suffix)
+{
+ struct template_map_index *tmi = &template_map_index[0];
+ static void *handle = 0;
+
+ if (!handle || strcmp(tmi->name, set)) {
+ char *filename = pool_printf(NIL, "/usr/lib/prayer/templates/%s%s.so",
+ set, suffix);
+
+ if (handle) {
+ dlclose(handle);
+ free(tmi->name);
+ }
+ tmi->name = pool_strdup(NIL, set);
+ if (!(handle = dlopen(filename, RTLD_NOW))
+ || !(tmi->template_map = dlsym(handle, "template_map"))
+ || !(tmi->count = dlsym(handle, "template_map_count"))) {
+ log_fatal("Failed to load template library: %s",
+ dlerror());
+ }
+ log_debug("Loaded library %s with %d templates", filename, *tmi->count);
+ free(filename);
+ }
+ return tmi;
+}
--- /dev/null
+++ b/shared/dlopen_templates.h
@@ -0,0 +1 @@
+struct template_map_index *dlopen_templates(const char *set, const char *suffix);
--- a/templates/cam/Makefile
+++ b/templates/cam/Makefile
@@ -6,12 +6,16 @@ else
include ../../Config
endif
-CFLAGS = $(BASECFLAGS)
-LDFLAGS = $(BASELDFLAGS)
+MYCFLAGS = $(BASECFLAGS) -fPIC
+MYLDFLAGS = $(BASELDFLAGS) -fPIC
+LDFLAGS_TEMPLATELIB = \
+ -Wl,--defsym=template_map=template_map_$(TYPE) \
+ -Wl,--defsym=template_map_count=template_map_$(TYPE)_count
+MYLDFLAGS += $(LDFLAGS_TEMPLATELIB)
TYPE=cam
-TARGETS=templates.a templates_frontend.a
+TARGETS=templates.a templates_frontend.a $(TYPE).so $(TYPE)_frontend.so
T_FILES_FRONTEND=login.t login_hermes.t \
frontend_login_error.t frontend_security.t frontend_session.t \
@@ -111,8 +115,14 @@ templates.a: $(O_FILES)
rm -f templates.a
ar q templates.a $(O_FILES)
+$(TYPE)_frontend.so: $(O_FILES_FRONTEND)
+ $(CC) $(MYLDFLAGS) -shared -o $@ $(O_FILES_FRONTEND)
+
+$(TYPE).so: $(O_FILES)
+ $(CC) $(MYLDFLAGS) -shared -o $@ $(O_FILES)
+
%.o: %.c Makefile
- $(CC) $(CFLAGS) -I../../lib -c $<
+ $(CC) $(MYCFLAGS) -I../../lib -c $<
_template_index_frontend.c:
../src/build_index.pl $(TYPE) $(T_FILES_FRONTEND) > _template_index_frontend.c
@@ -129,6 +139,10 @@ install:
cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE)
cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)
+ $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
+ $(BROOT)$(LIB_PREFIX)/templates
+ cp *.so $(BROOT)$(LIB_PREFIX)/templates/
+
clean:
rm -f $(TARGETS) *.html *.o *.c \#*\# *~
--- a/templates/old/Makefile
+++ b/templates/old/Makefile
@@ -6,12 +6,16 @@ else
include ../../Config
endif
-CFLAGS = $(BASECFLAGS)
-LDFLAGS = $(BASELDFLAGS)
+MYCFLAGS = $(BASECFLAGS) -fPIC
+MYLDFLAGS = $(BASELDFLAGS) -fPIC
+LDFLAGS_TEMPLATELIB = \
+ -Wl,--defsym=template_map=template_map_$(TYPE) \
+ -Wl,--defsym=template_map_count=template_map_$(TYPE)_count
+MYLDFLAGS += $(LDFLAGS_TEMPLATELIB)
TYPE=old
-TARGETS=templates.a templates_frontend.a
+TARGETS=templates.a templates_frontend.a $(TYPE).so $(TYPE)_frontend.so
T_FILES_FRONTEND=login.t \
frontend_login_error.t frontend_security.t frontend_session.t \
@@ -110,8 +114,14 @@ templates.a: $(O_FILES)
rm -f templates.a
ar q templates.a $(O_FILES)
+$(TYPE)_frontend.so: $(O_FILES_FRONTEND)
+ $(CC) $(MYLDFLAGS) -shared -o $@ $(O_FILES_FRONTEND)
+
+$(TYPE).so: $(O_FILES)
+ $(CC) $(MYLDFLAGS) -shared -o $@ $(O_FILES)
+
%.o: %.c Makefile
- $(CC) $(CFLAGS) -I../../lib -c $<
+ $(CC) $(MYCFLAGS) -I../../lib -c $<
_template_index_frontend.c:
../src/build_index.pl $(TYPE) $(T_FILES_FRONTEND) > _template_index_frontend.c
@@ -128,6 +138,10 @@ install:
cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE)
cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)
+ $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
+ $(BROOT)$(LIB_PREFIX)/templates
+ cp *.so $(BROOT)$(LIB_PREFIX)/templates/
+
clean:
rm -f $(TARGETS) *.html *.o *.c \#*\# *~
--- a/servers/prayer_chroot.c
+++ b/servers/prayer_chroot.c
@@ -255,6 +255,8 @@ int main(int argc, char *argv[])
if (list_length(prayer->http_port_list) == 0L)
prayer_fatal(prayer, "No HTTP or HTTPS ports active");
+ dlopen_templates(config->template_set, "_frontend");
+
if (config->prayer_background && !want_foreground) {
pid_t pid = fork();
--- a/shared/Makefile
+++ b/shared/Makefile
@@ -33,7 +33,7 @@ MYCFLAGS = $(BASECFLAGS)
SHARED_OBJS = \
config.o gzip.o html_common.o log.o \
- request.o response.o user_agent.o
+ request.o response.o user_agent.o dlopen_templates.o
all: $(SHARED_OBJS)
--- a/servers/prayer_main.c
+++ b/servers/prayer_main.c
@@ -290,6 +290,8 @@ int main(int argc, char *argv[])
prayer_log_open(prayer);
+ dlopen_templates(config->template_set, "_frontend");
+
if (config->limit_vm)
os_limit_vm(config->limit_vm);
--- a/shared/shared.h
+++ b/shared/shared.h
@@ -40,3 +40,4 @@ extern int errno; /* just
#include "setproctitle.h"
#include "mymutex.h"
#include "log.h"
+#include "dlopen_templates.h"
--- a/servers/Makefile
+++ b/servers/Makefile
@@ -60,8 +60,8 @@ ifeq ($(strip $(ACCOUNTD_ENABLE)), true)
endif
endif
-PRAYER_LIBS = $(BASE_LIBS) $(SERVER_SSL_LIBS)
-SESSION_LIBS = $(CCLIENT_LIBS) $(BASE_LIBS)
+PRAYER_LIBS = $(BASE_LIBS) $(SERVER_SSL_LIBS) -ldl
+SESSION_LIBS = $(CCLIENT_LIBS) $(BASE_LIBS) -ldl
# Add SSL if c-client needs SSL
ifeq ($(strip $(CCLIENT_SSL_ENABLE)), true)
@@ -90,15 +90,13 @@ TEMPLATES_FRONTEND= ../templates/index.o
../templates/cam/templates_frontend.a
PRAYER_OBJS= prayer.o prayer_login.o prayer_server.o portlist.o \
- ../shared/shared.a $(LIB) $(TEMPLATES_FRONTEND)
+ ../shared/shared.a $(LIB)
SESSION_OBJS= \
session_config.o session_exchange.o session_unix.o session_server.o \
session_main.o portlist.o ../cmd/cmd.a ../session/session.a \
../shared/shared.a ../lib/lib_nossl.a
-SESSION_OBJS += $(TEMPLATES)
-
#########################################################################
all: $(BIN)
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ install-cert:
install:
$(MAKE) -C files install
$(MAKE) -C man install
-# $(MAKE) -C templates install
+ $(MAKE) -C templates install
$(MAKE) -C servers install
$(MAKE) -C utils install
ifeq ($(strip $(ACCOUNTD_ENABLE)), true)
--- a/servers/session_exchange.c
+++ b/servers/session_exchange.c
@@ -146,6 +146,8 @@ BOOL session_exchange(struct session * s
else
template_set = config->template_set; /* Safe default */
+ dlopen_templates(template_set, "");
+
/* Set up template_vars ready for dispatch */
session->template_vals = tvals
= template_vals_create(request->pool,
--- a/servers/prayer_shared.h
+++ b/servers/prayer_shared.h
@@ -44,3 +44,4 @@ extern int errno; /* just
#include "mymutex.h"
#include "log.h"
#include "utf8.h"
+#include "dlopen_templates.h"
|