projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
[citadel.git]
/
citadel
/
serv_extensions.c
diff --git
a/citadel/serv_extensions.c
b/citadel/serv_extensions.c
index 4b4e44c08ab958bdb32478fa6e1629dbaaf3cd8b..568d9a3ae0275032f977296793b288dabe8aa912 100644
(file)
--- a/
citadel/serv_extensions.c
+++ b/
citadel/serv_extensions.c
@@
-1,8
+1,8
@@
/*
/*
- * Citadel
Dynamic Loading Module
+ * Citadel
Extension Loader
* Written by Brian Costello <btx@calyx.net>
*
* Written by Brian Costello <btx@calyx.net>
*
- * Copyright (c) 1987-201
1
by the citadel.org team
+ * Copyright (c) 1987-201
5
by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 3.
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 3.
@@
-21,6
+21,7
@@
#include "serv_extensions.h"
#include "ctdl_module.h"
#include "serv_extensions.h"
#include "ctdl_module.h"
+#include "config.h"
int DebugModules = 0;
int DebugModules = 0;
@@
-1131,7
+1132,7
@@
void CtdlRegisterServiceHook(int tcp_port,
newfcn->ServiceName = ServiceName;
if (sockpath != NULL) {
newfcn->ServiceName = ServiceName;
if (sockpath != NULL) {
- newfcn->msock = ctdl_uds_server(sockpath,
config.c_maxsessions
, error);
+ newfcn->msock = ctdl_uds_server(sockpath,
CtdlGetConfigInt("c_maxsessions")
, error);
snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
}
else if (tcp_port <= 0) { /* port -1 to disable */
snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
}
else if (tcp_port <= 0) { /* port -1 to disable */
@@
-1141,12
+1142,12
@@
void CtdlRegisterServiceHook(int tcp_port,
return;
}
else {
return;
}
else {
- newfcn->msock = ctdl_tcp_server(
config.c_ip_addr
,
+ newfcn->msock = ctdl_tcp_server(
CtdlGetConfigStr("c_ip_addr")
,
tcp_port,
tcp_port,
-
config.c_maxsessions
,
+
CtdlGetConfigInt("c_maxsessions")
,
error);
snprintf(message, SIZ, "TCP port %s:%d: (%s) ",
error);
snprintf(message, SIZ, "TCP port %s:%d: (%s) ",
-
config.c_ip_addr
, tcp_port, ServiceName);
+
CtdlGetConfigStr("c_ip_addr")
, tcp_port, ServiceName);
}
if (newfcn->msock > 0) {
}
if (newfcn->msock > 0) {