Skip to content
Snippets Groups Projects
Commit 1f06fc85 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Add and use sbbs_free_ini() to free allocated portions of startup structures 

Remove values, not keys, when setting a key with a global default.

Use UInt16 functions for getting/setting TCP ports (this fixes an issue with
the FTP PasvHigh port being set to -1 (instead of 65535).

Use iniGetUInteger instead of iniGetShortInt for most other key values.

First sbbs.ini save support in SCFG, still experimental.
parent a6c20de1
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #3977 passed
Stage: build
Show whitespace changes
Inline Side-by-side
src/sbbs3/sbbs_ini.c
+ 115
− 84
View file @ 1f06fc85
...@@ -100,8 +100,7 @@ static BOOL iniSetStringWithGlobalDefault(str_list_t* lp, const char* section, c ...@@ -100,8 +100,7 @@ static BOOL iniSetStringWithGlobalDefault(str_list_t* lp, const char* section, c
,const char* value, const char* global_value, ini_style_t* style) ,const char* value, const char* global_value, ini_style_t* style)
{ {
if(value != global_value && strcmp(value, global_value) == 0) { if(value != global_value && strcmp(value, global_value) == 0) {
iniRemoveKey(lp, section, key); return iniKeyExists(*lp, section, key) == FALSE || iniRemoveValue(lp, section, key) == TRUE;
return iniKeyExists(*lp, section, key) == FALSE;
} }
return iniSetString(lp, section, key, value, style) != NULL; return iniSetString(lp, section, key, value, style) != NULL;
} }
...@@ -253,12 +252,13 @@ static void set_login_attempt_settings(str_list_t* lp, const char* section, stru ...@@ -253,12 +252,13 @@ static void set_login_attempt_settings(str_list_t* lp, const char* section, stru
iniSetInteger(lp,section,strLoginAttemptFilterThreshold,settings.filter_threshold,&style); iniSetInteger(lp,section,strLoginAttemptFilterThreshold,settings.filter_threshold,&style);
} }
static const struct in6_addr wildcard6;
static void get_ini_globals(str_list_t list, global_startup_t* global) static void get_ini_globals(str_list_t list, global_startup_t* global)
{ {
const char* section = "Global"; const char* section = "Global";
char value[INI_MAX_VALUE_LEN]; char value[INI_MAX_VALUE_LEN];
char* p; char* p;
struct in6_addr wildcard6 = {{{0}}};
p=iniGetString(list,section,strCtrlDirectory,nulstr,value); p=iniGetString(list,section,strCtrlDirectory,nulstr,value);
if(*p) { if(*p) {
...@@ -276,10 +276,9 @@ static void get_ini_globals(str_list_t list, global_startup_t* global) ...@@ -276,10 +276,9 @@ static void get_ini_globals(str_list_t list, global_startup_t* global)
if(*p) if(*p)
SAFECOPY(global->host_name,value); SAFECOPY(global->host_name,value);
global->sem_chk_freq=iniGetShortInt(list,section,strSemFileCheckFrequency,DEFAULT_SEM_CHK_FREQ); global->sem_chk_freq=iniGetUInteger(list,section,strSemFileCheckFrequency,DEFAULT_SEM_CHK_FREQ);
iniFreeStringList(global->interfaces);
global->interfaces=iniGetStringList(list,section,strInterfaces, ",", "0.0.0.0,::"); global->interfaces=iniGetStringList(list,section,strInterfaces, ",", "0.0.0.0,::");
global->outgoing4.s_addr=iniGetIpAddress(list,section,strOutgoing4,0); global->outgoing4.s_addr=iniGetIpAddress(list,section,strOutgoing4,INADDR_ANY);
global->outgoing6=iniGetIp6Address(list,section,strOutgoing6,wildcard6); global->outgoing6=iniGetIp6Address(list,section,strOutgoing6,wildcard6);
global->log_level=iniGetLogLevel(list,section,strLogLevel,DEFAULT_LOG_LEVEL); global->log_level=iniGetLogLevel(list,section,strLogLevel,DEFAULT_LOG_LEVEL);
global->tls_error_level=iniGetLogLevel(list,section, strTLSErrorLevel, 0); global->tls_error_level=iniGetLogLevel(list,section, strTLSErrorLevel, 0);
...@@ -299,6 +298,40 @@ static void get_ini_globals(str_list_t list, global_startup_t* global) ...@@ -299,6 +298,40 @@ static void get_ini_globals(str_list_t list, global_startup_t* global)
sbbs_get_sound_settings(list, section, &global->sound, &global->sound); sbbs_get_sound_settings(list, section, &global->sound, &global->sound);
} }
void sbbs_free_ini(
global_startup_t* global
,bbs_startup_t* bbs
,ftp_startup_t* ftp
,web_startup_t* web
,mail_startup_t* mail
,services_startup_t* services
)
{
if(global != NULL) {
iniFreeStringList(global->interfaces);
}
if(bbs != NULL) {
iniFreeStringList(bbs->telnet_interfaces);
iniFreeStringList(bbs->rlogin_interfaces);
iniFreeStringList(bbs->ssh_interfaces);
}
if(web != NULL) {
iniFreeStringList(web->interfaces);
iniFreeStringList(web->tls_interfaces);
iniFreeStringList(web->index_file_name);
iniFreeStringList(web->cgi_ext);
}
if(ftp != NULL) {
iniFreeStringList(ftp->interfaces);
}
if(mail != NULL) {
iniFreeStringList(mail->interfaces);
iniFreeStringList(mail->pop3_interfaces);
}
if(services != NULL) {
iniFreeStringList(services->interfaces);
}
}
void sbbs_read_ini( void sbbs_read_ini(
FILE* fp FILE* fp
...@@ -335,6 +368,14 @@ void sbbs_read_ini( ...@@ -335,6 +368,14 @@ void sbbs_read_ini(
global=&global_buf; global=&global_buf;
} }
sbbs_free_ini(global
,bbs
,ftp
,web
,mail
,services
);
list=iniReadFile(fp); list=iniReadFile(fp);
get_ini_globals(list, global); get_ini_globals(list, global);
...@@ -371,14 +412,12 @@ void sbbs_read_ini( ...@@ -371,14 +412,12 @@ void sbbs_read_ini(
=iniGetIp6Address(list,section,strOutgoing6,global->outgoing6); =iniGetIp6Address(list,section,strOutgoing6,global->outgoing6);
bbs->telnet_port bbs->telnet_port
=iniGetShortInt(list,section,"TelnetPort",IPPORT_TELNET); =iniGetUInt16(list,section,"TelnetPort",IPPORT_TELNET);
iniFreeStringList(bbs->telnet_interfaces);
bbs->telnet_interfaces bbs->telnet_interfaces
=iniGetStringList(list,section,"TelnetInterface",",",global_interfaces); =iniGetStringList(list,section,"TelnetInterface",",",global_interfaces);
bbs->rlogin_port bbs->rlogin_port
=iniGetShortInt(list,section,"RLoginPort",513); =iniGetShortInt(list,section,"RLoginPort",513);
iniFreeStringList(bbs->rlogin_interfaces);
bbs->rlogin_interfaces bbs->rlogin_interfaces
=iniGetStringList(list,section,"RLoginInterface",",",global_interfaces); =iniGetStringList(list,section,"RLoginInterface",",",global_interfaces);
...@@ -391,7 +430,6 @@ void sbbs_read_ini( ...@@ -391,7 +430,6 @@ void sbbs_read_ini(
=iniGetShortInt(list,section,"SSHPort",22); =iniGetShortInt(list,section,"SSHPort",22);
bbs->ssh_connect_timeout bbs->ssh_connect_timeout
=iniGetShortInt(list,section,"SSHConnectTimeout",10); =iniGetShortInt(list,section,"SSHConnectTimeout",10);
iniFreeStringList(bbs->ssh_interfaces);
bbs->ssh_interfaces bbs->ssh_interfaces
=iniGetStringList(list,section,"SSHInterface",",",global_interfaces); =iniGetStringList(list,section,"SSHInterface",",",global_interfaces);
...@@ -482,7 +520,6 @@ void sbbs_read_ini( ...@@ -482,7 +520,6 @@ void sbbs_read_ini(
=iniGetIp6Address(list,section,strOutgoing6,global->outgoing6); =iniGetIp6Address(list,section,strOutgoing6,global->outgoing6);
ftp->port ftp->port
=iniGetShortInt(list,section,strPort,IPPORT_FTP); =iniGetShortInt(list,section,strPort,IPPORT_FTP);
iniFreeStringList(ftp->interfaces);
ftp->interfaces ftp->interfaces
=iniGetStringList(list,section,strInterfaces,",",global_interfaces); =iniGetStringList(list,section,strInterfaces,",",global_interfaces);
ftp->max_clients ftp->max_clients
...@@ -539,7 +576,6 @@ void sbbs_read_ini( ...@@ -539,7 +576,6 @@ void sbbs_read_ini(
if(mail!=NULL) { if(mail!=NULL) {
iniFreeStringList(mail->interfaces);
mail->interfaces mail->interfaces
=iniGetStringList(list,section,strInterfaces,",",global_interfaces); =iniGetStringList(list,section,strInterfaces,",",global_interfaces);
mail->outgoing4.s_addr mail->outgoing4.s_addr
...@@ -552,7 +588,6 @@ void sbbs_read_ini( ...@@ -552,7 +588,6 @@ void sbbs_read_ini(
=iniGetShortInt(list,section,"SubmissionPort",IPPORT_SUBMISSION); =iniGetShortInt(list,section,"SubmissionPort",IPPORT_SUBMISSION);
mail->submissions_port mail->submissions_port
=iniGetShortInt(list,section,"TLSSubmissionPort",IPPORT_SUBMISSIONS); =iniGetShortInt(list,section,"TLSSubmissionPort",IPPORT_SUBMISSIONS);
iniFreeStringList(mail->pop3_interfaces);
mail->pop3_interfaces mail->pop3_interfaces
=iniGetStringList(list,section,"POP3Interface",",",global_interfaces); =iniGetStringList(list,section,"POP3Interface",",",global_interfaces);
mail->pop3_port mail->pop3_port
...@@ -566,15 +601,15 @@ void sbbs_read_ini( ...@@ -566,15 +601,15 @@ void sbbs_read_ini(
mail->max_inactivity mail->max_inactivity
=(uint16_t)iniGetDuration(list,section,strMaxInactivity,MAIL_DEFAULT_MAX_INACTIVITY); /* seconds */ =(uint16_t)iniGetDuration(list,section,strMaxInactivity,MAIL_DEFAULT_MAX_INACTIVITY); /* seconds */
mail->max_delivery_attempts mail->max_delivery_attempts
=iniGetShortInt(list,section,"MaxDeliveryAttempts",MAIL_DEFAULT_MAX_DELIVERY_ATTEMPTS); =iniGetUInteger(list,section,"MaxDeliveryAttempts",MAIL_DEFAULT_MAX_DELIVERY_ATTEMPTS);
mail->rescan_frequency mail->rescan_frequency
=iniGetShortInt(list,section,"RescanFrequency",MAIL_DEFAULT_RESCAN_FREQUENCY); /* 60 minutes */ =iniGetUInteger(list,section,"RescanFrequency",MAIL_DEFAULT_RESCAN_FREQUENCY); /* 60 minutes */
mail->sem_chk_freq mail->sem_chk_freq
=iniGetShortInt(list,section,strSemFileCheckFrequency,global->sem_chk_freq); =iniGetUInteger(list,section,strSemFileCheckFrequency,global->sem_chk_freq);
mail->lines_per_yield mail->lines_per_yield
=iniGetShortInt(list,section,"LinesPerYield",MAIL_DEFAULT_LINES_PER_YIELD); =iniGetUInteger(list,section,"LinesPerYield",MAIL_DEFAULT_LINES_PER_YIELD);
mail->max_recipients mail->max_recipients
=iniGetShortInt(list,section,"MaxRecipients",MAIL_DEFAULT_MAX_RECIPIENTS); =iniGetUInteger(list,section,"MaxRecipients",MAIL_DEFAULT_MAX_RECIPIENTS);
mail->max_msg_size mail->max_msg_size
=(DWORD)iniGetBytes(list,section,"MaxMsgSize",/* units: */1,MAIL_DEFAULT_MAX_MSG_SIZE); =(DWORD)iniGetBytes(list,section,"MaxMsgSize",/* units: */1,MAIL_DEFAULT_MAX_MSG_SIZE);
mail->max_msgs_waiting mail->max_msgs_waiting
...@@ -639,7 +674,6 @@ void sbbs_read_ini( ...@@ -639,7 +674,6 @@ void sbbs_read_ini(
if(services!=NULL) { if(services!=NULL) {
iniFreeStringList(services->interfaces);
services->interfaces services->interfaces
=iniGetStringList(list,section,strInterfaces,",",global_interfaces); =iniGetStringList(list,section,strInterfaces,",",global_interfaces);
services->outgoing4.s_addr services->outgoing4.s_addr
...@@ -648,7 +682,7 @@ void sbbs_read_ini( ...@@ -648,7 +682,7 @@ void sbbs_read_ini(
=iniGetIp6Address(list,section,strOutgoing6,global->outgoing6); =iniGetIp6Address(list,section,strOutgoing6,global->outgoing6);
services->sem_chk_freq services->sem_chk_freq
=iniGetShortInt(list,section,strSemFileCheckFrequency,global->sem_chk_freq); =iniGetUInteger(list,section,strSemFileCheckFrequency,global->sem_chk_freq);
/* JavaScript operating parameters */ /* JavaScript operating parameters */
sbbs_get_js_settings(list, section, &services->js, &global->js); sbbs_get_js_settings(list, section, &services->js, &global->js);
...@@ -683,22 +717,20 @@ void sbbs_read_ini( ...@@ -683,22 +717,20 @@ void sbbs_read_ini(
if(web!=NULL) { if(web!=NULL) {
iniFreeStringList(web->interfaces);
web->interfaces web->interfaces
=iniGetStringList(list,section,strInterfaces,",",global_interfaces); =iniGetStringList(list,section,strInterfaces,",",global_interfaces);
iniFreeStringList(web->tls_interfaces);
web->tls_interfaces web->tls_interfaces
=iniGetStringList(list,section,"TLSInterface",",",global_interfaces); =iniGetStringList(list,section,"TLSInterface",",",global_interfaces);
web->port web->port
=iniGetShortInt(list,section,strPort,IPPORT_HTTP); =iniGetUInt16(list,section,strPort,IPPORT_HTTP);
web->tls_port web->tls_port
=iniGetShortInt(list,section,"TLSPort",IPPORT_HTTPS); =iniGetUInt16(list,section,"TLSPort",IPPORT_HTTPS);
web->max_clients web->max_clients
=iniGetShortInt(list,section,strMaxClients,WEB_DEFAULT_MAX_CLIENTS); =iniGetUInteger(list,section,strMaxClients,WEB_DEFAULT_MAX_CLIENTS);
web->max_inactivity web->max_inactivity
=(uint16_t)iniGetDuration(list,section,strMaxInactivity,WEB_DEFAULT_MAX_INACTIVITY); /* seconds */ =(uint16_t)iniGetDuration(list,section,strMaxInactivity,WEB_DEFAULT_MAX_INACTIVITY); /* seconds */
web->sem_chk_freq web->sem_chk_freq
=iniGetShortInt(list,section,strSemFileCheckFrequency,global->sem_chk_freq); =iniGetUInteger(list,section,strSemFileCheckFrequency,global->sem_chk_freq);
/* JavaScript operating parameters */ /* JavaScript operating parameters */
sbbs_get_js_settings(list, section, &web->js, &global->js); sbbs_get_js_settings(list, section, &web->js, &global->js);
...@@ -728,10 +760,8 @@ void sbbs_read_ini( ...@@ -728,10 +760,8 @@ void sbbs_read_ini(
SAFECOPY(web->default_cgi_content SAFECOPY(web->default_cgi_content
,iniGetString(list,section,"DefaultCGIContent",WEB_DEFAULT_CGI_CONTENT,value)); ,iniGetString(list,section,"DefaultCGIContent",WEB_DEFAULT_CGI_CONTENT,value));
iniFreeStringList(web->index_file_name);
web->index_file_name web->index_file_name
=iniGetStringList(list,section,"IndexFileNames", "," ,"index.html,index.ssjs"); =iniGetStringList(list,section,"IndexFileNames", "," ,"index.html,index.ssjs");
iniFreeStringList(web->cgi_ext);
web->cgi_ext web->cgi_ext
=iniGetStringList(list,section,"CGIExtensions", "," ,".cgi"); =iniGetStringList(list,section,"CGIExtensions", "," ,".cgi");
SAFECOPY(web->ssjs_ext SAFECOPY(web->ssjs_ext
...@@ -750,7 +780,7 @@ void sbbs_read_ini( ...@@ -750,7 +780,7 @@ void sbbs_read_ini(
=iniGetBitField(list,section,strOptions,web_options =iniGetBitField(list,section,strOptions,web_options
,BBS_OPT_NO_HOST_LOOKUP | WEB_OPT_HTTP_LOGGING); ,BBS_OPT_NO_HOST_LOOKUP | WEB_OPT_HTTP_LOGGING);
web->outbuf_drain_timeout web->outbuf_drain_timeout
=iniGetShortInt(list,section,"OutbufDrainTimeout",10); =iniGetUInteger(list,section,"OutbufDrainTimeout",10);
web->bind_retry_count=iniGetInteger(list,section,strBindRetryCount,global->bind_retry_count); web->bind_retry_count=iniGetInteger(list,section,strBindRetryCount,global->bind_retry_count);
web->bind_retry_delay=iniGetInteger(list,section,strBindRetryDelay,global->bind_retry_delay); web->bind_retry_delay=iniGetInteger(list,section,strBindRetryDelay,global->bind_retry_delay);
...@@ -810,8 +840,10 @@ BOOL sbbs_write_ini( ...@@ -810,8 +840,10 @@ BOOL sbbs_write_ini(
iniSetString(lp,section,strCtrlDirectory,global->ctrl_dir,&style); iniSetString(lp,section,strCtrlDirectory,global->ctrl_dir,&style);
iniSetString(lp,section,strTempDirectory,global->temp_dir,&style); iniSetString(lp,section,strTempDirectory,global->temp_dir,&style);
iniSetString(lp,section,strHostName,global->host_name,&style); iniSetString(lp,section,strHostName,global->host_name,&style);
iniSetShortInt(lp,section,strSemFileCheckFrequency,global->sem_chk_freq,&style); iniSetUInteger(lp,section,strSemFileCheckFrequency,global->sem_chk_freq,&style);
if(global->outgoing4.s_addr != INADDR_ANY)
iniSetIpAddress(lp,section,strOutgoing4,global->outgoing4.s_addr,&style); iniSetIpAddress(lp,section,strOutgoing4,global->outgoing4.s_addr,&style);
if(memcmp(&global->outgoing6, &wildcard6, sizeof(wildcard6)) != 0)
iniSetIp6Address(lp,section,strOutgoing6,global->outgoing6,&style); iniSetIp6Address(lp,section,strOutgoing6,global->outgoing6,&style);
iniSetStringList(lp, section, strInterfaces, ",", global->interfaces, &style); iniSetStringList(lp, section, strInterfaces, ",", global->interfaces, &style);
iniSetLogLevel(lp,section,strLogLevel,global->log_level,&style); iniSetLogLevel(lp,section,strLogLevel,global->log_level,&style);
...@@ -841,37 +873,37 @@ BOOL sbbs_write_ini( ...@@ -841,37 +873,37 @@ BOOL sbbs_write_ini(
else if(!iniSetStringList(lp,section,"TelnetInterface", ",", bbs->telnet_interfaces, &style)) else if(!iniSetStringList(lp,section,"TelnetInterface", ",", bbs->telnet_interfaces, &style))
break; break;
if(!iniSetShortInt(lp,section,"TelnetPort",bbs->telnet_port,&style)) if(!iniSetUInt16(lp,section,"TelnetPort",bbs->telnet_port,&style))
break; break;
if(strListCmp(bbs->rlogin_interfaces, global->interfaces)==0) if(strListCmp(bbs->rlogin_interfaces, global->interfaces)==0)
iniRemoveValue(lp,section,"RLoginInterface"); iniRemoveValue(lp,section,"RLoginInterface");
else if(!iniSetStringList(lp,section,"RLoginInterface", ",", bbs->rlogin_interfaces,&style)) else if(!iniSetStringList(lp,section,"RLoginInterface", ",", bbs->rlogin_interfaces,&style))
break; break;
if(!iniSetShortInt(lp,section,"RLoginPort",bbs->rlogin_port,&style)) if(!iniSetUInt16(lp,section,"RLoginPort",bbs->rlogin_port,&style))
break; break;
if(!iniSetShortInt(lp,section,"Pet40Port",bbs->pet40_port,&style)) if(!iniSetUInt16(lp,section,"Pet40Port",bbs->pet40_port,&style))
break; break;
if(!iniSetShortInt(lp,section,"Pet80Port",bbs->pet80_port,&style)) if(!iniSetUInt16(lp,section,"Pet80Port",bbs->pet80_port,&style))
break; break;
if(strListCmp(bbs->ssh_interfaces, global->interfaces)==0) if(strListCmp(bbs->ssh_interfaces, global->interfaces)==0)
iniRemoveValue(lp,section,"SSHInterface"); iniRemoveValue(lp,section,"SSHInterface");
else if(!iniSetStringList(lp,section,"SSHInterface", ",", bbs->ssh_interfaces,&style)) else if(!iniSetStringList(lp,section,"SSHInterface", ",", bbs->ssh_interfaces,&style))
break; break;
if(!iniSetShortInt(lp,section,"SSHPort",bbs->ssh_port,&style)) if(!iniSetUInt16(lp,section,"SSHPort",bbs->ssh_port,&style))
break; break;
if(!iniSetShortInt(lp,section,"SSHConnectTimeout",bbs->ssh_connect_timeout,&style)) if(!iniSetUInteger(lp,section,"SSHConnectTimeout",bbs->ssh_connect_timeout,&style))
break; break;
if(!iniSetShortInt(lp,section,"FirstNode",bbs->first_node,&style)) if(!iniSetUInteger(lp,section,"FirstNode",bbs->first_node,&style))
break; break;
if(!iniSetShortInt(lp,section,"LastNode",bbs->last_node,&style)) if(!iniSetUInteger(lp,section,"LastNode",bbs->last_node,&style))
break; break;
if(!iniSetShortInt(lp,section,"OutbufHighwaterMark",bbs->outbuf_highwater_mark,&style)) if(!iniSetUInteger(lp,section,"OutbufHighwaterMark",bbs->outbuf_highwater_mark,&style))
break; break;
if(!iniSetShortInt(lp,section,"OutbufDrainTimeout",bbs->outbuf_drain_timeout,&style)) if(!iniSetUInteger(lp,section,"OutbufDrainTimeout",bbs->outbuf_drain_timeout,&style))
break; break;
if(!iniSetInteger(lp,section,strMaxConConn,bbs->max_concurrent_connections,&style)) if(!iniSetInteger(lp,section,strMaxConConn,bbs->max_concurrent_connections,&style))
break; break;
...@@ -884,7 +916,7 @@ BOOL sbbs_write_ini( ...@@ -884,7 +916,7 @@ BOOL sbbs_write_ini(
if(bbs->sem_chk_freq==global->sem_chk_freq) if(bbs->sem_chk_freq==global->sem_chk_freq)
iniRemoveValue(lp,section,strSemFileCheckFrequency); iniRemoveValue(lp,section,strSemFileCheckFrequency);
else if(!iniSetShortInt(lp,section,strSemFileCheckFrequency,bbs->sem_chk_freq,&style)) else if(!iniSetUInteger(lp,section,strSemFileCheckFrequency,bbs->sem_chk_freq,&style))
break; break;
if(bbs->log_level==global->log_level) if(bbs->log_level==global->log_level)
...@@ -958,20 +990,20 @@ BOOL sbbs_write_ini( ...@@ -958,20 +990,20 @@ BOOL sbbs_write_ini(
else if(!iniSetIpAddress(lp, section, strOutgoing4, ftp->outgoing4.s_addr, &style)) else if(!iniSetIpAddress(lp, section, strOutgoing4, ftp->outgoing4.s_addr, &style))
break; break;
if(memcmp(&ftp->outgoing6, &global->outgoing6, sizeof(ftp->outgoing6))) if(memcmp(&ftp->outgoing6, &global->outgoing6, sizeof(ftp->outgoing6)) == 0)
iniRemoveValue(lp,section,strOutgoing6); iniRemoveValue(lp,section,strOutgoing6);
else if(!iniSetIp6Address(lp, section, strOutgoing6, ftp->outgoing6, &style)) else if(!iniSetIp6Address(lp, section, strOutgoing6, ftp->outgoing6, &style))
break; break;
if(!iniSetShortInt(lp,section,strPort,ftp->port,&style)) if(!iniSetUInt16(lp,section,strPort,ftp->port,&style))
break; break;
if(!iniSetShortInt(lp,section,strMaxClients,ftp->max_clients,&style)) if(!iniSetUInteger(lp,section,strMaxClients,ftp->max_clients,&style))
break; break;
if(!iniSetDuration(lp,section,strMaxInactivity,ftp->max_inactivity,&style)) if(!iniSetDuration(lp,section,strMaxInactivity,ftp->max_inactivity,&style))
break; break;
if(!iniSetInteger(lp,section,strMaxConConn,ftp->max_concurrent_connections,&style)) if(!iniSetInteger(lp,section,strMaxConConn,ftp->max_concurrent_connections,&style))
break; break;
if(!iniSetShortInt(lp,section,"QwkTimeout",ftp->qwk_timeout,&style)) if(!iniSetUInteger(lp,section,"QwkTimeout",ftp->qwk_timeout,&style))
break; break;
if(!iniSetBytes(lp,section,"MinFileSize",1,ftp->min_fsize,&style)) if(!iniSetBytes(lp,section,"MinFileSize",1,ftp->min_fsize,&style))
break; break;
...@@ -983,14 +1015,14 @@ BOOL sbbs_write_ini( ...@@ -983,14 +1015,14 @@ BOOL sbbs_write_ini(
break; break;
if(!iniSetIp6Address(lp,section,"PasvIp6Address",ftp->pasv_ip6_addr,&style)) if(!iniSetIp6Address(lp,section,"PasvIp6Address",ftp->pasv_ip6_addr,&style))
break; break;
if(!iniSetShortInt(lp,section,"PasvPortLow",ftp->pasv_port_low,&style)) if(!iniSetUInt16(lp,section,"PasvPortLow",ftp->pasv_port_low,&style))
break; break;
if(!iniSetShortInt(lp,section,"PasvPortHigh",ftp->pasv_port_high,&style)) if(!iniSetUInt16(lp,section,"PasvPortHigh",ftp->pasv_port_high,&style))
break; break;
if(ftp->sem_chk_freq==global->sem_chk_freq) if(ftp->sem_chk_freq==global->sem_chk_freq)
iniRemoveValue(lp,section,strSemFileCheckFrequency); iniRemoveValue(lp,section,strSemFileCheckFrequency);
else if(!iniSetShortInt(lp,section,strSemFileCheckFrequency,ftp->sem_chk_freq,&style)) else if(!iniSetUInteger(lp,section,strSemFileCheckFrequency,ftp->sem_chk_freq,&style))
break; break;
if(ftp->log_level==global->log_level) if(ftp->log_level==global->log_level)
...@@ -1046,14 +1078,14 @@ BOOL sbbs_write_ini( ...@@ -1046,14 +1078,14 @@ BOOL sbbs_write_ini(
else if(!iniSetIpAddress(lp, section, strOutgoing4, mail->outgoing4.s_addr, &style)) else if(!iniSetIpAddress(lp, section, strOutgoing4, mail->outgoing4.s_addr, &style))
break; break;
if(memcmp(&mail->outgoing6, &global->outgoing6, sizeof(ftp->outgoing6))) if(memcmp(&mail->outgoing6, &global->outgoing6, sizeof(ftp->outgoing6)) == 0)
iniRemoveValue(lp,section,strOutgoing6); iniRemoveValue(lp,section,strOutgoing6);
else if(!iniSetIp6Address(lp, section, strOutgoing6, mail->outgoing6, &style)) else if(!iniSetIp6Address(lp, section, strOutgoing6, mail->outgoing6, &style))
break; break;
if(mail->sem_chk_freq==global->sem_chk_freq) if(mail->sem_chk_freq==global->sem_chk_freq)
iniRemoveValue(lp,section,strSemFileCheckFrequency); iniRemoveValue(lp,section,strSemFileCheckFrequency);
else if(!iniSetShortInt(lp,section,strSemFileCheckFrequency,mail->sem_chk_freq,&style)) else if(!iniSetUInteger(lp,section,strSemFileCheckFrequency,mail->sem_chk_freq,&style))
break; break;
if(mail->log_level==global->log_level) if(mail->log_level==global->log_level)
...@@ -1064,29 +1096,29 @@ BOOL sbbs_write_ini( ...@@ -1064,29 +1096,29 @@ BOOL sbbs_write_ini(
iniRemoveValue(lp,section,strTLSErrorLevel); iniRemoveValue(lp,section,strTLSErrorLevel);
else if(!iniSetLogLevel(lp,section,strTLSErrorLevel,mail->tls_error_level,&style)) else if(!iniSetLogLevel(lp,section,strTLSErrorLevel,mail->tls_error_level,&style))
break; break;
if(!iniSetShortInt(lp,section,"SMTPPort",mail->smtp_port,&style)) if(!iniSetUInt16(lp,section,"SMTPPort",mail->smtp_port,&style))
break; break;
if(!iniSetShortInt(lp,section,"SubmissionPort",mail->submission_port,&style)) if(!iniSetUInt16(lp,section,"SubmissionPort",mail->submission_port,&style))
break; break;
if(!iniSetShortInt(lp,section,"TLSSubmissionPort",mail->submissions_port,&style)) if(!iniSetUInt16(lp,section,"TLSSubmissionPort",mail->submissions_port,&style))
break; break;
if(!iniSetShortInt(lp,section,"POP3Port",mail->pop3_port,&style)) if(!iniSetUInt16(lp,section,"POP3Port",mail->pop3_port,&style))
break; break;
if(!iniSetShortInt(lp,section,"TLSPOP3Port",mail->pop3s_port,&style)) if(!iniSetUInt16(lp,section,"TLSPOP3Port",mail->pop3s_port,&style))
break; break;
if(!iniSetShortInt(lp,section,"RelayPort",mail->relay_port,&style)) if(!iniSetUInt16(lp,section,"RelayPort",mail->relay_port,&style))
break; break;
if(!iniSetShortInt(lp,section,strMaxClients,mail->max_clients,&style)) if(!iniSetUInteger(lp,section,strMaxClients,mail->max_clients,&style))
break; break;
if(!iniSetDuration(lp,section,strMaxInactivity,mail->max_inactivity,&style)) if(!iniSetDuration(lp,section,strMaxInactivity,mail->max_inactivity,&style))
break; break;
if(!iniSetShortInt(lp,section,"MaxDeliveryAttempts",mail->max_delivery_attempts,&style)) if(!iniSetUInteger(lp,section,"MaxDeliveryAttempts",mail->max_delivery_attempts,&style))
break; break;
if(!iniSetShortInt(lp,section,"RescanFrequency",mail->rescan_frequency,&style)) if(!iniSetUInteger(lp,section,"RescanFrequency",mail->rescan_frequency,&style))
break; break;
if(!iniSetShortInt(lp,section,"LinesPerYield",mail->lines_per_yield,&style)) if(!iniSetUInteger(lp,section,"LinesPerYield",mail->lines_per_yield,&style))
break; break;
if(!iniSetShortInt(lp,section,"MaxRecipients",mail->max_recipients,&style)) if(!iniSetUInteger(lp,section,"MaxRecipients",mail->max_recipients,&style))
break; break;
if(!iniSetBytes(lp,section,"MaxMsgSize",/* unit: */1,mail->max_msg_size,&style)) if(!iniSetBytes(lp,section,"MaxMsgSize",/* unit: */1,mail->max_msg_size,&style))
break; break;
...@@ -1171,14 +1203,14 @@ BOOL sbbs_write_ini( ...@@ -1171,14 +1203,14 @@ BOOL sbbs_write_ini(
else if(!iniSetIpAddress(lp, section, strOutgoing4, services->outgoing4.s_addr, &style)) else if(!iniSetIpAddress(lp, section, strOutgoing4, services->outgoing4.s_addr, &style))
break; break;
if(memcmp(&services->outgoing6, &global->outgoing6, sizeof(ftp->outgoing6))) if(memcmp(&services->outgoing6, &global->outgoing6, sizeof(ftp->outgoing6)) == 0)
iniRemoveValue(lp,section,strOutgoing6); iniRemoveValue(lp,section,strOutgoing6);
else if(!iniSetIp6Address(lp, section, strOutgoing6, services->outgoing6, &style)) else if(!iniSetIp6Address(lp, section, strOutgoing6, services->outgoing6, &style))
break; break;
if(services->sem_chk_freq==global->sem_chk_freq) if(services->sem_chk_freq==global->sem_chk_freq)
iniRemoveValue(lp,section,strSemFileCheckFrequency); iniRemoveValue(lp,section,strSemFileCheckFrequency);
else if(!iniSetShortInt(lp,section,strSemFileCheckFrequency,services->sem_chk_freq,&style)) else if(!iniSetUInteger(lp,section,strSemFileCheckFrequency,services->sem_chk_freq,&style))
break; break;
if(services->log_level==global->log_level) if(services->log_level==global->log_level)
...@@ -1237,12 +1269,11 @@ BOOL sbbs_write_ini( ...@@ -1237,12 +1269,11 @@ BOOL sbbs_write_ini(
iniRemoveValue(lp,section,"TLSInterface"); iniRemoveValue(lp,section,"TLSInterface");
else if(!iniSetStringList(lp,section,"TLSInterface",",",web->tls_interfaces,&style)) else if(!iniSetStringList(lp,section,"TLSInterface",",",web->tls_interfaces,&style))
break; break;
if(!iniSetUInt16(lp,section,strPort,web->port,&style))
if(!iniSetShortInt(lp,section,strPort,web->port,&style))
break; break;
if(!iniSetShortInt(lp,section,"TLSPort",web->tls_port,&style)) if(!iniSetUInt16(lp,section,"TLSPort",web->tls_port,&style))
break; break;
if(!iniSetShortInt(lp,section,strMaxClients,web->max_clients,&style)) if(!iniSetUInteger(lp,section,strMaxClients,web->max_clients,&style))
break; break;
if(!iniSetDuration(lp,section,strMaxInactivity,web->max_inactivity,&style)) if(!iniSetDuration(lp,section,strMaxInactivity,web->max_inactivity,&style))
break; break;
...@@ -1251,7 +1282,7 @@ BOOL sbbs_write_ini( ...@@ -1251,7 +1282,7 @@ BOOL sbbs_write_ini(
if(web->sem_chk_freq==global->sem_chk_freq) if(web->sem_chk_freq==global->sem_chk_freq)
iniRemoveValue(lp,section,strSemFileCheckFrequency); iniRemoveValue(lp,section,strSemFileCheckFrequency);
else if(!iniSetShortInt(lp,section,strSemFileCheckFrequency,web->sem_chk_freq,&style)) else if(!iniSetUInteger(lp,section,strSemFileCheckFrequency,web->sem_chk_freq,&style))
break; break;
if(web->log_level==global->log_level) if(web->log_level==global->log_level)
...@@ -1320,7 +1351,7 @@ BOOL sbbs_write_ini( ...@@ -1320,7 +1351,7 @@ BOOL sbbs_write_ini(
iniRemoveValue(lp,section,strBindRetryDelay); iniRemoveValue(lp,section,strBindRetryDelay);
else if(!iniSetInteger(lp,section,strBindRetryDelay,web->bind_retry_delay,&style)) else if(!iniSetInteger(lp,section,strBindRetryDelay,web->bind_retry_delay,&style))
break; break;
if(!iniSetShortInt(lp,section,"OutbufDrainTimeout",web->outbuf_drain_timeout,&style)) if(!iniSetUInteger(lp,section,"OutbufDrainTimeout",web->outbuf_drain_timeout,&style))
break; break;
} }
......
src/sbbs3/sbbs_ini.h
+ 11
− 2
View file @ 1f06fc85
...@@ -55,6 +55,15 @@ void sbbs_read_ini( ...@@ -55,6 +55,15 @@ void sbbs_read_ini(
,services_startup_t* services_startup ,services_startup_t* services_startup
); );
void sbbs_free_ini(
global_startup_t* global
,bbs_startup_t* bbs_startup
,ftp_startup_t* ftp_startup
,web_startup_t* web_startup
,mail_startup_t* mail_startup
,services_startup_t* services_startup
);
void sbbs_get_js_settings( void sbbs_get_js_settings(
str_list_t list str_list_t list
,const char* section ,const char* section
......
src/sbbs3/scfg/scfgsrvr.c
+ 93
− 21
View file @ 1f06fc85
...@@ -32,12 +32,17 @@ static const char* threshold(uint val) ...@@ -32,12 +32,17 @@ static const char* threshold(uint val)
return str; return str;
} }
static const char* duration(uint val) static const char* duration(uint val, bool verbose)
{ {
static char str[128]; static char str[128];
if(val == 0) if(val == 0)
return strDisabled; return strDisabled;
return duration_to_vstr(val, str, sizeof(str)); return verbose ? duration_to_vstr(val, str, sizeof(str)) : duration_to_str(val, str, sizeof(str));;
}
static const char* vduration(uint val)
{
return duration(val, true);
} }
static const char* maximum(uint val) static const char* maximum(uint val)
...@@ -54,6 +59,7 @@ static void global_cfg(global_startup_t* startup) ...@@ -54,6 +59,7 @@ static void global_cfg(global_startup_t* startup)
static int cur; static int cur;
char str[256]; char str[256];
char tmp[256]; char tmp[256];
uint32_t ip4_addr;
while(1) { while(1) {
int i = 0; int i = 0;
...@@ -62,7 +68,7 @@ static void global_cfg(global_startup_t* startup) ...@@ -62,7 +68,7 @@ static void global_cfg(global_startup_t* startup)
sprintf(opt[i++], "%-40s%s", "Network Interfaces (IPv4/6)", strListCombine(startup->interfaces, tmp, sizeof(tmp), ", ")); sprintf(opt[i++], "%-40s%s", "Network Interfaces (IPv4/6)", strListCombine(startup->interfaces, tmp, sizeof(tmp), ", "));
sprintf(opt[i++], "%-40s%s", "Outbound Interface (IPv4)", IPv4AddressToStr(startup->outgoing4.s_addr, tmp, sizeof(tmp))); sprintf(opt[i++], "%-40s%s", "Outbound Interface (IPv4)", IPv4AddressToStr(startup->outgoing4.s_addr, tmp, sizeof(tmp)));
sprintf(opt[i++], "%-40s%s", "Bind Retry Count", threshold(startup->bind_retry_count)); sprintf(opt[i++], "%-40s%s", "Bind Retry Count", threshold(startup->bind_retry_count));
sprintf(opt[i++], "%-40s%s", "Bind Retry Delay", duration(startup->bind_retry_delay)); sprintf(opt[i++], "%-40s%s", "Bind Retry Delay", vduration(startup->bind_retry_delay));
sprintf(opt[i++], "%-40s%u ms", "Failed Login Delay", startup->login_attempt.delay); sprintf(opt[i++], "%-40s%u ms", "Failed Login Delay", startup->login_attempt.delay);
sprintf(opt[i++], "%-40s%u ms", "Failed Login Throttle", startup->login_attempt.throttle); sprintf(opt[i++], "%-40s%u ms", "Failed Login Throttle", startup->login_attempt.throttle);
sprintf(opt[i++], "%-40s%s", "Failed Login Hack Log Threshold", threshold(startup->login_attempt.hack_threshold)); sprintf(opt[i++], "%-40s%s", "Failed Login Hack Log Threshold", threshold(startup->login_attempt.hack_threshold));
...@@ -75,7 +81,7 @@ static void global_cfg(global_startup_t* startup) ...@@ -75,7 +81,7 @@ static void global_cfg(global_startup_t* startup)
sprintf(opt[i++], "%-40s%u ticks", "JavaScript GC Interval ", startup->js.gc_interval); sprintf(opt[i++], "%-40s%u ticks", "JavaScript GC Interval ", startup->js.gc_interval);
sprintf(opt[i++], "%-40s%u ticks", "JavaScript Yield Interval", startup->js.yield_interval); sprintf(opt[i++], "%-40s%u ticks", "JavaScript Yield Interval", startup->js.yield_interval);
sprintf(opt[i++], "%-40s%s", "JavaScript Load Path", startup->js.load_path); sprintf(opt[i++], "%-40s%s", "JavaScript Load Path", startup->js.load_path);
sprintf(opt[i++], "%-40s%s", "Semaphore File Check Interval", duration(startup->sem_chk_freq)); sprintf(opt[i++], "%-40s%s", "Semaphore File Check Interval", vduration(startup->sem_chk_freq));
opt[i][0] = '\0'; opt[i][0] = '\0';
uifc.helpbuf= uifc.helpbuf=
...@@ -104,16 +110,49 @@ static void global_cfg(global_startup_t* startup) ...@@ -104,16 +110,49 @@ static void global_cfg(global_startup_t* startup)
break; break;
case 2: case 2:
strListCombine(startup->interfaces, str, sizeof(str), ", "); strListCombine(startup->interfaces, str, sizeof(str), ", ");
if(uifc.input(WIN_MID|WIN_SAV, 0, 0, "", str, sizeof(str)-1, K_NONE|K_EDIT) >= 0) { if(uifc.input(WIN_MID|WIN_SAV, 0, 0, "Network Interfaces", str, sizeof(str)-1, K_EDIT) >= 0) {
strListFree(&startup->interfaces); strListFree(&startup->interfaces);
strListSplitCopy(&startup->interfaces, str, ", "); strListSplitCopy(&startup->interfaces, str, ", ");
uifc.changes = true; uifc.changes = true;
} }
break; break;
case 3: case 3:
IPv4AddressToStr(startup->outgoing4.s_addr, str, sizeof(str)); IPv4AddressToStr(ip4_addr = startup->outgoing4.s_addr, str, sizeof(str));
if(uifc.input(WIN_MID|WIN_SAV, 0, 0, "Outbound Network Interface", str, sizeof(str)-1, K_NONE|K_EDIT) > 0) if(uifc.input(WIN_MID|WIN_SAV, 0, 0, "Outbound Network Interface", str, sizeof(str)-1, K_EDIT) > 0) {
startup->outgoing4.s_addr = parseIPv4Address(str); if((ip4_addr = parseIPv4Address(str)) != startup->outgoing4.s_addr) {
startup->outgoing4.s_addr = ip4_addr;
uifc.changes = true;
}
}
break;
case 4:
SAFECOPY(str, threshold(startup->bind_retry_count));
if(uifc.input(WIN_MID|WIN_SAV, 0, 0, "Port Bind Retry Count", str, 6, K_EDIT) > 0) {
if(atoi(str) != startup->bind_retry_count) {
startup->bind_retry_count = atoi(str);
uifc.changes = true;
}
}
break;
case 5:
SAFECOPY(str, duration(startup->bind_retry_delay, false));
if(uifc.input(WIN_MID|WIN_SAV, 0, 0, "Port Bind Retry Delay", str, 6, K_EDIT) > 0) {
uint dur = parse_duration(str);
if(dur != startup->bind_retry_delay) {
startup->bind_retry_delay = dur;
uifc.changes = true;
}
}
break;
case 6:
SAFEPRINTF(str, "%u", startup->login_attempt.delay);
if(uifc.input(WIN_MID|WIN_SAV, 0, 0, "Millisecond Delay After Failed Login Attempts", str, 6, K_NUMBER|K_EDIT) > 0) {
uint dur = atoi(str);
if(dur != startup->login_attempt.delay) {
startup->login_attempt.delay = dur;
uifc.changes = true;
}
}
break; break;
} }
} }
...@@ -134,7 +173,7 @@ static void termsrvr_cfg(BOOL* enabled, bbs_startup_t* startup) ...@@ -134,7 +173,7 @@ static void termsrvr_cfg(BOOL* enabled, bbs_startup_t* startup)
sprintf(opt[i++], "%-30s%s", "SSH Support", startup->options & BBS_OPT_ALLOW_SSH ? "Yes" : "No"); sprintf(opt[i++], "%-30s%s", "SSH Support", startup->options & BBS_OPT_ALLOW_SSH ? "Yes" : "No");
sprintf(opt[i++], "%-30s%s", "SSH Interfaces", startup->options & BBS_OPT_ALLOW_SSH ? strListCombine(startup->ssh_interfaces, tmp, sizeof(tmp), ", ") : "N/A"); sprintf(opt[i++], "%-30s%s", "SSH Interfaces", startup->options & BBS_OPT_ALLOW_SSH ? strListCombine(startup->ssh_interfaces, tmp, sizeof(tmp), ", ") : "N/A");
sprintf(opt[i++], "%-30s%u", "SSH Port", startup->ssh_port); sprintf(opt[i++], "%-30s%u", "SSH Port", startup->ssh_port);
sprintf(opt[i++], "%-30s%s", "SSH Connect Timeout", startup->options & BBS_OPT_ALLOW_SSH ? duration(startup->ssh_connect_timeout) : "N/A"); sprintf(opt[i++], "%-30s%s", "SSH Connect Timeout", startup->options & BBS_OPT_ALLOW_SSH ? vduration(startup->ssh_connect_timeout) : "N/A");
sprintf(opt[i++], "%-30s%s", "Telnet Support", startup->options & BBS_OPT_NO_TELNET ? "No" : "Yes"); sprintf(opt[i++], "%-30s%s", "Telnet Support", startup->options & BBS_OPT_NO_TELNET ? "No" : "Yes");
sprintf(opt[i++], "%-30s%s", "Telnet Interfaces", startup->options & BBS_OPT_NO_TELNET ? "N/A" : strListCombine(startup->telnet_interfaces, tmp, sizeof(tmp), ", ")); sprintf(opt[i++], "%-30s%s", "Telnet Interfaces", startup->options & BBS_OPT_NO_TELNET ? "N/A" : strListCombine(startup->telnet_interfaces, tmp, sizeof(tmp), ", "));
sprintf(opt[i++], "%-30s%u", "Telnet Port", startup->telnet_port); sprintf(opt[i++], "%-30s%u", "Telnet Port", startup->telnet_port);
...@@ -146,9 +185,9 @@ static void termsrvr_cfg(BOOL* enabled, bbs_startup_t* startup) ...@@ -146,9 +185,9 @@ static void termsrvr_cfg(BOOL* enabled, bbs_startup_t* startup)
sprintf(opt[i++], "%-30s%u", "40 Column PETSCII Port", startup->pet40_port); sprintf(opt[i++], "%-30s%u", "40 Column PETSCII Port", startup->pet40_port);
sprintf(opt[i++], "%-30s%u", "80 Column PETSCII Port", startup->pet80_port); sprintf(opt[i++], "%-30s%u", "80 Column PETSCII Port", startup->pet80_port);
sprintf(opt[i++], "%-30s%s", "Max Concurrent Connections", maximum(startup->max_concurrent_connections)); sprintf(opt[i++], "%-30s%s", "Max Concurrent Connections", maximum(startup->max_concurrent_connections));
sprintf(opt[i++], "%-30s%s", "Max Login Inactivity", duration(startup->max_login_inactivity)); sprintf(opt[i++], "%-30s%s", "Max Login Inactivity", vduration(startup->max_login_inactivity));
sprintf(opt[i++], "%-30s%s", "Max New User Inactivity", duration(startup->max_newuser_inactivity)); sprintf(opt[i++], "%-30s%s", "Max New User Inactivity", vduration(startup->max_newuser_inactivity));
sprintf(opt[i++], "%-30s%s", "Max User Inactivity", duration(startup->max_session_inactivity)); sprintf(opt[i++], "%-30s%s", "Max User Inactivity", vduration(startup->max_session_inactivity));
sprintf(opt[i++], "%-30s%u ms", "Output Buffer Drain Timeout", startup->outbuf_drain_timeout); sprintf(opt[i++], "%-30s%u ms", "Output Buffer Drain Timeout", startup->outbuf_drain_timeout);
sprintf(opt[i++], "%-30s%s", "Execute Timed Events", startup->options & BBS_OPT_NO_EVENTS ? "No" : "Yes"); sprintf(opt[i++], "%-30s%s", "Execute Timed Events", startup->options & BBS_OPT_NO_EVENTS ? "No" : "Yes");
sprintf(opt[i++], "%-30s%s", "Execute QWK-relatd Events", startup->options & BBS_OPT_NO_EVENTS ? "N/A" : startup->options & BBS_OPT_NO_QWK_EVENTS ? "No" : "Yes"); sprintf(opt[i++], "%-30s%s", "Execute QWK-relatd Events", startup->options & BBS_OPT_NO_EVENTS ? "N/A" : startup->options & BBS_OPT_NO_QWK_EVENTS ? "No" : "Yes");
...@@ -203,7 +242,7 @@ static void websrvr_cfg(BOOL* enabled, web_startup_t* startup) ...@@ -203,7 +242,7 @@ static void websrvr_cfg(BOOL* enabled, web_startup_t* startup)
sprintf(opt[i++], "%-30s%s", "Virtual Host Support", startup->options & WEB_OPT_VIRTUAL_HOSTS ? "Yes" : "No"); sprintf(opt[i++], "%-30s%s", "Virtual Host Support", startup->options & WEB_OPT_VIRTUAL_HOSTS ? "Yes" : "No");
sprintf(opt[i++], "%-30s%s", "Access Logging", startup->options & WEB_OPT_HTTP_LOGGING ? startup->logfile_base : strDisabled); sprintf(opt[i++], "%-30s%s", "Access Logging", startup->options & WEB_OPT_HTTP_LOGGING ? startup->logfile_base : strDisabled);
sprintf(opt[i++], "%-30s%s", "Max Clients", maximum(startup->max_clients)); sprintf(opt[i++], "%-30s%s", "Max Clients", maximum(startup->max_clients));
sprintf(opt[i++], "%-30s%s", "Max Inactivity", duration(startup->max_inactivity)); sprintf(opt[i++], "%-30s%s", "Max Inactivity", vduration(startup->max_inactivity));
sprintf(opt[i++], "%-30s%s", "Filebase Index Script", startup->file_index_script); sprintf(opt[i++], "%-30s%s", "Filebase Index Script", startup->file_index_script);
sprintf(opt[i++], "%-30s%s", "Filebase VPath Prefix", startup->file_vpath_prefix); sprintf(opt[i++], "%-30s%s", "Filebase VPath Prefix", startup->file_vpath_prefix);
sprintf(opt[i++], "%-30s%s", "Filebase VPath for VHosts", startup->file_vpath_for_vhosts ? "Yes" : "No"); sprintf(opt[i++], "%-30s%s", "Filebase VPath for VHosts", startup->file_vpath_for_vhosts ? "Yes" : "No");
...@@ -216,7 +255,7 @@ static void websrvr_cfg(BOOL* enabled, web_startup_t* startup) ...@@ -216,7 +255,7 @@ static void websrvr_cfg(BOOL* enabled, web_startup_t* startup)
sprintf(opt[i++], "%-30s%s", "CGI Directory", startup->cgi_dir); sprintf(opt[i++], "%-30s%s", "CGI Directory", startup->cgi_dir);
sprintf(opt[i++], "%-30s%s", "CGI File Extensions", strListCombine(startup->cgi_ext, tmp, sizeof(tmp), ", ")); sprintf(opt[i++], "%-30s%s", "CGI File Extensions", strListCombine(startup->cgi_ext, tmp, sizeof(tmp), ", "));
sprintf(opt[i++], "%-30s%s", "CGI Default Content-Type", startup->default_cgi_content); sprintf(opt[i++], "%-30s%s", "CGI Default Content-Type", startup->default_cgi_content);
sprintf(opt[i++], "%-30s%s", "CGI Max Inactivity", duration(startup->max_cgi_inactivity)); sprintf(opt[i++], "%-30s%s", "CGI Max Inactivity", vduration(startup->max_cgi_inactivity));
} }
if(!*enabled) if(!*enabled)
i = 1; i = 1;
...@@ -255,9 +294,9 @@ static void ftpsrvr_cfg(BOOL* enabled, ftp_startup_t* startup) ...@@ -255,9 +294,9 @@ static void ftpsrvr_cfg(BOOL* enabled, ftp_startup_t* startup)
sprintf(opt[i++], "%-30s%u - %u", "Passive Port Range", startup->pasv_port_low, startup->pasv_port_high); sprintf(opt[i++], "%-30s%u - %u", "Passive Port Range", startup->pasv_port_low, startup->pasv_port_high);
sprintf(opt[i++], "%-30s%s", "Auto-generate Index File", startup->options & FTP_OPT_INDEX_FILE ? startup->index_file_name : strDisabled); sprintf(opt[i++], "%-30s%s", "Auto-generate Index File", startup->options & FTP_OPT_INDEX_FILE ? startup->index_file_name : strDisabled);
sprintf(opt[i++], "%-30s%s", "QWK Message Packet Transfers", startup->options & FTP_OPT_ALLOW_QWK ? "Yes" : "No"); sprintf(opt[i++], "%-30s%s", "QWK Message Packet Transfers", startup->options & FTP_OPT_ALLOW_QWK ? "Yes" : "No");
sprintf(opt[i++], "%-30s%s", "QWK Message Packet Timeout", startup->options & FTP_OPT_ALLOW_QWK ? duration(startup->qwk_timeout) : "N/A"); sprintf(opt[i++], "%-30s%s", "QWK Message Packet Timeout", startup->options & FTP_OPT_ALLOW_QWK ? vduration(startup->qwk_timeout) : "N/A");
sprintf(opt[i++], "%-30s%s", "Max Clients", maximum(startup->max_clients)); sprintf(opt[i++], "%-30s%s", "Max Clients", maximum(startup->max_clients));
sprintf(opt[i++], "%-30s%s", "Max Inactivity", duration(startup->max_inactivity)); sprintf(opt[i++], "%-30s%s", "Max Inactivity", vduration(startup->max_inactivity));
sprintf(opt[i++], "%-30s%s", "Max Concurrent Connections", maximum(startup->max_concurrent_connections)); sprintf(opt[i++], "%-30s%s", "Max Concurrent Connections", maximum(startup->max_concurrent_connections));
sprintf(opt[i++], "%-30s%s", "Sysop Filesystem Access", startup->options & FTP_OPT_NO_LOCAL_FSYS ? "Yes" : "No"); sprintf(opt[i++], "%-30s%s", "Sysop Filesystem Access", startup->options & FTP_OPT_NO_LOCAL_FSYS ? "Yes" : "No");
sprintf(opt[i++], "%-30s%s", "Allow Bounce Transfers", startup->options & FTP_OPT_ALLOW_BOUNCE ? "Yes" : "No"); sprintf(opt[i++], "%-30s%s", "Allow Bounce Transfers", startup->options & FTP_OPT_ALLOW_BOUNCE ? "Yes" : "No");
...@@ -305,7 +344,7 @@ static void mailsrvr_cfg(BOOL* enabled, mail_startup_t* startup) ...@@ -305,7 +344,7 @@ static void mailsrvr_cfg(BOOL* enabled, mail_startup_t* startup)
sprintf(opt[i++], "%-30s%s", "POP3/TLS Support", startup->options & MAIL_OPT_TLS_POP3 ? "Yes" : "No"); sprintf(opt[i++], "%-30s%s", "POP3/TLS Support", startup->options & MAIL_OPT_TLS_POP3 ? "Yes" : "No");
sprintf(opt[i++], "%-30s%u", "POP3/TLS Port", startup->pop3s_port); sprintf(opt[i++], "%-30s%u", "POP3/TLS Port", startup->pop3s_port);
sprintf(opt[i++], "%-30s%s", "Max Clients", maximum(startup->max_clients)); sprintf(opt[i++], "%-30s%s", "Max Clients", maximum(startup->max_clients));
sprintf(opt[i++], "%-30s%s", "Max Inactivity", duration(startup->max_inactivity)); sprintf(opt[i++], "%-30s%s", "Max Inactivity", vduration(startup->max_inactivity));
sprintf(opt[i++], "%-30s%s", "Max Concurrent Connections", maximum(startup->max_concurrent_connections)); sprintf(opt[i++], "%-30s%s", "Max Concurrent Connections", maximum(startup->max_concurrent_connections));
sprintf(opt[i++], "%-30s%s", "Max Recipients Per Message", maximum(startup->max_recipients)); sprintf(opt[i++], "%-30s%s", "Max Recipients Per Message", maximum(startup->max_recipients));
sprintf(opt[i++], "%-30s%s", "Max Messages Waiting", maximum(startup->max_msgs_waiting)); sprintf(opt[i++], "%-30s%s", "Max Messages Waiting", maximum(startup->max_msgs_waiting));
...@@ -345,8 +384,8 @@ static void mailsrvr_cfg(BOOL* enabled, mail_startup_t* startup) ...@@ -345,8 +384,8 @@ static void mailsrvr_cfg(BOOL* enabled, mail_startup_t* startup)
p = "None"; p = "None";
sprintf(opt[i++], "%-30s%s", "SendMail Relay Auth", applicable ? p : "N/A"); sprintf(opt[i++], "%-30s%s", "SendMail Relay Auth", applicable ? p : "N/A");
sprintf(opt[i++], "%-30s%u", "SendMail Max Attempts", startup->max_delivery_attempts); sprintf(opt[i++], "%-30s%u", "SendMail Max Attempts", startup->max_delivery_attempts);
sprintf(opt[i++], "%-30s%s", "SendMail Rescan Interval", duration(startup->rescan_frequency)); sprintf(opt[i++], "%-30s%s", "SendMail Rescan Interval", vduration(startup->rescan_frequency));
sprintf(opt[i++], "%-30s%s", "SendMail Connect Timeout", duration(startup->connect_timeout)); sprintf(opt[i++], "%-30s%s", "SendMail Connect Timeout", vduration(startup->connect_timeout));
} }
if(!*enabled) if(!*enabled)
i = 1; i = 1;
...@@ -411,7 +450,7 @@ void server_cfg(void) ...@@ -411,7 +450,7 @@ void server_cfg(void)
services_startup_t services_startup = {0}; services_startup_t services_startup = {0};
sbbs_get_ini_fname(cfg.filename, cfg.ctrl_dir); sbbs_get_ini_fname(cfg.filename, cfg.ctrl_dir);
FILE* fp = fopen(cfg.filename, "r"); FILE* fp = iniOpenFile(cfg.filename, /* for_modify? */false);
if(fp == NULL) { if(fp == NULL) {
uifc.msgf("Error opening %s", cfg.filename); uifc.msgf("Error opening %s", cfg.filename);
return; return;
...@@ -431,7 +470,7 @@ void server_cfg(void) ...@@ -431,7 +470,7 @@ void server_cfg(void)
,&run_services ,&run_services
,&services_startup ,&services_startup
); );
fclose(fp); iniCloseFile(fp);
while(1) { while(1) {
int i = 0; int i = 0;
...@@ -474,6 +513,39 @@ void server_cfg(void) ...@@ -474,6 +513,39 @@ void server_cfg(void)
services_cfg(&run_services, &services_startup); services_cfg(&run_services, &services_startup);
break; break;
default: default:
i = save_changes(WIN_MID);
if(i < 0)
continue;
if(i == 0) {
fp = iniOpenFile(cfg.filename, /* for_modify? */true);
if(fp == NULL)
uifc.msgf("Error opening %s", cfg.filename);
else {
if(!sbbs_write_ini(
fp
,&cfg
,&global_startup
,run_bbs
,&bbs_startup
,run_ftp
,&ftp_startup
,run_web
,&web_startup
,run_mail
,&mail_startup
,run_services
,&services_startup
))
uifc.msgf("Error writing %s", cfg.filename);
iniCloseFile(fp);
}
}
sbbs_free_ini(&global_startup
,&bbs_startup
,&ftp_startup
,&web_startup
,&mail_startup
,&services_startup);
return; return;
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment