comparison: src/server/daemon/webserver.c
src/server/daemon/webserver.c
- branch
- cpp-ports
- changeset 363
- 7f0f5c03666a
- parent 179
- ef6827505bd2
- child 386
- b91f8efadb63
equal
deleted
inserted
replaced
| 362:e45f218628cd | 363:7f0f5c03666a |
|---|---|
| 43 #include <openssl/err.h> | 43 #include <openssl/err.h> |
| 44 | 44 |
| 45 #include "../public/nsapi.h" | 45 #include "../public/nsapi.h" |
| 46 #include "../public/auth.h" | 46 #include "../public/auth.h" |
| 47 #include "../util/systhr.h" | 47 #include "../util/systhr.h" |
| 48 #include "../util/io.h" | 48 #include "../util/pblock.h" |
| 49 #include "../util/util.h" | 49 #include "../util/util.h" |
| 50 | 50 |
| 51 #include "../../ucx/utils.h" | 51 #include "../../ucx/utils.h" |
| 52 | 52 |
| 53 #include "../safs/common.h" | 53 #include "../safs/common.h" |
| 55 #include "func.h" | 55 #include "func.h" |
| 56 #include "config.h" | 56 #include "config.h" |
| 57 #include "configmanager.h" | 57 #include "configmanager.h" |
| 58 #include "httplistener.h" | 58 #include "httplistener.h" |
| 59 #include "webserver.h" | 59 #include "webserver.h" |
| 60 #include "log.h" | |
| 61 #include "auth.h" | 60 #include "auth.h" |
| 62 #include "srvctrl.h" | 61 #include "srvctrl.h" |
| 63 | 62 |
| 64 extern struct FuncStruct webserver_funcs[]; | 63 extern struct FuncStruct webserver_funcs[]; |
| 65 | 64 |
| 73 if(ws_init_ssl()) { | 72 if(ws_init_ssl()) { |
| 74 return -1; | 73 return -1; |
| 75 } | 74 } |
| 76 | 75 |
| 77 // init NSAPI functions | 76 // init NSAPI functions |
| 77 pblock_init_default_keys(); | |
| 78 atexit(pblock_free_default_keys); | |
| 78 func_init(); | 79 func_init(); |
| 79 add_functions(webserver_funcs); | 80 add_functions(webserver_funcs); |
| 80 | 81 |
| 81 // load init.conf | 82 // load init.conf |
| 82 if(load_init_conf("config/init.conf")) { | 83 if(load_init_conf("config/init.conf")) { |
