Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commits (3)
  • Rob Swindell's avatar
    Detect TLS startup errors correct/fully · 6fee1956
    Rob Swindell authored
    We can't (apparently) only rely on the return value of start_tls(), we have to check the value of the crypt session too.
    This fix the possibility of this happening:
    Jun  7 18:07:26 sbbs synchronet: ftp  0058 TLS ERROR 'No permiss.to perform this operation' (-21) opening keyset
    Jun  7 18:07:26 sbbs synchronet: ftp  0058 <192.168.1.25> initialized TLS successfully
    
    Instead, we'll detect the failure and disable FTPS support, logging "failed to initialize TLS successfully".
    6fee1956
  • Rob Swindell's avatar
    Increase the progress() reporting frequency for filename/desc searches · cb4067ec
    Rob Swindell authored
    This resolve long delays (while searching for files) without any indication of progress.
    
    Keep new-scan progress interval at 10 dirs however (they're fast).
    cb4067ec
  • Rob Swindell's avatar
    Condition newline before progress display · 52fa8335
    Rob Swindell authored
    Sometimes the progress meter (e.g. during file text searches) appears at a column offset > 0 and doesn't look good. Fix that.
    52fa8335
......@@ -1403,6 +1403,7 @@ void sbbs_t::progress(const char* text, int count, int total, int interval)
if(text == NULL) text = "";
float pct = total ? ((float)count/total)*100.0F : 100.0F;
SAFEPRINTF2(str, "[ %-8s %4.1f%% ]", text, pct);
cond_newline();
cursor_left(backfill(str, pct, cfg.color[clr_progress_full], cfg.color[clr_progress_empty]));
}
......
......@@ -2581,7 +2581,7 @@ static void ctrl_thread(void* arg)
sockprintf(sock,sess,"534 Already in TLS mode");
continue;
}
if (start_tls(&sock, &sess, TRUE)) {
if (start_tls(&sock, &sess, TRUE) || sess == -1) {
lprintf(LOG_WARNING, "%04d <%s> failed to initialize TLS successfully", sock, host_ip);
break;
}
......
......@@ -72,7 +72,7 @@ void sbbs_t::scandirs(long mode)
if(ch=='L') {
k=0;
for(i=0;i<usrdirs[curlib] && !msgabort();i++) {
progress(text[Scanning], i, usrdirs[curlib], 10);
progress(text[Scanning], i, usrdirs[curlib], (mode & FL_ULTIME) ? 10 : 1);
if(mode&FL_ULTIME /* New-scan */
&& (cfg.lib[usrlib[curlib]]->offline_dir==usrdir[curlib][i]
|| cfg.dir[usrdir[curlib][i]]->misc&DIR_NOSCAN))
......@@ -129,7 +129,7 @@ void sbbs_t::scanalldirs(long mode)
total_dirs += usrdirs[i];
for(i=d=0;i<usrlibs;i++) {
for(j=0;j<usrdirs[i] && !msgabort();j++,d++) {
progress(text[Scanning], d, total_dirs, 10);
progress(text[Scanning], d, total_dirs, (mode & FL_ULTIME) ? 10 : 1);
if(mode&FL_ULTIME /* New-scan */
&& (cfg.lib[usrlib[i]]->offline_dir==usrdir[i][j]
|| cfg.dir[usrdir[i][j]]->misc&DIR_NOSCAN))
......