PR patch auto nr, nc flag#45
Open
skbn wants to merge 20 commits into
Open
Conversation
added 20 commits
April 26, 2026 16:53
…======
MULTI-PLATFORM CHANGES (all OS)
===========================================================================
--- Bug fixes ---
binkd.c:
- Fixed null pointer dereference: added null check after strdup() on SSH_CONNECTION
- Fixed potential use-after-free: mypid declaration moved to shared scope (HAVE_FORK || AMIGA)
- Added config file validation: reject filenames that look like FTN addresses
readcfg.c:
- Fixed null pointer dereference: added null check after calloc() in print_node_info_1()
- Fixed use-after-free: checkcfg() error path restructured (unlock before log)
- Fixed config reload storm: mtime stability check + 5s minimum between reloads (prevents partial-file parse and bind() failures)
inbound.c:
- Fixed double PATH_SEPARATOR: strnzcat(PATH_SEPARATOR) now checks if path already ends with separator (5 locations)
server.c:
- Fixed use-after-free: config->rescan_delay saved to local variable before main loop, re-read from new config after checkcfg() reload
- Fixed ENOTSOCK/EOPNOTSUPP recovery: extended OS/2-only ENOTSOCK handler to also cover EOPNOTSUPP
ftnq.c:
- Fixed try file deletion: only delete if file exists (prevents error on missing .try files)
--- New features ---
NC_flag (no-compression per node):
btypes.h - Added NC_flag field to FTN_NODE struct
ftnnode.h - Added NC_ON/NC_OFF/NC_USE_OLD defines, NC_flag parameter to add_node()
ftnnode.c - NC_flag propagation in add_node(), add_node_nolock(), copy_node()
readcfg.c - NC_flag parsing in node configuration keyword
protocol.c - Skip zlib/bzip2 compression when NC_flag is set on the node
no-call-delay config keyword:
readcfg.h - Added no_call_delay field to BINKD_CONFIG
readcfg.c - Added "no-call-delay" config keyword (read_bool)
client.c - Skip SLEEP(call_delay) when no_call_delay is set
ftnnode.c:
- NC_flag propagation in add_node(), add_node_nolock(), copy_node()
ftnnode.h:
- Added NC_ON/NC_OFF/NC_USE_OLD defines, NC_flag parameter to add_node()
--- New files ---
bsycleanup.c:
- BSY/CSY/TRY file cleanup at startup, scans domain outbounds
bsycleanup.h:
- API: cleanup_old_bsy()
--- Multi-platform refactoring ---
protocol.c:
- Changed static functions to extern: init_protocol(), deinit_protocol(), process_rcvdlist(), send_block(), recv_block(), banner(), start_file_transfer(), log_end_of_session(), ND_set_status()
binlog.c:
- Added extern blsem declaration under (HAVE_THREADS || AMIGA)
client.c:
- Changed call0() from static to extern (required for Amiga evloop direct calls)
server.c:
- Added extern eothread declaration under (HAVE_THREADS || AMIGA)
--- Misc tools (new) ---
misc/decompress.c:
- Decompress FTN day bundles (.SU/.MO/.TU/.WE/.TH/.FR/.SA)
- Uses MAXPATHLEN from portable.h instead of local #define
misc/freq.c:
- Create .req/.clo files (ASO flat layout, BSO BinkleyStyle layout)
- Uses MAXPATHLEN from portable.h
- Removed local str_tolower() implementation (now in portable.c)
misc/nodelist.c:
- Compile FidoNet nodelist to binkd.conf node lines (extracts IBN/INA flags)
- Uses MAX_LINE from portable.h
- Uses MAXPATHLEN from portable.h
- Removed local str_trim() implementation
misc/process_tic.c:
- Process .tic files to filebox (supports config file and legacy args)
- Uses MAXPATHLEN from portable.h
- Uses MAX_LINE from portable.h
- Removed local implementations: trim_nl, skip_ws, ensure_dir, copy_file, move_file, get_file_size
misc/srifreq.c:
- Reimplementation in C of pgul's misc/srifreq shell script (password protection, aliases, wildcards, rate limiting)
- Uses MAXPATHLEN from portable.h
- Uses MAX_LINE from portable.h
- Converted MAX_ALIASES to dynamic array (realloc)
- Removed local implementations: wildmatch, is_wildcard, get_file_mtime, str_trim, str_upper
- Added example aliases file format in header comment
- Fixed: sizeof(logbuf) on pointer parameter gave wrong size (4/8 bytes instead of buffer size)
- Fixed: memory leak -- g_aliases array was never freed
- Fixed: memory leak -- g_conf.tracking linked list was never freed
- Fixed: sscanf format widths did not match buffer sizes in load_config(), parse_srif(), load_aliases()
- Fixed: tracking_load() did not reject future/corrupt timestamps
- Fixed: request line parser offset was wrong when line had leading whitespace
- Fixed: get_file_size() returning -1 was added to tracking bytes as negative
- Fixed: parse_srif() TIME keyword without value changed time_limit from -1 to 0
misc/portable.c:
- Shared implementations: string utilities, file operations, path utilities
misc/portable.h:
- Portable declarations and platform-specific includes (POSIX, Win32, OS/2, DOS, AmigaOS)
- Fixed: duplicate declaration of safe_strncpy removed
misc/decompress.txt:
- Usage documentation for decompress utility
misc/freq.txt:
- Usage documentation for freq utility
misc/nodelist.txt:
- Usage documentation for nodelist utility
misc/process_tic.txt:
- Usage documentation and config file example for process_tic
misc/srifreq.txt:
- Usage documentation, config file and aliases file examples for srifreq
--- Makefile updates (all platforms) ---
All Makefiles updated to:
- Include bsycleanup.c in main binary
- Add portable.c to misc tool compilations
- Add -I misc to TOOL_CFLAGS for portable.h includes
mkfls/unix/Makefile.in:
- Added bsycleanup.c to SRCS
- Added portable.c to misc tool builds
- Added -I misc to TOOL_CFLAGS
mkfls/nt95-mingw/Makefile:
- Added bsycleanup.c to SRCS
- Added portable.c to misc tool builds
- Added -I misc to TOOL_CFLAGS
mkfls/nt95-msvc/Makefile:
- Added portable.c to misc tool builds
- Added -I misc to TOOL_CFLAGS
mkfls/os2-emx/Makefile:
- Added bsycleanup.c to SRCS
- Added portable.c to misc tool builds
- Added -I misc to TOOL_CFLAGS
mkfls/amiga/Makefile.bebbo:
- New: Complete rewrite for bebbo gcc cross-compiler (no ixemul fork, libnix, Roadshow TCP/IP)
- Added bsycleanup.c, portable.c, all amiga/ sources
- Added misc tool compilation rules + -I misc
- Added AMIGADOS_4D_OUTBOUND define
mkfls/amiga/Makefile.analyze.bebbo:
- New: Static analysis Makefile for bebbo gcc
mkfls/unix/Makefile.analyze.unix:
- New: Static analysis Makefile for Unix/GCC
--- Documentation ---
README.md:
- Added AmigaOS compilation instructions (ADE, ixemul/ixnet library versions)
- Added usage documentation for all misc tools (decompress, freq, process_tic, srifreq, nodelist)
- Added note about config reload instability
===========================================================================
AMIGA-SPECIFIC CHANGES (#ifdef AMIGA / AMIGADOS_4D_OUTBOUND)
===========================================================================
--- New Amiga-specific files (.c) ---
amiga/evloop.c:
- Non-blocking event loop with WaitSelect(), replaces servmgr()/clientmgr()
amiga/session.c:
- Session allocation, accept(), non-blocking connect(), outbound scan
amiga/sock.c:
- Listen socket management (open_listen_sockets, close_listen_sockets)
amiga/utime.c:
- utime() stub for AmigaDOS (converts Unix epoch to AmigaDOS epoch)
amiga/rfc2553_amiga.c:
- getaddrinfo/getnameinfo fallback for Roadshow TCP/IP
amiga/bsdsock.c:
- BSD socket layer for Roadshow TCP/IP (SocketBase initialization)
amiga/dirent.c:
- POSIX dirent emulation for AmigaDOS
amiga/proto_amiga.c:
- Non-blocking BinkP protocol (amiga_proto_open, amiga_proto_step, amiga_proto_close)
--- New Amiga-specific files (.h) ---
amiga/evloop.h:
- Event loop API (amiga_evloop_run)
amiga/evloop_int.h:
- Internal session types (sess_t, sess_phase_t, session table)
amiga/bsdsock.h:
- BSD socket API (SocketBase, TCPERR macros)
amiga/compat_netinet_in.h:
- Compatibility header for netinet/in.h
amiga/dirent.h:
- POSIX dirent API (DIR, dirent, opendir, readdir)
amiga/proto_amiga.h:
- Non-blocking protocol API (APROTO_RUNNING, APROTO_DONE_OK, APROTO_DONE_ERR)
--- Modified Amiga-specific files (existed in pgul, rewritten/extended) ---
amiga/rename.c:
- Complete rewrite: added duplicate name handling with .001/.002 suffixes, directory scanning for next free name, path splitting, buffer overflow protection
amiga/sem.c:
- Complete rewrite: replaced ixemul inline/strsup.h with direct Exec calls, added EVENTSEM implementation (AllocSignal/FreeSignal/Signal/Wait), added _InitEventSem/_PostSem/_WaitSem/_CleanEventSem
--- Modified .c files (Amiga-specific changes, all under #ifdef AMIGA) ---
binkd.c:
- Added #include "bsycleanup.h" (unconditional)
- Added cleanup_old_bsy() call at startup (unconditional)
- Added #if defined(HAVE_THREADS) || defined(AMIGA) semaphore declarations (hostsem, resolvsem, lsem, blsem, varsem, config_sem, eothread, wakecmgr)
- Added #ifdef AMIGA block calling amiga_evloop_run() instead of servmgr()/clientmgr()
- Added #elif defined(AMIGA) for NIL: null device (instead of /dev/null or nul)
- Added #ifndef AMIGA guards around fork-only code paths (-i inetd, -a remote addr options)
readcfg.c:
- Added #ifdef AMIGA extern for config_sem (SignalSemaphore)
- Added #ifdef AMIGA tcp_nodelay default initialization
- Added #ifdef AMIGA config keywords: tcp-nodelay, so-sndbuf, so-rcvbuf
protocol.c:
- Added #ifdef AMIGA include for amiga/proto_amiga.h
- Added #if defined(HAVE_THREADS) || defined(AMIGA) for extern lsem
- Added #ifdef AMIGA setsockopts_amiga() calls for tcp-nodelay/so-sndbuf/so-rcvbuf
run.c:
- Added #ifdef AMIGA includes (dos/dos.h, dos/dostags.h, proto/dos.h)
- Added #elif defined(AMIGA) SHELL/SHELL_META defines ("c:execute")
- Added #ifdef AMIGA run() implementation via SystemTagList() with NIL: I/O (synchronous execution, error output to temp file, command existence check)
- Added #ifdef AMIGA in run3(): pipe/tunnel not supported, returns -1 with log message
- Added #ifdef AMIGA in execl(): no SHELLOPT parameter (AmigaDOS shell syntax)
tools.c:
- Added #ifdef AMIGA include for amiga/bsdsock.h
- Added #if defined(HAVE_THREADS) || defined(AMIGA) for extern lsem
- Added #ifdef AMIGA console logging rewrite in vLog(): need_newline tracking, \r carriage return for status line overwriting
branch.c:
- Removed ix_vfork() implementation under #ifdef AMIGA (code was in pgul but not needed for Amiga evloop)
breaksig.c:
- Added #ifdef AMIGA signal handlers: SIGINT/SIGTERM via signal() (replaces SIGBREAK/SIGHUP used on other platforms)
exitproc.c:
- Added #if defined(HAVE_THREADS) || defined(AMIGA) extern semaphore declarations (hostsem, resolvsem, lsem, blsem, varsem, config_sem, eothread, wakecmgr)
- Added #ifdef AMIGA cleanup block in exitfunc(): close_srvmgr_socket(), CleanEventSem/CleanSem for all semaphores, sock_deinit(), nodes_deinit(), bsy_remove_all(), pid_file removal
https.c:
- Added #ifdef AMIGA: inet_ntoa() uses .sin_addr.s_addr (Roadshow struct in_addr is u_long, not struct)
iptools.c:
- Added #ifdef AMIGA include for netinet/tcp.h
- Added #ifdef AMIGA ioctl() size parameter (Amiga ioctl doesn't take size parameter)
server.c:
- Added #ifdef AMIGA include for amiga/bsdsock.h
- Added #ifdef AMIGA: force PF_INET (no IPv6 on AmigaOS 3)
- Added #ifdef AMIGA: bind() retry loop (6 retries, 2s delay) for socket release timing
- Added #ifdef AMIGA: select() ENOTSOCK/EBADF recovery (restart listen sockets)
- Added #ifndef AMIGA guard around HAVE_FORK child process handling
client.c:
- Added #ifdef AMIGA include for amiga/bsdsock.h
--- Modified .h files (Amiga-specific changes, all under #ifdef AMIGA) ---
Config.h:
- Added AMIGA to platform check: #if defined(HAVE_FORK)+defined(HAVE_THREADS)+defined(DOS)+defined(AMIGA)==0
btypes.h:
- Added #ifdef AMIGA uintmax_t typedef for long long unsigned on m68k
client.h:
- Added #ifdef AMIGA includes (netinet/in.h, netinet/tcp.h, sys/socket.h)
- Added #ifdef AMIGA call0() declaration for direct evloop outbound calls
iphdr.h:
- Added #ifdef AMIGA: include amiga/bsdsock.h, define sock_init()/sock_deinit()/soclose() macros
iptools.h:
- Added #ifdef AMIGA includes (sys/socket.h, netinet/in.h, netdb.h)
- Added #ifdef AMIGA setsockopts_amiga() declaration
readcfg.h:
- Added #ifdef AMIGA fields: tcp_nodelay, so_sndbuf, so_rcvbuf
readdir.h:
- Added #elif defined(AMIGA) include for amiga/dirent.h
rfc2553.h:
- Added #ifdef AMIGA: EAI_* constant redefinitions (prevent libnix conflicts)
- Added #ifdef AMIGA: include chain (sys/types, sys/socket, netinet/in, arpa/inet, netdb.h)
- Added #ifdef AMIGA: undef/redefine getaddrinfo/freeaddrinfo/gai_strerror macros
- Added #ifndef EAI_ADDRFAMILY portability define (maps to EAI_FAMILY)
sem.h:
- Added #ifdef AMIGA EVENTSEM typedef (struct with Task* waiter + sigbit)
- Added #ifdef AMIGA typed prototypes for _InitEventSem, _PostSem, _WaitSem, _CleanEventSem
server.h:
- Added #ifdef AMIGA include for netinet/in.h
sys.h:
- Added #ifdef AMIGA include for proto/exec.h
- Added #ifdef AMIGA: undef getpid/sleep, redefine as FindTask(NULL)/Delay()
- Added #ifdef AMIGA PRIuMAX define as "llu" (uintmax_t is long long unsigned on m68k)
- Added #ifdef HAVE_FORK includes for signal.h and sys/wait.h
protocol.c - log_end_of_session() now includes session duration in seconds
Auto NR-mode on incomplete files:
inbound.c - Added inb_has_partials(): scans inbound for .hr files matching remote AKAs
inbound.h - Added inb_has_partials() declaration
protocol.c - Call inb_has_partials() in banner() (outgoing) and PWD() (incoming) to
automatically set WANT_NR when partial files exist for the remote link
update changes.txt
… sending M_EOB while a remote file is still being received (avoids "M_EOB but N files pending M_GOT" error on the remote side) Fixed startup delay: last_rescan=0 after pre-loop try_outbound forces immediate retry in first loop iteration (avoids waiting rescan-delay seconds if DNS failed at startup)
- Added --zone-ext option: use zone extension (outbound.002/) with --bso - Default BSO format: outbound/ (no zone extension, binkd standard) misc/portable.c - Added parse_config_line(): robust config line parser (BOM, tabs, comments inline, whitespace) - Added config_get(): lookup single key in config file - Added config_load(): load entire config into memory cache - Added config_lookup(): lookup key in cached config (no file I/O) - Added config_cache_free(): free cached config memory (renamed from config_free to avoid conflict with srifreq.c) - Added parse_size(): parse size with suffixes (k/K/m/M/g/G) or plain bytes - Added parse_time(): parse time with suffixes (s/m/h/d) or plain seconds misc/portable.h: - Portable declarations and platform-specific includes (POSIX, Win32, OS/2, DOS, AmigaOS) misc/process_tic.c: - Updated parse_config() to use portable.c parse_config_line() misc/srifreq.c: - Updated load_config() to use portable.c config_load(), config_lookup(), config_cache_free() - Renamed local config_free() to srifreq_config_cleanup() to avoid conflict with portable.c - Error messages now go to log file (config logfile) instead of stderr
inbound.c: - Fixed resource leak: close(fd) when fdopen() fails misc/decompress.c: - Replaced local is_safe_filename() with portable.c version - Fixed: validate basename only, not full path - Fixed: basename extraction now supports Windows backslash separator (\) - Fixed: accept return code 1 (warnings) as success for all decompressors - Added validation: inbound must be a directory - Added validation: outdir must be a directory misc/freq.c: - Added validation: outbound must be a directory - Added validation: filenames must be safe misc/nodelist.c: - Added --pointlist option: process pointlist format (Boss/Point styles per FTS-5002) - Supports Boss format: Boss,Z:N/N followed by point entries - Supports Point format: Point,N,... (FTS-5002 2.2) - In pointlist mode, leading comma entries are treated as points (Boss format 2.1) misc/process_tic.c: - Added validation: inbound must be a directory - Added validation: logfile, filelist, newfiles, ticlog must be regular files - Added validation: .tic files must be regular files misc/srifreq.c: - Added validation: pubdir must be a directory - Added validation: logfile, aliases, trackfile must be regular files - Added validation: private paths must be directories misc/portable.c: - Added is_safe_filename(): validate filename for shell command injection protection (whitelist approach) misc/portable.h: - Added is_safe_filename() declaration validate filename doc/decompress.txt: - Usage documentation for decompress utility doc/freq_new.txt: - Usage documentation for freq utility doc/nodelist.txt: - Usage documentation for nodelist utility doc/process_tic.txt: - Usage documentation and config file example for process_tic doc/srifreq_new.txt: - Usage documentation, config file and aliases file examples for srifreq
amiga/evloop.c: - Fixed crash on exit: check state.ibuf != NULL before calling amiga_proto_close() (prevents crash when binkd_exit activates during session with freed STATE) - Fixed Delay(1) bottleneck: only delay when no activity (sockfd_used == 0 && n_clients == 0) amiga/proto_amiga.c: - Fixed memory leak: added deinit_protocol(state, config, 1) when banner() fails - Fixed memory leak: added deinit_protocol(state, config, 1) when server limit reached misc/process_tic.c: - Fixed validation: newfiles is_directory instead of is_regular_file mkfls/amiga/Makefile.analyze.bebbo: - Added misc/portable.c to ALL_SRCS for analysis mkfls/unix/Makefile.analyze.unix: - Added misc/portable.c and misc tools to UNIX_SRCS - Added -Imisc to INCLUDES - Added UNIX_DEFINES with proper Unix-specific defines - Updated cppcheck, clang-tidy and quick to use UNIX_DEFINES mkfls/unix/Makefile.in: - Added binkd to clean target Note: mkfls/nt95-mingw, nt95-msvc, os2-emx Makefiles restored to pgul versions (compiler tools not yet updated in my VMs for proper testing)
Cleaning up remnants of createnewprocess in net code. amiga/bsdsock.c: - Simplified: removed FindTask()/tc_UserData per-task storage (no longer needed without threads) - Removed _amiga_get_socket_base() function, using SocketBase global directly - amiga_sock_init()/amiga_sock_cleanup() now use SocketBase global directly - Removed amiga_child_sock_init() (no child processes without fork) amiga/bsdsock.h: - Removed _amiga_get_socket_base() declaration - Removed #define SocketBase _amiga_get_socket_base() macro - Using extern struct Library *SocketBase directly amiga/proto_amiga.c: - Fixed session status: detect successful session when peer closes connection after file transfer complete (files_rcvd > 0, sent_fls == 0, no pending files) - returns APROTO_DONE_OK instead of APROTO_DONE_ERR
- Merge write_log()+write_ticlog() into write_ticentry() (identical bodies) - Merge parse_file/area/origin/from_field() into parse_keyword_field(keyword,...) - Remove local my_toupper()/my_strnicmp(); use toupper() from <ctype.h> - Rewrite is_tic_file() using inline toupper() char comparison - Fixed: logfile/filelist/ticlog now accept if not exist yet (created on first write) - Fixed: return without moving file if copy_file fails (prevents loss of public copy) srifreq.c: - Extract passwd_match() helper; replace 3 duplicated password compare blocks - Fixed: trim leading whitespace from alias path after sscanf freq.c: - Fixed: remove .req if validation fails after writing some files (avoid orphaned entries) - Fixed negative time values: reject parsed < 0 (prevents -7d being treated as future time) - Fixed invalid suffix: reject parsed == 0 when suffix present. Prevents 7x being treated as 'now' (parse_time returns 0 for invalid suffix) decompress.c: - Fixed: delete bundle even if decompressor fails (prevents infinite retry loop) - Fixed outdir creation: now creates outdir if it doesn't exist using ensure_dir() nodelist.c: - Fixed: skip Point entries if boss/net context invalid (avoids 0:0/0.x AKAs) - Fixed invalid AKAs in regular nodelist: skip Node entries if zone context is invalid Prevents 0:net/node AKAs when Host appears without Zone
- Added Makefile.crossmingw32 for cross-compilation (x86_64-w64-mingw32-gcc) - Fixed sem.h: added WIN32/OS2 function declarations (_InitEventSem, etc.) - Fixed run.c: moved w32tools.h include after sys.h for correct type order - Fixed misc/portable.c: use mkdir(p) for Windows - Fixed misc/decompress.c: added #include <windows.h> for DeleteFileA - Updated mkfls/nt95-mingw/Makefile: OUTDIR=bin, misc tools
- Separated eothread to HAVE_THREADS only (no AMIGA) - Migrated server.c to amiga/sock.c, amiga/session.c, amiga/evloop.c - Fixed C89 compliance in misc/tools (variable declarations) - Updated Makefile.bebbo for Amiga ixemul-free build
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I've managed to find the time despite my exams, and I've separated the "amiga" section from the "auto nr, nc flag" and "no-call-delay" sections. I've also attached the patch file, in case it's helpful.
The nr was partially completed; I just needed to scan the inbound directory for the hr and dt files, so I took advantage of one of the functions already built for that.