From 132a6641f4e661bbeed15c63b8db582aac4f1823 Mon Sep 17 00:00:00 2001 From: Alexey Khromov Date: Sun, 12 May 2024 18:47:07 +0300 Subject: [PATCH] Flags renamed to incnet_flag and incarc_flag, fixed typos, READMEs and CHANGES files --- CHANGES | 176 ++++++++++++++++++++++++++++++++++++++ CHANGES.fidoman | 30 ------- CHANGES.kst | 67 --------------- CHANGES.ugenk | 54 ------------ FAQ | 7 +- README.kst | 14 --- README.md | 17 ++-- README.ugenk | 14 --- examples/bforce.conf | 11 ++- source/.version | 2 +- source/bforce/conf_proc.c | 4 +- source/bforce/sess_main.c | 33 +++++++ source/include/confread.h | 4 +- 13 files changed, 239 insertions(+), 194 deletions(-) delete mode 100644 CHANGES.fidoman delete mode 100644 CHANGES.kst delete mode 100644 CHANGES.ugenk delete mode 100644 README.kst delete mode 100644 README.ugenk diff --git a/CHANGES b/CHANGES index bcb4f0b..86b05b2 100644 --- a/CHANGES +++ b/CHANGES @@ -58,3 +58,179 @@ then sending/receiving. Recode tables are compartible with HPT. New config keywords: "Recode_file_in", "Recode_file_out", "Recode_intro_in" +Konstantin Stepanenkov, 2:5030/1251 +0.22.7.kst1 +=========== + + * Attempt to fix warnings, when compiling with -Wall. + + make update -- install only binaries. + * Better EMSI handling, when calling to cisco. + + Correct ZMH support in daemon. + * Some fixes in contributed perl scripts. + +0.22.7.kst2 +=========== + + + Added option --with-uucp-lockdir=... to configure. + * Using strncpy(3) instead of strcpy(3) if possible. + + Added patches by Maxi Rovnich @ 2:5030/872: + + Support for maximum 'no dialtone' count. + + Support for download resyncing, while checking for free space. + + Ignore all files, but *.pnt, *.req, *.?lo and *.?ut in BSO. + +0.22.7.kst3 +=========== + + * Compilation failed with --disable-hangup-watch-cd. Fixed. + + Ability to write daemon pid in file. + * -f option had reverse meaning. Thanks to Eugene Korovin @ 2:5080/196.72 + + -q option terminates daemon process (only if pidfile is used). + +0.22.7.kst4 +=========== + + * Hydra was broken in kst2. Fixed. + + Bidirectional session drops only if rxcps and txcps are less than + mincps at the same time. + +0.22.7.kst5 +=========== + + + port tcpip patch by Serge N. Pokhodyaev @ 2:5020/1838 + * lock fix, when outbound on not lockable filesystem. + Patch by Andrew Dolgov @ 2:5030/394.41 + +0.22.7.kst6 +=========== + + * traffic wasn't shown if no files in boxes. + Patch by Alexander Shiyan @ 2:5030/39.2 + * bfstat now correctly shows age of files. + Patch by Alexander Shiyan @ 2:5030/39.2 + * logging 'undefined cmd' fixed. + Thanks to Pavel I.Osipov @ 2:5020/770.50 + +0.22.8.kst7 +=========== + + Some changes taken from 0.22.8 by Alexander Belkin: + * some bugfixes + + new environment variable $RC (session return code) + + sending of EMSI_ACK every time after recving of EMSI_DAT + + support for nodelist IBN flag + +0.22.8.kst8 +=========== + + * fixed bug with flags CM in override + * fixed bug with sending HUP to daemon + +Andrey Slusar +Evgeniy Kozhuhovskiy +Sergey Babitch + + 0.22.8.ugenk1 +============= + + initial release, based on bforce 0.22.8.kst8 + * fixed problem with worktime detecting + + makefiles fixed (removed make update, now make install installs config files with extension .sample) + + added --with-user and --with-group options to ``configure'' script. + + installation directories by default are compliance with default fidogate installation + +0.22.8.ugenk2 +============= + * pathes by Andrey Slusar @ 2:467/126 + (total 12: patch-bforce.c, patch-bfstat.c, patch-daemon.c, patch-expression.y, + patch-nlookup.c, patch-prot_binkp.c, patch-prot_emsi.c, patch-prot_yoohoo.c, patch-prot_zmrecv.c, + patch-prot_zmsend.c, patch-sess_call.c, patch-sess_stat.c) + + added syslog support (see SYSLOG) + + fixed nlookup (broken in ugenk1) + + spec file now goes with bforce + +0.22.8.ugenk3 +============= + + fixed working with syslog (not tested yet, any volonteers?) + * some bugfixes + +0.22.8.ugenk4 +============= + + fixed problems with license (thnx to Jonathan Gonzales V. from gnu.org) + + added nomail flag + - project moved to sourceforge.net (projectname - binkforce) + + now --enable-syslog is by default! Read SYSLOG for details + + nodelist mask detection (see sample config for details) + + contrib/outman now supports bso (thnx to Andrew Leonov @ 2:4641/500.119) + +0.22.8.ugenk5 +============= + + fixed ``got unexpected emsi sequence "EMSI_INQC816"'' + + added some features to INSTALL.ru + * added documentation about incoming sessions over ip/pstn by Igor Mitichev + +0.22.8.ugenk6 +============= + + some changes in autoconf + * added Type to nlookup + * fixed 'ц▒' in FAQ + * added buggy-emsi option in configure. use it in case of problems with stupid mailers + * fixed hydra + +0.22.9 +====== + + Changed version for compliance with *BSD ports + + Added possibility to run external program for each override and + hidden. See bforce.subst.sample for examples and + docs/readme.txt for details. + + Implement binkp/1.1 (Multiple Batch Mode and Non-reliable Mode). + + Turn on FREQ at binkp sessions. + +fidoman (Sergey Dorofeev) +=== 2012-03 === + +$DEBUGLEVEL, $DEBUGFILE removed - please use configuration options + +DNS zone support + +=== 2012-02 === + +Netspool support +24554 protocol remake + +=== 2011-12-25 === + +Cmdline processing code is partially rewritten. +New key -u for selection proto for IP session. +Added code to get node IP address from nodelist (INA flag). +Some maybe noisy messages in log added. +Some code rearrangements in session_call. +Added feature to try all available connection ways if not specified one +on calls from command line (IP methods then modem). + +=== 2011-12-15 === + +Patch io_unix_tio.diff for OpenBSD systems running telnetted serial modem. + +=== 2011-12-13 === + +Split inbound feature have added. +Received files from different links are placed in separate folders in inbound. +Use option "split_inbound" to enable this feature. + + +Alexander Skovpen +Max N. Boyarov + + +Alexey Khromov (zx@zxalexis.ru) +====== +0.24.1 + + Added pre-init debugging (primarily of config readout) to stderr by -v + option. Vanished out errorful calls to "log" and "debug" before log and + debug files initialization. + + As of bison is default yacc for (almost) every foss system - fix + warning of yacc compliance (delete -y flag in Makefile.in) + + Fixed build on 64-bit systems (amd64 and aarch64) + + Initially added config options incpkt_flag and incbdl_flag to raise + up flag-driven tosser manipulation + diff --git a/CHANGES.fidoman b/CHANGES.fidoman deleted file mode 100644 index e8d148d..0000000 --- a/CHANGES.fidoman +++ /dev/null @@ -1,30 +0,0 @@ -=== 2012-03 === - -$DEBUGLEVEL, $DEBUGFILE removed - please use configuration options - -DNS zone support - -=== 2012-02 === - -Netspool support -24554 protocol remake - -=== 2011-12-25 === - -Cmdline processing code is partially rewritten. -New key -u for selection proto for IP session. -Added code to get node IP address from nodelist (INA flag). -Some maybe noisy messages in log added. -Some code rearrangements in session_call. -Added feature to try all available connection ways if not specified one -on calls from command line (IP methods then modem). - -=== 2011-12-15 === - -Patch io_unix_tio.diff for OpenBSD systems running telnetted serial modem. - -=== 2011-12-13 === - -Split inbound feature have added. -Received files from different links are placed in separate folders in inbound. -Use option "split_inbound" to enable this feature. diff --git a/CHANGES.kst b/CHANGES.kst deleted file mode 100644 index e8fbb66..0000000 --- a/CHANGES.kst +++ /dev/null @@ -1,67 +0,0 @@ -0.22.7.kst1 -=========== - - * Attempt to fix warnings, when compiling with -Wall. - + make update -- install only binaries. - * Better EMSI handling, when calling to cisco. - + Correct ZMH support in daemon. - * Some fixes in contributed perl scripts. - -0.22.7.kst2 -=========== - - + Added option --with-uucp-lockdir=... to configure. - * Using strncpy(3) instead of strcpy(3) if possible. - - Added patches by Maxi Rovnich @ 2:5030/872: - + Support for maximum 'no dialtone' count. - + Support for download resyncing, while checking for free space. - + Ignore all files, but *.pnt, *.req, *.?lo and *.?ut in BSO. - -0.22.7.kst3 -=========== - - * Compilation failed with --disable-hangup-watch-cd. Fixed. - + Ability to write daemon pid in file. - * -f option had reverse meaning. Thanks to Eugene Korovin @ 2:5080/196.72 - + -q option terminates daemon process (only if pidfile is used). - -0.22.7.kst4 -=========== - - * Hydra was broken in kst2. Fixed. - + Bidirectional session drops only if rxcps and txcps are less than - mincps at the same time. - -0.22.7.kst5 -=========== - - + port tcpip patch by Serge N. Pokhodyaev @ 2:5020/1838 - * lock fix, when outbound on not lockable filesystem. - Patch by Andrew Dolgov @ 2:5030/394.41 - -0.22.7.kst6 -=========== - - * traffic wasn't shown if no files in boxes. - Patch by Alexander Shiyan @ 2:5030/39.2 - * bfstat now correctly shows age of files. - Patch by Alexander Shiyan @ 2:5030/39.2 - * logging 'undefined cmd' fixed. - Thanks to Pavel I.Osipov @ 2:5020/770.50 - -0.22.8.kst7 -=========== - - Some changes taken from 0.22.8 by Alexander Belkin: - * some bugfixes - + new environment variable $RC (session return code) - + sending of EMSI_ACK every time after recving of EMSI_DAT - + support for nodelist IBN flag - -0.22.8.kst8 -=========== - - * fixed bug with flags CM in override - * fixed bug with sending HUP to daemon - diff --git a/CHANGES.ugenk b/CHANGES.ugenk deleted file mode 100644 index 2a3e408..0000000 --- a/CHANGES.ugenk +++ /dev/null @@ -1,54 +0,0 @@ -0.22.8.ugenk1 -============= - + initial release, based on bforce 0.22.8.kst8 - * fixed problem with worktime detecting - + makefiles fixed (removed make update, now make install installs config files with extension .sample) - + added --with-user and --with-group options to ``configure'' script. - + installation directories by default are compliance with default fidogate installation - -0.22.8.ugenk2 -============= - * pathes by Andrey Slusar @ 2:467/126 - (total 12: patch-bforce.c, patch-bfstat.c, patch-daemon.c, patch-expression.y, - patch-nlookup.c, patch-prot_binkp.c, patch-prot_emsi.c, patch-prot_yoohoo.c, patch-prot_zmrecv.c, - patch-prot_zmsend.c, patch-sess_call.c, patch-sess_stat.c) - + added syslog support (see SYSLOG) - + fixed nlookup (broken in ugenk1) - + spec file now goes with bforce - -0.22.8.ugenk3 -============= - + fixed working with syslog (not tested yet, any volonteers?) - * some bugfixes - -0.22.8.ugenk4 -============= - + fixed problems with license (thnx to Jonathan Gonzales V. from gnu.org) - + added nomail flag - - project moved to sourceforge.net (projectname - binkforce) - + now --enable-syslog is by default! Read SYSLOG for details - + nodelist mask detection (see sample config for details) - + contrib/outman now supports bso (thnx to Andrew Leonov @ 2:4641/500.119) - -0.22.8.ugenk5 -============= - + fixed ``got unexpected emsi sequence "EMSI_INQC816"'' - + added some features to INSTALL.ru - * added documentation about incoming sessions over ip/pstn by Igor Mitichev - -0.22.8.ugenk6 -============= - + some changes in autoconf - * added Type to nlookup - * fixed 'я' in FAQ - * added buggy-emsi option in configure. use it in case of problems with stupid mailers - * fixed hydra - -0.22.9 -====== - + Changed version for compliance with *BSD ports - + Added possibility to run external program for each override and - hidden. See bforce.subst.sample for examples and - docs/readme.txt for details. - + Implement binkp/1.1 (Multiple Batch Mode and Non-reliable Mode). - + Turn on FREQ at binkp sessions. diff --git a/FAQ b/FAQ index a514f74..da9e172 100644 --- a/FAQ +++ b/FAQ @@ -43,7 +43,9 @@ Q: A: /All/ ugenkXX. Брать на http://sourceforge.net/projects/binkforce, или с cvs там же. - +A: /AK/ + Переехало оттуда в гит, но лучше искать в профильных эхах. + Q: Как подключать нодлисты с цифровыми расширениями? Маски в конфиге bforce не задаются. A: /MR/ @@ -81,7 +83,7 @@ A: /KAS/ /GM/ Это мое и лежит оно тyт http://btrieve.virtualave.net/files/bf0224-filebox.diff.rar - в моем патче, в отличие от пpедыдyщего, не все подpд имеют тип + в моем патче, в отличие от пpедыдyщего, не все подpяд имеют тип TYPE_FILEBOX. мыло - это TYPE_NETMAIL, эхи - TYPE_ARCMAIL и т.д. Это yдобно дл пpосмотpа статистики поинтy - что на него лежит. @@ -223,6 +225,7 @@ MR = Maxi Rovnich, 2:5030/872 PVC = Peter V. Chernikoff, 2:5020/2091 SNP = Serge N. Pokhodyaev, 2:5020/1838 VS = Valery Shishkov, 2:5040/9 +AK = Alexey Khromov, 2:5030/723 Исправления и добавления в виде пар вопрос/ответ будут с благодарностью приняты в netmail. diff --git a/README.kst b/README.kst deleted file mode 100644 index 0e732d1..0000000 --- a/README.kst +++ /dev/null @@ -1,14 +0,0 @@ -BinkleyForce FTN mailer (Branch KST) ------------------------------------- - -Bug Reports ------------ - - E-Mail : kst@moecho.org - FidoNet : Konstantin Stepanenkov, 2:5030/1251 - -New Versions ------------- - - http://kst.spb.ru/bforce/ - diff --git a/README.md b/README.md index 53d2952..6077670 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -[![Build Status](https://travis-ci.org/askovpen/binkleyforce.svg?branch=master)](https://travis-ci.org/askovpen/binkleyforce) - BinkleyForce FTN mailer ----------------------- @@ -15,18 +13,25 @@ any later version. See the COPYING file for further information. Known Bugs ---------- - BinkD use and expect local file time at BinkP sessions, but - BinkleyForce allways use UTC time (?) + BinkleyForce always use UTC time (?) Bug Reports ----------- - E-Mail : adb@newmail.ru - FidoNet : Alexander Belkin, 2:5020/1398.11 + E-Mail : zx@zxalexis.ru + FidoNet : Alexey Khromov, 2:5030/723 New Versions ------------ - http://adb.newmail.ru + https://prj.zxalexis.ru/gitea/zx/bforce Copyright (c) 1998-2000 Alexander Belkin, Moscow, Russia. + (c) 2004-2007 Evgeniy Kozhuhovskiy 2:450/256, 2:450/267 + (c) 2005 Andrey Slusar + (c) 2006-2016 Max N. Boyarov + (c) 2007-2008 Sergey Babitch + (c) 2011-2014 Sergey Dorofeev + (c) 2014 Alexander Skovpen + (c) 2024 Alexey Khromov diff --git a/README.ugenk b/README.ugenk deleted file mode 100644 index b6fbfbe..0000000 --- a/README.ugenk +++ /dev/null @@ -1,14 +0,0 @@ -BinkleyForce FTN mailer (Branch ugenk) ------------------------------------- - -Bug Reports ------------ - - E-Mail : e.kozhuhovskiy@gmail.com - FidoNet : Evgeniy Kozhuhovskiy, 2:450/256, 2:450/267 - -New Versions ------------- - - http://ugenk.bas-net.by/ - diff --git a/examples/bforce.conf b/examples/bforce.conf index adee3cc..c84436f 100644 --- a/examples/bforce.conf +++ b/examples/bforce.conf @@ -78,8 +78,8 @@ options NoDirZap NoJanus NoChat #log_file /var/log/bforce/bf-log # Debugging information completness level. Debugging is disabled by -# default. Allowed debug levels: config, nodelist, outbound, info, hshake, -# ttyio, modem, prot, freq, daemon, full +# default. Allowed debug levels: config, override, event, nodelist, outbound, +# info, hshake, ttyio, modem, prot, freq, statem, daemon, 24554, free, full #debug_file /var/log/bforce/bf-debug #debug_level info hshake prot @@ -91,6 +91,13 @@ options NoDirZap NoJanus NoChat # nodial_flag /etc/nodial +# +# Incoming flags +# Netmail: +#incnet_flag /var/spool/fido/flags/mail +# Arcmail: +#incarc_flag /var/spool/fido/flags/echo + # # Inbound directories # diff --git a/source/.version b/source/.version index 39010d2..48b91fd 100644 --- a/source/.version +++ b/source/.version @@ -1 +1 @@ -0.23 +0.24.1 diff --git a/source/bforce/conf_proc.c b/source/bforce/conf_proc.c index a2e8ebc..c2dfa54 100644 --- a/source/bforce/conf_proc.c +++ b/source/bforce/conf_proc.c @@ -96,8 +96,8 @@ s_conf_entry bforce_config[BFORCE_NUMBER_OF_KEYWORDS+1] = { CONF_KEY(freq_limit_time, CT_NUMBER), CONF_KEY(freq_min_speed, CT_NUMBER), CONF_KEY(freq_srif_command, CT_STRING), - CONF_KEY(incpkt_flag, CT_STRING), - CONF_KEY(incbdl_flag, CT_STRING), + CONF_KEY(incnet_flag, CT_STRING), + CONF_KEY(incarc_flag, CT_STRING), CONF_KEY(hide_our_aka, CT_ADDRESS), CONF_KEY(history_file, CT_STRING), CONF_KEY(hydra_options, CT_OPTIONS), diff --git a/source/bforce/sess_main.c b/source/bforce/sess_main.c index 8827167..e67bcb5 100644 --- a/source/bforce/sess_main.c +++ b/source/bforce/sess_main.c @@ -695,6 +695,7 @@ int session(void) s_traffic traff_send; s_traffic traff_recv; char *p; + int fd = -1; memset(&traff_send, '\0', sizeof(s_traffic)); memset(&traff_recv, '\0', sizeof(s_traffic)); @@ -890,6 +891,38 @@ int session(void) */ p_log_txrxstat(&pi); + + /* + * Raise flags if session incoming traffic was not empty + */ + if ( (p = conf_string(cf_incnet_flag)) ) + if (state.traff_recv.netmail_size > 0) { + DEB((D_EVENT, "Incoming netmail > 0, raising flag")); + log("Raising flag for netmail in %s", p); + fd = open(p, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP ); + if (fd == -1) { + DEB((D_EVENT, "Error raising netmail flag")); + log("Error creating flag for netmail in %s", p); + } else { + /* all ok - closing file */ + close(fd); + } + } + + if ( (p = conf_string(cf_incarc_flag)) ) + if (state.traff_recv.arcmail_size > 0) { + DEB((D_EVENT, "Incoming arcmail > 0, raising flag")); + log("Raising flag for arcmail in %s", p); + fd = open(p, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + if (fd == -1) { + DEB((D_EVENT, "Error raising arcmail flag")); + log("Error creating flag for arcmail in %s", p); + } else { + /* all ok - closing file */ + close(fd); + } + } + /* * Save session traffic before deiniting */ diff --git a/source/include/confread.h b/source/include/confread.h index 076b25a..714ea0b 100644 --- a/source/include/confread.h +++ b/source/include/confread.h @@ -191,8 +191,8 @@ typedef enum { cf_freq_limit_time, cf_freq_min_speed, cf_freq_srif_command, - cf_incpkt_flag, - cf_incbdl_flag, + cf_incnet_flag, + cf_incarc_flag, cf_hide_our_aka, cf_history_file, cf_hydra_options,