projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_1_branch to trunk.
[silc.git]
/
apps
/
silcd
/
serverconfig.h
diff --git
a/apps/silcd/serverconfig.h
b/apps/silcd/serverconfig.h
index 7ef873e0797a56131c750d81dcf5c496f16b2eff..183f6501634cc1263bf8be9dc56265b61370a66f 100644
(file)
--- a/
apps/silcd/serverconfig.h
+++ b/
apps/silcd/serverconfig.h
@@
-50,6
+50,7
@@
typedef struct SilcServerConfigPkcsStruct {
typedef struct SilcServerConfigServerInfoInterfaceStruct {
char *server_ip;
typedef struct SilcServerConfigServerInfoInterfaceStruct {
char *server_ip;
+ char *public_ip;
SilcUInt16 port;
struct SilcServerConfigServerInfoInterfaceStruct *next;
} SilcServerConfigServerInfoInterface;
SilcUInt16 port;
struct SilcServerConfigServerInfoInterfaceStruct *next;
} SilcServerConfigServerInfoInterface;
@@
-149,6
+150,7
@@
typedef struct SilcServerConfigRouterStruct {
SilcServerConfigConnParams *param;
SilcBool initiator;
SilcBool backup_router;
SilcServerConfigConnParams *param;
SilcBool initiator;
SilcBool backup_router;
+ SilcBool dynamic_connection;
char *backup_replace_ip;
SilcUInt16 backup_replace_port;
SilcBool backup_local;
char *backup_replace_ip;
SilcUInt16 backup_replace_port;
SilcBool backup_local;
@@
-180,6
+182,8
@@
typedef struct {
SilcBool httpd;
char *httpd_ip;
SilcUInt16 httpd_port;
SilcBool httpd;
char *httpd_ip;
SilcUInt16 httpd_port;
+ SilcBool dynamic_server;
+ SilcBool local_channels;
/* Other configuration sections */
SilcServerConfigCipher *cipher;
/* Other configuration sections */
SilcServerConfigCipher *cipher;