Fixed changelist to represent changes

Mode was checked lated so move check to possibly correct place
 and disable it

.gitea/workflows/arch.yaml

@@ -0,0 +1,42 @@
+name: Archlinux build
+run-name: Deploy to ${{ inputs.deploy_target }} by @${{ github.actor }} 🚀
+on: 
+  - push
+  - workflow_dispatch
+
+jobs:
+  build-arch:
+    runs-on: arch-latest
+    if: ${{ github.ref }} == 'refs/head/master' 
+    branches:
+      - 'master'
+      - 'zx'
+    steps:
+      - name: Checking environment
+        continue-on-error: true
+        run: printenv
+      - name: Installing prerequisites - update pacman
+        run: pacman -Sy
+      - name: Installing prerequisites - install nodejs for actions & git
+        run: pacman --disable-sandbox --noconfirm -v -S git nodejs
+      - name: Adding user builder
+        continue-on-error: true
+        run: useradd -d /builder -g users -m builder
+      - name: Downloading PKGBUILD
+        run: |
+          su - builder -c "curl -O http://zxprj:3001/zx/bforce/raw/branch/${GITHUB_REF_NAME}/archlinux/bforce.install"
+          su - builder -c "curl -o PKGBUILD http://zxprj:3001/zx/bforce/raw/branch/${GITHUB_REF_NAME}/archlinux/PKGBUILD.ci"
+      - name: Building archlinux package
+        run: |
+          su -w GITHUB_SHA,GITHUB_REF_NAME,GITHUB_REF_TYPE - builder -c makepkg
+          su - builder -c "ls -la"
+      - name: Constructing artifact name and version
+        run: |
+          echo "BFORCE_VER=$(cat /builder/src/bforce/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV
+      - name: Retrieving artifact files
+        run: mkdir bforce && cp /builder/bforce-r*.pkg.tar.zst bforce
+      - name: Try to upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: bforce-${{ env.BFORCE_VER }}-Arch
+          path: bforce

.gitea/workflows/debpkg.yaml

@@ -0,0 +1,50 @@
+name: Debian build
+run-name: Deploy to ${{ inputs.deploy_target }} by @${{ github.actor }} 🚀
+on: [push]
+jobs:
+  build-ubuntu:
+    runs-on: ubuntu-latest
+    branches:
+      - 'master'
+      - 'zx'
+    steps:
+      - name: Checking environment
+        continue-on-error: true
+        run: printenv
+      - name: Installing build-essentials
+        continue-on-error: false
+        run: |
+            apt update
+            apt install -y build-essential fakeroot devscripts debhelper pkg-config --no-install-recommends
+      - name: Installing dependencies
+        continue-on-error: false
+        run: |
+            echo '---- bison ----'
+            apt install -y bison
+            echo '---- tcl ------'
+            apt install -y tcl
+      - name: Cloning source
+        uses: actions/checkout@v4
+      - name: Getting version info
+        run: |
+            echo "BFORCE_VER=$(cat ${{ env.GITHUB_WORKSPACE }}/source/.version)-$(date +%Y%M%d)" >> $GITHUB_ENV
+      - name: Building package
+        continue-on-error: false
+        run: |
+            pwd
+            echo '---------------------'
+            cd ${GITHUB_WORKSPACE}/debian
+            ls -l
+            debuild -us -uc -b
+            echo '---build complete---'
+            ls -l ${{ env.GITHUB_WORKSPACE }}/../
+      - name: Collecting artifacts
+        run: |
+            mkdir -pv ${{ env.GITHUB_WORKSPACE }}/artifacts
+            mv -v ${{ env.GITHUB_WORKSPACE }}/../*.deb ${{ env.GITHUB_WORKSPACE }}/artifacts/
+      - name: Try to upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: bforce-${{ env.BFORCE_VER }}-Ubuntu
+          path: ${{ env.GITHUB_WORKSPACE }}/artifacts/bforce*.deb
+      - run: echo "This job's over"

.gitignore

@@ -0,0 +1,9 @@
+*.o
+debian/Makefile
+source/Makefile
+source/bin/
+source/bforce/expression.c
+source/config.log
+source/config.status
+source/include/config.h
+bforce.geany

.travis.yml

@@ -0,0 +1,5 @@
+language: c
+compiler:
+  - gcc
+# Change this to your needs
+script: cd source && ./configure && make

CHANGES

@@ -58,3 +58,224 @@
   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 <anray@users.sourceforge.net>
+Evgeniy Kozhuhovskiy <e.kozhuhovskiy@gmail.com> 
+Sergey Babitch <vpooh@users.sourceforge.net>
+
+ 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 <a.n.skovpen@gmail.com>
+Max N. Boyarov <zotrix@users.noreply.github.com>
+
+
+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.
+ + 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
+   
+0.24.2
+ + Fixed environment variables while executing external programs
+   on handshake or session end
+ + Fixed flags working on arcmail/netmail recieve
+ 
+0.25
+ + EMSI handshake logic reworked to comply with EMSI-II std (FTSC-0088)
+ + New option: proto_order - dezired protocol order for outgoing calls 
+   in EMSI session handshake
+   EMSI-II-compliance works as follows:
+    * if both (caller and callee) expose EII flag - selected proto
+    will be first in caller compat.options compatible with callee
+    * if caller is EMSI-I-compliant and does not show EII flad - 
+    selection by callee internal order from compatible with caller
+ + Changed ifcico protocol port hardcoded to num and not name from
+   /etc/services line (as of abscence of latter)
+ + Config example reworked to include new options
+ + New option: emsi_send_tz - to send TZUTC EMSI-handshake part.
+
+0.25.1
+ + Added testing script for PSTN comms (tests folder).
+
+0.25.2
+ + Adopted for outgoing IPv6 communication
+
+0.25.3
+ + Fixed IPv6 address logging in inetd connections
+ + Fixed outgoing proto detection and order - as Direct, BinkP, Ifcico, 
+   Telnet, Modem first allowed to connect. You may change this order 
+   individually by override flags.
+ + Daemon mode now tries to make outgoing tcp calls prior to modem
+ + Daemon mode - fixed working time for tcp nodes (CM)
+ + Fixed some x64 errors in comparisons to integers
+ + Added systemd and xinetd service files to contrib folder
+ + Fixed flag files creation
+ + Added flags for TIC files (inctic_flag) and files (incfile_flag)
+ + Fixed nodelist index creation
+ + Added support for TCP port description in IBN/IFC/ITN flags
+
+0.26
+ + Fixed incorrect binkp protocol realization in unprotected sessions.
+ + Fixed binkp override appliance in incoming handshake
+ 
+0.26.1
+ + Fixed binkp stuck on overrides in config
+ + ReDebianized
+ + Added CI automation: builds for Archlinux and Ubuntu

CHANGES.fidoman

@@ -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.

CHANGES.kst

@@ -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
-

CHANGES.ugenk

@@ -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.

FAQ

@@ -43,6 +43,8 @@ Q:
 A: /All/
    ugenkXX. Брать на http://sourceforge.net/projects/binkforce,
    или с cvs там же.
+A: /AK/
+   Переехало оттуда в гит, но лучше искать в профильных эхах.
    
 Q: Как подключать нодлисты с цифровыми расширениями? Маски в конфиге bforce не
    задаются.
@@ -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.

INSTALL.ru

@@ -1,10 +1,10 @@
 В этом файле описывается процесс установки и настройки
-фидонет-совместимого мейлера bforce 0.22.8.ugenk1.
+фидонет-совместимого мейлера bforce 0.xx.
 
 В данном документе приняты следующие обозначения:
 
 <SRCDIR> - путь, куда вы распаковали тарболл с исходными
-	   текстами bforce 0.22.8.ugenk1 (далее bforce)
+	   текстами bforce 0.xx (далее bforce)
 Тарболл  - файл с расширением tar.gz, или tar.bz2
 
 
@@ -24,14 +24,14 @@ gmake
 
 Распакуйте тарболл следующими командами:
 
-gzip -d bforce-0.22.8.ugenk1.tar.gz
+gzip -d bforce-master.tar.gz
 или 
-bzip2 -d bforce-0.22.8.ugenk1.tar.bz2
+bzip2 -d bforce-master.tar.bz2
 
-tar -xvf bforce-0.22.8.ugenk1.tar
+tar -xvf bforce-master.tar
 
-Перейдите в директорию bforce-0.22.8.ugenk1/source:
+Перейдите в директорию bforce/source:
-cd <SRCDIR>/bforce-0.22.8.ugenk1/source
+cd <SRCDIR>/bforce/source
 
 Для создания Makefile, который наиболее подходит к вашей
 системе, наберите:
@@ -76,6 +76,11 @@ gmake install
 Настройка
 =========
 
+Рекомендуется установить системную переменную BFCONFIG,
+указывающую на местоположение конфигурации bforce.
+Проще всего через /etc/environment для общесистемной или 
+.profile для переменной пользователя.
+
 Для нормальной работы вам нужно отредактировать конфигурационные файлы
 bforce. По умолчанию они находятся в /usr/local/fido/etc и называются
 bforce.conf - основной конфигурационный файл bforce
@@ -125,6 +130,19 @@ cat `which mgetty` |strings |grep FIDO |wc -l
 
 где news - это пользователь, из-под которого у вас работает ftn-подсистема.
 
+Bforce при ИСХОДЯЩИХ звонках использует файлы блокировки порта модема,
+при несовпадении каталога или невозможности создания файла
+mgetty сбросит модем во время звонка. 
+Поэтому настоятельно рекомендуется проверить права на папку /var/lock
+и то, на какой ФС она расположенв.
+Современные системы имеют тенденцию к применению /var/lock как ссылки
+на /run/lock, а ФС /run монтируется и создается на tmpfs при каждой 
+загрузке с помощью systemd-tempfiles.
+Для изменения поведения необходимо создать файл в /etc/tempfiles.d/, 
+совпадающим (за исключением части имени -part) c именем файла в 
+/usr/lib/systemd/systemd-tempfiles.d. 
+Рабочий пример legacy-part.conf в папке contrib.
+
 Совместная работа с inetd/xinetd
 ================================
 К сожалению (или к счастью), bforce не умеет самостоятельно принимать входящие
@@ -150,6 +168,7 @@ init.d/bforce		   - init-
 bfha			   - bforce history analyzer (bfha)
 bfha/README		   - bfha README
 bfha/bfha.pl		   - собственно, bfha
+legacy-part.conf   - файл для донастройки прав на /run/lock в systemd
 u-srif		 	   - продвинутый freq-процессор
 u-srif/u-srif-index.py     \ с поддержой отчетов,
 u-srif/u-srif-lookup.py     \ ограничений, 

README

@@ -1,32 +0,0 @@
-$Id$:
-
-BinkleyForce FTN mailer
------------------------
-
-BinkleyForce is a simple ifcico like FTN mailer. It can works via
-TCP/IP as well as on modem links. Look sample configs for more
-information.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-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 (?)
-
-Bug Reports
------------
-
-    E-Mail  : adb@newmail.ru
-    FidoNet : Alexander Belkin, 2:5020/1398.11
-
-New Versions
-------------
-
-    http://adb.newmail.ru
-    
-
-Copyright (c) 1998-2000 Alexander Belkin, Moscow, Russia.

README.kst

@@ -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/
-    

README.md

@@ -0,0 +1,61 @@
+![zx branch](https://prj.zxalexis.ru/gitea/zx/bforce/actions/workflows/arch.yaml/badge.svg?branch=zx)
+
+BinkleyForce FTN mailer
+-----------------------
+
+BinkleyForce is a simple ifcico like FTN mailer. It can work via
+TCP/IP as well as on modem links. Look sample configs for more
+information.
+
+Supported Features
+------------------
+
+	- PSTN dial-out with EMSI-II/EMSI/YooHoo handshake
+	- PSTN protocols: Hydra, ZedZap, ZModem
+	- PSTN dial-in through mgetty
+	- TCP/IP dial-out through IPv4 and IPv6 networks
+	- TCP/IP protocols - ifcico / BinkP 1.1
+	- TCP/IP dial-in through xinetd/inetd
+	- Daemon mode for outbound queue managing
+	
+	Linux 2.4.11+, FreeBSD (6+ AFAIR) compatible.
+	
+Licence
+-------
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version. See the COPYING file for further information.
+
+Known Bugs
+----------
+    - BinkleyForce has no support (yet) for multiple INA: addresses
+    - Can not rotate hidden lines
+    - Can not rotate supported IP protocols in case of failure
+
+Bug Reports
+-----------
+
+    E-Mail  : zx@zxalexis.ru
+    FidoNet : Alexey Khromov, 2:5030/723
+
+New Versions
+------------
+
+    https://prj.zxalexis.ru/gitea/zx/bforce
+
+Older Sources
+-------------
+    https://github.com/zotrix/binkleyforce/
+    https://sourceforge.net/projects/binkforce/
+
+Copyright <br>
+> (c) 1998-2000 Alexander Belkin, Moscow, Russia.<br>
+> (c) 2004-2007 Evgeniy Kozhuhovskiy 2:450/256, 2:450/267<br>
+> (c) 2005      Andrey Slusar<br>
+> (c) 2006-2016 Max N. Boyarov<br>
+> (c) 2007-2008 Sergey Babitch<br>
+> (c) 2011-2014 Sergey Dorofeev<br>
+> (c) 2014      Alexander Skovpen<br>
+> (c) 2024-2025 Alexey Khromov<br>

README.ugenk

@@ -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/
-    

archlinux/PKGBUILD

@@ -0,0 +1,59 @@
+pkgname=bforce
+pkgver=r235.a1c93b8
+pkgrel=1
+pkgdesc="binkleyforce FTN mailer"
+arch=('i686' 'x86_64' 'aarch64')
+url="https://prj.zxalexis.ru/gitea/zx/bforce/"
+license=('GPL2')
+source=(
+    "${pkgname}::git+https://prj.zxalexis.ru/gitea/zx/bforce.git"
+)
+makedepends=('git' 'gcc' 'make' 'glibc')
+provides=('bforce')
+
+build() {
+    cd "${srcdir}/${pkgname}/source"
+    ./configure --prefix=/ --disable-syslog --with-owner=fido --with-group=uucp
+    make
+}
+
+prepare() {
+    cd "${pkgname}"
+    printf "$( pwd )\n"
+}
+
+pkgver() {
+    cd "$pkgname"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+package() {
+    cd ${pkgdir}
+    mkdir -p ${pkgdir}/etc
+    mkdir -p ${pkgdir}/usr/bin
+    mkdir -p ${pkgdir}/usr/local/bin
+    mkdir -p ${pkgdir}/usr/share/doc/bforce
+    mkdir -p ${pkgdir}/usr/share/man/man1
+    mkdir -p ${pkgdir}/var/log/bforce
+    mkdir -p ${pkgdir}/var/spool/bforce
+    mkdir -p ${pkgdir}/var/spool/bforce/bt/in
+    mkdir -p ${pkgdir}/var/spool/bforce/bt/pin
+    mkdir -p ${pkgdir}/var/spool/bforce/bt/out
+    mkdir -p ${pkgdir}/var/spool/bforce/ndl
+    mkdir -p ${pkgdir}/var/spool/bforce/bforce
+    /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/bforce ${pkgdir}/usr/bin/bforce
+    /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/bfindex ${pkgdir}/usr/bin/bfindex
+    /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/bfstat ${pkgdir}/usr/bin/bfstat
+    /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/nlookup ${pkgdir}/usr/bin/nlookup
+    /usr/bin/install -c ${srcdir}/${pkgname}/man/*.1 ${pkgdir}/usr/share/man/man1/
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/bforce.conf ${pkgdir}/etc/bforce.conf.sample
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/bforce.subst ${pkgdir}/etc/bforce.subst.sample
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/bforce.passwd ${pkgdir}/etc/bforce.passwd.sample
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/freq.aliases ${pkgdir}/etc/freq.aliases.sample
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/freq.dirs ${pkgdir}/etc/freq.dirs.sample
+    /usr/bin/install -c ${srcdir}/${pkgname}/contrib/outman ${pkgdir}/usr/local/bin/outman
+    echo "Please, edit /usr/local/bin/outman"
+    cp ${srcdir}/${pkgname}/docs/* ${pkgdir}/usr/share/doc/bforce/    
+}
+
+sha256sums=('SKIP')

archlinux/PKGBUILD.ci

@@ -0,0 +1,60 @@
+pkgname=bforce
+pkgver=r235.a1c93b8
+pkgrel=1
+pkgdesc="binkleyforce FTN mailer"
+arch=('i686' 'x86_64' 'aarch64')
+url="https://prj.zxalexis.ru/gitea/zx/bforce/"
+license=('GPL2')
+source=(
+    "${pkgname}::git+https://prj.zxalexis.ru/gitea/${GITHUB_REF_NAME}/bforce.git"
+)
+makedepends=('git' 'gcc' 'make' 'glibc')
+provides=('bforce')
+
+build() {
+    cd "${srcdir}/${pkgname}/source"
+    ./configure --prefix=/ --disable-syslog --with-owner=fido --with-group=uucp
+    make
+}
+
+prepare() {
+    cd "${pkgname}"
+    git checkout "${GITHUB_SHA}"
+    printf "$( pwd )\n"
+}
+
+pkgver() {
+    cd "$pkgname"
+    printf "r%s.%s.%s" "$(git rev-list --count ${GITHUB_SHA})" "$(git rev-parse --short ${GITHUB_SHA})" "${GITHUB_REF_NAME}"
+}
+
+package() {
+    cd ${pkgdir}
+    mkdir -p ${pkgdir}/etc
+    mkdir -p ${pkgdir}/usr/bin
+    mkdir -p ${pkgdir}/usr/local/bin
+    mkdir -p ${pkgdir}/usr/share/doc/bforce
+    mkdir -p ${pkgdir}/usr/share/man/man1
+    mkdir -p ${pkgdir}/var/log/bforce
+    mkdir -p ${pkgdir}/var/spool/bforce
+    mkdir -p ${pkgdir}/var/spool/bforce/bt/in
+    mkdir -p ${pkgdir}/var/spool/bforce/bt/pin
+    mkdir -p ${pkgdir}/var/spool/bforce/bt/out
+    mkdir -p ${pkgdir}/var/spool/bforce/ndl
+    mkdir -p ${pkgdir}/var/spool/bforce/bforce
+    /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/bforce ${pkgdir}/usr/bin/bforce
+    /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/bfindex ${pkgdir}/usr/bin/bfindex
+    /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/bfstat ${pkgdir}/usr/bin/bfstat
+    /usr/bin/install -c ${srcdir}/${pkgname}/source/bin/nlookup ${pkgdir}/usr/bin/nlookup
+    /usr/bin/install -c ${srcdir}/${pkgname}/man/*.1 ${pkgdir}/usr/share/man/man1/
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/bforce.conf ${pkgdir}/etc/bforce.conf.sample
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/bforce.subst ${pkgdir}/etc/bforce.subst.sample
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/bforce.passwd ${pkgdir}/etc/bforce.passwd.sample
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/freq.aliases ${pkgdir}/etc/freq.aliases.sample
+    /usr/bin/install -c -m 644 ${srcdir}/${pkgname}/examples/freq.dirs ${pkgdir}/etc/freq.dirs.sample
+    /usr/bin/install -c ${srcdir}/${pkgname}/contrib/outman ${pkgdir}/usr/local/bin/outman
+    echo "Please, edit /usr/local/bin/outman"
+    cp ${srcdir}/${pkgname}/docs/* ${pkgdir}/usr/share/doc/bforce/    
+}
+
+sha256sums=('SKIP')

archlinux/bforce.install

@@ -0,0 +1,7 @@
+post_install() {
+  chmod 
+}
+
+post_upgrade() {
+  post_install
+}

contrib/legacy-part.conf

@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# See tmpfiles.d(5) for details
+
+# These files are considered legacy and are unnecessary on legacy-free
+# systems.
+
+z /run/lock 0777 root lock -
+z /var/lock 0777 root lock - ../run/lock
+
+# /run/lock/subsys is used for serializing SysV service execution, and
+# hence without use on SysV-less systems.
+
+z /run/lock/subsys 0775 root lock -

contrib/mkpoll.sh

@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# Directories and static values
+DEFZONE=2
+# Default outbound
+# OUTBOUND="."
+# Our AKA
+# AKA="2:5030/723@fidonet"
+# FLO Extension
+FLOEXT="dlo"
+# BFCONFIG=/opt/fidonms/etc/bforce.conf
+
+if [ "${BFCONFIG}" == "" ]; then
+	BFCONF="/etc/bforce/bforce.conf"
+else
+	BFCONF=${BFCONFIG}
+fi
+
+if [ "$1" == "" ]; then
+	echo "No FTN provided. Usage: mkpoll <address>"
+	exit 1
+fi
+
+# Address to create poll 
+FTNA=$1
+
+# Outbound address
+OUTB=""
+if [ -f "${BFCONF}" ]; then
+	# We have config!
+	OUTB=$(grep -E "^outbound_directory" ${BFCONF} | awk '{print $2}')
+else
+	OUTB=${OUTBOUND}
+fi
+
+#echo "FTNA: ${FTNA} OUTB: ${OUTB}"
+
+FZONE=$(echo -n ${FTNA}| awk -F':' '{print $1}')
+FNET=$(echo -n ${FTNA} | awk -F':' '{print $2}' | awk -F'/' '{ print $1 }')
+FNODE=$(echo -n ${FTNA}| awk -F'/' '{print $2}' | awk -F'@' '{ print $1 }'| awk -F'.' '{ print $1 }')
+FPNT=$(echo -n ${FTNA} | awk -F'/' '{print $2}' | awk -F'@' '{ print $1 }'| awk -F'.' '{ print $2 }')
+FDOM=$(echo -n ${FTNA} | awk -F'@' '{print $2}')
+
+# echo "Dest ZONE: ${FZONE}, NET: ${FNET}, NODE: ${FNODE}, PNT: ${FPNT} DOM: ${FDOM}"
+
+# Our AKA
+FAKA=""
+if [ -f "${BFCONF}" ]; then
+	# We have config!
+	FAKA=$(grep -E "^address" ${BFCONF} | awk '{print $2}')
+else
+	FAKA=${AKA}
+fi
+
+AZONE=$(echo -n ${FAKA}| awk -F':' '{print $1}')
+ANET=$(echo -n ${FAKA} | awk -F':' '{print $2}' | awk -F'/' '{ print $1 }')
+ANODE=$(echo -n ${FAKA}| awk -F'/' '{print $2}' | awk -F'@' '{ print $1 }'| awk -F'.' '{ print $1 }')
+APNT=$(echo -n ${FAKA} | awk -F'/' '{print $2}' | awk -F'@' '{ print $1 }'| awk -F'.' '{ print $2 }')
+ADOM=$(echo -n ${FAKA} | awk -F'@' '{print $2}')
+
+# echo "Our ZONE: ${AZONE}, NET: ${ANET}, NODE: ${ANODE}, PNT: ${APNT} DOM: ${ADOM}"
+
+
+FTNB=$( printf "%04x%04x" ${FNET} ${FNODE} )
+
+if [ "${FPNT}" == "" ]; then
+	FPNT="0"
+fi
+
+FFLO=""
+if [ "${AZONE}" == "${FZONE}" ] && [ "${FNET}" == "${ANET}" ] && [ "${FNODE}" == "${ANODE}" ] && [ ! "${FPNT}" == "0" ]; then
+	# echo "Point operations!"
+	FLOFIL=$( printf "%08x.${FLOEXT}" ${FPNT} )
+	PNTDIR=$( echo -n "${OUTB}/${FTNB}.pnt")
+	FFLO=$( echo -n "${PNTDIR}/${FLOFIL}" )
+elif [ ! "${DEFZONE}" == "${FZONE}" ]; then
+	# Interzonal poll
+	FLOFIL=$( echo -n "${FTNB}.${FLOEXT}" )
+	FDIR=$( printf "%03x" ${FZONE} )
+	FFLO=$( echo -n "${OUTB}.${FDIR}/${FLOFIL}" )
+else
+	# Normal in-zone poll
+	FLOFIL=$( echo -n "${FTNB}.${FLOEXT}" )
+	FFLO=$( echo -n "${OUTB}/${FLOFIL}" )
+fi
+
+# echo "FloFile: ${FFLO}"
+
+if [ ! -f "${FFLO}" ]; then
+	touch "${FFLO}"
+fi
+

contrib/systemd/bforce.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Binkleyforce Outbound server
+
+[Service]
+Type=forking
+PIDFile=/tmp/bforce.pid
+User=fido
+Group=fido
+ExecStart=/usr/bin/bforce -d -C /opt/fidonms/etc/bforce.conf
+ExecStop=/usr/bin/bforce -q
+
+[Install]
+WantedBy=multi-user.target

contrib/xinetd.d/bforce-binkp

@@ -0,0 +1,13 @@
+#binkleyforce ifc (port 60179) EMSI-over-ip
+service binkp
+{
+    disable	= no
+    socket_type	= stream
+#    flags	= IPv4
+    protocol	= tcp
+    port	= 24554
+    wait	= no
+    user	= fido
+    server	= /usr/bin/bforce
+    server_args	= -C /opt/fidonms/etc/bforce.conf -i binkp
+}

contrib/xinetd.d/bforce-ifcico

@@ -0,0 +1,13 @@
+#binkleyforce ifc (port 60179) EMSI-over-ip
+service ifc
+{
+    disable	= no
+    socket_type	= stream
+#    flags	= IPv4
+    protocol	= tcp
+    port	= 60179
+    wait	= no
+    user	= fido
+    server	= /usr/bin/bforce
+    server_args	= -C /opt/fidonms/etc/bforce.conf -i auto
+}

debian/changelog

@@ -1,3 +1,15 @@
+bforce (0.26.1) UNRELEASED; urgency=medium
+
+  * Fixed for ubuntu/debian builds and CI actions
+
+ -- Alexey Khromov <zx@zxalexis.ru>  Sun, 13 Apr 2025 20:06:54 +0300
+
+bforce (0.26) UNRELEASED; urgency=medium
+
+  * Fixed for IPv6 and build on amd64 and aarch64 platforms
+
+ -- Alexey Khromov <zx@zxalexis.ru>  Sun, 13 Apr 2025 12:53:54 +0000
+
 bforce (0.22.9-3) unstable; urgency=low
 
   * fixes in init.d script

debian/compat

@@ -1 +1 @@
-4
+3

debian/conffiles

@@ -1,6 +0,0 @@
-/etc/bforce/bforce.conf
-/etc/bforce/bforce.subst
-/etc/bforce/bforce.passwd
-/etc/bforce/freq.dirs
-/etc/bforce/freq.aliases
-

debian/control

@@ -1,13 +1,13 @@
 Source: bforce
 Section: net
 Priority: optional
-Maintainer: Evgeniy Kozhuhovskiy <e.kozhuhovskiy@gmail.com>
+Maintainer: Alexey Khromov <zx@zxalexis.ru>
 Build-Depends: debhelper (>> 3.0.0), bison (>> 1.0.0)
 Standards-Version: 3.5.10
 
 Package: bforce
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, tclsh:any
 Description: Binkey Force FTN mailer
  FTN mailer is a program that transmit files (netmail and echomail)
  between your FTN node and other. 

debian/dirs

@@ -1,5 +1,6 @@
 usr/bin
 usr/lib/bforce
+usr/lib/systemd/system
 etc/bforce
 etc/default
 etc/default/bforce

debian/docs

@@ -1,9 +1,5 @@
-README
+README.md
-README.kst
-README.ugenk
 TODO
-CHANGES
-CHANGES.kst
-CHANGES.ugenk
 INSTALL
 INSTALL.ru
+SYSLOG

debian/postinst

@@ -26,15 +26,15 @@ set -e
 case "$1" in
     configure)
 
-	if ! grep -s news /etc/group >/dev/null 2>&1; then
+#	if ! grep -s news /etc/group >/dev/null 2>&1; then
-	    addgroup --system news
+#	    addgroup --system news
-	fi
+#	fi
-	
+#	
-	if ! id uucp >/dev/null 2>&1; then
+#	if ! id uucp >/dev/null 2>&1; then
-	    adduser --system --disabled-password uucp
+#	    adduser --system --disabled-password uucp
-	    chsh -s /bin/sh uucp
+#	    chsh -s /bin/sh uucp
-	    adduser uucp dialout
+#	    adduser uucp dialout
-	fi
+#	fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

debian/rules

@@ -6,8 +6,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=3
+export DH_COMPAT=11
-
 
 PACKAGE = bforce
 
@@ -49,7 +48,7 @@ clean:
 	rm -f build-stamp configure-stamp
 
 #	 Add here commands to clean up after the build process.
-	-$(MAKE) -C source clean
+#	-$(MAKE) -C source clean
 	dh_clean
 	rm -f source/config.cache source/include/config.h source/config.log\
 		source/config.status source/Makefile
@@ -57,7 +56,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 #	Add here commands to install the package into debian/bforce.
@@ -74,7 +73,7 @@ install: build
 	/usr/bin/install -c -m 600 -o $(USER) -g $(GROUP) examples/bforce.passwd $(CURDIR)/debian/bforce/etc/bforce/bforce.passwd	
 	/usr/bin/install -c -m 644 -o $(USER) -g $(GROUP) examples/freq.aliases $(CURDIR)/debian/bforce/etc/bforce/freq.aliases
 	/usr/bin/install -c -m 644 -o $(USER) -g $(GROUP) examples/freq.dirs $(CURDIR)/debian/bforce/etc/bforce/freq.dirs
-
+	/usr/bin/install -c -m 660 contrib/systemd/bforce.service $(CURDIR)/debian/bforce/usr/lib/systemd/system/bforce.service
 	/usr/bin/install $(CURDIR)/debian/bfha.def $(CURDIR)/debian/bforce/etc/default/bforce/bfha
 	/usr/bin/install $(CURDIR)/contrib/bfha/bfha-debian.pl $(CURDIR)/debian/bforce/usr/lib/bforce/bfha.pl
 
@@ -92,8 +91,8 @@ binary-arch: build install
 #	dh_installlogrotate
 	dh_installinit
 #	dh_installcron
-	dh_installman $(CURDIR)/debian/bfindex.1 $(CURDIR)/debian/bforce.1 \
+	dh_installman $(CURDIR)/man/bfindex.1 $(CURDIR)/man/bforce.1 \
-			$(CURDIR)/debian/bfstat.1 $(CURDIR)/debian/nlookup.1
+			$(CURDIR)/man/bfstat.1 $(CURDIR)/man/nlookup.1 $(CURDIR)/man/outman.1
 #	dh_installinfo
 	dh_installchangelogs CHANGES
 	dh_link

examples/bforce.conf

@@ -63,6 +63,12 @@ address 20:26/100.0@easynet
 #
 options NoDirZap NoJanus NoChat
 
+# Protocol order for outgoing EMSI calls
+# Tolerant to Options (i.e. you can order all kind of protos
+# as of TZA,KER,JAN and SLK are not supported at all
+# Default: HYD,JAN,DZA,ZAP,ZMO,TZA,SLK,KER
+proto_order HYD,ZMO,ZAP,DZA,JAN,TZA,KER,SLK
+
 #
 # Domain outbounds
 #   Domain <domain_name> <outbound_dir> <zone>
@@ -78,8 +84,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,
+# default. Allowed debug levels: config, override, event, nodelist, outbound, 
-# ttyio, modem, prot, freq, daemon, full
+# 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 +97,18 @@ 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
+# FileEcho TIC
+#inctic_flag /var/spool/fido/flags/tick
+# Regular file recieve
+#incfile_flag /var/spool/fido/flags/alert
+
+
 #
 # Inbound directories
 #
@@ -102,13 +120,13 @@ split_inbound yes
 #
 # Path to your 4D outbound (use zone as extension)
 #
-#outbound_directory /var/spool/fido/bt/out
+outbound_directory /var/spool/fido/bt/out
 
 #
 # Path to your AmigaDos style 4D outbound.
 # (You can use all outbound styles at the same time)
 #
-amiga_outbound_directory /var/spool/fido/bt/out
+#amiga_outbound_directory /var/spool/fido/bt/out
 
 #
 # Directory with your nodelists (for nodelist without full path)
@@ -246,6 +264,10 @@ mode_request 100660
 #	'~'	1 second delay
 #	'`'	1/4 second delay
 
+# Modem lock directory (/var/lock as in FHS-3.0 
+# if you have it on tmpfs by systemd - read INSTALL.ru)
+# uucp_lock_directory /var/lock
+
 #
 # Yor modem devices names (will use first not locked one)
 #   ModemDev <device>[<:lock_speed>]
@@ -335,6 +357,9 @@ max_speed 57600
 flags XW,V34B,IDC,LMD
 emsi_OH_time 22:00-07:30
 emsi_FR_time 22:30-05:30
+#emsi_send_tz no
+#emsi_send_time no
+
 
 #
 # Our receiver buffer size [bytes]
@@ -435,6 +460,23 @@ skip_files_recv *.pif *.swp
 #   setsid   - run command in a new session
 #   useshell - run command by calling a shell (/bin/sh)
 #
+#   Bforce will make environment for external programs 
+#   which include these variables:
+#   $REM_ADDR_FTN - remote ftn address
+#   $REM_ADDR_INET - remote inet address
+#   $LOC_ADDR_FTN - local ftn address
+#   $LOC_ADDR_INET - local inet address
+#   $PASSWORD - session password
+#   $MAILER - remote mailer
+#   $LOCATION - remote location
+#   $SYSOP - remote SysOp name
+#   $SYSTEM_NAME - remote station name
+#   $PHONE - remote phone 
+#   $FLAGS - remote flags
+#   $PROTECTED - password protected on both sides
+#   $LISTED - present in nodelist
+#   $INBOUND - current inbound path for this remote
+#
 #run_after_handshake [logout]/bin/echo "Hello, world!"
 #run_after_session [nowait,setsid]/usr/local/lib/ftp/run-in
 #

rpm/bforce.spec

@@ -1,7 +1,7 @@
 Summary: Bforce, Fidonet mailer
 Name: bforce
-Version: 0.22.8
+Version: 0.26.1
-Release: ugenk4
+Release: 0
 Copyright: GPL
 Group: Fidonet/mailer
 Source0: bforce-%{version}.%{release}.tar.gz
@@ -56,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(550,uucp,news) /usr/bin/bfstat
 %attr(550,uucp,news) /usr/bin/nlookup
 %attr(550,uucp,news) /usr/bin/outman
-%attr(644,root,root) /usr/share/doc/bforce-0.22.8/*
+%attr(644,root,root) /usr/share/doc/bforce/*
 %dir %attr(770,uucp,news)  /var/log/bforce
 %dir %attr(770,uucp,news)  /var/spool/fido/ndl
 %attr(775,uucp,news) /var/spool/fido/bt

source/.version

@@ -1 +1 @@
-0.23
+0.26.1

source/Makefile.in

@@ -12,7 +12,7 @@ exec_prefix=@exec_prefix@
 CC 		= @CC@
 INCLUDES	= -I./include
 CFLAGS		= @CFLAGS@ -fno-builtin
-LIBS 		= @LIBS@
+LIBS 		= @LIBS@ @CLOCK_LIB@
 YACC		= @YACC@
 INSTALL		= @INSTALL@
 INSTALL_PROGRAM	= @INSTALL_PROGRAM@
@@ -146,6 +146,7 @@ clean:
 		rm -f ./bin/core
 clean-am:	
 		rm -f ./Makefile
+		rm -f ../debian/Makefile
 		rm -f ./include/config.h
 		rm -f ./config.log
 		rm -f ./config.status

source/bforce/bforce.c

@@ -23,6 +23,8 @@
 /* PID of our child process (if use fork) */
 pid_t child_pid = 0;
 
+char * mainenv[EXEC_MAX_NUM_ENVS+1];
+
 const char *BFERR[] = {
 	/* 00 */ "Successfull",
 	/* 01 */ "Fatal error occured",
@@ -102,6 +104,7 @@ static void usage(void)
 		"  -S <connect_str>        connect string (for slave mode only)\n"
 		"  -p <port>               override modem port (must be defined in config)\n"
 		"  -u binkp|ifcico|telnet  protocol to use over TCP/IP\n"
+		"  -v                      display early debug info on stderr\n"
 		"  -h                      show this help message\n"
 		"\n",
 		conf_getconfname()
@@ -252,12 +255,22 @@ int main(int argc, char *argv[], char *envp[])
 	int rc = 0;
 	int ch = 0;
 	opts.runmode = MODE_UNDEFINED;
+	int i = 0;
+	
+	mainenv[0] = NULL;
+	i=0;
+	while (envp[i]) {
+		mainenv[i] = malloc(strlen(envp[i])+2);
+		strcpy(mainenv[i], envp[i]);
+		mainenv[++i] = NULL;
+		DEB((D_FREE, "Program ENV: %s\n", mainenv[(i-1)]));
+	}
 	
 	memset(&opts, '\0', sizeof(s_bforce_opts));
 	
 	// parsing
 	
-	while( (ch=getopt(argc, argv, "hfI:p:n:l:a:u:oiC:S:dq")) != EOF )
+	while( (ch=getopt(argc, argv, "hfI:p:n:l:a:u:oivC:S:dq")) != (int)-1 )
 	{
 		switch( ch ) {
 		case 'h':
@@ -308,6 +321,9 @@ int main(int argc, char *argv[], char *envp[])
 			//if( opts.runmode != MODE_ANSWER || opts.inetd ) { usage(); exit(BFERR_FATALERROR); }
 			opts.inetd = 1;
 			break;
+		case 'v':
+			opts.earlydbg = TRUE;
+			break;
 		case 'C':
 			if( opts.confname || !optarg ) { usage(); exit(BFERR_FATALERROR); }
 			opts.confname = (char *)xstrcpy(optarg);
@@ -334,11 +350,6 @@ int main(int argc, char *argv[], char *envp[])
 		}
 	}
 	
-	if( opts.inetd && opts.runmode != MODE_ANSWER && opts.runmode != MODE_CALL_STDIO )
-	{
-		usage();
-		exit(BFERR_FATALERROR);
-	}
 	
 	/* Expression checker use it, so init first */
 	init_state(&state);
@@ -423,6 +434,15 @@ int main(int argc, char *argv[], char *envp[])
 		}
 	}
 
+	/*
+	  if( opts.inetd && opts.runmode != MODE_ANSWER && opts.runmode != MODE_CALL_STDIO )
+	  {
+	  usage();
+	  exit(BFERR_FATALERROR);
+	  }
+	*/
+
+
 /*	if( (rc = log_open(BFORCE_LOGFILE, NULL, NULL)) ) //compiled in
 	{
 		log("can't continue without logging");
@@ -431,20 +451,21 @@ int main(int argc, char *argv[], char *envp[])
 	
 	/* Process primary config file */
 	if( opts.confname && *opts.confname )
-		rc = conf_readconf(opts.confname, 0);
+		rc = conf_readconf(opts.confname, 0, opts.earlydbg);
 	else
-		rc = conf_readconf(conf_getconfname(), 0);
+		rc = conf_readconf(conf_getconfname(), 0, opts.earlydbg);
 	
 	if( rc ) gotoexit(BFERR_FATALERROR);
 	
 	/* Process additional config file, ignore errors */
 	if( opts.incname && *opts.incname )
-		(void)conf_readconf(opts.incname, 1);
+		if (conf_readconf(opts.incname, 1, opts.earlydbg))
+			gotoexit(BFERR_FATALERROR);
 	
 	/* Reopen log file if it was defined in config */
 	if( log_reopen(log_getfilename(LOG_FILE_SESSION), NULL, NULL) )
 	{
-		log("can't continue without logging");
+		DEB((D_CONFIG, "can't continue without logging"));
 		gotoexit(BFERR_FATALERROR);
 	}
 	
@@ -455,6 +476,7 @@ int main(int argc, char *argv[], char *envp[])
 	switch( opts.runmode )
 	{
 case MODE_DAEMON:
+		DEB((D_STATEM, "Daemon mode"));
 		log("Daemon mode");
 		rc = bforce_daemon(&opts);
 		break;
@@ -462,14 +484,17 @@ case MODE_CALL_DEFAULT:
 case MODE_CALL_IP:
 case MODE_CALL_MODEM:
 case MODE_CALL_STDIO:
+		DEB((D_STATEM, "Outgoing call"));
 		log("Outgoing call");
 		rc = bforce_master(&opts);
 		break;
 case MODE_ANSWER:
+		DEB((D_STATEM, "Start answer"));
 		log("Start answer");
 		rc = bforce_slave(&opts);
 		break;
 default:
+		DEB((D_STATEM, "Could not determine run mode"));
 		log("Could not determine run mode");
 	}
 
@@ -478,6 +503,13 @@ exit:
 	deinit_conf();
 	deinit_opts(&opts);
 	
+	/* de-init sessenv */
+	i=0;
+	while(mainenv[i]) {
+		DEB((D_FREE, "De-init session ENV: %s\n", mainenv[(i)]));
+		free(mainenv[i++]);
+	}
+	
 	/* Shutdown logging services */
 	if( log_isopened() ) log_close();
         DEB((D_FREE, "good exit"));

source/bforce/conf_deinit.c

@@ -67,8 +67,9 @@ void deinit_cval_entry(s_cval_entry *dest, bforce_config_keyword type)
 		deinit_translate(&dest->d.translate);
 		break;
 	default:
-		DEB((D_CONFIG, "deinit_cval_entry: type %d doesn't use dynamic memory",
+		//DEB((D_CONFIG, "deinit_cval_entry: type %d doesn't use dynamic memory",
-				type));
+		//		type));
+		;
 	}
 }
 

source/bforce/conf_get.c

@@ -20,10 +20,14 @@ s_cval_entry *conf_first(bforce_config_keyword keyword)
 {
 	s_cval_entry *ptrl;
 	
-	for( ptrl = bforce_config[keyword].data; ptrl; ptrl = ptrl->next )
+	DEB((D_CONFIG, "conf_first entry nr %d",(int16_t)keyword));
-		if( !ptrl->expr.expr || eventexpr(&ptrl->expr) )
-			return ptrl;
 
+	for( ptrl = bforce_config[keyword].data; ptrl; ptrl = ptrl->next )
+		if( !ptrl->expr.expr || eventexpr(&ptrl->expr) ) {
+			DEB((D_CONFIG, "conf_first ptrl found"));
+			return ptrl;
+		}
+	DEB((D_CONFIG, "conf_first ptrl not found"));
 	return NULL;
 }
 
@@ -32,9 +36,11 @@ s_cval_entry *conf_next(s_cval_entry *ptrl)
 	ASSERT(ptrl);
 	
 	for( ptrl = ptrl->next; ptrl; ptrl = ptrl->next )
-		if( !ptrl->expr.expr || eventexpr(&ptrl->expr) )
+		if( !ptrl->expr.expr || eventexpr(&ptrl->expr) ) {
+			DEB((D_CONFIG, "conf_next ptrl found"));
 			return ptrl;
-	
+		}
+	DEB((D_CONFIG, "conf_next ptrl not found"));
 	return NULL;
 }
 
@@ -91,7 +97,7 @@ long conf_number(bforce_config_keyword keyword)
 s_override *conf_override(bforce_config_keyword keyword, s_faddr addr)
 {
 	s_cval_entry *ptrl;
-
+	DEB((D_CONFIG, "conf_override entry"));
 	for( ptrl = conf_first(keyword); ptrl; ptrl = conf_next(ptrl) )
 		if( !ftn_addrcomp(ptrl->d.override.addr, addr) )
 			return &ptrl->d.override;

source/bforce/conf_proc.c

@@ -84,6 +84,8 @@ s_conf_entry bforce_config[BFORCE_NUMBER_OF_KEYWORDS+1] = {
 	CONF_KEY(emsi_FR_time,               CT_STRING),
 	CONF_KEY(emsi_OH_time,               CT_STRING),
 	CONF_KEY(emsi_slave_sends_nak,       CT_BOOLEAN),
+	CONF_KEY(emsi_send_tz,				 CT_BOOLEAN),
+	CONF_KEY(emsi_send_time,			 CT_BOOLEAN),
 	CONF_KEY(filebox,                    CT_FILEBOX),
 	CONF_KEY(filebox_directory,          CT_PATH),
 	CONF_KEY(flags,                      CT_STRING),
@@ -96,6 +98,10 @@ 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(incnet_flag,                CT_STRING),
+	CONF_KEY(incarc_flag,                CT_STRING),
+	CONF_KEY(inctic_flag,				 CT_STRING),
+	CONF_KEY(incfile_flag,				 CT_STRING),
 	CONF_KEY(hide_our_aka,               CT_ADDRESS),
 	CONF_KEY(history_file,               CT_STRING),
 	CONF_KEY(hydra_options,              CT_OPTIONS),
@@ -142,6 +148,7 @@ s_conf_entry bforce_config[BFORCE_NUMBER_OF_KEYWORDS+1] = {
 	CONF_KEY(password,                   CT_PASSWORD),
 	CONF_KEY(phone,                      CT_STRING),
 	CONF_KEY(phone_translate,            CT_TRANSLATE),
+	CONF_KEY(proto_order,				 CT_STRING),
 	CONF_KEY(recode_file_in,             CT_STRING),
 	CONF_KEY(recode_file_out,            CT_STRING),
 	CONF_KEY(recode_intro_in,            CT_STRING),

source/bforce/conf_read.c

@@ -129,9 +129,11 @@ static void conf_parsestr(char *str, char **key, char **expr, char **value)
 	return;
 }
 
-int conf_readconf(const char *confname, int inclevel)
+int conf_readconf(const char *confname, int inclevel, bool earlydbg)
 {
-//        printf("%s %d\n", confname, inclevel);
+	if (earlydbg)
+		fprintf(stderr,"BF-DEBUG: Parsing config file: %s %d\n", confname, inclevel);
+	
 	FILE *fp = NULL;
 	char tmp[BF_MAXCFGLINE + 1];
 	int rc, maxrc = 0;
@@ -156,7 +158,8 @@ int conf_readconf(const char *confname, int inclevel)
 		{
 			if( i != (int)bforce_config[i].real_key )
 			{
-				log("invalid config table: found %d instead of %d",
+				if (earlydbg)
+					fprintf(stderr,"BF-DEBUG: invalid config table: found %d instead of %d\n",
 					bforce_config[i].real_key, i);
 				return -1;
 			}
@@ -165,11 +168,12 @@ int conf_readconf(const char *confname, int inclevel)
 	
 	if( (fp = file_open(confname,"r")) == NULL )
 	{
-		logerr("can't open config file \"%s\"", confname);
+		if (earlydbg)
-		return(PROC_RC_IGNORE);
+			fprintf(stderr,"BF-DEBUG: can't open config file \"%s\"\n", confname);
+		return(PROC_RC_ABORT);
 	}
-
+	if (earlydbg)
-	DEB((D_CONFIG, "readconfig: start reading config \"%s\"", confname));
+		fprintf(stderr,"BF-DEBUG: start reading config \"%s\"\n", confname);
 	
 	while( fgets(tmp, sizeof(tmp), fp) )
 	{
@@ -180,7 +184,9 @@ int conf_readconf(const char *confname, int inclevel)
 		{
 			if( isifexpr )
 			{
-				log("warning: automatically close expression at empty line %d", line);
+				if (earlydbg)
+					fprintf(stderr,"BF-DEBUG: warning: automatically close expression at empty line %d\n", line);
+				
 				if( ifexpr ) { free(ifexpr); ifexpr = NULL; }
 				isifexpr = FALSE;
 			}
@@ -188,7 +194,10 @@ int conf_readconf(const char *confname, int inclevel)
 			if( !isappend )
 				continue;
 				
-			log("warning: appending empty or comment line %d", line);
+			if (earlydbg)
+				fprintf(stderr,"BF-DEBUG: warning: appending empty or comment line %d\n", line);
+			
+			
 			isappend = FALSE;
 		}
 		
@@ -230,9 +239,10 @@ int conf_readconf(const char *confname, int inclevel)
 		p_value = NULL;
 
 		conf_parsestr(fullstr ? fullstr : tmp, &p_key, &p_expr, &p_value);
+		if (earlydbg)
+			fprintf(stderr, "BF-DEBUG: conf_readconf: [%d] key \"%s\" expr \"%s\" value \"%s\"\n",
+			line, p_key, p_expr, p_value);
 		
-		DEB((D_CONFIG, "conf_readconf: [%d] key \"%s\" expr \"%s\" value \"%s\"",
-			line, p_key, p_expr, p_value));
 		
 		if( p_value )
 		{
@@ -256,19 +266,24 @@ int conf_readconf(const char *confname, int inclevel)
 			{
 				if( value == NULL || expr )
 				{
-					log("incorrect usage of `%s' directive", p_key);
+					if (earlydbg)
+						fprintf(stderr, "BF-DEBUG: incorrect usage of `%s' directive\n", p_key);
+					
 					rc = PROC_RC_IGNORE;
 				}
 				else if( inclevel < MAXINCLUDELEVEL )
 				{
-					DEB((D_CONFIG, "conf_readconf: process inlude file \"%s\"", value));
+					if (earlydbg)
-					rc = conf_readconf(value, inclevel + 1);
+						fprintf(stderr, "BF-DEBUG: conf_readconf: process inlude file \"%s\"\n", value);
+					
+					rc = conf_readconf(value, inclevel + 1, earlydbg);
 					if( rc ) rc = PROC_RC_IGNORE;
 				}
 				else
 				{
-					DEB((D_CONFIG, "conf_readconf: too deep include"));
+					if (earlydbg)
-					log("including level too deep");
+						fprintf(stderr, "BF-DEBUG: conf_readconf: too deep include\n");
+					
 					rc = PROC_RC_IGNORE;
 				}
 			}
@@ -276,7 +291,9 @@ int conf_readconf(const char *confname, int inclevel)
 			{
 				if( value || isifexpr )
 				{
-					log("incorrect usage of `%s' directive", p_key);
+					if (earlydbg)
+						fprintf(stderr, "BF-DEBUG: incorrect usage of `%s' directive\n", p_key);
+					
 					rc = PROC_RC_ABORT;
 				}
 				else
@@ -292,7 +309,9 @@ int conf_readconf(const char *confname, int inclevel)
 			{
 				if( value || expr || !isifexpr )
 				{
-					log("incorrect usage of `%s' directive", p_key);
+					if (earlydbg)
+						fprintf(stderr, "BF-DEBUG: incorrect usage of `%s' directive\n", p_key);
+					
 					rc = PROC_RC_IGNORE;
 				}
 				else
@@ -301,69 +320,12 @@ int conf_readconf(const char *confname, int inclevel)
 					isifexpr = FALSE;
 				}
 			}
-/*			else if( strcasecmp(p_key+1, "logfile") == 0 )
-			{
-				if( value == NULL || expr )
-				{
-					log("incorrect usage of `%s' directive", p_key);
-					rc = PROC_RC_IGNORE;
-				}
-				else
-				{
-					if( log_reopen(value, NULL, NULL) )
-					{
-						log("can't continue without logging");
-						rc = PROC_RC_ABORT;
-					}
-				}
-			}
-			else if( strcasecmp(p_key+1, "debugfile") == 0 )
-			{
-				if( value == NULL || expr )
-				{
-					log("incorrect usage of `%s' directive", p_key);
-					rc = PROC_RC_IGNORE;
-				}
-				else
-#ifdef DEBUG
-				{
-					if( debug_isopened() ) debug_close();
-					debug_setfilename(value);
-				}
-#else
-				{
-					log("incorrect directive `%s': no debug code", p_key);
-					rc = PROC_RC_IGNORE;
-				}
-#endif
-			}
-			else if( strcasecmp(p_key+1, "debuglevel") == 0 )
-			{
-				if( value == NULL || expr )
-				{
-					rc = PROC_RC_IGNORE;
-				}
-				else
-#ifdef DEBUG
-				{
-					unsigned long newlevel = 0L;
 
-					if( debug_parsestring(value, &newlevel) )
-					{
-						rc = PROC_RC_WARN;
-					}
-					debug_setlevel(newlevel, 1);
-				}
-#else
-				{
-					log("incorrect directive `%s': no debug code", p_key);
-					rc = PROC_RC_IGNORE;
-				}
-#endif
-			}*/
 			else
 			{
-				log("unknown directive `%s'", p_key);
+				if (earlydbg)
+					fprintf(stderr, "BF-DEBUG: unknown directive `%s'\n", p_key);
+				
 				rc = PROC_RC_IGNORE;
 			}
 		}
@@ -371,7 +333,9 @@ int conf_readconf(const char *confname, int inclevel)
 		{
 			if( isifexpr && expr )
 			{
-				log("can't use expressions inside $ifexpr block");
+				if (earlydbg)
+					fprintf(stderr, "BF-DEBUG: can't use expressions inside $ifexpr block\n");
+				
 				rc = PROC_RC_IGNORE;
 			}
 			else if( isifexpr )
@@ -385,7 +349,9 @@ int conf_readconf(const char *confname, int inclevel)
 		}
 		else
 		{
-			log("incorrect config string");
+			if (earlydbg)
+				fprintf(stderr, "BF-DEBUG: incorrect config string %s\n", fullstr);
+			
 			rc = PROC_RC_IGNORE;
 		}
 		
@@ -400,13 +366,19 @@ int conf_readconf(const char *confname, int inclevel)
 		case PROC_RC_OK:
 			break;
 		case PROC_RC_WARN:
-			log("warning in config \"%s\" line %d", confname, line);
+			if (earlydbg)
+				fprintf(stderr, "BF-DEBUG: warning in config \"%s\" line %d\n", confname, line);
+			
 			break;
 		case PROC_RC_IGNORE:
-			log("ignore line %d in config \"%s\"", line, confname);
+			if (earlydbg)
+				fprintf(stderr, "BF-DEBUG: ignore line %d in config \"%s\"\n", line, confname);
+			
 			break;
 		case PROC_RC_ABORT:
-			log("fatal error in config \"%s\" in line %d", confname, line);
+			if (earlydbg)
+				fprintf(stderr, "BF-DEBUG: fatal error in config \"%s\" in line %d\n", confname, line);
+			
 			break;
 		default:
 			ASSERT_MSG();
@@ -418,54 +390,36 @@ int conf_readconf(const char *confname, int inclevel)
 	file_close(fp);
 
 	if( isifexpr )
-		{ maxrc = 1; log("unterminated directive `#ifexp'"); }
+		{ 
+			maxrc = 1; 
+			if (earlydbg)
+				fprintf(stderr, "BF-DEBUG: unterminated directive `#ifexp'\n"); 
+			
+		}
 	
 	if( fullstr )
 		free(fullstr);
 	if( ifexpr )
 		free(ifexpr);
 	
-	DEB((D_CONFIG, "readconfig: exit with maxrc = %d", maxrc));
+	if (earlydbg)
+		fprintf(stderr, "BF-DEBUG: readconfig: exit with maxrc = %d\n", maxrc);
+	
 
         /* update subsystems */
         if (inclevel==0) { // end of main config
             if( log_reopen(log_getfilename(LOG_FILE_SESSION), NULL, NULL) )
             {
-                log("can't continue without logging");
+                if (earlydbg)
+					fprintf(stderr, "BF-DEBUG: can't continue without logging\n");
+				
                 exit(-1);
             }
 #ifdef DEBUG
             debug_configure();
-
 #endif
         }
 
 	return maxrc;
 }
 
-#ifdef DEBUG
-/*void debug_override(void)
-{
-	s_cval_entry *ptrl;
-	char abuf[BF_MAXADDRSTR+1];
-	
-	DEB((D_CONFIG, "debug_override: BEGIN"));
-	
-	for( ptrl = bforce_config[cf_override].data; ptrl; ptrl = ptrl->next )
-	{
-		DEB((D_CONFIG, "log_overridelist: address %s",
-				ftn_addrstr(abuf, ptrl->d.override.addr)));
-		DEB((D_CONFIG, "log_overridelist: \tIpaddr   = \"%s\"",
-				ptrl->d.override.sIpaddr));
-		DEB((D_CONFIG, "log_overridelist: \tPhone    = \"%s\"",
-				ptrl->d.override.sPhone));
-		DEB((D_CONFIG, "log_overridelist: \tWorktime = \"%s\"",
-				timevec_string(abuf, &ptrl->d.override.worktime, sizeof(abuf))));
-		DEB((D_CONFIG, "log_overridelist: \tFlags    = \"%s\"",
-				ptrl->d.override.sFlags));
-	}
-
-	DEB((D_CONFIG, "debug_override: END"));
-}*/
-#endif /* DEBUG */
-

source/bforce/daemon.c

@@ -161,7 +161,7 @@ static int daemon_sysentry_init(s_sysentry *sysent)
 			strcpy(msg, "freqs holded");
 	}
 
-	if( msg && *msg )
+	if( *msg )
 		log("QUEUE: add %s (%s)", ftn_addrstr(abuf, sysent->node.addr), msg);
 	else
 		log("QUEUE: add %s", ftn_addrstr(abuf, sysent->node.addr));
@@ -178,7 +178,7 @@ static int daemon_sysentry_deinit(s_sysentry *sysent)
 	return 0;
 }
 
-static bool daemon_node_cancall_line(const s_node *node, const s_override *ovrd)
+static int daemon_node_cancall_line(const s_node *node, const s_override *ovrd)
 {
 	bool good_phone = FALSE;
 	bool good_host = FALSE;
@@ -194,7 +194,7 @@ static bool daemon_node_cancall_line(const s_node *node, const s_override *ovrd)
 		 if( modem_isgood_phone(ovrd->sPhone) )
 			good_phone = TRUE;
 	}
-	else if( node && node->phone && *node->phone )
+	else if( node && *node->phone )
 	{
 		 if( modem_isgood_phone(node->phone) )
 			good_phone = TRUE;
@@ -208,6 +208,11 @@ static bool daemon_node_cancall_line(const s_node *node, const s_override *ovrd)
 		if( tcpip_isgood_host(ovrd->sIpaddr) )
 			good_host = TRUE;
 	}
+	else if ( node && *node->host )
+	{
+		if( tcpip_isgood_host(node->host) )
+			good_host = TRUE;
+	}
 	
 	/*
 	 * Check work time
@@ -231,6 +236,16 @@ static bool daemon_node_cancall_line(const s_node *node, const s_override *ovrd)
 			good_time = TRUE;
 	}
 	
+	
+	// Must be more complicated, i.e. call to IP even if modem is not good time
+	if ( good_host )
+	{
+		good_time = TRUE;
+	}
+	
+	DEB((D_DAEMON, "daemon: node_cancall_line good_phone: %d, good_time:%d, good_host:%d", 
+					good_phone, good_time, good_host));
+	
 	if( good_time )
 	{
 		if( good_host )
@@ -323,9 +338,23 @@ static bool daemon_node_cancall(s_sysentry *syst, bool ign_wtime, bool tcpip)
 			return FALSE;
 	}
 	
+	/* Make check for tcpip out */
+	if ( tcpip )
+	{
+		rc = daemon_node_cancall_line(&syst->node, NULL);
+		DEB((D_DAEMON, "daemon tcpip: node_cancall rc=%d", rc));
+		if ( rc == 2 )
+		{
+			syst->tcpip = TRUE;
+			return TRUE;
+		}
+	}
+	
+	
 	/* Make checks for all lines */
 	if( syst->overrides )
 	{
+		DEB((D_DAEMON, "daemon: node_cancall OVR-IN"));
 		if( syst->lineptr && syst->lineptr->hidden )
 		{
 			line = syst->line + 1;
@@ -363,11 +392,18 @@ static bool daemon_node_cancall(s_sysentry *syst, bool ign_wtime, bool tcpip)
 			}
 			line++;
 		}
+		
 	}
 	else /* Node without overriden parameters */
 	{
 		syst->line = line = 0;
-		return daemon_node_cancall_line(&syst->node, NULL);
+		rc = daemon_node_cancall_line(&syst->node, NULL);
+		DEB((D_DAEMON, "daemon: node_cancall rc=%d", rc));
+		if ( rc )
+		{
+			syst->tcpip = (rc == 2) ? TRUE : FALSE;
+			return TRUE;
+		}
 	}
 	
 	return FALSE;
@@ -687,6 +723,8 @@ int daemon_rescan_sysqueue(s_sysqueue *q, s_daemon_queue dqs[])
 	
 #ifdef DEBUG
 	log_sysqueue(q);
+	DEB((D_DAEMON, "daemon rescan_sysqueue daemon queue: MODEM: %d, %d; TCPIP: %d, %d",
+		dqs[MODEM_QUEUE].circle, dqs[MODEM_QUEUE].current, dqs[TCPIP_QUEUE].circle, dqs[TCPIP_QUEUE].current));
 #endif
 
 	return 0;
@@ -755,6 +793,7 @@ int daemon_pidfile(int cmd)
 	pid_t hispid, mypid = getpid();
 	FILE *pf;
 	struct stat sb;
+	int res;
 
 	if( !pidfile )
 		return 0;
@@ -768,7 +807,12 @@ int daemon_pidfile(int cmd)
 					return -1;
 				}	
 				
-				fscanf(pf, "%d", &hispid);
+				res = fscanf(pf, "%d", &hispid);
+				if (res != 1) {
+					log("daemon pidfile: not readable");
+					return -1;
+				}
+				
 				fclose(pf);
 
 				if( hispid ) {
@@ -807,7 +851,12 @@ int daemon_pidfile(int cmd)
 					return -1;
 				}
 				
-				fscanf(pf, "%d", &hispid);
+				res = fscanf(pf, "%d", &hispid);
+				if (res != 1) {
+					log("daemon pidfile: not readable");
+					return -1;
+				}
+				
 				fclose(pf);
 				
 				if( !hispid  || (hispid == mypid) ) {
@@ -831,7 +880,12 @@ int daemon_pidfile(int cmd)
 					return -1;
 				}
 				
-				fscanf(pf, "%d", &hispid);
+				res = fscanf(pf, "%d", &hispid);
+				if (res != 1) {
+					log("daemon pidfile: not readable");
+					return -1;
+				}
+				
 				fclose(pf);
 				unlink(pidfile);
 				
@@ -938,15 +992,15 @@ int daemon_run(const char *confname, const char *incname, bool quit)
 			
 			/* Read primary config file */
 			if( confname && *confname )
-				rc = conf_readconf(confname, 0);
+				rc = conf_readconf(confname, 0, false);
 			else
-				rc = conf_readconf(conf_getconfname(), 0);
+				rc = conf_readconf(conf_getconfname(), 0, false);
 			
 			if( rc )
 				return(BFERR_FATALERROR);
 			
 			/* Read additional config file (manual include) */
-			if( incname && *incname && conf_readconf(incname, 1) )
+			if( incname && *incname && conf_readconf(incname, 1, false) )
 				log("cannot read additional config (ignore)");
 			
 			dmstate = DM_Start;
@@ -994,10 +1048,17 @@ int daemon_run(const char *confname, const char *incname, bool quit)
 				timer_set(&timer_alive, DAEMON_ALIVE_TIMER);
 			}
 			
-			if( max_modem > 0 )
-				daemon_queue_do(&daemon_queues[MODEM_QUEUE]);
 			if( max_tcpip > 0 ) 
+			{
+				DEB((D_DAEMON,"daemon: daemon_tcpip_queue"));
 				daemon_queue_do(&daemon_queues[TCPIP_QUEUE]);
+			}
+			
+			if( max_modem > 0 )
+			{
+				DEB((D_DAEMON,"daemon: daemon_modem_queue"));
+				daemon_queue_do(&daemon_queues[MODEM_QUEUE]);
+			}
 			
 			(void)sleep(DAEMON_IDLE_SLEEP);
 			break;

source/bforce/daemon_call.c

@@ -39,8 +39,8 @@ static s_modemport *daemon_getfree_port(const char *lockdir)
 
 static int daemon_call_branch(s_sysentry *syst, const char *lockdir, s_modemport *port)
 {
-	int rc = BFERR_NOERROR;
+	//int rc = BFERR_NOERROR;
-	char abuf[BF_MAXADDRSTR+1];
+	//char abuf[BF_MAXADDRSTR+1];
 
 	/*
 	 * First of all restore the default signal handlers
@@ -54,7 +54,12 @@ static int daemon_call_branch(s_sysentry *syst, const char *lockdir, s_modemport
 
         s_bforce_opts opts;
         // TODO: add hiddenline round-robin
-        opts.hiddline=0;
+        memset(&opts, '\0', sizeof(s_bforce_opts));
+        
+        opts.hiddline = 0;
+        if ( syst->tcpip )
+			opts.runmode = MODE_CALL_IP;
+		else
 			opts.runmode = MODE_CALL_DEFAULT;
         opts.ipproto = NULL;
         opts.phone = NULL;
@@ -62,7 +67,7 @@ static int daemon_call_branch(s_sysentry *syst, const char *lockdir, s_modemport
         opts.inetd = 0;
         opts.connect = NULL;
         opts.device = NULL;
-
+    DEB((D_DAEMON, "daemon_call: calling call_system from branch"));
 //        log("doing call_system");
 	return call_system(syst->node.addr, &opts);
 }
@@ -88,7 +93,10 @@ int daemon_call(s_sysentry *syst)
 	 * Check whether this node is allready locked
 	 */
 	if( out_bsy_check(syst->node.addr) ) 
+	{
+		DEB((D_DAEMON, "daemon_call: node locked by .bsy file"));
 		return 0;
+	}
 	
 	/*
 	 * Set state structure to make expressions works properly now
@@ -101,6 +109,7 @@ int daemon_call(s_sysentry *syst)
 	
 	if( syst->tcpip == FALSE )
 	{
+		DEB((D_DAEMON, "daemon_call: tcpip false - prep modem line"));
 		if( (p_lockdir = conf_string(cf_uucp_lock_directory)) == NULL )
 			p_lockdir = BFORCE_LOCK_DIR;
 		
@@ -110,6 +119,9 @@ int daemon_call(s_sysentry *syst)
 			return 1;
 		}
 	}
+	DEB((D_DAEMON, "call %s line %d via %s",
+		ftn_addrstr(abuf, syst->node.addr), syst->line,
+		syst->tcpip ? "TCP/IP" : modemport->name));
 		
 	log("call %s line %d via %s",
 		ftn_addrstr(abuf, syst->node.addr), syst->line,
@@ -138,7 +150,7 @@ int daemon_call(s_sysentry *syst)
 	}
 	
 	/* Now we are in child process */
-	
+	DEB((D_DAEMON, "daemon_call: fork success - calling..."));
 	exit(daemon_call_branch(syst, p_lockdir, modemport));
 }
 

source/bforce/expression.y

@@ -45,6 +45,7 @@
 %token LOGOP
 
 %expect 2
+
 %{
 #include "includes.h"
 #include "confread.h"

source/bforce/freq_srif.c

@@ -68,7 +68,8 @@ int req_createsrif(char *sname, char *req, char *rsp)
 	else
 		fprintf(fp, "Sysop SysOp\n");
 		
-	if( aptr = session_1remote_address() )
+	aptr = session_1remote_address();
+	if( aptr )
 		fprintf(fp, "AKA %s\n", ftn_addrstr(abuf, *aptr));
 	else
 		return -1;

source/bforce/io_tcpip.c

@@ -19,29 +19,49 @@
 
 #define DEFAULT_PORT 60179	/* Birthday .. mother fucker :) */
 
+struct addrinfo *ai = NULL;
+
 static RETSIGTYPE tcpip_interrupt(int sig)
 {
 	tty_abort = TRUE;
-	log("terminating on signal %d", sig);
+	(void)log("terminating on signal %d", sig);
 }
 
 static RETSIGTYPE tcpip_brokenpipe(int sig)
 {
 	tty_abort = TRUE;
 	if( tty_online )
-		log("connection closed");
+		(void)log("connection closed");
 	else
-		log("terminating on signal %d", sig);
+		(void)log("terminating on signal %d", sig);
 }
 
-static int tcpip_connect2(struct sockaddr_in server)
+static int tcpip_connect2(struct addrinfo *ai)
 {
-	int fd;
+	int fd = -1;
+	char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
 	
-	DEB((D_INFO, "tcpip_connect2: trying \"%s\" at port %d",
+	struct addrinfo *rai;
-		inet_ntoa(server.sin_addr), (int)ntohs(server.sin_port)));
 	
-	if( (fd = socket(AF_INET, SOCK_STREAM, 0)) < 0 )
+	for (rai = ai; rai != NULL; rai = rai->ai_next)
+	{
+		if (getnameinfo(rai->ai_addr, rai->ai_addrlen, hbuf, sizeof(hbuf), sbuf,
+                       sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV) == 0)
+		DEB((D_INFO, "tcpip_connect2: trying host=%s, serv=%s", hbuf, sbuf));
+		
+		fd = socket (rai->ai_family, rai->ai_socktype, rai->ai_protocol);
+		
+		if ( fd == -1 ) 
+		{
+			DEB((D_INFO, "tcpip_connect2: socket error"));
+		}
+		else break;
+		
+		hbuf[0]='\0';
+		sbuf[0]='\0';
+	}
+	DEB((D_INFO, "tcpip_connect2: socket success: %d", fd));
+	if (fd < 0 )
 	{
 		logerr("can't create socket");
 		return(1);
@@ -84,9 +104,9 @@ static int tcpip_connect2(struct sockaddr_in server)
 	clearerr(stdout);
 	clearerr(stderr);
 	
-	if( connect(0, (struct sockaddr*)&server, sizeof(server)) == -1 )
+	if( connect(0, rai->ai_addr, rai->ai_addrlen) == -1 )
 	{
-		logerr("can't connect to %s", inet_ntoa(server.sin_addr));
+		logerr("can't connect to %s", hbuf);
 		close(0);
 		close(1);
 		close(2);
@@ -99,8 +119,7 @@ static int tcpip_connect2(struct sockaddr_in server)
 		return 1;
 	}
 
-	log("TCP/IP connect to %s on port %d",
+	(void)log("TCP/IP connect success to %s on service %s", hbuf, sbuf);
-		inet_ntoa(server.sin_addr), (int)ntohs(server.sin_port));
 	
 	return(0);
 }
@@ -108,14 +127,23 @@ static int tcpip_connect2(struct sockaddr_in server)
 int tcpip_connect(const char *hostname, e_tcpmode tcpmode)
 {
 	int rc = 0;
-	struct hostent *he = NULL;
+	//struct hostent *he = NULL;
-	struct servent *se = NULL;
+	//struct servent *se = NULL;
-	struct sockaddr_in server;
+	//struct sockaddr_in server;
+	//struct sockaddr_storage server;
+	
+	struct addrinfo *aisave = NULL;
+	struct addrinfo aihints;
+	int nameres = 0;
+	
+	
 	char *host = xstrcpy(hostname);
 	char *p = strrchr(host, ':');
 	const char *port = NULL;
 	
-	server.sin_family = AF_INET;
+	
+	// AF_INET - only IPv4
+	//server.sin_family = AF_INET;
 	
 	if( p )
 		{ *p++ = '\0'; port = p; }
@@ -123,18 +151,34 @@ int tcpip_connect(const char *hostname, e_tcpmode tcpmode)
 		port = "binkp";
 	else if( tcpmode == TCPMODE_TELNET )
 		port = "telnet";
-	else /* Default service name is "fido" */
+	else /* Can not rely on /etc/services - it is not well-known port */
-		port = "fido";
+		port = "60179";
 	
+	// Do not need it
+	/* 
 	if( ISDEC(port) )
 		server.sin_port = htons(atoi(port));
 	else if( (se = getservbyname(port, "tcp")) )
 		server.sin_port = se->s_port;
 	else
 		{ log("invalid port or service name \"%s\"", port); rc = 1; }
+	*/
+	//if( rc == 0 )
+	//{
+	DEB((D_INFO, "tcpip_connect: port is %s", port));	 
+	memset( &aihints, 0, sizeof( aihints) );
+	aihints.ai_family = AF_UNSPEC;
+	//aihints.ai_socktype = SOCK_STREAM;
+	aihints.ai_protocol = IPPROTO_TCP;
 	
-	if( rc == 0 )
+	nameres = getaddrinfo ( host, port, &aihints, &ai );
+	if ( nameres != 0 )
 	{
+		rc = 1;
+		log("Resolver error for host %s, port %s: \"%s\".", host, port, gai_strerror(nameres));
+	}
+		// GetHostByName works with IPv4 only and *deprecated*
+		/*
 		if( (he = gethostbyname(host)) )
 		{
 			memcpy(&server.sin_addr, he->h_addr, he->h_length);
@@ -159,12 +203,19 @@ int tcpip_connect(const char *hostname, e_tcpmode tcpmode)
 				log("unknown error while resolving host \"%s\"", host);
 				break;
 			}
-		}
+		} */
-	}
+	//}
 
 	if( host ) { free(host); host = NULL; }
+	DEB((D_INFO, "tcpip_connect: resolver got result!")); 
+	aisave = ai;
 	
-	return rc ? rc : tcpip_connect2(server);
+	if (rc == 0 )
+		rc = tcpip_connect2(ai);
+	
+	freeaddrinfo( aisave );
+	
+	return rc;
 }
 
 int tcpip_init(void)

source/bforce/io_unix_lock.c

@@ -77,7 +77,7 @@ static char *lock_getname(const char *lockdir, const s_modemport *modemport)
 	
 	ASSERT(modemport != NULL);
 	
-	if( lockdir && *lockdir )
+	if( *lockdir )
 		lckname = (char *)xstrcpy(lockdir);
 	else
 		lckname = (char *)xstrcpy(BFORCE_LOCK_DIR);
@@ -314,7 +314,7 @@ int port_lock(const char *lockdir, const s_modemport *modemport)
 	char *lckname;
 	char *tmpname, *p_tmpname;
 	
-	if( lockdir && *lockdir )
+	if( *lockdir )
 		tmpname = xstrcpy(lockdir);
 	else
 		tmpname = xstrcpy(BFORCE_LOCK_DIR);

source/bforce/io_unix_tio.c

@@ -118,6 +118,9 @@ int tio_get(int fd, TIO *tio)
 {
 #ifdef HAVE_TERMIOS_H
 	return tcgetattr(fd, tio);
+#else
+	DEB(("io_unix_tio: TERMIOS not supported!"));
+	return -1;
 #endif
 }
 
@@ -127,6 +130,9 @@ int tio_set(int fd, TIO *tio)
 {
 #ifdef HAVE_TERMIOS_H
 	return tcsetattr(fd, TCSANOW, tio);
+#else
+	DEB(("io_unix_tio: TERMIOS not supported!"));
+	return -1;
 #endif
 }
 
@@ -177,7 +183,7 @@ int tio_get_speed(TIO *tio)
 			return speedtab[i].nspeed;
 	}
 	
-	return-1;
+	return -1;
 }
 
 int tio_set_flow_control(int fd, TIO *tio, int flow)

source/bforce/io_unix_tty.c

@@ -307,7 +307,7 @@ int tty_putc(unsigned char ch, int timeout)
 
 int tty_puts(const unsigned char *s, int timeout)
 {
-	return tty_write_timeout(s, strlen(s), timeout);
+	return tty_write_timeout(s, strlen((char *)s), timeout);
 }
 
 int tty_getc(int timeout)

source/bforce/logger.c

@@ -106,11 +106,15 @@ int log_open(const char *logname, const char *ext, const char *tty)
 	
 	if( logname )
 	{
+		DEB((D_INFO,"log_open: Opening log file %s", logname));
+		
 		strnxcpy(log_name, logname, sizeof(log_name));
 		
+		// May be NULL, so check both
 		if( tty && *tty )
 			strnxcpy(log_ttyname, tty, sizeof(log_ttyname));
 		
+		// May be NULL, so check both
 		if( ext && *ext )
 		{
 			strnxcpy(log_extension, ext, sizeof(log_extension));
@@ -142,7 +146,9 @@ int log_close(void)
 	
 	if( log_fp )
 	{
-		rc = fclose(log_fp); log_fp = NULL;
+		rc = fclose(log_fp); 
+		DEB((D_INFO,"Closing log file."));
+		log_fp = NULL;
 	}
 	
 	return rc;	
@@ -283,6 +289,8 @@ int logerr(const char *s, ...)
 
 #ifdef USE_SYSLOG 
 
+bool slog_active = FALSE;
+
 const char *log_getfilename(int whatfor)
 {
      const char *p = "/dev/null";
@@ -291,21 +299,26 @@ const char *log_getfilename(int whatfor)
 
 bool log_isopened(void)
 {
-     return TRUE;
+     return slog_active;
 }
 
 int log_open(const char *logname, const char *ext, const char *tty)
 {
-     char *p = "bforce";
+     char *p = "bforce ";
+     p = xstrcat(p, BF_VERSION);
      int fac = conf_number(cf_syslog_facility);
      if( tty && *tty )
                 strncpy(p, tty, sizeof(p));
      openlog(p, LOG_PID, fac);
+     slog_active = TRUE;
      return 0;
 }
 
 int log_reopen(const char *logname, const char *ext, const char *tty)
 {
+     if ( !slog_active ) {
+		return (log_reopen(logname, ext, tty));
+	 } else 
 		return 0;
 }
 

source/bforce/nodelist.c

@@ -56,18 +56,25 @@ int nodelist_checkflag(const char *nodeflags, const char *flag)
 	const char *searchbase = nodeflags;
 	char *q;
 	
-	while( p = strstr(searchbase, flag) )
+	DEB((D_NODELIST, "nodelist: checking flag \"%s\" in flags \"%s\"", flag, nodeflags));
+	if ( nodeflags ) {
+		while( p = strcasestr(searchbase, flag) ) // p - found flag 
 		{
-		if( p == searchbase || *(p-1) == ',' )
+			if( (p == searchbase) || (p != searchbase && *(p-1) == ',') )
 			{
-			if( (q = strchr(p, ',')) == NULL || (q - p) == strlen(flag) )
+				if( (q = strchr(p, ',')) == NULL || (q - p) == strlen(flag) ) {
+					DEB((D_NODELIST, "nodelist: found flag %s", flag));
 					return 0;
-			if( (strchrnul(p, ':') - p) == strlen(flag) )
+				}
+				if( (strchrnul(p, ':') - p) == strlen(flag) ) {
+					DEB((D_NODELIST, "nodelist: found flag %s", flag));
 					return 0;
 				}
+			}
 		
 			searchbase = p + 1; // avoid finding again the same
 		}
+	}
 	
 	return 1;
 }
@@ -243,7 +250,7 @@ int nodelist_parsestring(s_node *node, char *str)
 	strnxcpy(node->phone, argv[NODELIST_POSPHONE], sizeof(node->phone));
 	strnxcpy(node->flags, argv[NODELIST_POSFLAGS], sizeof(node->flags));
 	node->speed = atoi(argv[NODELIST_POSSPEED]);
-	
+	DEB((D_NODELIST, "nodelist: Parsed common values SYS: %s, ZYZ: %s, LOC: %s, PHONE: %s", node->name, node->sysop, node->location, node->phone));
 	/*
 	 * Replace all '_' by space character
 	 */
@@ -291,8 +298,11 @@ int nodelist_parsestring(s_node *node, char *str)
 	node->do_ifcico = nodelist_checkflag(node->flags, "IFC") == 0;
 	node->do_telnet = nodelist_checkflag(node->flags, "ITN") == 0;
 	
+	//TODO: Add more INA flags to array
 	nodelist_flagvalue(node->flags, "INA", node->host);
 	
+	DEB((D_NODELIST, "nodelist: Parsed inet values IBN: %d, IFC: %d, ITN: %d, INA: %s", node->do_binkp, node->do_ifcico, node->do_telnet, node->host)); 
+	
 	return 0;
 }
 

source/bforce/os_unix.c

@@ -73,9 +73,18 @@ int exec_options_parse(char *str)
 
 void exec_options_init(s_exec_options *eopt)
 {
+	int i = 0;
+	
 	memset(eopt, '\0', sizeof(s_exec_options));
 	eopt->umask    = EXEC_DEFAULT_UMASK;
 	eopt->envp[0]  = NULL;
+	
+	while(mainenv[i]) {
+		DEB((D_FREE,"EXEC: Added ENV variable: %s\n", mainenv[i]));
+		eopt->envp[i] = xmalloc(strlen(mainenv[i]) + 2);
+		strcpy(eopt->envp[i],mainenv[i]);
+		eopt->envp[++i] = NULL;
+	}
 }
 
 void exec_options_deinit(s_exec_options *eopt)

source/bforce/outb_fsqueue.c

@@ -31,6 +31,7 @@ int out_filetype(const char *fname)
 	else
 		p_nam = fname;
 	
+	DEB((D_EVENT, "outb_fsqueue: getting type of file %s", p_nam));
 	/*
 	 *  Get file name extension
 	 */
@@ -39,12 +40,19 @@ int out_filetype(const char *fname)
 	
 	for( i = 0; outtab[i].ext; i++ )
 		if( strcasemask(p_ext, outtab[i].ext) == 0 )
+		{
+			DEB((D_EVENT, "outb_fsqueue: got type %d from outtab ext %s", outtab[i].type, p_ext ));
 			return outtab[i].type;
+		}
 	
 	for( i = 0; exttab[i].ext; i++ )
 		if( strcasemask(p_ext, exttab[i].ext) == 0 )
+		{
+			DEB((D_EVENT, "outb_fsqueue: got type %d from exttab ext %s", exttab[i].type, p_ext ));
 			return exttab[i].type;
+		}
 	
+	DEB((D_EVENT, "outb_fsqueue: got type UNKNOWN", exttab[i].type, p_ext ));
 	return TYPE_UNKNOWN;
 }
 

source/bforce/prot_binkp.c

@@ -64,6 +64,8 @@ int binkp_getforsend(s_binkp_state *bstate, char *buf, int *block_type, unsigned
 int binkp_doreceiveblock(s_binkp_state *bstate, char *buf, int block_type, unsigned short block_length);
 void binkp_process_NUL(s_binkp_sysinfo *remote_data, char *buffer);
 void binkp_process_ADR(char *buffer);
+int binkp_auth_incoming(s_binkp_sysinfo *remote_data);
+
 
 int binkp_loop(s_binkp_state *bstate) {
     unsigned char readbuf[BINKP_HEADER+BINKP_MAXBLOCK+1];
@@ -93,12 +95,12 @@ int binkp_loop(s_binkp_state *bstate) {
     bstate->emptyloop = 0;
     bstate->continuesend = false;
 
-    unsigned short read_pos=0;
+    uint16_t read_pos=0;
-    unsigned short read_blklen=0;
+    uint16_t read_blklen=0;
-    unsigned short want_read=BINKP_HEADER;
+    uint16_t want_read=BINKP_HEADER;
 
-    unsigned short write_pos=0;
+    uint16_t write_pos=0;
-    unsigned short have_to_write=0;
+    uint16_t have_to_write=0;
 
     int n, m;
     bool no_more_to_send = false;
@@ -115,13 +117,14 @@ int binkp_loop(s_binkp_state *bstate) {
 
     //     session criterium           handshake criterium
     while (!bstate->complete || bstate->waiting_got) {
-        DEB((D_24554, "loop s: %d r: %d p: %d sp: %d", bstate->batchsendcomplete, bstate->batchreceivecomplete,
+        DEB((D_24554, ">>> BinkP loop sendcpl: %d recvcpl: %d phase: %d subphase: %d", bstate->batchsendcomplete, bstate->batchreceivecomplete,
                     bstate->phase, bstate->subphase));
         if (bstate->continuesend) {
             no_more_to_send = false;
             bstate->continuesend = false;
         }
-        if (have_to_write==0 && (!no_more_to_send || bstate->extracmd[0]!=-1)) {
+
+        if (have_to_write==0 && (!no_more_to_send || bstate->extracmd[0]!=(char)-1)) {
             m = binkp_getforsend(bstate, writebuf+BINKP_HEADER, &block_type, &block_length);
             if(m==1 || m==3) {
                 //DEB((D_24554, "got block for sending %d %hu", block_type, block_length));
@@ -137,6 +140,7 @@ int binkp_loop(s_binkp_state *bstate) {
                     return PRC_ERROR;
                 }
                 writebuf[1] = block_length&0xff;
+                // TODO: FIX unprotected mode
                 if (bstate->mode==bmode_transfer && bstate->remote_data->options&BINKP_OPT_CRYPT)
                     encrypt_buf(writebuf, have_to_write, bstate->remote_data->keys_out);
             }
@@ -206,15 +210,19 @@ int binkp_loop(s_binkp_state *bstate) {
                 log("read: remote socket shutdown");
                 return PRC_REMOTEABORTED;
             }
-            if (bstate->mode==bmode_transfer && bstate->remote_data->options & BINKP_OPT_CRYPT)
+            // TODO: FIX unprotected mode
+            if (bstate->mode==bmode_transfer && bstate->remote_data->options & BINKP_OPT_CRYPT) {
                 decrypt_buf(readbuf+read_pos, n, bstate->remote_data->keys_in);
+                } else {
+                DEB((D_24554,"binkp: not encripted transfer"));
+                };
             DEB((D_24554, "got %d bytes", n));
             want_read -= n;
             read_pos += n;
             if (read_pos == BINKP_HEADER) {
                 // have read header, want read body
                 DEB((D_24554, "it should be 0: %d", want_read));
-                want_read = ((unsigned short)(readbuf[0]&0x7F)<<8) | readbuf[1];
+                want_read = ((uint16_t)(readbuf[0]&0x7F)<<8) | (uint16_t)readbuf[1];
                 DEB((D_24554, "got block header, block length %u", want_read));
             } // no else here: if want_read may be zero here for zero length block
         }
@@ -225,6 +233,7 @@ int binkp_loop(s_binkp_state *bstate) {
                 block_length = read_pos - BINKP_HEADER;
                 DEB((D_24554, "binkp: complete block is received %d %hu", block_type, block_length));
                 m = binkp_doreceiveblock(bstate, readbuf+BINKP_HEADER, block_type, block_length);
+                DEB((D_24554, "binkp: dorecieveblock result is %d", m));
                 if(m==1) {
                     DEB((D_24554, "block is successfully accepted"));
                     read_pos = 0;
@@ -265,6 +274,7 @@ int binkp_loop(s_binkp_state *bstate) {
             have_to_write -= n;
         }
     }
+    DEB((D_24554,"+++ BinkP Loop ended with rc=%d", bstate->rc));
     return bstate->rc;
 }
 
@@ -336,8 +346,8 @@ int binkp_getforsend(s_binkp_state *bstate, char *buf, int *block_type, unsigned
 {
     int my_sf, wr_pos;
     int n; // read file
-    if (bstate->extracmd[0]!=-1) {
+    if (bstate->extracmd[0]!=(char)-1) {
-        DEB((D_24554, "send command from receiver %d %s", bstate->extracmd[0], bstate->extracmd+1));
+        DEB((D_24554, "Send cmd to remote %d %s", bstate->extracmd[0], bstate->extracmd+1));
         buf[0] = bstate->extracmd[0];
         strcpy(buf+1, bstate->extracmd+1);
         *block_type = BINKP_BLK_CMD;
@@ -415,6 +425,7 @@ case 7:
 		// seems not to remove files from inbound until successful session end is enough to eliminate dupes
 		// if (!nodelist_checkflag (state.node.flags, "ND"))
 		//	strcat(buf+1, " ND");
+		// TODO: add GZ BZ2 and maybe EXTCMD
 		*block_length = 1 + strlen(buf+1);
 		DEB((D_24554, "send M_NUL %s", buf+1));
 		return 1;
@@ -480,7 +491,7 @@ case 3: // send password on outgoing or pw confirmation on incoming
             buf[0] = BPMSG_PWD;
             *block_type = BINKP_BLK_CMD;
 
-            if( bstate->local_data->passwd == '\0' ) {
+            if( bstate->local_data->passwd[0] == '\0' ) {
                 *block_length = 1 + sprintf(buf+1, "-");
 	    }
             else if( bstate->remote_data->options & BINKP_OPT_MD5 ) {
@@ -512,27 +523,48 @@ case 3: // send password on outgoing or pw confirmation on incoming
 
 
 case 4:
+        ;
+        char pbuf[32];
+        int pwset = 0;
+        
         if (bstate->mode==bmode_incoming_handshake) {
+            char * p;
             DEB((D_24554, "incoming handshake is complete"));
             bstate->complete = true;
-            char *p;
+            
-            char pbuf[32];
             for (i=0;i<state.n_remoteaddr;i++)
                 if( !session_get_password(state.remoteaddrs[i].addr, pbuf, sizeof(pbuf)) ){
-                    init_keys(bstate->remote_data->keys_in, pbuf?pbuf:"-");
+					pwset = 1;
+                    init_keys(bstate->remote_data->keys_in, pbuf[0]?pbuf:"-");
                     init_keys(bstate->remote_data->keys_out,  "-");
-                    for (p=pbuf?pbuf:"-"; *p; p++)
+                    for (p=pbuf[0]?pbuf:"-"; *p; p++)
                         update_keys(bstate->remote_data->keys_out, (int)*p);
                 }
+            //TODO: FIX incoming options 
         }
         else {
+			//TODO: Fix outgoing options
             DEB((D_24554, "outgoing handshake: everything is sent"));
+            for (i=0;i<state.n_remoteaddr;i++)
+                if( !session_get_password(state.remoteaddrs[i].addr, pbuf, sizeof(pbuf)) ){
+                    pwset = 1;
+                }
+           
+        }
+        // We have password-protected link. Remote options are already set,
+        // Now we determine how to CRYPT or not to CRYPT our file transfer
+        // Our CRYPT flag is always sent, so if the other side have CRYPT
+        // and link is password is set - The CRYPT must be
+        // Literally: if we have no pass -> drop the CRYPT flag
+        if ( !pwset ) {
+			DEB((D_24554, "binkp handshake: password NOT set, dropping CRYPT"));
+			bstate->remote_data->options &= !BINKP_OPT_CRYPT;	
 		}
         return 2;
         }
 
     }
-    else if (bstate->mode == bmode_transfer) {
+else if (bstate->mode == bmode_transfer) {
 
         switch (bstate->phase) {
             send_next_file:
@@ -623,7 +655,7 @@ case 4:
                 return 1;
 
             case 5:
-                DEB((D_24554, "nothing to send"));
+                DEB((D_24554, "BinkP_GetForSend: nothing to send"));
                 return 2;
 
 
@@ -647,7 +679,10 @@ bstate->extracmd[0] = BPMSG_ERR; strcpy(bstate->extracmd+1, msg); bstate->extrai
 
 int binkp_doreceiveblock(s_binkp_state *bstate, char *buf, int block_type, unsigned short block_length)
 {
+    DEB((D_24554, "dorecieveblock_type: %d", block_type));
+	DEB((D_24554, "dorecieveblock_bytes: %x %x %x %x", buf[0], buf[1], buf[2], buf[3]));
     switch (block_type) {
+		
 case BINKP_BLK_CMD:
         if (block_length<1) {
             PROTO_ERROR("Zero length command received")
@@ -664,12 +699,12 @@ case BPMSG_ADR:              /* List of addresses */
             if (bstate->address_established) {
                 PROTO_ERROR("remote tries to change address");
             }
-            if( bstate->extracmd[0] !=-1 ) return 0; // suspend !!!
+            if( bstate->extracmd[0] != (char)-1 ) return 0; // suspend !!!
             binkp_process_ADR(buf+1);
 
 	    if( !state.n_remoteaddr ) {
 	        log("error: remote did not supplied any addresses");
-	        if( bstate->extracmd[0] !=-1 ) return 0; // suspend
+	        if( bstate->extracmd[0] != (char)-1 ) return 0; // suspend
 	        bstate->extracmd[0] = BPMSG_BSY;
 	        strcpy(bstate->extracmd+1, "No addresses was presented");
 		bstate->extraislast = true;
@@ -681,16 +716,19 @@ case BPMSG_ADR:              /* List of addresses */
 		DEB((D_24554, "sending options"));
 		bstate->extracmd[0] = BPMSG_NUL;
 		bstate->extraislast = false;
-		sprintf(bstate->extracmd+1,"OPT MB");
+		sprintf(bstate->extracmd+1,"OPT MB CRYPT");
 		s_override ovr;
+		DEB((D_24554, "process adr overrides"));
 		for(i = 0; i < state.n_remoteaddr; i++) {
 		    ovr.sFlags = "";
 		    override_get (&ovr, state.remoteaddrs[i].addr, 0);
+		    DEB((D_24554, "got adr overrides"));
 		    if (nodelist_checkflag (ovr.sFlags, "NR")==0) {
 				strcat (bstate->extracmd+1, " NR");
 				break;
 				}
 	        }
+	    DEB((D_24554, "process adr overrides"));
             }
             // further use extracmd only for errors
 
@@ -736,7 +774,7 @@ case BPMSG_PWD:              /* Session password */
             /* Do authorization */
 	    if( binkp_auth_incoming(bstate->remote_data) ) {
 	        log("error: invalid password");
-	        if( bstate->extracmd[0] !=-1 ) return 0; // suspend if extra is occupied
+	        if( bstate->extracmd[0] != (char)-1 ) return 0; // suspend if extra is occupied
 	        bstate->extracmd[0] = BPMSG_ERR;
 	        strcpy(bstate->extracmd+1, "Security violation");
 	        bstate->extraislast = true;
@@ -745,7 +783,7 @@ case BPMSG_PWD:              /* Session password */
 	    // lock addresses
 	    if( session_addrs_lock(state.remoteaddrs, state.n_remoteaddr) ) {
 	        log("error locking addresses of the remote");
-	        if( bstate->extracmd[0] !=-1 ) return 0; // suspend if extra is occupied
+	        if( bstate->extracmd[0] != (char)-1 ) return 0; // suspend if extra is occupied
 	        bstate->extracmd[0] = BPMSG_BSY;
 	        strcpy(bstate->extracmd+1, "All addresses are busy");
 	        bstate->extraislast = true;
@@ -766,6 +804,7 @@ case BPMSG_FILE:             /* File information */
             s_bpfinfo recvfi;
             if( binkp_parsfinfo(buf+1, &recvfi, true) ) {
 		log ("M_FILE parse error: %s", buf + 1);
+		DEB((D_24554, "M_FILE parse error: %s", buf + 1 ));
 		PROTO_ERROR("invalid M_FILE");
             }
             bstate->batch_recv_count += 1;
@@ -782,9 +821,9 @@ case BPMSG_FILE:             /* File information */
 		    return 1;
 	        }
 	        DEB((D_24554, "no, skipping; TODO: accept it"));
-		if( bstate->extracmd[0] != -1 ) return 0;
+		if( bstate->extracmd[0] != (char)-1 ) return 0;
 		bstate->extracmd[0] = BPMSG_SKIP;
-		sprintf(bstate->extracmd+1, "%s %ld %ld %ld", recvfi.fn, recvfi.sz, recvfi.tm);
+		sprintf(bstate->extracmd+1, "%s %ld %ld %ld", recvfi.fn, recvfi.sz, recvfi.tm, recvfi.offs);
 		bstate->extraislast = false;
 		return 1;
 	    }
@@ -794,7 +833,7 @@ case BPMSG_FILE:             /* File information */
 	        PROTO_ERROR("invalid mode for M_FILE");
 	    }
 
-            if( bstate->extracmd[0] != -1 ) return 0;
+            if( bstate->extracmd[0] != (char)-1 ) return 0;
 	    switch(p_rx_fopen(bstate->pi, recvfi.fn, recvfi.sz, recvfi.tm, 0)) {
 case 0:
 		if (bstate->pi->recv->bytes_skipped == recvfi.offs) {
@@ -802,7 +841,7 @@ case 0:
 			bstate->frs = frs_data;
 			return 1;
 		}
-		DEB((D_24554, "making M_GET to skip downloaded part"));
+		DEB((D_24554, "making M_GET to skip downloaded part, file: %s, size %ld, time %ld, mode 0",recvfi.fn,recvfi.sz, recvfi.tm ));
 		bstate->extracmd[0] = BPMSG_GET;
 		sprintf(bstate->extracmd+1, "%s %ld %ld %ld",
 					bstate->pi->recv->net_name, (long)bstate->pi->recv->bytes_total,
@@ -840,7 +879,7 @@ case BPMSG_OK:               /* Password was acknowleged (data ignored) */
             }
             if (session_addrs_lock(state.remoteaddrs, state.n_remoteaddr)) {
                 log("error: unable to lock");
-                if (bstate->extracmd[0]!=-1) return 0;
+                if (bstate->extracmd[0]!= (char)-1) return 0;
                 bstate->extracmd[0] = BPMSG_BSY;
                 strcpy(bstate->extracmd+1, "All addresses are busy");
 		bstate->extraislast = true;
@@ -916,10 +955,10 @@ got_skip:
 
 check_that_all_files_are_confirmed:
             {
-                int i;
+                int j;
-                for (i = 0; i < bstate->pi->n_sentfiles; i++) {
+                for (j = 0; j < bstate->pi->n_sentfiles; j++) {
                     if (bstate->pi->sentfiles[i].status == FSTAT_WAITACK) {
-                        DEB((D_24554, "sent file %d waits for acknowlede", i));
+                        DEB((D_24554, "sent file %d waits for acknowlede", j));
                         return 1;
                     }
                 }
@@ -950,7 +989,7 @@ case BPMSG_GET:              /* Get a file from offset */
             }
             DEB((D_24554, "M_GET file %s size %d time %d offset %d", getfi.fn, getfi.sz, getfi.tm, getfi.offs));
 
-            if (bstate->extracmd[0] != -1) return 0;
+            if (bstate->extracmd[0] != (char)-1) return 0;
 
             if (bstate->pi->send) if (p_compfinfo(bstate->pi->send, getfi.fn, getfi.sz, getfi.tm)==0) {
                 DEB((D_24554, "M_GET for currently transmitted file"));
@@ -1040,14 +1079,14 @@ case BINKP_BLK_DATA:
             return 1;
         }
 
-        if (bstate->extracmd[0] != -1) return 0;
+        if (bstate->extracmd[0] != (char)-1) return 0;
 
         long int n;
         n = p_rx_writefile(buf, block_length, bstate->pi);
 
 	if( n < 0 ) {
 	    log("error writing local file");
-	    if( n == -2 ) {
+	    if( n == (long int)-2 ) {
 		bstate->extracmd[0] = BPMSG_GOT;
 		sprintf(bstate->extracmd+1, "%s %ld %ld", bstate->pi->recv->net_name, (long)bstate->pi->recv->bytes_total,
 							(long)bstate->pi->recv->mod_time);
@@ -1076,11 +1115,13 @@ case BINKP_BLK_DATA:
 		p_rx_fclose(bstate->pi);
 		PROTO_ERROR("extra data for file")
 	    }
-	    else if( bstate->pi->recv->bytes_received == bstate->pi->recv->bytes_total ) {
+	    else if( bstate->pi->recv->bytes_received == bstate->pi->recv->bytes_total ) 
+	    {
 			DEB((D_24554, "receive completed"));
 			bstate->frs = frs_nothing;
 			bstate->pi->recv->status = FSTAT_SUCCESS;
-		if( !p_rx_fclose(bstate->pi) ) {
+			if( !p_rx_fclose(bstate->pi) ) 
+			{
 				bstate->extracmd[0] = BPMSG_GOT;
 				sprintf(bstate->extracmd+1, "%s %ld %ld",
 						bstate->pi->recv->net_name, (long)bstate->pi->recv->bytes_total,
@@ -1088,7 +1129,8 @@ case BINKP_BLK_DATA:
 				bstate->extraislast = false;
 				return 1;
 			}
-		else {
+			else 
+			{
 			    DEB((D_24554, "some error committing file"));
 			    bstate->extracmd[0] = BPMSG_SKIP;
 			    sprintf(bstate->extracmd+1, "%s %ld %ld",
@@ -1097,7 +1139,9 @@ case BINKP_BLK_DATA:
 			    bstate->extraislast = false;
 			    return 1;
 			}
-	    } else {
+	    } 
+	    else 
+	    {
 	        DEB((D_24554, "data block accepted"));
 	        return 1;
 	    }
@@ -1113,7 +1157,7 @@ default:
 
 void binkp_process_NUL(s_binkp_sysinfo *remote_data, char *buffer)
 {
-	char *p, *q;
+	
 	
 	if( strncmp(buffer, "SYS ", 4) == 0 )
 		strnxcpy(remote_data->systname, buffer+4, sizeof(remote_data->systname));
@@ -1136,14 +1180,16 @@ void binkp_process_NUL(s_binkp_sysinfo *remote_data, char *buffer)
 		}
 		else
 			strnxcpy(remote_data->opt, buffer+4, sizeof(remote_data->opt));
-		
+		DEB((D_24554,"Process OPT"));
 		binkp_parse_options(remote_data, buffer+4);
 	}
 	else if( strncmp(buffer, "VER ", 4) == 0 )
 	{
+		char *p;
 		/* <mailer> [<protocol>/<vermaj>.<vermin>] */
 		if( (p = strchr(buffer+4, ' ')) )
 		{
+			char *q;
 			strnxcpy(remote_data->progname, buffer+4,
 					MIN(sizeof(remote_data->progname), p - (buffer+4) + 1));
 			++p;
@@ -1177,13 +1223,16 @@ void binkp_process_ADR(char *buffer)
 {
 	s_faddr addr;
 	char *p, *q;
-	
+	DEB((D_24554, "process ADR: %s", buffer));
 	for( p = string_token(buffer, &q, NULL, 0); p; p = string_token(NULL, &q, NULL, 0) )
 	{
+		DEB((D_24554, "binkp_process_ADR got token \"%s\" ",p ));
 		if( ftn_addrparse(&addr, p, FALSE) )
 			log("BinkP got unparsable address \"%s\"", string_printable(p));
-		else
+		else {
 			session_addrs_add(&state.remoteaddrs, &state.n_remoteaddr, addr);
+			DEB((D_24554, "process ADR complete"));
+		}
 	}
 }
 

source/bforce/prot_binkp_misc.c

@@ -45,7 +45,7 @@ int binkp_parsfinfo(const char *str, s_bpfinfo *fi, bool with_offset)
         return -1;
     }
     DEB((D_24554, "info to parse: %s", str));
-    r = sscanf(str, with_offset? "%s %d %d %d": "%s %d %d", &fi->fn, &fi->sz, &fi->tm, &fi->offs);
+    r = sscanf(str, with_offset? "%s %ld %ld %ld": "%s %ld %ld", &fi->fn, &fi->sz, &fi->tm, &fi->offs);
     chkslash = fi->fn;
     while (1) {
         chkslash = strchr(chkslash, '/');
@@ -304,7 +304,7 @@ void binkp_set_sysinfo(s_binkp_sysinfo *binkp, s_faddr *remote_addr, bool caller
 void binkp_parse_options(s_binkp_sysinfo *binkp, char *options)
 {
 	char *p, *n;
-
+	DEB((D_24554,"binkp: parse_options: %s", options));
 	for( p = string_token(options, &n, NULL, 0); p;
 	     p = string_token(NULL, &n, NULL, 0) )
 	{

source/bforce/prot_common.c

@@ -415,6 +415,7 @@ int p_tx_rewind(s_protinfo *pi, size_t pos)
 
 void prot_traffic_update(s_traffic *traf, size_t size, int xtime, int type)
 {
+	DEB((D_EVENT, "prot_common: Adding type %d with size %ld to stats", type, size));
 	if( type & TYPE_REQANSW )
 	{
 		traf->freqed_size += size;
@@ -433,6 +434,10 @@ void prot_traffic_update(s_traffic *traf, size_t size, int xtime, int type)
 		traf->arcmail_time += xtime;
 		traf->arcmail_num++;
 	}
+	else if( type & TYPE_TICFILE )
+	{
+		traf->ticfile_num++;
+	}
 	else
 	{
 		traf->files_size += size;
@@ -860,6 +865,8 @@ int p_rx_fopen(s_protinfo *pi, char *fn, size_t sz, time_t tm, mode_t mode)
 	size_t minfree = 0;
 	size_t needed_bytes_total = 0;
 	
+	DEB((D_FREE, "P_RX_FOPEN: File: %s, Size: %ld", fn, sz));
+	
 	/*
 	 * Check. May be we are receiving this file allready
 	 */

source/bforce/prot_emsi.c

@@ -598,6 +598,8 @@ void emsi_set_sysinfo(s_emsi *emsi, s_emsi *remote_emsi, int hrc,
 	s_cval_entry *addr_ptr;
 	s_cval_entry *hide_ptr;
 	s_faddr *primary = NULL;
+	char xdt[EMSI_MAXXDATETIME+1];
+	time_t xtm;
 	
 	const long options      = conf_options(cf_options);
 	const long speed        = conf_number(cf_max_speed);
@@ -737,6 +739,10 @@ void emsi_set_sysinfo(s_emsi *emsi, s_emsi *remote_emsi, int hrc,
 			{ emsi->compcodes.JAN = 1; }
 		if( (options & OPTIONS_NO_HYDRA) != OPTIONS_NO_HYDRA )
 			{ emsi->compcodes.HYD = 1; }
+		DEB((D_HSHAKE,"Generated compcodes for caller: NCP:%x.ZMO:%x.ZAP:%x.DZA:%x.JAN:%x.HYD:%x.KER:%x.SLK:%x.TZA:%x",
+		 emsi->compcodes.NCP, emsi->compcodes.ZMO, emsi->compcodes.ZAP,
+		 emsi->compcodes.DZA, emsi->compcodes.JAN, emsi->compcodes.HYD,
+		 emsi->compcodes.KER, emsi->compcodes.SLK, emsi->compcodes.TZA));
 	}
 	else
 	{
@@ -813,6 +819,22 @@ void emsi_set_sysinfo(s_emsi *emsi, s_emsi *remote_emsi, int hrc,
 		strnxcpy(emsi->flags,    p_flags     ? p_flags     : "MO",      sizeof(emsi->flags));
 	}
 	
+	/* ----------------------------------------------------------------- */
+	/* Data for {TZUTC} and {XDATETIME} field                            */
+	/* ----------------------------------------------------------------- */
+	
+	if ( conf_boolean(cf_emsi_send_tz) ) {
+		emsi->have_tzutc = 1;
+		emsi->tzutc = (int)(time_gmtoffset());
+	}
+	
+	if ( conf_boolean(cf_emsi_send_time) ) {
+		emsi->have_xdatetime = 1;
+		
+		strnxcpy(xdt,time_string_format(xdt, EMSI_MAXXDATETIME, "%d.%m.%Y %H:%M:%S %z", xtm),EMSI_MAXXDATETIME); 
+		strnxcpy(emsi->xdatetime, xdt, sizeof(emsi->xdatetime));
+	}
+	
 	/* ----------------------------------------------------------------- */
 	/* Data for {OHFR} field                                             */
 	/* ----------------------------------------------------------------- */

source/bforce/prot_emsi_api.c

@@ -134,6 +134,7 @@ int emsi_incoming(s_handshake_protocol *THIS)
 	int rc = HRC_OK;
 	s_emsi *remote_emsi = NULL;
 	s_emsi *local_emsi = NULL;
+	char *p = NULL;
 	
 	ASSERT(THIS);
 	ASSERT(THIS->remote_data);
@@ -198,7 +199,34 @@ int emsi_incoming(s_handshake_protocol *THIS)
 				
 		/*
 		 * Set protocol that we will use
+		 * EMSI-II compatible as of v0.25
 		 */
+		if ( remote_emsi->compcodes.EII ) {
+			/* EMSI-II relies on protocol order sent by CALLER
+			 * we must agree on first matching protocol
+			 */
+			p = xstrcpy( remote_emsi->proto_order );
+			THIS->protocol = PROT_NOPROT;
+			for ( p = strtok( p, "," ); p ; p=strtok( NULL, "," ) ) {
+				if ( !strcmp(p, "ZMO") && !(options & OPTIONS_NO_ZMODEM)) {
+					if ( THIS->protocol == PROT_NOPROT ) THIS->protocol = PROT_ZMODEM;
+				}
+				if ( !strcmp(p, "HYD") && !(options & OPTIONS_NO_HYDRA)) {
+					if ( THIS->protocol == PROT_NOPROT ) THIS->protocol = PROT_HYDRA;
+				}
+				if ( !strcmp(p, "ZAP") && !(options & OPTIONS_NO_ZEDZAP)) {
+					if ( THIS->protocol == PROT_NOPROT ) THIS->protocol = PROT_ZEDZAP;
+				}
+				if ( !strcmp(p, "DZA") && !(options & OPTIONS_NO_DIRZAP)) {
+					if ( THIS->protocol == PROT_NOPROT ) THIS->protocol = PROT_DIRZAP;
+				}
+				/* if ( !strcmp(p, "JAN") && !(options & OPTIONS_NO_JANUS)) {
+					if ( THIS->protocol == PROT_NOPROT ) THIS->protocol = PROT_JANUS;
+				} */
+			}
+			
+		} else {
+			/* EMSI-I relies on our self order, not the CALLER's */
 			if( remote_emsi->compcodes.HYD && !(options & OPTIONS_NO_HYDRA) )
 				THIS->protocol = PROT_HYDRA;
 			else if( remote_emsi->compcodes.ZAP && !(options & OPTIONS_NO_ZEDZAP) )
@@ -208,8 +236,9 @@ int emsi_incoming(s_handshake_protocol *THIS)
 			else /* NCP */
 			{
 				THIS->protocol = PROT_NOPROT;
-			rc = HRC_NO_PROTOS;
 			}
+		}
+		if ( THIS->protocol == PROT_NOPROT ) rc = HRC_NO_PROTOS;
 		
 		/*
 		 * Check EMSI flags and set corresponding local HOLD flags

source/bforce/prot_emsi_misc.c

@@ -103,6 +103,10 @@ char *emsi_createdat(s_emsi *emsi)
 	char *tmp = NULL;
 	char buf[100];
 	char abuf[BF_MAXADDRSTR+1];
+	char *p_order = NULL;
+	char *ord = NULL;
+	
+	
 	
 	tmp = (char *)xstrcpy("**EMSI_DAT0000");
 	
@@ -179,14 +183,79 @@ char *emsi_createdat(s_emsi *emsi)
 			tmp = add_char(tmp, '}');
 		}
 			
-		/* compatibility_codes */
+		/* compatibility_codes (EMSI behavior as FTS-0088) */
 		tmp = add_char(tmp, '{');
-		if( emsi->compcodes.NCP ) tmp = add_str(tmp, "NCP,");
+		
-		if( emsi->compcodes.ZMO ) tmp = add_str(tmp, "ZMO,");
+		p_order = conf_string(cf_proto_order);
-		if( emsi->compcodes.ZAP ) tmp = add_str(tmp, "ZAP,");
+		
-		if( emsi->compcodes.DZA ) tmp = add_str(tmp, "DZA,");
+		if ( !p_order ) {
-		if( emsi->compcodes.JAN ) tmp = add_str(tmp, "JAN,");
 			if( emsi->compcodes.HYD ) tmp = add_str(tmp, "HYD,");
+			if( emsi->compcodes.JAN ) tmp = add_str(tmp, "JAN,");
+			if( emsi->compcodes.DZA ) tmp = add_str(tmp, "DZA,");
+			if( emsi->compcodes.ZAP ) tmp = add_str(tmp, "ZAP,");
+			if( emsi->compcodes.ZMO ) tmp = add_str(tmp, "ZMO,");
+			if( emsi->compcodes.TZA ) tmp = add_str(tmp, "TZA,");
+			if( emsi->compcodes.SLK ) tmp = add_str(tmp, "SLK,");
+			if( emsi->compcodes.KER ) tmp = add_str(tmp, "KER,");
+			if( emsi->compcodes.NCP ) tmp = add_str(tmp, "NCP,");
+		} else {
+			ord = xmalloc(4);
+			DEB((D_HSHAKE,"Protocol order found: %s", p_order));
+			ord = strncpy(ord, p_order,3);
+			ord[3] = '\0';
+			DEB((D_HSHAKE,"Protocol order chunk: %s", ord));
+			if ( ord == NULL )
+				DEB((D_HSHAKE,"EMSI create order error"));
+			if ( !strcmp(ord,"HYD") )
+				if ( emsi->compcodes.HYD) tmp = add_str(tmp, "HYD,");
+			if ( !strcmp(ord,"JAN") )
+				if ( emsi->compcodes.JAN) tmp = add_str(tmp, "JAN,");
+			if ( !strcmp(ord,"DZA") )
+				if ( emsi->compcodes.DZA) tmp = add_str(tmp, "DZA,");
+			if ( !strcmp(ord,"ZAP") )
+				if ( emsi->compcodes.ZAP) tmp = add_str(tmp, "ZAP,");
+			if ( !strcmp(ord,"ZMO") )
+				if ( emsi->compcodes.ZMO) tmp = add_str(tmp, "ZMO,");
+			if ( !strcmp(ord,"TZA") )
+				if ( emsi->compcodes.TZA) tmp = add_str(tmp, "TZA,");
+			if ( !strcmp(ord,"SLK") )
+				if ( emsi->compcodes.SLK) tmp = add_str(tmp, "SLK,");
+			if ( !strcmp(ord,"KER") )
+				if ( emsi->compcodes.KER) tmp = add_str(tmp, "KER,");
+			if ( !strcmp(ord,"NCP") )
+				if ( emsi->compcodes.NCP) tmp = add_str(tmp, "NCP,");
+			p_order = strchr(p_order, ',');
+			if ( p_order ) p_order = p_order+1; /* skip ',' */
+			while ( p_order ) {
+				ord = strncpy(ord, p_order,3);
+				ord[3] = '\0';
+				DEB((D_HSHAKE,"Protocol order chunk: %s", ord));
+				if ( ord == NULL )
+					DEB((D_HSHAKE,"EMSI create order error"));
+				if ( !strcmp(ord,"HYD") )
+					if ( emsi->compcodes.HYD) tmp = add_str(tmp, "HYD,");
+				if ( !strcmp(ord,"JAN") )
+					if ( emsi->compcodes.JAN) tmp = add_str(tmp, "JAN,");
+				if ( !strcmp(ord,"DZA") )
+					if ( emsi->compcodes.DZA) tmp = add_str(tmp, "DZA,");
+				if ( !strcmp(ord,"ZAP") )
+					if ( emsi->compcodes.ZAP) tmp = add_str(tmp, "ZAP,");
+				if ( !strcmp(ord,"ZMO") )
+					if ( emsi->compcodes.ZMO) tmp = add_str(tmp, "ZMO,");
+				if ( !strcmp(ord,"TZA") )
+					if ( emsi->compcodes.TZA) tmp = add_str(tmp, "TZA,");
+				if ( !strcmp(ord,"SLK") )
+					if ( emsi->compcodes.SLK) tmp = add_str(tmp, "SLK,");
+				if ( !strcmp(ord,"KER") )
+					if ( emsi->compcodes.KER) tmp = add_str(tmp, "KER,");
+				if ( !strcmp(ord,"NCP") )
+					if ( emsi->compcodes.NCP) tmp = add_str(tmp, "NCP,");
+				p_order = strchr(p_order, ',');
+				if ( p_order ) p_order = p_order+1; /* skip ',' */	
+			}
+			free(ord);
+		}
+		
 		if( emsi->compcodes.FRQ ) tmp = add_str(tmp, "FRQ,");
 		if( emsi->compcodes.NRQ ) tmp = add_str(tmp, "NRQ,");
 		if( emsi->compcodes.ARC ) tmp = add_str(tmp, "ARC,");
@@ -325,10 +394,15 @@ char *emsi_createdat(s_emsi *emsi)
 		
 		tmp = add_char(tmp, '{');
 		tmp = add_char(tmp, '[');
-		sprintf(buf, "+%04d", emsi->tzutc);
+		/* BUGGY */
-		tmp = add_str(tmp, buf);
+		// sprintf(buf, "+%04d", emsi->tzutc);
+		ord = xmalloc(6);
+		ord = xstrcpy(time_string_gmtoffset(ord));
+		ord[5] = '\0';
+		tmp = add_str(tmp, ord);
 		tmp = add_char(tmp, ']');
 		tmp = add_char(tmp, '}');
+		free(ord);
 	}
 	
 	/* {XDATE} indentifier.. What's the fucking invention :-/
@@ -450,6 +524,8 @@ int emsi_parsedat(char *emsi_dat, s_emsi *emsi)
 {
 	int i;
 	char *tmp, *p, *q, *n;
+	unsigned int tzh, tzm,tzn ;
+	char *tzc, *otmp;
 	
 	while( (tmp=get_field(&emsi_dat, '{', '}')) != NULL )
 	{
@@ -525,13 +601,64 @@ int emsi_parsedat(char *emsi_dat, s_emsi *emsi)
 			/* compatibility codes */
 			if( (p=get_field(&emsi_dat, '{', '}')) == NULL ) return(1);
 			DEB((D_HSHAKE, "parse_emsidat: compatibility codes: %s", p));
+			emsi->proto_order[0] = '\0';
+			
 			for( p = strtok(p, ","); p; p=strtok(NULL, ",") )
 			{
-				     if( !strcmp(p, "ZMO") ) emsi->compcodes.ZMO = 1;
+				/*   if( !strcmp(p, "ZMO") ) emsi->compcodes.ZMO = 1;
 				else if( !strcmp(p, "ZAP") ) emsi->compcodes.ZAP = 1;
 				else if( !strcmp(p, "DZA") ) emsi->compcodes.DZA = 1;
 				else if( !strcmp(p, "JAN") ) emsi->compcodes.JAN = 1;
 				else if( !strcmp(p, "HYD") ) emsi->compcodes.HYD = 1;
+				*/
+				if ( !strcmp(p, "ZMO") ) {
+					emsi->compcodes.ZMO = 1;
+					otmp = strcat(emsi->proto_order,"ZMO,");
+					strcpy(emsi->proto_order, otmp);
+					DEB((D_HSHAKE,"Parse_emsidat: ordered proto added: %s", otmp));
+				}
+				else if ( !strcmp(p, "ZAP") ) {
+					emsi->compcodes.ZAP = 1;
+					otmp = strcat(emsi->proto_order,"ZAP,");
+					strcpy(emsi->proto_order, otmp);
+					DEB((D_HSHAKE,"Parse_emsidat: ordered proto added: %s", otmp));
+				}
+				else if ( !strcmp(p, "DZA") ) {
+					emsi->compcodes.DZA = 1;
+					otmp = strcat(emsi->proto_order,"DZA,");
+					strcpy(emsi->proto_order, otmp);
+					DEB((D_HSHAKE,"Parse_emsidat: ordered proto added: %s", otmp));
+				}
+				else if ( !strcmp(p, "JAN") ) {
+					emsi->compcodes.JAN = 1;
+					otmp = strcat(emsi->proto_order,"JAN,");
+					strcpy(emsi->proto_order, otmp);
+					DEB((D_HSHAKE,"Parse_emsidat: ordered proto added: %s", otmp));
+				}
+				else if ( !strcmp(p, "HYD") ) {
+					emsi->compcodes.HYD = 1;
+					otmp = strcat(emsi->proto_order,"HYD,");
+					strcpy(emsi->proto_order, otmp);
+					DEB((D_HSHAKE,"Parse_emsidat: ordered proto added: %s", otmp));
+				}
+				else if ( !strcmp(p, "KER") ) {
+					emsi->compcodes.KER = 1;
+					otmp = strcat(emsi->proto_order,"KER,");
+					strcpy(emsi->proto_order, otmp);
+					DEB((D_HSHAKE,"Parse_emsidat: ordered proto added: %s", otmp));
+				}
+				else if ( !strcmp(p, "TZA") ) {
+					emsi->compcodes.TZA = 1;
+					otmp = strcat(emsi->proto_order,"TZA,");
+					strcpy(emsi->proto_order, otmp);
+					DEB((D_HSHAKE,"Parse_emsidat: ordered proto added: %s", otmp));
+				}
+				else if ( !strcmp(p, "SLK") ) {
+					emsi->compcodes.SLK = 1;
+					otmp = strcat(emsi->proto_order,"SLK,");
+					strcpy(emsi->proto_order, otmp);
+					DEB((D_HSHAKE,"Parse_emsidat: ordered proto added: %s", otmp));
+				}
 				else if( !strcmp(p, "NCP") ) emsi->compcodes.NCP = 1;
 				else if( !strcmp(p, "NRQ") ) emsi->compcodes.NRQ = 1;
 				else if( !strcmp(p, "ARC") ) emsi->compcodes.ARC = 1;
@@ -542,6 +669,9 @@ int emsi_parsedat(char *emsi_dat, s_emsi *emsi)
 				else if( !strcmp(p, "BBS") ) emsi->compcodes.BBS = 1;
 				else if( !strcmp(p, "HFR") ) emsi->compcodes.HFR = 1;
 			}
+			/* Delete last comma from order list */
+			emsi->proto_order[strlen(emsi->proto_order)-1] = '\0';
+			DEB((D_HSHAKE,"Ordered compcodes: %s",emsi->proto_order));
 			
 			/* mailer information */
 			if( (p=get_field(&emsi_dat, '{', '}')) == NULL ) return(1);
@@ -646,13 +776,31 @@ int emsi_parsedat(char *emsi_dat, s_emsi *emsi)
 		}
 		else if( strcmp(tmp, "TZUTC") == 0 )
 		{	
-			emsi->have_tzutc = 1;
-			
 			if( (p=get_field(&emsi_dat, '{', '}')) == NULL ) return(1);
 			if( (p=get_field(&p, '[', ']')) == NULL ) return(1);
+			/* Parse EMSI TZUTC in fmt (+|-)HHMM */
+			if( *p ) {
+				tzc = malloc(2);
+				DEB((D_HSHAKE, "Got TZUTC=%s for parsing", p));
+				tzn = sscanf( p, "%1c%02u%02u", tzc, &tzh, &tzm);
+				tzc[1] = '\0';
+				if ( tzn == 3) {
+					DEB((D_HSHAKE, "Got TZC=%s , H=%u, M=%u", tzc, tzh,tzm));
+					emsi->have_tzutc = 1;
+					if ( strcmp(tzc, "-") == 0 ) {
+						emsi->tzutc = -(tzh*60 + tzm);
+					} else {
+						emsi->tzutc = tzh*60 + tzm;
+					}
+				} else {
+					DEB((D_HSHAKE,"TZUTC value not parsed!"));
+				}
+				free(tzc);
+			}
 		}
 		else
 		{
+			DEB((D_HSHAKE, "Step - no known EMSI-part - got %s", tmp));
 			strnxcat(emsi->addons, "{", sizeof(emsi->addons));
 			strnxcat(emsi->addons, tmp, sizeof(emsi->addons));
 			strnxcat(emsi->addons, "}", sizeof(emsi->addons));

source/bforce/sess_answ.c

@@ -22,8 +22,16 @@
 int answ_system(e_session type, char *connstr, int inetd)
 {
 	TIO oldtio;
-	struct sockaddr_in client;
+	union {
+                struct sockaddr a;
+                struct sockaddr_in in;
+                struct sockaddr_in6 in6;
+        } client;
+	//struct sockaddr_storage client;
 	int clientlen = sizeof(client);
+	char clienthost[NI_MAXHOST];
+	char clientport[NI_MAXSERV];
+	int clientres = 0;
 	int rc = 0;
 	char *p;
 	
@@ -71,20 +79,23 @@ int answ_system(e_session type, char *connstr, int inetd)
 
 	if( inetd )
 	{
+		log("Answering TCPIP call...");
 		if( connstr && *connstr )
 			state.connstr = (char*)xstrcpy(connstr);
-		else if( getpeername(0, (struct sockaddr*)&client, &clientlen) == -1 )
-			logerr("can't get client address");
 		else 
 		{
-#ifdef IPV6
+			if(getpeername(0, &client.a, &clientlen)) 
-			>char addr_str[INET6_ADDRSTRLEN+1];
+				log("sess_answ: can't detrmine socket client");
-			state.peername = (char*)xstrcpy(inet_ntop(AF_INET6, client.sin6_addr, addr_str, INET6_ADDRSTRLEN));
+			clientres = getnameinfo( &client.a, clientlen,
-			state.peerport = (long)ntohs(client.sin6_port);
+					clienthost, sizeof(clienthost), clientport, 
-#else
+					sizeof(clientport), NI_NUMERICHOST | NI_NUMERICSERV);
-			state.peername = (char*)xstrcpy(inet_ntoa(client.sin_addr));
+			if ( clientres == 0 )
-			state.peerport = (long)ntohs(client.sin_port);
+			{
-#endif
+				state.peername = (char*)xstrcpy(clienthost);
+				state.peerport = (long)atol(clientport);
+			}
+			else
+				log("sess_answ: can't get client address: ", gai_strerror(clientres));
 		}
 	}
 	
@@ -116,9 +127,10 @@ int answ_system(e_session type, char *connstr, int inetd)
 		port_carrier(0, TRUE);
 		
 		rc = session();
-		
+		log("Session ended up, rc=%d, inetd=%d", rc, inetd);
-		if( (inetd != 0) && (state.inet = FALSE) )
+		if( ( !inetd ) )
 		{
+			log("Deactivating modem port");
 			port_deinit(0, &oldtio);
 			port_close();
 		}

source/bforce/sess_call.c

@@ -480,10 +480,15 @@ int call_system_tcpip(int callwith) // only TCPIP values
 {
 	char abuf[BF_MAXADDRSTR+1];
 	int rc = BFERR_NOERROR;
-	
+	char * pbuf;
+	char * target = 0;
+	int resflg;
 	/*
 	 * Set verbal line name to "tcpip" value
 	 */
+	memset(abuf, '\0', BF_MAXADDRSTR+1);
+	target = xmalloc(1024);
+	memset(target, '\0', 1024);
 	
 	state.linename = xstrcpy("tcpip");
 	state.inet = TRUE;
@@ -502,14 +507,17 @@ int call_system_tcpip(int callwith) // only TCPIP values
 case CALL_TCPIP_BINKP:
 		state.tcpmode = TCPMODE_BINKP;
 		state.session = SESSION_BINKP;
+		target = xstrcpy("IBN");
 		break;
 case CALL_TCPIP_IFCICO:
 		state.tcpmode = TCPMODE_RAW;
 		state.session = SESSION_UNKNOWN;
+		target = xstrcpy("IFC");
 		break;
 case CALL_TCPIP_TELNET:
 		state.tcpmode = TCPMODE_TELNET;
 		state.session = SESSION_UNKNOWN;
+		target = xstrcpy("ITN");
 		break;
 defalt:
 		log("invalid protocol for TCP/IP module");
@@ -521,7 +529,45 @@ defalt:
 		(state.node.name  && *state.node.name ) ? state.node.name  : "<none>",
 		(state.node.host && *state.node.host) ? state.node.host : "<none>");
 	
-	if( (rc = tcpip_connect(state.node.host, state.tcpmode)) == 0
+	memset(abuf, '\0', BF_MAXADDRSTR+1);
+	pbuf = xmalloc(1024);
+	
+	resflg = nodelist_lookup_string(pbuf, 1024, state.node.addr);
+	if ( ! resflg ) 
+	{
+		
+		char *p = string_casestr(pbuf, target);
+		
+		if ( p ) 
+		{
+			target = strchr(p, ',');
+			if ( target ) target[0] = '\0';
+			target = 0;
+			target = strrchr(p, ':');
+			if ( target ) {
+				target++;
+				strcpy(abuf,target);
+			}
+		}
+	}
+
+	free(pbuf);
+	pbuf = xstrcpy(state.node.host);
+
+	
+	if ( ! resflg )
+	{
+		if ( abuf[0] != '\0' )
+		{
+			// port not empty
+			DEB((D_EVENT, "Modifying host address %s with port %s", pbuf, abuf));
+			pbuf = xstrcat(pbuf, ":");
+			pbuf = xstrcat(pbuf, abuf);
+		}
+	}
+	
+	
+	if( (rc = tcpip_connect(pbuf, state.tcpmode)) == 0
 	 && (rc = tcpip_init() == 0) )
 	{
 		TTYSTATUS(1);
@@ -532,7 +578,7 @@ defalt:
 	{
 		rc = BFERR_CANT_CONNECT10;
 	}
-
+	free(pbuf);
 	return rc;
 }
 
@@ -543,7 +589,7 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 	char s[300];
 	snprintf(s, 299, "bforce calling system %d:%d/%d.%d", addr.zone, addr.net, addr.node, addr.point );
 	log(s);
-	
+	DEB((D_EVENT, s));
 	// find suitable way of connection and try to make session
 	
         int rc = 0;
@@ -568,12 +614,13 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 	}
 	
 	state.listed    = state.node.listed;
+	//DEB((D_EVENT, "Calling init, listed=%d", state.listed));
 	state.node.addr.domain[0] = '\0'; /* Discard domain for node address */
 
 	// 1. If call method specified in cmdline, do use it
 	// 2. If not, use nodelist data and overrides and call all available methods
 	//    If override contains Phone or IP flags, ignore nodelist connect methods (but save INA if not overrided)
-
+	DEB((D_EVENT, "Calling init, runmode=%d", opts->runmode));
 	// 1st - get all allowed call ways
 	// 2nd - gather information reqired to call and remove unavailable ways (no info, node does not support)
 
@@ -581,7 +628,7 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 
 	if( opts->runmode == MODE_CALL_DEFAULT )
 	{
-		call_mayuse = CALL_MODEM | CALL_TCPIP_ANY;
+		call_mustuse = CALL_MODEM | CALL_TCPIP_ANY;
 	}
 	else if( opts->runmode == MODE_CALL_STDIO )
 	{
@@ -593,7 +640,14 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 	}
 	else if( opts->runmode == MODE_CALL_IP )
 	{
-		if( strcasecmp(opts->ipproto, "binkp") == 0 )
+		DEB((D_EVENT, "Calling init, MODE_CALL_IP"));
+		if( !(opts->ipproto) ) // determine from nodelist/override
+		{
+			DEB((D_EVENT, "ipproto not set"));
+			call_mayuse = CALL_TCPIP_ANY;
+			call_mustuse = 0;
+		}
+		else if( strcasecmp(opts->ipproto, "binkp") == 0 )
 		{
 			call_mustuse = CALL_TCPIP_BINKP;
 		}
@@ -605,20 +659,17 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 		{
 			call_mustuse = CALL_TCPIP_TELNET;
 		}
-		else if( opts->ipproto == NULL ) // determine from nodelist/override
-		{
-			call_mayuse = CALL_TCPIP_ANY;
-			call_mustuse = 0;
-		}
 		else
 		{
+			DEB((D_EVENT, "Unknown protocol %s", opts->ipproto));
 			log("Unknown protocol");
 			return -1;
 		}
 	}
 	else
 	{
-		log("Unknown protocol");
+		DEB((D_EVENT, "Unknown runmode %d", opts->runmode));
+		log("Unknown runmode");
 		return -1;
 	}
 	
@@ -627,9 +678,10 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
        //char s[300];
        //snprintf(s, 299, "initial: may use %d must use %d", call_mayuse, call_mustuse);
        //log(s);
+       //DEB((D_EVENT, s));
 
 
-	if( call_mayuse & CALL_MODEM )
+	if( (call_mayuse & CALL_MODEM) )
 	{
 		// 1. use phone from opts
 		// 2. use overrides
@@ -650,7 +702,7 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 		{
 			log("bad phone, excluding modem");
 			call_mayuse &= ~CALL_MODEM;
-			if( call_mustuse & CALL_MODEM )
+			if( !(call_mayuse) )
 			{
 				errmsg = "don't know phone number";
 				gotoexit(BFERR_PHONE_UNKNOWN);
@@ -684,7 +736,7 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 			{
 				call_mayuse &= ~CALL_MODEM;
 				log("bad worktime, excluding modem");
-				if( call_mustuse & CALL_MODEM )
+				if( !(call_mayuse) )
 				{
 					errmsg = "not works now, try later";
 					gotoexit(BFERR_NOTWORKING);
@@ -693,9 +745,9 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 		}
 	}
 
-//       snprintf(s, 299, "after phone check: may use %d must use %d", call_mayuse, call_mustuse);
+       //snprintf(s, 299, "after phone check: may use %d must use %d", call_mayuse, call_mustuse);
-//       log(s);
+       //log(s);
-
+	   //DEB((D_EVENT, s));
 	/*
 	 * Apply overrides to the node information
 	 */	
@@ -714,7 +766,8 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 	
 	if( !(call_mustuse & CALL_TCPIP_BINKP) && (call_mayuse & CALL_TCPIP_BINKP) )
 	{
-		if( nodelist_checkflag(state.node.flags, "BINKP") != 0 && nodelist_checkflag(state.node.flags, "IBN") != 0 )
+		//if( nodelist_checkflag(state.node.flags, "BINKP") != 0 && nodelist_checkflag(state.node.flags, "IBN") != 0 )
+		if( state.node.do_binkp == 0 )
 		{
 			call_mayuse &= ~CALL_TCPIP_BINKP;
 		}
@@ -722,7 +775,8 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 
 	if( !(call_mustuse & CALL_TCPIP_IFCICO) && (call_mayuse & CALL_TCPIP_IFCICO) )
 	{
-		if( nodelist_checkflag(state.node.flags, "IFC") != 0 && nodelist_checkflag(state.node.flags, "IFC") != 0 )
+		//if( nodelist_checkflag(state.node.flags, "IFC") != 0 && nodelist_checkflag(state.node.flags, "IFC") != 0 )
+		if( state.node.do_ifcico == 0 )
 		{
 			call_mayuse &= ~CALL_TCPIP_IFCICO;
 		}
@@ -730,7 +784,8 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 
 	if( !(call_mustuse & CALL_TCPIP_TELNET) && (call_mayuse & CALL_TCPIP_TELNET) )
 	{
-		if( nodelist_checkflag(state.node.flags, "TELN") != 0 && nodelist_checkflag(state.node.flags, "TLN") != 0 )
+		//if( nodelist_checkflag(state.node.flags, "TELN") != 0 && nodelist_checkflag(state.node.flags, "TLN") != 0 )
+		if( state.node.do_telnet == 0 )
 		{
 			call_mayuse &= ~CALL_TCPIP_TELNET;
 		}
@@ -746,7 +801,12 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 				state.override.sIpaddr, sizeof(state.node.host));
 	}
 	
-	if( call_mayuse & CALL_TCPIP_ANY && !tcpip_isgood_host(state.node.host) ) {
+	//DEB((D_EVENT, "Calling init, IPHOST", state.node.host));
+	
+	// We have at least one protocol and not valid address - try to
+	// find INA with through Fidonet DNS
+	if( (call_mayuse & CALL_TCPIP_ANY) && !tcpip_isgood_host(state.node.host) ) 
+	{
 	    char *fidodnszone = conf_string(cf_fidodnszone);
 	    if (fidodnszone) {
 	        if (addr.point) {
@@ -761,17 +821,21 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 	    }
 	}
 
-	if( call_mayuse & CALL_TCPIP_ANY && !tcpip_isgood_host(state.node.host) )
+	// We have no valid tcpip protocols OR not valid address
+	if( !(call_mayuse & CALL_TCPIP_ANY) || !tcpip_isgood_host(state.node.host) )
 	{
 		call_mayuse &= ~CALL_TCPIP_ANY;
 		log("bad host, exclude IP");
-		if( call_mustuse & CALL_TCPIP_ANY )
+		DEB((D_EVENT, "bad host or proto -> exclude IP, mayuse=%d", call_mayuse));
+		
+		// If we had ONLY tcpip command - go out with error
+		if( !(call_mayuse) )
 		{
-			errmsg = "don't know host name";
+			errmsg = "Aborting, don't know host name";
 			gotoexit(BFERR_PHONE_UNKNOWN);
 		}
 	}
-
+	DEB((D_EVENT,"sess_call: may use %d must use %d", call_mayuse, call_mustuse));
 //       snprintf(s, 299, "after IP check: may use %d must use %d", call_mayuse, call_mustuse);
 //       log(s);
 	
@@ -808,28 +872,33 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 	// try allowed methods and break if rc == 0
 	rc = -1;
 	
-	if( rc && call_mayuse & CALL_STDIO )
+	if( rc && (call_mayuse & CALL_STDIO) )
 	{
+		DEB((D_EVENT,"sess_call: calling stdio"));
 		rc = call_system_quiet(opts->connect, opts->inetd);
 	}
 
-	if( rc && call_mayuse & CALL_TCPIP_BINKP )
+	if( rc && (call_mayuse & CALL_TCPIP_BINKP) )
 	{
+		DEB((D_EVENT,"sess_call: calling binkp"));
 		rc = call_system_tcpip(CALL_TCPIP_BINKP);
 	}
 
-	if( rc && call_mayuse & CALL_TCPIP_IFCICO )
+	if( rc && (call_mayuse & CALL_TCPIP_IFCICO) )
 	{
+		DEB((D_EVENT,"sess_call: calling ifcico"));
 		rc = call_system_tcpip(CALL_TCPIP_IFCICO);
 	}
 
-	if( rc && call_mayuse & CALL_TCPIP_TELNET )
+	if( rc && (call_mayuse & CALL_TCPIP_TELNET) )
 	{
+		DEB((D_EVENT,"sess_call: calling telnet"));
 		rc = call_system_tcpip(CALL_TCPIP_TELNET);
 	}
 
-	if( rc && call_mayuse & CALL_MODEM )
+	if( rc && (call_mayuse & CALL_MODEM) )
 	{
+		DEB((D_EVENT,"sess_call: calling MODEM"));
 		setproctitle("bforce calling %.32s, %.32s",
 			ftn_addrstr(abuf, state.node.addr), state.node.phone);
 		rc = -1;
@@ -850,6 +919,7 @@ int call_system(s_faddr addr, const s_bforce_opts *opts)
 		
 		    if( port_lock(p_lockdir, state.modemport) == 0 ) /* Successfuly locked port */
 		    {
+				DEB((D_EVENT,"sess_call: call_system_modem running"));
 		    	rc = call_system_modem();
 		    	port_unlock(p_lockdir, state.modemport);
 		    }

source/bforce/sess_common.c

@@ -135,15 +135,17 @@ int override_get(s_override *dest, s_faddr addr, int line)
 {
 	s_override *p;
 	int curline = 0;
-	
 	p = conf_override(cf_override, addr);
 	
 	curline = 0;
+	if (line > 0) 
+	{
 		while( p && curline < line )
 		{
 			p = p->hidden;
 			++curline;
 		}
+	}
 	
 	if( p && curline == line )
 	{

source/bforce/sess_main.c

@@ -264,7 +264,7 @@ int session_check_addr(s_faddr addr)
 int session_get_password(s_faddr addr, char *buffer, size_t buflen)
 {
 	s_cval_entry *pwd_ptr;
-
+	buffer[0]='\0';
 	for( pwd_ptr = conf_first(cf_password); pwd_ptr;
 	     pwd_ptr = conf_next(pwd_ptr) )
 	{
@@ -311,6 +311,7 @@ int session_set_inbound(void)
 {
 	struct stat st;
 	char *p_inb;
+	int res;
 	
 	p_inb = conf_string(cf_inbound_directory);
 	if( !p_inb ) {
@@ -341,8 +342,12 @@ int session_set_inbound(void)
 		}  */
 		log("inbound: %s", buf);
 		state.inbound = (char*)xstrcpy(buf);
-		snprintf( buf, PATH_MAX+30, "/bin/mkdir -p %s -m 700", state.inbound ); /* 30 additional chars allowed */
+		snprintf( buf, PATH_MAX+30, "/bin/mkdir -p -m 700 %s", state.inbound ); /* 30 additional chars allowed */
-		system( buf );
+		res = system( buf );
+		if (res != 0) {
+			log("Inbound create error: %d", res);
+			return -1;
+		}
 	}
 	else
 	{
@@ -695,6 +700,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 +896,74 @@ int session(void)
 		 */
 		p_log_txrxstat(&pi);
 		
+		
+		// Protocol info - real info from protocol
+		DEB((D_EVENT,"sess_main: Pi stats> Net: %d, Arc: %d, Fil: %d, Tic: %d",
+			pi.traffic_rcvd.netmail_num, pi.traffic_rcvd.arcmail_num,
+			pi.traffic_rcvd.files_num, pi.traffic_rcvd.ticfile_num));
+		
+		// Session info - HANDSHAKE info for traffic
+		DEB((D_EVENT,"sess_main: Sess stats> Net: %d, Arc: %d, Fil: %d, Tic: %d",
+			state.traff_recv.netmail_num, state.traff_recv.arcmail_num,
+			state.traff_recv.files_num, state.traff_recv.ticfile_num));
+		/*
+		 * Raise flags if session incoming traffic was not empty
+		 */
+		if ( (p = conf_string(cf_incnet_flag)) )
+			if (pi.traffic_rcvd.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 (pi.traffic_rcvd.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);
+				}
+			}
+		
+		if ( (p = conf_string(cf_inctic_flag)) )
+			if (pi.traffic_rcvd.ticfile_num > 0) {
+				DEB((D_EVENT, "Incoming TIC files > 0, raising flag"));
+				log("Raising flag for TIC 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 ticfiles flag"));
+					log("Error creating flag for ticfiles in %s", p);
+				} else {
+					/* all ok - closing file */
+					close(fd);
+				}
+			}
+		if ( (p = conf_string(cf_incfile_flag)) )
+			if (pi.traffic_rcvd.files_size > 0) {
+				DEB((D_EVENT, "Incoming FILES > 0, raising flag"));
+				log("Raising flag for files 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 files flag"));
+					log("Error creating flag for files in %s", p);
+				} else {
+					/* all ok - closing file */
+					close(fd);
+				}
+			}
+		
 		/*
 		 * Save session traffic before deiniting
 		 */

source/bforce/sess_stat.c

@@ -70,12 +70,14 @@ static char *session_stat_get_stsfile(s_faddr *addr, int linenum)
 
 static int session_stat_read_stsfile(FILE *fp, s_sess_stat *stat)
 {
+	int res;
+	
 	if( fseek(fp, 0, SEEK_SET) == -1 )
 		return -1;
 	
 	memset(stat, '\0', sizeof(s_sess_stat));
 	
-	fscanf(fp, "%u %u %u %u %u %u %lu %lu %lu %lu",
+	res = fscanf(fp, "%u %u %u %u %u %u %lu %lu %lu %lu",
 			(unsigned int *) &stat->tries,
 			(unsigned int *) &stat->tries_noconn,
 			(unsigned int *) &stat->tries_noansw,
@@ -86,7 +88,10 @@ static int session_stat_read_stsfile(FILE *fp, s_sess_stat *stat)
 			(unsigned long *) &stat->hold_freqs,
 			(unsigned long *) &stat->last_success_out,
 			(unsigned long *) &stat->last_success_in);
-	
+	if (res == 0) {
+		log("Read STS unsuccessfull...");
+		return -1;
+	}
 	/* Set last successfull session time */
 	stat->last_success = MAX(stat->last_success_out, stat->last_success_in);
 	

source/bforce/u_file.c

@@ -145,6 +145,7 @@ char *file_name_makesafe(char *filename)
 char *file_getname(char *filename)
 {
 	char *p = strrchr(filename, '/');
+	DEB((D_FREE, "File_getname: %s", (p ? p + 1 : filename) ));
 	return p ? p + 1 : filename;
 }
 

source/bforce/u_ftn.c

@@ -189,7 +189,8 @@ static int ftn_addrparse_fido(s_faddr *addr, const char *s, bool wildcard)
 	{
 		strnxcpy(addr->domain, string_printable(p), sizeof(addr->domain));
 	}
-	
+	DEB((D_INFO,"u_ftn: Parsed ftn address z:%d, net:%d, node:%d, point:%d",
+		addr->zone, addr->net, addr->node, addr->point));
 	return badaddr;
 }
 
@@ -326,6 +327,7 @@ int ftn_addrparse(s_faddr *addr, const char *s, bool wildcard)
 		addr->node  = DEFAULT_NODE;
 		addr->point = 0;
 		
+		DEB((D_INFO, "u_ftn: parsing ftnaddr %s", s));
 		if( addr->inetform )
 			badaddr = ftn_addrparse_inet(addr, s, wildcard);
 		else

source/bforce/u_misc.c

@@ -81,6 +81,7 @@ void *xrealloc(void *buf, size_t size)
 	else if( (tmp = (char*)(buf ? realloc(buf, size) : malloc(size))) == NULL )
 	{
 		log("failed to reallocate %ld bytes -> abort", size);
+		if( buf ) free(buf);
 		abort();
 	}
 	

source/bforce/u_time.c

@@ -173,18 +173,20 @@ long time_gmtoffset(void)
 	time_t tt       = time(NULL);
 	struct tm local = *localtime(&tt);
 	struct tm gmt   = *gmtime(&tt);
-	long tz         = gmt.tm_yday - local.tm_yday;
+	long tz = 0; /*         = local.tm_yday - gmt.tm_yday;
 	
 	if( tz > 1 )
 		tz = -24;
 	else if( tz < -1 )
-		tz = 24;
+		tz = +24;
 	else
-		tz *= 24;
+		tz *= 24; */
 	
-	tz += gmt.tm_hour - local.tm_hour;
+	/*tz +=  gmt.tm_hour - local.tm_hour;
 	tz *= 60;
-	tz += gmt.tm_min - local.tm_min;
+	tz +=  gmt.tm_min - local.tm_min;*/
+	
+	tz =  (gmt.tm_hour*60+gmt.tm_min) - (local.tm_hour*60+local.tm_min);
 	
 	return tz;
 }
@@ -200,12 +202,13 @@ long time_gmtoffset(void)
  */
 char *time_string_gmtoffset(char *buffer)
 {
-	long tz   = time_gmtoffset();
+	long tz   = -time_gmtoffset();
 	char sign = (tz > 0)?'+':'-';
-	int hour  = tz/60;
+	tz = abs(tz);
-	int mint  = tz%60;
+	unsigned int hour  = tz/60;
+	unsigned int mint  = tz%60;
 	
-	sprintf(buffer, "%c%02d%02d", sign, hour, mint);
+	sprintf(buffer, "%c%02u%02u", sign, hour, mint);
 	
 	return buffer;
 }

source/bfutil/bfindex.c

@@ -127,7 +127,7 @@ static int nodelist_makeindex(s_nodelist *nlp, s_faddr addr)
 			switch(keyword) {
 			case KEYWORD_ZONE:
 				bni.zone  = value;
-				bni.net   = 0;
+				bni.net   = value; // zxalexis
 				bni.node  = 0;
 				bni.point = 0;
 				bni.hub   = 0;
@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
 	(void)setlocale(LC_ALL, "");
 	/* Set our name (for logging only) */
 	
-	while( (c = getopt(argc, argv, "hf")) != EOF )
+	while( (c = getopt(argc, argv, "hf")) != (char)-1 )
 	{
 		switch( c ) {
 		case 'f':
@@ -204,11 +204,12 @@ int main(int argc, char *argv[])
 			exit(0);
 		default:
 			usage();
-			exit(1);
+			exit(5);
-		}
 		}
 		
-	if( conf_readconf(conf_getconfname(), 0) )
+	}
+
+	if( conf_readconf(conf_getconfname(), 0, false) )
 	{
 		exit(1);
 	}
@@ -216,7 +217,7 @@ int main(int argc, char *argv[])
 	if( log_open(log_getfilename(LOG_FILE_SESSION), NULL, NULL) )
 	{
 		log("can't continue without logging");
-		exit(1);
+		exit(2);
 	}
 	
 	/* Ignore some terminating signals */

source/bfutil/bfstat.c

@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
 	
 	bfstat_opts_default(&opts);
 	
-	while( (c = getopt(argc, argv, "acfhn:prst")) != EOF )
+	while( (c = getopt(argc, argv, "acfhn:prst")) != (char)-1 )
 	{
 		switch( c ) {
 		case 'h':
@@ -301,7 +301,7 @@ int main(int argc, char *argv[])
 	/* Initialise current locale */
 	(void)setlocale(LC_ALL, "");
 	
-	if( conf_readconf(conf_getconfname(), 0) )
+	if( conf_readconf(conf_getconfname(), 0, false) )
 		exit(1);
 
 	memset(&ocb, '\0', sizeof(s_outbound_callback_data));

source/bfutil/nlookup.c

@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
 	/* Initialise current locale */
 	(void)setlocale(LC_ALL, "");
 	
-	while( (ch=getopt(argc, argv, "hrm")) != EOF )
+	while( (ch=getopt(argc, argv, "hrm")) != (char)-1 )
 	{
 		switch( ch ) {
 		case 'h':
@@ -159,7 +159,7 @@ int main(int argc, char *argv[])
 		exit(BFERR_FATALERROR);
 	}
 
-	if( conf_readconf(conf_getconfname(), 0) )
+	if( conf_readconf(conf_getconfname(), 0, false) )
 		exit(BFERR_FATALERROR);
 	
 	if( rawstring )

source/config.guess

@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   Copyright 1992-2013 Free Software Foundation, Inc.
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
 
-timestamp='2011-05-11'
+timestamp='2013-11-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@ timestamp='2011-05-11'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
-
+# program.  This Exception is an additional permission under section 7
-
+# of the GNU General Public License, version 3 ("GPLv3").
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
 #
-# This script attempts to guess a canonical system name similar to
+# Originally written by Per Bothner.
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+Copyright 1992-2013 Free Software Foundation, Inc.
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -140,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -202,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -304,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -792,21 +809,26 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	    pc98)
+	case ${UNAME_PROCESSOR} in
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
 	# uname -m includes "-pc" on this system.
 	echo ${UNAME_MACHINE}-mingw32
@@ -852,15 +874,22 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -872,56 +901,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -940,54 +967,74 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	eval $set_cc_for_build
+	X86_64_ABI=
+	# If there is a compiler, see if it is configured for 32-bit objects.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_X32 >/dev/null
+	    then
+		X86_64_ABI=x32
+	    fi
+	fi
+	echo x86_64-unknown-linux-gnu${X86_64_ABI}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1191,6 +1238,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1217,19 +1267,31 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
 	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
 	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
 		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
-		      UNAME_PROCESSOR="x86_64"
+		    case $UNAME_PROCESSOR in
-		  fi
+			i386) UNAME_PROCESSOR=x86_64 ;;
-		fi ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
 		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1246,7 +1308,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1315,11 +1377,11 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_

source/config.sub

@@ -1,38 +1,31 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   Copyright 1992-2013 Free Software Foundation, Inc.
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
 
-timestamp='2011-03-23'
+timestamp='2013-10-01'
 
-# This file is (in principle) common to ALL GNU software.
+# This file is free software; you can redistribute it and/or modify it
-# The presence of a machine in this file suggests that SOME GNU software
+# under the terms of the GNU General Public License as published by
-# can handle that machine.  It does not imply ALL GNU software can.
+# the Free Software Foundation; either version 3 of the License, or
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful, but
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# GNU General Public License for more details.
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
-# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -75,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+Copyright 1992-2013 Free Software Foundation, Inc.
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -125,13 +116,17 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -154,7 +149,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
@@ -223,6 +218,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -247,20 +248,28 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
+	| d10v | d30v | dlx | dsp16xx | dvp \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -278,20 +287,21 @@ case $basic_machine in
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 \
-	| or32 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -300,7 +310,7 @@ case $basic_machine in
 	| spu \
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -315,8 +325,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
-		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -329,7 +338,10 @@ case $basic_machine in
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -352,25 +364,31 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -388,19 +406,20 @@ case $basic_machine in
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -408,10 +427,11 @@ case $basic_machine in
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -711,7 +731,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -769,11 +788,15 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -787,6 +810,24 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
+	mipsEE* | ee | ps2)
+		basic_machine=mips64r5900el-scei
+		case $os in
+		    -linux*)
+			;;
+		    *)
+			os=-elf
+			;;
+		esac
+		;;
+	iop)
+		basic_machine=mipsel-scei
+		os=-irx
+		;;
+	dvp)
+		basic_machine=dvp-scei
+		os=-elf
+		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -808,10 +849,18 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -992,7 +1041,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1120,13 +1173,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	# This must be matched before tile*.
-	tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1324,25 +1372,25 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
@@ -1470,9 +1518,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1521,6 +1566,12 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;
@@ -1548,9 +1599,6 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
@@ -1564,6 +1612,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;

source/configure

@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for bforce 0.24.
+# Generated by GNU Autoconf 2.69 for bforce 0.24.
 #
 # Report bugs to <sergey@fidoman.ru>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,21 +238,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
   export CONFIG_SHELL
-	case $- in # ((((
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
   *v*x* | *x*v* ) as_opts=-vx ;;
   *v* ) as_opts=-v ;;
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
-	esac
+esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -331,6 +359,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -452,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -486,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -507,28 +547,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
+as_test_x='test -x'
-  as_test_x='test -x'
+as_executable_p=as_fn_executable_p
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -560,10 +580,10 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='bforce'
 PACKAGE_TARNAME='bforce'
-PACKAGE_VERSION='0.24'
+PACKAGE_VERSION='0.24.1'
-PACKAGE_STRING='bforce 0.24'
+PACKAGE_STRING='bforce 0.24.1'
-PACKAGE_BUGREPORT='sergey@fidoman.ru'
+PACKAGE_BUGREPORT='zx@zxalexis.ru'
-PACKAGE_URL=''
+PACKAGE_URL='https://prj.zxalexis.ru/gitea/zx/bforce.git'
 
 ac_default_prefix=/usr/local/fido
 # Factoring default headers for most tests.
@@ -604,6 +624,7 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+CLOCK_LIB
 EGREP
 GREP
 CPP
@@ -1156,8 +1177,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1418,9 +1437,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 bforce configure 0.24
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1496,7 +1515,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1841,7 +1860,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by bforce $as_me 0.24, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2552,7 +2571,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_YACC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2599,7 +2618,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2639,7 +2658,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2692,7 +2711,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2733,7 +2752,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2791,7 +2810,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2835,7 +2854,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3281,8 +3300,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
+struct stat;
-#include <sys/stat.h>
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3404,7 +3422,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -3774,7 +3792,7 @@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -3840,7 +3858,7 @@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -4109,11 +4127,11 @@ else
 int
 main ()
 {
-/* FIXME: Include the comments suggested by Paul. */
+
 #ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
+  /* Ultrix mips cc rejects this sort of thing.  */
   typedef int charset[2];
-  const charset cs;
+  const charset cs = { 0, 0 };
   /* SunOS 4.1.1 cc rejects this.  */
   char const *const *pcpcc;
   char **ppc;
@@ -4130,8 +4148,9 @@ main ()
   ++pcpcc;
   ppc = (char**) pcpcc;
   pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
+  { /* SCO 3.2v4 cc rejects this sort of thing.  */
-    char *t;
+    char tx;
+    char *t = &tx;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
@@ -4147,10 +4166,10 @@ main ()
     iptr p = 0;
     ++p;
   }
-  { /* AIX XL C 1.02.0.0 rejects this saying
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
+    struct s { int j; const int *ap[3]; } bx;
-    struct s *b; b->j = 5;
+    struct s *b = &bx; b->j = 5;
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
@@ -4440,6 +4459,58 @@ _ACEOF
 fi
 done
 
+for ac_func in clock_gettime
+do :
+  ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
+if test "x$ac_cv_func_clock_gettime" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CLOCK_GETTIME 1
+_ACEOF
+ CLOCK_LIB=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
+$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
+if ${ac_cv_lib_rt_clock_gettime+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lrt  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char clock_gettime ();
+int
+main ()
+{
+return clock_gettime ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_rt_clock_gettime=yes
+else
+  ac_cv_lib_rt_clock_gettime=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
+$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
+  CLOCK_LIB=-lrt
+fi
+
+fi
+done
+
 
 ac_config_files="$ac_config_files Makefile"
 
@@ -4850,16 +4921,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -4919,28 +4990,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
+
-  as_test_x='test -x'
+# as_fn_executable_p FILE
-else
+# -----------------------
-  if ls -dL / >/dev/null 2>&1; then
+# Test if FILE is an executable regular file.
-    as_ls_L_option=L
+as_fn_executable_p ()
-  else
+{
-    as_ls_L_option=
+  test -f "$1" && test -x "$1"
-  fi
+} # as_fn_executable_p
-  as_test_x='
+as_test_x='test -x'
-    eval sh -c '\''
+as_executable_p=as_fn_executable_p
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -4962,7 +5021,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by bforce $as_me 0.24, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -5024,10 +5083,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 bforce config.status 0.24
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -5116,7 +5175,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -6142,16 +6201,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -6211,28 +6270,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
+
-  as_test_x='test -x'
+# as_fn_executable_p FILE
-else
+# -----------------------
-  if ls -dL / >/dev/null 2>&1; then
+# Test if FILE is an executable regular file.
-    as_ls_L_option=L
+as_fn_executable_p ()
-  else
+{
-    as_ls_L_option=
+  test -f "$1" && test -x "$1"
-  fi
+} # as_fn_executable_p
-  as_test_x='
+as_test_x='test -x'
-    eval sh -c '\''
+as_executable_p=as_fn_executable_p
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -6254,7 +6301,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by bforce $as_me 0.24, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -6316,10 +6363,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 bforce config.status 0.24
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -6408,7 +6455,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'

source/configure.in

@@ -3,7 +3,7 @@ dnl
 dnl $Id$
 dnl
 #AC_INIT(bforce/bforce.c)
-AC_INIT([bforce],[0.24],[sergey@fidoman.ru])
+AC_INIT([bforce],[0.24.1],[zx@zxalexis.ru])
 AC_CONFIG_HEADER(include/config.h)
 AC_CANONICAL_SYSTEM
 dnl # Minimum Autoconf version required.
@@ -140,6 +140,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(mkdir mktime select socket strspn strcasecmp mkstemp)
 AC_CHECK_FUNCS(rename statfs statvfs setproctitle)
-
+AC_CHECK_FUNCS([clock_gettime], [CLOCK_LIB=],[AC_CHECK_LIB([rt], [clock_gettime], [CLOCK_LIB=-lrt])])
+AC_SUBST([CLOCK_LIB])
 AC_OUTPUT(Makefile)
-AC_OUTPUT(../debian/Makefile)
+dnl AC_OUTPUT(../debian/Makefile)

source/include/bforce.h

@@ -151,6 +151,7 @@ typedef struct {
 	bool   daemon;		/* Run as daemon?                 */
 	bool   quit;		/* Quit from daemon               */
 	bool   usestdio;	/* Session on stdin and stdout    */
+	bool   earlydbg;	/* Early debug on stderr          */
 	int    inetd;		/* Called from inetd?             */
 	int    force;		/* Force call?                    */
 	int    hiddline;	/* Hidden line number (0,1..)     */
@@ -180,6 +181,8 @@ typedef struct {
  */
 extern const char *BFERR[];
 
+extern char * mainenv[];
+
 int daemon_run(const char *confname, const char *incname, bool quit);
 
 #endif

source/include/confread.h

@@ -159,123 +159,130 @@ typedef struct filebox {
 } s_filebox;
 
 typedef enum {
-	cf_address,
+	cf_address,										// 0
-	cf_amiga_outbound_directory,
+	cf_amiga_outbound_directory,					// 1
-	cf_binkp_timeout,
+	cf_binkp_timeout,								// 2
-	cf_daemon_circle,
+	cf_daemon_circle,								// 3
-	cf_daemon_circle_crash,
+	cf_daemon_circle_crash,							// 4
-	cf_daemon_circle_direct,
+	cf_daemon_circle_direct,						// 5
-	cf_daemon_circle_immed,
+	cf_daemon_circle_immed,							// 6
-	cf_daemon_circle_modem,
+	cf_daemon_circle_modem,							// 7
-	cf_daemon_circle_normal,
+	cf_daemon_circle_normal,						// 8
-	cf_daemon_circle_rescan,
+	cf_daemon_circle_rescan,						// 9
-	cf_daemon_maxclients_modem,
+	cf_daemon_maxclients_modem,						// 10
-	cf_daemon_maxclients_tcpip,
+	cf_daemon_maxclients_tcpip,						// 11
-	cf_daemon_pid_file,
+	cf_daemon_pid_file,								// 12
-	cf_delay_files_recv,
+	cf_delay_files_recv,							// 13
-	cf_delay_files_send,
+	cf_delay_files_send,							// 14
-	cf_disable_aka_matching,
+	cf_disable_aka_matching,						// 15
-	cf_domain,
+	cf_domain,										// 16
-	cf_emsi_FR_time,
+	cf_emsi_FR_time,								// 17
-	cf_emsi_OH_time,
+	cf_emsi_OH_time,								// 18
-	cf_emsi_slave_sends_nak,
+	cf_emsi_slave_sends_nak,						// 19
-	cf_filebox,
+	cf_emsi_send_tz,								// 20
-	cf_filebox_directory,
+	cf_emsi_send_time,								// 21
-	cf_flags,
+	cf_filebox,										// 22
-	cf_flo_translate,
+	cf_filebox_directory,							// 23
-	cf_freq_alias_list,
+	cf_flags,										// 24
-	cf_freq_dir_list,
+	cf_flo_translate,								// 25
-	cf_freq_ignore_masks,
+	cf_freq_alias_list,								// 26
-	cf_freq_limit_number,
+	cf_freq_dir_list,								// 27
-	cf_freq_limit_size,
+	cf_freq_ignore_masks,							// 28
-	cf_freq_limit_time,
+	cf_freq_limit_number,							// 29
-	cf_freq_min_speed,
+	cf_freq_limit_size,								// 30
-	cf_freq_srif_command,
+	cf_freq_limit_time,								// 31
-	cf_hide_our_aka,
+	cf_freq_min_speed,								// 32
-	cf_history_file,
+	cf_freq_srif_command,							// 33
-	cf_hydra_options,
+	cf_incnet_flag,									// 34
-	cf_hydra_mincps_recv,
+	cf_incarc_flag,									// 35
-	cf_hydra_mincps_send,
+	cf_inctic_flag,									// 36
-	cf_hydra_tx_window,
+	cf_incfile_flag,								// 37
-	cf_hydra_rx_window,
+	cf_hide_our_aka,								// 38
-	cf_inbound_directory,
+	cf_history_file,								// 39
-	cf_location,
+	cf_hydra_options,								// 40
-	cf_log_file,
+	cf_hydra_mincps_recv,							// 41
-	cf_log_file_daemon,
+	cf_hydra_mincps_send,							// 42
-	cf_max_speed,
+	cf_hydra_tx_window,								// 43
-	cf_maxtries,
+	cf_hydra_rx_window,								// 44
-	cf_maxtries_nodial,
+	cf_inbound_directory,							// 45
-	cf_maxtries_noansw,
+	cf_location,									// 46
-	cf_maxtries_noconn,
+	cf_log_file,									// 47
-	cf_maxtries_hshake,
+	cf_log_file_daemon,								// 48
-	cf_maxtries_sessions,
+	cf_max_speed,									// 49
-	cf_min_cps_recv,
+	cf_maxtries,									// 50
-	cf_min_cps_send,
+	cf_maxtries_nodial,								// 51
-	cf_min_cps_time,
+	cf_maxtries_noansw,								// 52
-	cf_min_free_space,
+	cf_maxtries_noconn,								// 53
-	cf_min_speed_in,
+	cf_maxtries_hshake,								// 54
-	cf_min_speed_out,
+	cf_maxtries_sessions,							// 55
-	cf_mode_netmail,
+	cf_min_cps_recv,								// 56
-	cf_mode_arcmail,
+	cf_min_cps_send,								// 57
-	cf_mode_request,
+	cf_min_cps_time,								// 58
-	cf_mode_ticfile,
+	cf_min_free_space,								// 59
-	cf_mode_default,
+	cf_min_speed_in,								// 60
-	cf_modem_can_send_break,
+	cf_min_speed_out,								// 61
-	cf_modem_dial_prefix,
+	cf_mode_netmail,								// 62
-	cf_modem_dial_suffix,
+	cf_mode_arcmail,								// 63
-	cf_modem_dial_response,
+	cf_mode_request,								// 64
-	cf_modem_hangup_command,
+	cf_mode_ticfile,								// 65
-	cf_modem_port,
+	cf_mode_default,								// 66
-	cf_modem_reset_command,
+	cf_modem_can_send_break,						// 67
-	cf_modem_stat_command,
+	cf_modem_dial_prefix,							// 68
-	cf_nodelist,
+	cf_modem_dial_suffix,							// 69
-	cf_nodelist_directory,
+	cf_modem_dial_response,							// 70
-	cf_nodial_flag,
+	cf_modem_hangup_command,						// 71
-	cf_override,
+	cf_modem_port,									// 72
-	cf_options,
+	cf_modem_reset_command,							// 73
-	cf_outbound_directory,
+	cf_modem_stat_command,							// 74
-	cf_password,
+	cf_nodelist,									// 75
-	cf_phone,
+	cf_nodelist_directory,							// 76
-	cf_phone_translate,
+	cf_nodial_flag,									// 77
-	cf_recode_file_in,
+	cf_override,									// 78
-	cf_recode_file_out,
+	cf_options,										// 79
-	cf_recode_intro_in,
+	cf_outbound_directory,							// 80
-	cf_recv_buffer_size,
+	cf_password,									// 81
-	cf_rescan_delay,
+	cf_phone,										// 82
-	cf_run_after_handshake,
+	cf_phone_translate,								// 83
-	cf_run_after_session,
+	cf_proto_order,									// 84
-	cf_run_before_session,
+	cf_recode_file_in,								// 85
-	cf_session_limit_in,
+	cf_recode_file_out,								// 86
-	cf_session_limit_out,
+	cf_recode_intro_in,								// 87
-	cf_skip_files_recv,
+	cf_recv_buffer_size,							// 88
-	cf_status_directory,
+	cf_rescan_delay,								// 89
-	cf_system_name,
+	cf_run_after_handshake,							// 90
-	cf_sysop_name,
+	cf_run_after_session,							// 91
-	cf_uucp_lock_directory,
+	cf_run_before_session,							// 92
-	cf_wait_carrier_in,
+	cf_session_limit_in,							// 93
-	cf_wait_carrier_out,
+	cf_session_limit_out,							// 94
-	cf_zmodem_mincps_recv,
+	cf_skip_files_recv,								// 95
-	cf_zmodem_mincps_send,
+	cf_status_directory,							// 96
-	cf_zmodem_send_dummy_pkt,
+	cf_system_name,									// 97
-	cf_zmodem_skip_by_pos,
+	cf_sysop_name,									// 98
-	cf_zmodem_start_block_size,
+	cf_uucp_lock_directory,							// 99
-	cf_zmodem_tx_window,
+	cf_wait_carrier_in,								// 100
-	cf_nomail_flag,
+	cf_wait_carrier_out,							// 101
-	cf_bind_ip,
+	cf_zmodem_mincps_recv,							// 102
-	cf_recieved_to_lower,
+	cf_zmodem_mincps_send,							// 103
+	cf_zmodem_send_dummy_pkt,						// 104
+	cf_zmodem_skip_by_pos,							// 105
+	cf_zmodem_start_block_size,						// 106
+	cf_zmodem_tx_window,							// 107
+	cf_nomail_flag,									// 108
+	cf_bind_ip,										// 109
+	cf_recieved_to_lower,							// 110
 #ifdef USE_SYSLOG
 	cf_syslog_facility,
 #endif
 #ifdef DEBUG
-	cf_debug_file,
+	cf_debug_file,									// 111
-	cf_debug_level,
+	cf_debug_level,									// 112
 #endif
-	cf_split_inbound,
+	cf_split_inbound,								// 113
 #ifdef NETSPOOL
         cf_netspool_host,
         cf_netspool_port,
 #endif
-        cf_fidodnszone,
+        cf_fidodnszone,								// 114
 	BFORCE_NUMBER_OF_KEYWORDS
 } bforce_config_keyword;
 
@@ -347,7 +354,7 @@ void deinit_translate(s_translate *dest);
 const char *conf_getconfname(void);
 int conf_postreadcheck(void);
 int conf_readpasswdlist(s_falist **pwdlist, char *fname);
-int conf_readconf(const char *confname, int inclevel);
+int conf_readconf(const char *confname, int inclevel, bool earlydbg);
 #ifdef DEBUG
 void log_overridelist(s_override *subst);
 void log_options(s_options *opt);

source/include/logger.h

@@ -33,28 +33,28 @@ enum { LOG_FILE_DAEMON, LOG_FILE_SESSION, LOG_FILE_DEBUG, LOG_FILE_HISTORY };
 
 
 #ifdef DEBUG
-# define D_CONFIG	0x0000001L
+	#define D_CONFIG	0x0000001L
-# define D_OVERRIDE	0x0000002L
+	#define D_OVERRIDE	0x0000002L
-# define D_EVENT	0x0000004L
+	#define D_EVENT		0x0000004L
-# define D_NODELIST	0x0000008L
+	#define D_NODELIST	0x0000008L
-# define D_OUTBOUND	0x0000010L
+	#define D_OUTBOUND	0x0000010L
-# define D_INFO		0x0000020L
+	#define D_INFO		0x0000020L
-# define D_HSHAKE	0x0000040L
+	#define D_HSHAKE	0x0000040L
-# define D_TTYIO	0x0000080L
+	#define D_TTYIO		0x0000080L
-# define D_MODEM	0x0000100L
+	#define D_MODEM		0x0000100L
-# define D_PROT		0x0000200L
+	#define D_PROT		0x0000200L
-# define D_FREQ		0x0000400L
+	#define D_FREQ		0x0000400L
-# define D_STATEM	0x0000800L
+	#define D_STATEM	0x0000800L
-# define D_DAEMON	0x0001000L
+	#define D_DAEMON	0x0001000L
-# define D_24554	0x0002000L
+	#define D_24554		0x0002000L
-# define D_FREE 	0x0004000L
+	#define D_FREE 		0x0004000L
-# define D_FULL		0xfffffffL
+	#define D_FULL		0xfffffffL
 #endif
 
 #ifdef DEBUG
-# define DEB(what)	debug what
+	#define DEB(what)	debug what
 #else
-# define DEB(what)
+	#define DEB(what)
 #endif
 
 const char *log_getfilename(int whatfor);

source/include/os.h

@@ -19,7 +19,7 @@
 #define EXEC_OPT_LOGOUT         0x04
 #define EXEC_OPT_USESHELL       0x08
 
-#define EXEC_MAX_NUM_ENVS       40
+#define EXEC_MAX_NUM_ENVS       4095
 #define EXEC_MAX_NUM_ARGS       20
 #define EXEC_DEFAULT_UMASK      ~(S_IRUSR|S_IWUSR);
 

source/include/prot_common.h

@@ -44,6 +44,7 @@ typedef struct traffic {
 	int    freqed_num;
 	int    freqed_time;
 	size_t freqed_size;
+	int    ticfile_num;
 } s_traffic;
 
 /*

source/include/prot_emsi.h

@@ -116,7 +116,10 @@ struct compcodes
 	       ZAP:1,   /* ZedZap    (Zmodem variant)        */
 	       DZA:1,   /* DirectZAP (Zmodem variant)        */
 	       JAN:1,   /* Janus                             */
-	       HYD:1;   /* Hydra                             */
+	       HYD:1,   /* Hydra                             */
+	       KER:1,	/* Kermit, not supported             */
+	       SLK:1,   /* SEALink, not supported            */
+	       TZA:1;   /* TrapDoor DirectZAP, not supported */
 
 	UINT16 FRQ:1,   /* The system will accept and process FREQs */
 	       NRQ:1,   /* No file requests accepted by this system */
@@ -148,6 +151,7 @@ struct emsi
 	char        passwd[EMSI_MAXPASSWD+1];
 	s_linkcodes linkcodes;		/* XXn linkcodes contained in eaddr  */
 	s_compcodes compcodes;
+	char        proto_order[EMSI_MAXADDONS+1];
 	char        m_pid[EMSI_MAXMPID+1];
 	char        m_name[EMSI_MAXMNAME+1];
 	char        m_ver[EMSI_MAXMVER+1];

source/install-sh

@@ -1,251 +1,527 @@
 #!/bin/sh
-#
 # install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
+scriptversion=2011-11-20.07; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
 #
-# Copyright 1991 by the Massachusetts Institute of Technology
+# Copyright (C) 1994 X Consortium
 #
-# Permission to use, copy, modify, distribute, and sell this software and its
+# Permission is hereby granted, free of charge, to any person obtaining a copy
-# documentation for any purpose is hereby granted without fee, provided that
+# of this software and associated documentation files (the "Software"), to
-# the above copyright notice appear in all copies and that both that
+# deal in the Software without restriction, including without limitation the
-# copyright notice and this permission notice appear in supporting
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# documentation, and that the name of M.I.T. not be used in advertising or
+# sell copies of the Software, and to permit persons to whom the Software is
-# publicity pertaining to distribution of the software without specific,
+# furnished to do so, subject to the following conditions:
-# written prior permission.  M.I.T. makes no representations about the
+#
-# suitability of this software for any purpose.  It is provided "as is"
+# The above copyright notice and this permission notice shall be included in
-# without express or implied warranty.
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
+# from scratch.
-# shared with many OS's install programs.
 
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
 
-mvprog="${MVPROG-mv}"
+posix_glob='?'
-cpprog="${CPPROG-cp}"
+initialize_posix_glob='
-chmodprog="${CHMODPROG-chmod}"
+  test "$posix_glob" != "?" || {
-chownprog="${CHOWNPROG-chown}"
+    if (set -f) 2>/dev/null; then
-chgrpprog="${CHGRPPROG-chgrp}"
+      posix_glob=
-stripprog="${STRIPPROG-strip}"
+    else
-rmprog="${RMPROG-rm}"
+      posix_glob=:
-mkdirprog="${MKDIRPROG-mkdir}"
+    fi
+  }
+'
 
-transformbasename=""
+posix_mkdir=
-transform_arg=""
+
-instcmd="$mvprog"
+# Desired mode of installed file.
-chmodcmd="$chmodprog 0755"
+mode=0755
-chowncmd=""
+
-chgrpcmd=""
+chgrpcmd=
-stripcmd=""
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
-src=""
-dst=""
-dir_arg=""
 
-while [ x"$1" != x ]; do
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
   case $1 in
-	-c) instcmd="$cpprog"
+    -c) ;;
-	    shift
-	    continue;;
 
-	-d) dir_arg=true
+    -C) copy_on_change=true;;
-	    shift
-	    continue;;
 
-	-m) chmodcmd="$chmodprog $2"
+    -d) dir_arg=true;;
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	    shift
+	shift;;
-	    shift
-	    continue;;
 
-	-s) stripcmd="$stripprog"
+    --help) echo "$usage"; exit $?;;
-	    shift
-	    continue;;
 
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+    -m) mode=$2
-	    shift
+	case $mode in
-	    continue;;
+	  *' '* | *'	'* | *'
-
+'*	  | *'*'* | *'?'* | *'['*)
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    echo "$0: invalid mode: $mode" >&2
-	    shift
+	    exit 1;;
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
 	esac
-done
+	shift;;
 
-if [ x"$src" = x ]
+    -o) chowncmd="$chownprog $2"
-then
+	shift;;
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
 
-if [ x"$dir_arg" != x ]; then
+    -s) stripcmd=$stripprog;;
-	dst=$src
-	src=""
 
-	if [ -d $dst ]; then
+    -t) dst_arg=$2
-		instcmd=:
+	# Protect names problematic for 'test' and other utilities.
-		chmodcmd=""
+	case $dst_arg in
-	else
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-		instcmd=mkdir
+	esac
-	fi
+	shift;;
-else
 
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+    -T) no_target_directory=true;;
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
 
-	if [ -f $src -o -d $src ]
+    --version) echo "$0 $scriptversion"; exit $?;;
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
 
-	if [ x"$dst" = x ]
+    --)	shift
-	then
+	break;;
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
 
-# If destination is a directory, append the input filename; if your system
+    -*)	echo "$0: invalid option: $1" >&2
-# does not like double slashes in filenames, you may need to add some logic
+	exit 1;;
 
-	if [ -d $dst ]
+    *)  break;;
-	then
+  esac
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
   shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
 done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
 fi
 
-if [ x"$dir_arg" != x ]
+if test $# -eq 0; then
-then
+  if test -z "$dir_arg"; then
-	$doit $instcmd $dst &&
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+if test -z "$dir_arg"; then
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+  do_exit='(exit $ret); exit $ret'
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+  trap "ret=129; $do_exit" 1
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+  trap "ret=130; $do_exit" 2
-else
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
-# If we're going to rename the final executable, determine the name now.
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
 
-	if [ x"$transformarg" = x ] 
+    *[0-7])
-	then
+      if test -z "$stripcmd"; then
-		dstfile=`basename $dst`
+	u_plus_rw=
       else
-		dstfile=`basename $dst $transformbasename | 
+	u_plus_rw='% 200'
-			sed $transformarg`$transformbasename
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
     fi
 
-# don't allow the sed command to completely eliminate the filename
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
 
-	if [ x"$dstfile" = x ] 
+    # If destination is a directory, append the input filename; won't work
-	then
+    # if double slashes aren't ignored.
-		dstfile=`basename $dst`
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
     else
-		true
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
   fi
 
-# Make a temp file name in the proper directory.
+  obsolete_mkdir_used=false
 
-	dsttmp=$dstdir/#inst.$$#
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
 
-# Move or copy the file name to the temp name
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
 
-	$doit $instcmd $src $dsttmp &&
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
 
-	trap "rm -f ${dsttmp}" 0 &&
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 
-# and set any options; do chmod last to preserve setuid bits
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
 
-# If any of these fail, we abort the whole thing.  If we want to
+    if
-# ignore errors from any of these, just make sure not to ignore
+      $posix_mkdir && (
-# errors from the above "$doit $instcmd $src $dsttmp" command.
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
 
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+      # or it failed possibly due to a race condition.  Create the
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+      # directory the slow way, step by step, checking for races as we go.
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
 
-# Now rename the file to the real destination.
+      case $dstdir in
+	/*) prefix='/';;
+	[-=\(\)!]*) prefix='./';;
+	*)  prefix='';;
+      esac
 
-	$doit $rmcmd -f $dstdir/$dstfile &&
+      eval "$initialize_posix_glob"
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
 
-fi &&
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
 
+      prefixes=
 
-exit 0
+      for d
+      do
+	test X"$d" = X && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

tests/configs/bforce.conf

@@ -0,0 +1,199 @@
+address 99:1/1@testzone
+options NoDirZap NoJanus NoChat
+proto_order ZMO,ZAP,HYD,SLK,KER,DZA,JAN,TZA
+#domain medianet  /var/spool/ftn/medianet/	776
+#domain schoolnet /var/spool/ftn/schoolnet/	461
+log_file %TESTZONE%/logsA/bf-log
+debug_file %TESTZONE%/logsA/bf-debug
+debug_level modem hshake event freq prot
+nodial_flag %TESTZONE%/etc/nodial
+inbound_directory (Protected) %TESTZONE%/inboundA
+inbound_directory %TESTZONE%/inbound-unsecureA
+# incnet_flag %TESTZONE%/flags/toss
+# incarc_flag %TESTZONE%/flags/toss
+outbound_directory %TESTZONE%/outboundA
+#amiga_outbound_directory /var/spool/fido/bt/out
+nodelist_directory %TESTZONE%/nodelist
+status_directory %TESTZONE%/logsA
+history_file %TESTZONE%/historyA
+#min_speed_in 1200
+#min_speed_out 1200
+#session_limit_in 1800
+#session_limit_out 1800
+#min_cps_time 120
+#   min_cps_recv (2:5020/1398) 2100
+#   min_cps_recv (2:5020/1682) 3000
+#   min_cps_recv (2:5020/1811) 1400
+zmodem_mincps_recv 300    15
+zmodem_mincps_recv 1200   90
+zmodem_mincps_recv 2400   120
+zmodem_mincps_recv 4800   240
+zmodem_mincps_recv 7200   360
+zmodem_mincps_recv 9600	  480
+zmodem_mincps_recv 12000  600
+zmodem_mincps_recv 14400  720
+zmodem_mincps_recv 16800  840
+zmodem_mincps_recv 19200  960
+zmodem_mincps_recv 21600  1080
+zmodem_mincps_recv 23600  1180
+zmodem_mincps_recv 24000  1200
+zmodem_mincps_recv 26400  1320
+zmodem_mincps_recv 28800  1440
+zmodem_mincps_recv 31200  1600
+zmodem_mincps_recv 33600  1700
+
+zmodem_mincps_send 300    15
+zmodem_mincps_send 1200   90
+zmodem_mincps_send 2400   120
+zmodem_mincps_send 4800   240
+zmodem_mincps_send 7200   360
+zmodem_mincps_send 9600   480
+zmodem_mincps_send 12000  600
+zmodem_mincps_send 14400  720
+zmodem_mincps_send 16800  840
+zmodem_mincps_send 19200  960
+zmodem_mincps_send 21600  1080
+zmodem_mincps_send 23600  1180
+zmodem_mincps_send 24000  1200
+zmodem_mincps_send 26400  1320
+zmodem_mincps_send 28800  1440
+zmodem_mincps_send 31200  1600
+zmodem_mincps_send 33600  1700
+
+hydra_mincps_recv 300    15
+hydra_mincps_recv 1200   90
+hydra_mincps_recv 2400   120
+hydra_mincps_recv 4800   240
+hydra_mincps_recv 7200   360
+hydra_mincps_recv 9600	  480
+hydra_mincps_recv 12000  600
+hydra_mincps_recv 14400  720
+hydra_mincps_recv 16800  840
+hydra_mincps_recv 19200  960
+hydra_mincps_recv 21600  1080
+hydra_mincps_recv 23600  1180
+hydra_mincps_recv 24000  1200
+hydra_mincps_recv 26400  1320
+hydra_mincps_recv 28800  1440
+hydra_mincps_recv 31200  1600
+hydra_mincps_recv 33600  1700
+
+hydra_mincps_send 300    15
+hydra_mincps_send 1200   90
+hydra_mincps_send 2400   120
+hydra_mincps_send 4800   240
+hydra_mincps_send 7200   360
+hydra_mincps_send 9600   480
+hydra_mincps_send 12000  600
+hydra_mincps_send 14400  720
+hydra_mincps_send 16800  840
+hydra_mincps_send 19200  960
+hydra_mincps_send 21600  1080
+hydra_mincps_send 23600  1180
+hydra_mincps_send 24000  1200
+hydra_mincps_send 26400  1320
+hydra_mincps_send 28800  1440
+hydra_mincps_send 31200  1600
+hydra_mincps_send 33600  1700
+#
+mode_default 100666
+mode_arcmail 100666
+mode_netmail 100666
+mode_request 100666
+
+#modem_port /dev/ttyUSB0:57600
+modem_reset_command ATE0M0|
+modem_dial_prefix ATDT
+modem_dial_suffix |
+modem_hangup_command v~^~ATH0|
+#modem_stat_command AT%S|
+#modem_stat_command AT|
+modem_stat_command AT&V1|
+modem_dial_response "CONNECT"     connect
+modem_dial_response "BUSY"        busy
+modem_dial_response "NO CARRIER"  nocarrier
+modem_dial_response "NO DIAL"     nodialTone
+modem_dial_response "NO ANSWER"   noanswer
+modem_dial_response "VOICE"       noanswer
+modem_dial_response "ERROR"       error
+
+nodelist NODELIST.999  *:*/*.0
+
+#nodelist 450_256.pnt  2:450/256.*
+#nodelist easynet.ndl   20:26/*.0
+#nodelist  *:*/*.*
+
+phone_translate 7-813-78 
+phone_translate 7-     8
+#phone_translate 375-  8
+
+system_name TestZoneA
+location TestZone
+sysop_name TestZoneA User
+phone -Unpublished-
+max_speed 9600
+emsi_OH_time 00:00-24:00
+emsi_FR_time 00:00-24:00
+emsi_send_tz  yes
+emsi_send_time yes
+
+recv_buffer_size 65536
+
+wait_carrier_out 120
+
+#freq_srif_command /usr/local/lib/u-srif/u-srif
+freq_alias_list %TESTZONE%/freq.aliases
+freq_dir_list %TESTZONE%/freq.dirs
+freq_limit_number 10
+
+freq_limit_size 6000000
+freq_limit_time 1200
+freq_ignore_masks \\* \\*.\\* \\*.zip \\*.rar \\*.exe \\*.mp3 \\*.avi \\*.mp4 \\*.tgz
+#zmodem_skip_by_pos yes
+zmodem_send_dummy_pkt no
+#zmodem_start_block_size 512
+#zmodem_tx_window 32768
+skip_files_recv *.pif *.swp
+#delay_files_recv !%arcmail !%netmail # We will refuse all except mail
+#delay_files_send !%netmail           # We will send only netmail
+#delay_files_recv (2:450/102) !%netmail
+#min_free_space 20000
+#recode_file_out /usr/local/fido/etc/koi82alt.tbl
+#recode_file_in /usr/local/fido/etc/alt2koi8.tbl 
+
+#run_after_handshake [logout]/bin/echo "Hello, world!"
+#run_after_session [nowait,setsid]/usr/local/lib/ftp/run-in
+#run_after_handshake [setsid,useshell,logout]/usr/bin/nlookup $REM_ADDR_FTN
+#run_after_session [logout,useshell]/usr/bin/hpt toss && /usr/bin/hpt link && /usr/bin/htick toss
+#run_after_handshake [setsid,useshell,logout]/usr/bin/nlookup $REM_ADDR_FTN
+#filebox_directory /var/spool/fido/bt/fbox
+
+#filebox  /var/spool/ftn/fbox/adb    2:5020/2120.1  hold
+#filebox  /var/spool/ftn/fbox/pvc    2:5020/2091    normal
+#flo_translate  C:\\fido\\spool\\outbound  /var/spool/ftn/out
+#flo_translate  \\  /
+
+maxtries           200  Undialable   # Be carefull.. =)
+maxtries_noansw    5    Hold  7200   # Call two hours later
+maxtries_noconn    40   Hold  10800  # Don't call 3 hours
+maxtries_hshake    10   Hold  86400  # 1 day delay
+maxtries_sessions  10   Hold  3600   # Don't annoy uplinks
+maxtries_nodial    1    Hold  1200   # Call 20 min later 
+
+daemon_circle_modem 40
+daemon_circle_rescan 60
+daemon_circle_normal 80
+daemon_circle_direct 40
+daemon_circle_crash  20
+daemon_circle_immed  10
+daemon_maxclients_tcpip 2
+daemon_maxclients_modem 1
+daemon_pid_file /var/run/bforce.pid
+
+#syslog_facility 64
+#nomail_flag /home/zx/fido/ftnroot/flags/nomail
+#run_before_session /usr/local/bin/call_inet.sh
+
+recieved_to_lower yes
+
+# That's all!

tests/configs/bforceA.conf

@@ -0,0 +1,202 @@
+address 99:1/1@testzone
+options NoDirZap NoJanus NoChat
+#proto_order ZMO,ZAP,HYD,SLK,KER,DZA,JAN,TZA
+proto_order %PROTO%
+#domain medianet  /var/spool/ftn/medianet/	776
+#domain schoolnet /var/spool/ftn/schoolnet/	461
+log_file %TESTZONE%/logsA/bf-log
+debug_file %TESTZONE%/logsA/bf-debug
+debug_level modem hshake event freq
+nodial_flag %TESTZONE%/etc/nodial
+inbound_directory (Protected) %TESTZONE%/inboundA
+inbound_directory %TESTZONE%/inbound-unsecureA
+# incnet_flag %TESTZONE%/flags/toss
+# incarc_flag %TESTZONE%/flags/toss
+outbound_directory %TESTZONE%/outboundA
+#amiga_outbound_directory /var/spool/fido/bt/out
+nodelist_directory %TESTZONE%/nodelist
+status_directory %TESTZONE%/logsA
+history_file %TESTZONE%/logsA/history
+
+password 99:1/2 testpwd1
+#min_speed_in 1200
+#min_speed_out 1200
+#session_limit_in 1800
+#session_limit_out 1800
+#min_cps_time 120
+#   min_cps_recv (2:5020/1398) 2100
+#   min_cps_recv (2:5020/1682) 3000
+#   min_cps_recv (2:5020/1811) 1400
+zmodem_mincps_recv 300    15
+zmodem_mincps_recv 1200   90
+zmodem_mincps_recv 2400   120
+zmodem_mincps_recv 4800   240
+zmodem_mincps_recv 7200   360
+zmodem_mincps_recv 9600	  480
+zmodem_mincps_recv 12000  600
+zmodem_mincps_recv 14400  720
+zmodem_mincps_recv 16800  840
+zmodem_mincps_recv 19200  960
+zmodem_mincps_recv 21600  1080
+zmodem_mincps_recv 23600  1180
+zmodem_mincps_recv 24000  1200
+zmodem_mincps_recv 26400  1320
+zmodem_mincps_recv 28800  1440
+zmodem_mincps_recv 31200  1600
+zmodem_mincps_recv 33600  1700
+
+zmodem_mincps_send 300    15
+zmodem_mincps_send 1200   90
+zmodem_mincps_send 2400   120
+zmodem_mincps_send 4800   240
+zmodem_mincps_send 7200   360
+zmodem_mincps_send 9600   480
+zmodem_mincps_send 12000  600
+zmodem_mincps_send 14400  720
+zmodem_mincps_send 16800  840
+zmodem_mincps_send 19200  960
+zmodem_mincps_send 21600  1080
+zmodem_mincps_send 23600  1180
+zmodem_mincps_send 24000  1200
+zmodem_mincps_send 26400  1320
+zmodem_mincps_send 28800  1440
+zmodem_mincps_send 31200  1600
+zmodem_mincps_send 33600  1700
+
+hydra_mincps_recv 300    15
+hydra_mincps_recv 1200   90
+hydra_mincps_recv 2400   120
+hydra_mincps_recv 4800   240
+hydra_mincps_recv 7200   360
+hydra_mincps_recv 9600	  480
+hydra_mincps_recv 12000  600
+hydra_mincps_recv 14400  720
+hydra_mincps_recv 16800  840
+hydra_mincps_recv 19200  960
+hydra_mincps_recv 21600  1080
+hydra_mincps_recv 23600  1180
+hydra_mincps_recv 24000  1200
+hydra_mincps_recv 26400  1320
+hydra_mincps_recv 28800  1440
+hydra_mincps_recv 31200  1600
+hydra_mincps_recv 33600  1700
+
+hydra_mincps_send 300    15
+hydra_mincps_send 1200   90
+hydra_mincps_send 2400   120
+hydra_mincps_send 4800   240
+hydra_mincps_send 7200   360
+hydra_mincps_send 9600   480
+hydra_mincps_send 12000  600
+hydra_mincps_send 14400  720
+hydra_mincps_send 16800  840
+hydra_mincps_send 19200  960
+hydra_mincps_send 21600  1080
+hydra_mincps_send 23600  1180
+hydra_mincps_send 24000  1200
+hydra_mincps_send 26400  1320
+hydra_mincps_send 28800  1440
+hydra_mincps_send 31200  1600
+hydra_mincps_send 33600  1700
+#
+mode_default 100666
+mode_arcmail 100666
+mode_netmail 100666
+mode_request 100666
+
+#modem_port /dev/ttyUSB0:57600
+modem_reset_command ATE0M0|
+modem_dial_prefix ATDT
+modem_dial_suffix |
+modem_hangup_command v~^~ATH0|
+#modem_stat_command AT%S|
+#modem_stat_command AT|
+modem_stat_command AT&V1|
+modem_dial_response "CONNECT"     connect
+modem_dial_response "BUSY"        busy
+modem_dial_response "NO CARRIER"  nocarrier
+modem_dial_response "NO DIAL"     nodialTone
+modem_dial_response "NO ANSWER"   noanswer
+modem_dial_response "VOICE"       noanswer
+modem_dial_response "ERROR"       error
+
+nodelist NODELIST.999  *:*/*.0
+
+#nodelist 450_256.pnt  2:450/256.*
+#nodelist easynet.ndl   20:26/*.0
+#nodelist  *:*/*.*
+
+phone_translate 7-813-78 
+phone_translate 7-     8
+#phone_translate 375-  8
+
+system_name TestZoneA
+location TestZone
+sysop_name TestZoneA User
+phone -Unpublished-
+max_speed 9600
+emsi_OH_time 00:00-24:00
+emsi_FR_time 00:00-24:00
+emsi_send_tz  yes
+emsi_send_time yes
+
+recv_buffer_size 65536
+
+wait_carrier_out 120
+
+#freq_srif_command /usr/local/lib/u-srif/u-srif
+freq_alias_list %TESTZONE%/etc/freq.aliases
+freq_dir_list %TESTZONE%/etc/freq.dirs
+freq_limit_number 10
+
+freq_limit_size 6000000
+freq_limit_time 1200
+freq_ignore_masks \\* \\*.\\* \\*.zip \\*.rar \\*.exe \\*.mp3 \\*.avi \\*.mp4 \\*.tgz
+#zmodem_skip_by_pos yes
+zmodem_send_dummy_pkt no
+#zmodem_start_block_size 512
+#zmodem_tx_window 32768
+skip_files_recv *.pif *.swp
+#delay_files_recv !%arcmail !%netmail # We will refuse all except mail
+#delay_files_send !%netmail           # We will send only netmail
+#delay_files_recv (2:450/102) !%netmail
+#min_free_space 20000
+#recode_file_out /usr/local/fido/etc/koi82alt.tbl
+#recode_file_in /usr/local/fido/etc/alt2koi8.tbl 
+
+#run_after_handshake [logout]/bin/echo "Hello, world!"
+#run_after_session [nowait,setsid]/usr/local/lib/ftp/run-in
+#run_after_handshake [setsid,useshell,logout]/usr/bin/nlookup $REM_ADDR_FTN
+#run_after_session [logout,useshell]/usr/bin/hpt toss && /usr/bin/hpt link && /usr/bin/htick toss
+#run_after_handshake [setsid,useshell,logout]/usr/bin/nlookup $REM_ADDR_FTN
+#filebox_directory /var/spool/fido/bt/fbox
+
+#filebox  /var/spool/ftn/fbox/adb    2:5020/2120.1  hold
+#filebox  /var/spool/ftn/fbox/pvc    2:5020/2091    normal
+#flo_translate  C:\\fido\\spool\\outbound  /var/spool/ftn/out
+#flo_translate  \\  /
+
+maxtries           200  Undialable   # Be carefull.. =)
+maxtries_noansw    5    Hold  7200   # Call two hours later
+maxtries_noconn    40   Hold  10800  # Don't call 3 hours
+maxtries_hshake    10   Hold  86400  # 1 day delay
+maxtries_sessions  10   Hold  3600   # Don't annoy uplinks
+maxtries_nodial    1    Hold  1200   # Call 20 min later 
+
+daemon_circle_modem 40
+daemon_circle_rescan 60
+daemon_circle_normal 80
+daemon_circle_direct 40
+daemon_circle_crash  20
+daemon_circle_immed  10
+daemon_maxclients_tcpip 2
+daemon_maxclients_modem 1
+daemon_pid_file %TESTZONE%/run/bforceA.pid
+
+#syslog_facility 64
+#nomail_flag /home/zx/fido/ftnroot/flags/nomail
+#run_before_session /usr/local/bin/call_inet.sh
+
+recieved_to_lower yes
+
+# That's all!

tests/configs/bforceB.conf

@@ -0,0 +1,202 @@
+address 99:1/2@testzone
+options NoDirZap NoJanus NoChat
+#proto_order ZMO,ZAP,HYD,SLK,KER,DZA,JAN,TZA
+proto_order %PROTO%
+#domain medianet  /var/spool/ftn/medianet/	776
+#domain schoolnet /var/spool/ftn/schoolnet/	461
+log_file %TESTZONE%/logsB/bf-log
+debug_file %TESTZONE%/logsB/bf-debug
+debug_level modem hshake event freq
+nodial_flag %TESTZONE%/etc/nodial
+inbound_directory (Protected) %TESTZONE%/inboundB
+inbound_directory %TESTZONE%/inbound-unsecureB
+# incnet_flag %TESTZONE%/flags/toss
+# incarc_flag %TESTZONE%/flags/toss
+outbound_directory %TESTZONE%/outboundB
+#amiga_outbound_directory /var/spool/fido/bt/out
+nodelist_directory %TESTZONE%/nodelist
+status_directory %TESTZONE%/logsB
+history_file %TESTZONE%/logsB/history
+
+password 99:1/1 testpwd1
+#min_speed_in 1200
+#min_speed_out 1200
+#session_limit_in 1800
+#session_limit_out 1800
+#min_cps_time 120
+#   min_cps_recv (2:5020/1398) 2100
+#   min_cps_recv (2:5020/1682) 3000
+#   min_cps_recv (2:5020/1811) 1400
+zmodem_mincps_recv 300    15
+zmodem_mincps_recv 1200   90
+zmodem_mincps_recv 2400   120
+zmodem_mincps_recv 4800   240
+zmodem_mincps_recv 7200   360
+zmodem_mincps_recv 9600	  480
+zmodem_mincps_recv 12000  600
+zmodem_mincps_recv 14400  720
+zmodem_mincps_recv 16800  840
+zmodem_mincps_recv 19200  960
+zmodem_mincps_recv 21600  1080
+zmodem_mincps_recv 23600  1180
+zmodem_mincps_recv 24000  1200
+zmodem_mincps_recv 26400  1320
+zmodem_mincps_recv 28800  1440
+zmodem_mincps_recv 31200  1600
+zmodem_mincps_recv 33600  1700
+
+zmodem_mincps_send 300    15
+zmodem_mincps_send 1200   90
+zmodem_mincps_send 2400   120
+zmodem_mincps_send 4800   240
+zmodem_mincps_send 7200   360
+zmodem_mincps_send 9600   480
+zmodem_mincps_send 12000  600
+zmodem_mincps_send 14400  720
+zmodem_mincps_send 16800  840
+zmodem_mincps_send 19200  960
+zmodem_mincps_send 21600  1080
+zmodem_mincps_send 23600  1180
+zmodem_mincps_send 24000  1200
+zmodem_mincps_send 26400  1320
+zmodem_mincps_send 28800  1440
+zmodem_mincps_send 31200  1600
+zmodem_mincps_send 33600  1700
+
+hydra_mincps_recv 300    15
+hydra_mincps_recv 1200   90
+hydra_mincps_recv 2400   120
+hydra_mincps_recv 4800   240
+hydra_mincps_recv 7200   360
+hydra_mincps_recv 9600	  480
+hydra_mincps_recv 12000  600
+hydra_mincps_recv 14400  720
+hydra_mincps_recv 16800  840
+hydra_mincps_recv 19200  960
+hydra_mincps_recv 21600  1080
+hydra_mincps_recv 23600  1180
+hydra_mincps_recv 24000  1200
+hydra_mincps_recv 26400  1320
+hydra_mincps_recv 28800  1440
+hydra_mincps_recv 31200  1600
+hydra_mincps_recv 33600  1700
+
+hydra_mincps_send 300    15
+hydra_mincps_send 1200   90
+hydra_mincps_send 2400   120
+hydra_mincps_send 4800   240
+hydra_mincps_send 7200   360
+hydra_mincps_send 9600   480
+hydra_mincps_send 12000  600
+hydra_mincps_send 14400  720
+hydra_mincps_send 16800  840
+hydra_mincps_send 19200  960
+hydra_mincps_send 21600  1080
+hydra_mincps_send 23600  1180
+hydra_mincps_send 24000  1200
+hydra_mincps_send 26400  1320
+hydra_mincps_send 28800  1440
+hydra_mincps_send 31200  1600
+hydra_mincps_send 33600  1700
+#
+mode_default 100666
+mode_arcmail 100666
+mode_netmail 100666
+mode_request 100666
+
+#modem_port /dev/ttyUSB0:57600
+modem_reset_command ATE0M0|
+modem_dial_prefix ATDT
+modem_dial_suffix |
+modem_hangup_command v~^~ATH0|
+#modem_stat_command AT%S|
+#modem_stat_command AT|
+modem_stat_command AT&V1|
+modem_dial_response "CONNECT"     connect
+modem_dial_response "BUSY"        busy
+modem_dial_response "NO CARRIER"  nocarrier
+modem_dial_response "NO DIAL"     nodialTone
+modem_dial_response "NO ANSWER"   noanswer
+modem_dial_response "VOICE"       noanswer
+modem_dial_response "ERROR"       error
+
+nodelist NODELIST.999  *:*/*.0
+
+#nodelist 450_256.pnt  2:450/256.*
+#nodelist easynet.ndl   20:26/*.0
+#nodelist  *:*/*.*
+
+phone_translate 7-813-78 
+phone_translate 7-     8
+#phone_translate 375-  8
+
+system_name TestZoneB
+location TestZone
+sysop_name TestZoneB User
+phone -Unpublished-
+max_speed 9600
+emsi_OH_time 00:00-24:00
+emsi_FR_time 00:00-24:00
+emsi_send_tz  yes
+emsi_send_time yes
+
+recv_buffer_size 65536
+
+wait_carrier_out 120
+
+#freq_srif_command /usr/local/lib/u-srif/u-srif
+freq_alias_list %TESTZONE%/etc/freq.aliases
+freq_dir_list %TESTZONE%/etc/freq.dirs
+freq_limit_number 10
+
+freq_limit_size 6000000
+freq_limit_time 1200
+freq_ignore_masks \\* \\*.\\* \\*.zip \\*.rar \\*.exe \\*.mp3 \\*.avi \\*.mp4 \\*.tgz
+#zmodem_skip_by_pos yes
+zmodem_send_dummy_pkt no
+#zmodem_start_block_size 512
+#zmodem_tx_window 32768
+skip_files_recv *.pif *.swp
+#delay_files_recv !%arcmail !%netmail # We will refuse all except mail
+#delay_files_send !%netmail           # We will send only netmail
+#delay_files_recv (2:450/102) !%netmail
+#min_free_space 20000
+#recode_file_out /usr/local/fido/etc/koi82alt.tbl
+#recode_file_in /usr/local/fido/etc/alt2koi8.tbl 
+
+#run_after_handshake [logout]/bin/echo "Hello, world!"
+#run_after_session [nowait,setsid]/usr/local/lib/ftp/run-in
+#run_after_handshake [setsid,useshell,logout]/usr/bin/nlookup $REM_ADDR_FTN
+#run_after_session [logout,useshell]/usr/bin/hpt toss && /usr/bin/hpt link && /usr/bin/htick toss
+#run_after_handshake [setsid,useshell,logout]/usr/bin/nlookup $REM_ADDR_FTN
+#filebox_directory /var/spool/fido/bt/fbox
+
+#filebox  /var/spool/ftn/fbox/adb    2:5020/2120.1  hold
+#filebox  /var/spool/ftn/fbox/pvc    2:5020/2091    normal
+#flo_translate  C:\\fido\\spool\\outbound  /var/spool/ftn/out
+#flo_translate  \\  /
+
+maxtries           200  Undialable   # Be carefull.. =)
+maxtries_noansw    5    Hold  7200   # Call two hours later
+maxtries_noconn    40   Hold  10800  # Don't call 3 hours
+maxtries_hshake    10   Hold  86400  # 1 day delay
+maxtries_sessions  10   Hold  3600   # Don't annoy uplinks
+maxtries_nodial    1    Hold  1200   # Call 20 min later 
+
+daemon_circle_modem 40
+daemon_circle_rescan 60
+daemon_circle_normal 80
+daemon_circle_direct 40
+daemon_circle_crash  20
+daemon_circle_immed  10
+daemon_maxclients_tcpip 2
+daemon_maxclients_modem 1
+daemon_pid_file %TESTZONE%/run/bforceB.pid
+
+#syslog_facility 64
+#nomail_flag /home/zx/fido/ftnroot/flags/nomail
+#run_before_session /usr/local/bin/call_inet.sh
+
+recieved_to_lower yes
+
+# That's all!

tests/configs/genpkt.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+txt2pkt -nf "TestZone UserB" -xf "99:1/1"  -xt "99:1/2" -t "Binkleyforce testzone" -o "fido.zxalexis.ru" -s "Test Message from TestNodeA to TestNodeB" -d ./msgAtoB ./testtextA.cp866
+txt2pkt -nf "TestZone UserA" -xf "99:1/2"  -xt "99:1/1" -t "Binkleyforce testzone" -o "fido.zxalexis.ru" -s "Test Message from TestNodeB to TestNodeA" -d ./msgBtoA ./testtextB.cp866
+
+

tests/configs/testtextA.cp866

@@ -0,0 +1,50 @@
+‚®â, ­ ¢¥ï«®:
+
+‡¢¥§¤ë ®âà ¦ «¨áì ¢ ¥ñ £« § å. � ­ìè¥, ¥é¥ ¬¥áïæ ­ § ¤ ¨å ­¥ ¡ë«® ¢¨¤­® ¢ ç¥à⥠£®à®¤ . ‘¢¥â ä®­ à¥© ¨ ᬮ£ § £«ãè «¨ ¨å á« ¡®¥ ¬¥àæ ­¨¥. ‚ᥠ¨§¬¥­¨«®áì. ˆ ®¤­¨¬ ¨§ ­¥¬­®£¨å ¯«îᮢ á«®¦¨¢è¥©áï á¨âã æ¨¨ ¡ë«® ¬¥àæ ­¨¥ §¢¥§¤ ¢ ¥ñ £« § å, ¨ ¢®§¤ãå, ª ¦¥âáï áâ « ç¨é¥. “ ¢á¥å ã ­ á ª®£¤  â® ¡ë«  à ¡®â , ¨ ¡ë« ¤®¬. “ ­¥ª®â®àëå ¡ë«¨ ¤¥â¨. “ ‹¥­ë ¡ë«  ¤®çª . Ž­  à ¡®â «  ¡ à¬¥­è®©,   ¯® ¢¥ç¥à ¬ ¯®¤à ¡ â뢠«  ¢ "ª«ã¡¥ §­ ª®¬áâ¢". �®¯à®áâã £®¢®àï - ¡ë«  ¯à®áâ¨âã⪮©. ’¥¯¥àì ¥© 㦥 ­¥ ¯à¨å®¤¨âáï ¥§¤¨âì ¯® ­¥§­ ª®¬ë¬ ª«¨¥­â ¬, ª ¦¤ë© à § ¯¥à¥¤ ¤¢¥àìî ª¢ àâ¨àë ªà¥áâ¨âìáï, ¨ ¬®«¨âìáï, çâ® ¡ë ¢á¥ ¯à®è«® ª ª ­ ¤®. �⮠⮦¥ ¯«îá. �® ⥯¥àì ã ­¥ñ ­¥â ¤®çª¨. Ž­  ¯®â¥àï« áì ¢ ¯¥à¢ë¥ ¤­¨, ª ª ⮫쪮 ¢á¥ íâ® ­ ç¨­ «®áì.
+‹¥­  ¡ë«  "­  ¢ë§®¢¥", ª®£¤  ¨á祧«® í«¥ªâà¨ç¥á⢮. �¨ªâ® ¥é¥ ­¥ §­ «, çâ® íâ® á¥à쥧­®. Œ®¡¨«ì­ ï á¢ï§ì ­¥ à ¡®â « , £®à®¤ ¯®£à㧨«áï ¢® âì¬ã §  ®ª­ ¬¨ ®¤­ ª®¬­ â­®© ª¢ àâ¨àë, ¢ ª®â®à®© ¢®§¡ã¦¤¥­­ë© ¬ã¦ç¨­  ª®­ç « ¢ ¯à¥§¥à¢ â¨¢,   ‹¥­  áç¨â «  á¥ªã­¤ë ¤® ®ç¥à¥¤­®£® ¢ë§®¢ . Ž­  ­¥ ¬®£«  ª ª ®¡ëç­® ¯à¨­ïâì ¤ãè, ¨ ¢ë§¢ âì â ªá¨, ¨ ¯®á«¥ ®á®§­ ­¨ï í⮣®, ¯à®áâ® ­ ç «  ®¤¥¢ âìáï. �¥«ì¥ ¯® ¯à¨¢ë窥 ¡ë«® á«®¦¥­® ®¤­®© ªã窮© à冷¬ á ªà®¢ âìî. Œã¦ç¨­ , ¨¬ï ª®â®à®£® ®­  ­¥ § å®â¥«  § ¯®¬¨­ âì ᪠§ « ¥© ᯠᨡ® ¨ ®âªàë« ¤¢¥àì, çâ® â® ¯à®¢®àç ¢ ­ ¯®á«¥¤®ª ­  "¤®«¡ ­­ëå í«¥ªâਪ®¢"...
+‹¥­¥ ¡ë«® ®ç¥­ì ¯à¨ïâ­® ¢ë©â¨ ­  ᢥ¦¨© ¢®§¤ãå, ¯®á«¥ ¯à®¯ å襩 ¯¥à¥£ à®¬ ª®¬­ âã誨. Ž­  è«  ¯® ⥬­ë¬ 㫨栬 £®à®¤ , è«  ­  "¡ §ã" ¯¥èª®¬, ¨ íâ  ­¥¯à®£«ï¤­ ï â쬠 ¢®ªà㣠¤«ï ­¥ñ ᥩç á ¡ë«  ®âà ¦¥­¨¥¬ ¢­ãâ७­¥£® á®áâ®ï­¨ï, ¨ ¯®í⮬㠮­  ­ á« ¦¤ « áì í⮩ ¯à®£ã«ª®©. Ž­  ¥é¥ ­¥ §­ « , çâ® í«¥ªâà¨ç¥á⢮ ¨ ¢®¤®á­ ¡¦¥­¨¥ 㦥 ­¥ ¢®ááâ ­®¢ïâ. Ž­  ­¥ ¬®£«  ¯®¤ã¬ âì, çâ® ç¥à¥§ âਠç á  ¥ñ ¯ï⨫¥â­ïï ¤®çª , ¨á¯ã£ ¢è¨áì ⥬­®âë ¨ ®¤¨­®ç¥á⢠, ¢ë©¤¥â ¨§ ª¢ àâ¨àë, ¨ ¯à®¯ ¤¥â ­ ¢á¥£¤ . Ž­  ¥é¥ ­¥ §­ « , çâ® ¥ñ ¯®¨áª¨ ¡ã¤ãâ ¡¥á¯®«¥§­ë ¨ ®¯ á­ë... Ž­  ¯à®áâ® è«  ¯® 㫨æ¥.
+
+‘¥©ç á ¬ë á⮨¬ ª®«ì殬, à¥è ¥¬ çâ® ¤¥« âì. „¬¨â਩ ˆ¢ ­®¢¨ç á«¥¢  ®â ¬¥­ï, ¤¯«¥¥ ‘ è®ª, ‹¥­  ¨ „¨¬ . �  ᪠¬¥©ª¥ ­¥¤ «¥ª® ᨤïâ ‹¥à  ¨ Ž«ï. ‹¨æ  ¢® â쬥 ¥«¥ à §«¨ç¨¬ë. “ ¬ã¦ç¨­ - ¯®ªàëâë é¥â¨­®©, ã ¤¥¢ã襪 ®áã­ã«¨áì ¨ ãáâ «¨..
+- �  Š¨à®¢  ï á«ëè « ¢ëáâ५ë. ’㤠 ¨¤â¨ ¡¥á¯®«¥§­®. - „¬¨â਩ ˆ¢ ­®¢¨ç ¡ë« ® ­ ¯ã£ ­.
+- „  ­¨ªâ® ⥡ï â㤠 ­¥ § áâ ¢«ï¥â ¨¤â¨! - ᪠§ « ‘ è®ª.
+- „ , ­® ­ ¬ ­ã¦­® ¤®áâ âì ¥é¥ ¥¤ë. - ®â¢¥â¨« ï.
+“«¨æë £®à®¤  ¡ë«¨ ¯ãáâë ⮫쪮 á ¢¨¤ã. �  á ¬®¬ ¤¥«¥ - ¢ ç¥à­ëå £« §­¨æ å §¤ ­¨© î⨫¨áì ã楫¥¢è¨¥. €£à¥áᨢ­ë¥, ®§«®¡«¥­­ë¥, £®â®¢ë¥ ­  ¢á¥. ‹î¤¨ ªã窮¢ «¨áì ¯® á«ãç ©­®¬ã ¯à¨§­ ªã. ’ ª ¨ ­ è  £à㯯  ®¡à §®¢ « áì á«ãç ©­®. Ž¤­®¬ã ᥩç á ­¥ ¢ë¦¨âì. �® ¯à®¡«¥¬  ¢ ⮬, çâ® ¬ë ­¥ ¤®¢¥à﫨 ¤à㣨¬. Š ª ¢¯à®ç¥¬ ¨ ®­¨ ­ ¬. “ ­ á ¥é¥ ¡ë«  ¥¤ , ¥ñ 墠⨫® ¡ë ­  ­¥¤¥«î ¬ ªá¨¬ã¬.
+- Šâ® ­¨¡ãâì á«¥¤¨« §  í⨬ ¤®¬®¬? - ï 㪠§ « ­  ¤®¬ 20, ª®à¯ãá 1 ¯® ‹¥­¨­£à ¤áª®© ­ ¡¥à¥¦­®©. �â® ¡ë«  ¯ïâ¨íâ ¦ª , ¨ ®­  £®à¥« . ƒ®à¥«  㦥 ¤ ¢­®. ˆ§ ®¤­®£® ¯®¤ê¥§¤  ¯®áâ®ï­­® ¢ «¨« ¤ë¬. —¥à­ë©, £ãá⮩. �® ¢á¯®«®å®¢ ¯« ¬¥­¨ ­¥ ¡ë«® ¢¨¤­®.
+- Ÿ á«¥¤¨« , ­¨ªâ® ­¥ ¢å®¤¨«. Š®¬ã ­ã¦¥­ íâ® £®àï饥 ¯¥ª«®? - ‹¥à  ¯®¤ «  £®«®á ᮠ᪠¬¥©ª¨.
+- �®©¤¥¬ â㤠. - ‘ è®ª ­¥ á¯à è¨¢ «, ®­ ¯à®áâ® ª®­áâ â¨à®¢ « ä ªâ.
+�¨ªâ® ­¥ ᯮਫ. ‚ᥠ®ç¥­ì ãáâ «¨. ˆ ¨¤¥ï ®¡è à¨âì £®àï騩 ¤®¬ ¢á¥¬ ¯®ª § « áì ¯à ¢¨«ì­®©. Œë ¯¥à¥¤¥à­ã«¨ § â¢®àë, ¯à®¢¥à¨«¨ £à ­ âë, ¨ ¯®è«¨.
+
+„¬¨â਩ ˆ¢ ­®¢¨ç ¡ë« ãç¨â¥«¥¬ ¢ â¥å­¨ªã¬¥. ‚ â®â ¤¥­ì ®­ ¯à¨è¥« ¤®¬®©,  ªªãà â­® à ááâ ¢¨« ¢á¥ ¯à®¤ãªâë ¢ 宫®¤¨«ì­¨ª, ª®â®àë¥ ¯à¨­¥á ¢ á㬪¥. � áá⥫¨« ᪠â¥àâì ­  á⮫¥. „®áâ « äã¦¥à ¨§ á⥭­®£® 誠ä . �冷¬ ¯®«®¦¨« ¡«î¤æ¥ á ­ à¥§ ­­ë¬ áë஬. �ãâ뫪㠢¨­  "Œ¥à«®", ªà¥¯ª®¥ ¯®«ãá« ¤ª®¥. ‚›ª«î稫 ᢥâ. ‚ª«î稫 ⥫¥¢¨§®à. � «¨« ¯®«­ë© ä㦥à. Ž­ ¯à¨£®â®¢¨«áï ¯à®¢¥á⨠®ç¥à¥¤­®© ¯à¨ïâ­ë© ¢¥ç¥à ¢ ¯®«­®¬ ®¤¨­®ç¥á⢥.
+—¥à¥§ ­¥¤¥«î ¯®á«¥ ⮣® ª ª á«ã稫 áì ª â áâà®ä  ®­ 㦥 «¥£ª® १ « «î¤¥© ­®¦®¬, ª®â®àë¬ ª®£¤  ⮠१ « áëà. Ž­ 㦥 «¥£ª® ¯¨« ¢®¤ªã, ¨ § ¡ë« ­ §¢ ­¨¥ «î¡¨¬®© ⥫¥¯¥à¥¤ ç¨. € ª®¬ ­¤  "‡¥­¨â", §  ª®â®àãî ®­ ª®£¤  â® ¡®«¥« - ¤«ï ­¥£® áâ «  祬 â® ¬¨ä¨ç¥áª¨¬, ¨§ ¤à㣮£® ¬¨à . ˆ â¥å «î¤¥©, ª®â®àë¬ ®­ áâ ¢¨« ª®£¤  â® ®æ¥­ª¨ ¢ ª« áá¥, ®­ 㡨¢ « ­¥ § ¤ã¬ë¢ ïáì. ˆ ¤ ¦¥ á ª ª¨¬ ⮠㤮¢®«ìá⢨¥¬ ¨ á ­¥ª®â®à®© ¤®«¥© á ¬®®â¤ ç¨ ¨ ᬥª «ª¨...
+
+ˆ ª®­¥ç­® ¦¥ ¨à®­¨¨. �¥§ ­¥ñ ᥩç á ­¥ ¯à®¦¨âì. ‚ ¯®¤ê¥§¤¥ ¯ïâ¨íâ ¦ª¨ ­¥á«® á¬à ¤®¬. Œë ¡ëáâà® ®¤¥«¨ ¬ à«¥¢ë¥ ¯®¢ï§ª¨. ‘¯ã᪠¢­¨§, ¯®¤¢ «, ¯à¥¢à é¥­­ë© ¢ ᪫ ¤ ¯à®¤ãªâ®¢®£® ¬ £ §¨­ . �â® ¨ ¥áâì ­ è  楫ì. „¨¬ , ¤¥à¦  ¯¨á⮫¥â ­ £®â®¢¥ ¢áâ « ®â ¤¢¥à¨ á«¥¢ . ‘ è®ª á¯à ¢ . �ã   ¬­¥ ­ã¦­® ¡ë«® ¢§«®¬ âì ¦¥«¥§­ãî ¤¢¥àì. Š ¦¤ë© ¨§ ­ á ⥯¥àì áâ « ¢ í⮬ ᯥ樠«¨á⮬. Ÿ ­¥ áâ « ¯®¤¡¨à âì ª«îç. Ÿ à §à廊« ®¡®©¬ã ᢮¥£® "¬ ª à®¢ " ¢®ªà㣠§ ¬ª . „¬¨â਩ ˆ¢ ­®¢¨ç, ¨­â¥««¨£¥­â­® ¯à¨«®¦¨«áï ­®£®© ¯® ¤¢¥à¨ ¨ ¯¥à¢ë© ¢®à¢ «áï ¢ ¯®¬¥é¥­¨¥. �®ª  ï ¯¥à¥§ à裂« ®¡®©¬ã, ï 㦥 ãá«ëè « ¢ëáâ५ë. Œë ¤¥©á⢮¢ «¨ ¡ëáâà® ¨ ¡¥§¦ «®áâ­®. „¥¢ã誨 áâ®ï«¨ á­ à㦨. ˆ¬ ®â¤ «¨ áâ àë© ª « è­¨ª®¢, ­  ¢á直© á«ãç ©.
+
+‹¥à  •®â¥«  ¯à®áâ® ¯®¤®£à¥âì ¢®¤ã, çâ® ¡ë ¢ë¯¨âì £®àï祣® ç î. ‚¯¥à¢ë¥, á¯ãáâï ¤¢  ¤­ï ª ª ®âª«î稫¨ í«¥ªâà¨ç¥á⢮, ®­  ®áâ®à®¦­® ¢ëè«  ­  㫨æã. ‚ ®ª­® ®­  ¢¨¤¥« , ª ª ¢® ¤¢®à¥ ¤®¬  «î¤¨ à §®¦£«¨ ª®áâ¥à. �ë«  ®á¥­ì, ¯®£®¤  ­¥ à ¤®¢ «  ⥯«®¬, ¨ à ááç¨â뢠âì ¡ë«® ®á®¡® ­¥ ­  çâ®. …ñ áã¯à㣠¡ë« ¢ ª®¬ ­¤¨à®¢ª¥ ¢ �¨â¥à¥, ¨ ®­  ­¥ å®â¥«  ­¨ç¥£® ¡¥§ ­¥£® ¯à¥¤¯à¨­¨¬ âì, ¯®ª  ®­ ­¥ ¢¥à­¥âáï. ‘®á¥¤ª , ¯®¦¨« ï ¦¥­é¨­ , ¡ë«  ¥¤¨­á⢥­­ë¬ 祫®¢¥ª®¬, á ª¥¬ ®­  ®¡é « áì ¢ íâ® ¢à¥¬ï. Ž­  à á᪠§ «  ¥©, çâ® í«¥ªâà¨ç¥á⢮ ¯®ç¨­¨âì ¯®ª  ­¥ 㤠¥âáï. —â® ¯® ­¥¯®­ïâ­ë¬ ¯à¨ç¨­ ¬ ­¥ à ¡®â îâ ¤ ¦¥ £¥­¥à â®àë ¢  ¢â®¬®¡¨«ïå. ˆ çâ® ¢à®¤¥ ¡ë íâ® ¯à®¡«¥¬  ­¥ ⮫쪮 ¢ Œ®­ç¥£®à᪥, ­® ¨ ¢® ¢á¥© ¬ãଠ­áª®© ®¡« áâ¨.
+‚ ¯¥à¢ë© ¤¥­ì, ¯® 㫨栬 室¨«¨ ¬¨«¨æ¥©áª¨¥ ¯ âà㫨, £à®¬ª® £®¢®à¨«¨ çâ® ¡ë ¢á¥ ᮡ«î¤ «¨ ᯮª®©á⢨¥. —â® ¯¨â ­¨¥ ¡ã¤¥â ᪮஠¢®ááâ ­®¢«¥­® ¨ ­¥â ¯à¨ç¨­ ¤«ï ¯ ­¨ª¨. “â஬ ¯à®è¥« ¥é¥ ®¤¨­ ¯ âàã«ì, ®­ ®£« á¨« ¨­ä®à¬ æ¨î ® ­¥áª®«ìª¨å ¯ã­ªâ å ᪮ன ¯®¬®é¨, à §¢¥à­ãâëå ¢ £®à®¤¥. �  業âà «ì­®© ¯«®é ¤¨, ­  ã«¨æ¥ Š«¨¬¥­â쥢 , ‹¥­¨­£à ¤áª®© ­ ¡¥à¥¦­®©, Œ®­ç¥, ¨ ã«¨æ¥ �।®¢ . ’ ¬ ¬®¦­® ¯®«ãç¨âì ¥¤ã ¨ ¢®¤ã. �¥ª®â®àë¥ «î¤¨ ¢á¥ â ª¨ ¯®¤¤ «¨áì ¯ ­¨ª¥. Žá®¡¥­­® â¥, ª®â®àë¥ å®¤¨«¨ á ¬ «®«¥â­¨¬¨ ¤¥â쬨. Ž­¨ âॡ®¢ «¨ ®â ¯ âàã«¥© ¯®«­®© ¨­ä®¬ æ¨¨ ¨ ¢¥«¨ á¥¡ï ®ç¥­ì ­¥á¯®ª®©­®. ‚á«¥¤á⢨¨ 祣® ­¥ª®â®àë¥ ¡ë«¨  à¥á⮢ ­ë ¨ ¯®¬¥é¥­ë ¯®¤  à¥áâ.
+‹¥à  ¢ëè«  á ª áâàî«¥© ¢®¤ë ¢® ¤¢®à. ‘®á¥¤¨ ¡¥§ ¯à®¬¥¤«¥­¨ï 㪠§ «¨ ­  áâ àë¥ ª ç¥«¨, ¯®¤ ª®â®à묨 £®à¥« ®£®­ì, ¨ ¢¨á¥«® ¥é¥ ­¥áª®«ìª® ª®â¥«ª®¢. ‹¥à  ¯®¢¥á¨«  ᢮©.
+‹¨æ  㠫© ¢®ªà㣠ª®áâà ,   ¨å ¡ë«® ®ª®«® 50-⨠祫®¢¥ª. �뫨 ­ ¯à殮­ë. ƒ« §  ã ¬­®£¨å ¢®§¡ã¦¤¥­­® £®à¥«¨. Šâ® â® ¤ ¦¥ èã⨫. ’¨è¨­ã ¨ ¬¥à­ë© £®¬®­ £®«®á®¢ ¨­®£¤  ¯à¥à뢠« £à®¬ª¨© ᬥå.
+‹¥à  ¯®£®¢®à¨«  ­¥¬­®£® á á®á¥¤ï¬¨. �¨ªâ® ­¥ §­ «, çâ® á«ã稫®áì...
+
+�¥¯«®å®. Ž­¨ ¢á¥ ᯠ«¨. Ž¡®è«®áì ¡¥§ ®á«®¦­¥­¨©. ’®«ìª® ®¤¨­ ¨§ ­¨å ¯ëâ «áï ®¡®à®­ïâìáï. Œ «ì稪, «¥â 15-â¨, ­¥ ¡®«ìè¥... ¯®¤­ï«  ¢â®¬ â ­  „¨¬ã. €¢â®¬ â ¡ë« ­  ¯à¥¤®åà ­¨â¥«¥, ¨ ¯®ª  ¬ «ì稪 ¤¥« « ¯®¯ë⪨ ¯®­ïâì, ¯®ç¥¬ã ­¥ à ¡®â ¥â á¯ã᪮¢®© ªàî箪 - „¨¬  ¢ë­¥á ¥¬ã ¬®§£¨ ­  ¯à®â¨¢®¯®«®¦­ãî á⥭ªã. �ë«® ¥é¥ ¯ïâì 祫®¢¥ª ¢ ¯®¤¢ «¥. ’ਠ¤¥¢ã誨 ¨ ¤¢®¥ ¬ã¦ç¨­. ‚á¥å § áâ५«¨«¨ ¡¥§ ®á®¡ëå ¯à®¡«¥¬. Œë ¯®§¢ «¨ ¤¥¢ã襪. ‹¥­  ¨ ‹¥à  ­ ç «¨ 㡨à âì âàã¯ë ¢ ®¤­ã ª®¬­ âã. Ž«ï ®áâ « áì 㠢室 , á ª « è®¬ ­ £®â®¢¥. ‚ᥠ®áâ «ì­ë¥ ®æ¥­¨¢ «¨ § ¯ áë ¯à®¢¨ ­â . Š®­á¥à¢ë. ‘ã娥 ¯ ª¥âë á « ¯è®©. Ÿé¨ª¨ á «¨¬®­ ¤®¬, ¬¨­¥à «ª . ’ãâ ¡ë«® ¯à¨£®¤­®© ¥¤ë ­  ¤¢  ¬¥áïæ , ¥á«¨ à ááç¨â뢠âì ­  è¥áâ¥àëå. �஡«¥¬  ¡ë«  ⮫쪮 ¢ ⮬, £¤¥ ¢á¥ íâ® á¯àïâ âì.
+- �«ïâì! - ‹¥à  ¯®¤áª®«ì§­ã« áì ¨ 㯠«  ­  âà㯠¬ «ì稪  á ¯à®áâ५¥­­®© ¡ èª®©.
+- ’ ¬ ¬®§£¨ ­  ¯®«ã, âë ç¥ ­¥ ¢¨¤¥« ? - ‹¥­  ᬥ﫠áì...
+- ’ë à ­ìè¥ ­¥ ¬®£«  ᪠§ âì? - ¨ ‹¥à  ⮦¥ à áᬥ﫠áì...
+- ’ ª, ¯®¤à㣨 è ¡ è ¢¥á¥«ìî, ¡«ïâì, ¥á«¨ ¢ ¬ § ­ïâìáï ­¥ç¥¬ - ¯¨§¤ã©â¥ á, ï ¢ ¬ ᥩç á § £àã¦ã ï騪 ¬¨!!! - Ÿ ¡ë« ­¥ ¢ ­ áâ஥­¨¨ èãâ¨âì.
+- �ã ¨ á㪠 âë Œ ªá...
+- „  ¯®è¥« ®­ ­  åã©! - ¯®¤¤¥à¦ «  ‹¥à ...
+- �¥ ¯¨§¤¥âì! ‚ᥬ á ­ åã©!!!!
+
+‹¥­  ᨤ¥«  ­   ¢â®¡ãá­®© ®áâ ­®¢ª¥ ­ ¯à®â¨¢ ¬®¥£® ¤®¬ . Ž­  â¨å® ¯« ª « , ®¡å¢ â¨¢ à㪠¬¨ £®«®¢ã. “¦¥ ­¥¤¥«î ï ­¨ç¥£® £®àï祣® ­¥ ¥«. ‡ ¯ áë ¯à®¤ãªâ®¢ ª®­ç¨«¨áì, 㫨æë ®¯ãá⥫¨. ˆ «¨èì ­¥¬­®£¨¥ ¯à®å®¦¨¥ è â «¨áì ¯® £®à®¤ã ª ª §®¬¡¨, á«®¢­® ­¨ç¥£® ¯¥à¥¤ ᮡ®© ­¥ ¢¨¤¥«¨. Ž­¨ 諨 ª à §¤ â®ç­ë¬ ¯ã­ªâ ¬. �® á«ãå ¬ - â ¬ 㦥 ­ ç «¨áì ¡¥á¯®à浪¨. �¥ª®â®àë¥ ¤®¬  £®à¥«¨.
+Œ­¥ ­ ¤®¥«® 室¨âì, ¬­¥ ¡ë«® ®¤¨­®ª®. Ÿ ᥫ à冷¬ á ­¥©.
+- Š ª ¤¥« ?
+- Ÿ ­¥ ¬®£ã ­ ©â¨ á¢®î ¤®çì. - ‹¥­  £®¢®à¨«  ¢ ¯ãáâ®âã ¯¥à¥¤ ᮡ®©.
+- Š ª ¥ñ §®¢ãâ? - ï ¯®¯ëâ «áï § ¯®«­¨âì íâã ¯ãáâ®âã.
+- „ è .
+- —â® âë ᮡ¨à ¥èìáï ¤¥« âì?
+- Ÿ å®çã ã©â¨ ¢á«¥¤ §  ­¥©.. - ¥ñ á«®¢  ¯à¥à뢠«¨áì áâ®­ ¬¨ ¨ ¯« ç¥¬.
+- �®è«¨ §  ¬­®©.
+
+Œë ­¥¯«®å® ¯®¦¨¢¨«¨áì. ‚áî ¯à¨£®¤­ãî ¥¤ã 㭥᫨ á ᮡ®©. �¥áª®«ìª®  ¢â®¬ â®¢ ¨ ¡®¥¯à¨¯ á®¢. “¤ ç . Žâªã¤  ¢ £®à®¤¥ ®ª § «®áì á⮫쪮 ®à㦨ï? �®ç¥¬ã ⥯¥àì ¬ë ¡®¨¬áï ᮫­¥ç­®£® ᢥâ ? •®«¥à  ª®á¨â «î¤¥© ¨ ¦¨¢®â­ëå. �  㫨æ å, ¢® ¤¢®à å ¢¨¤­ë âàã¯ë «î¤¥©, ¤¥â¥©... Ž­¨ ¯®ªãá ­ë ᮡ ª ¬¨. Ž­¨ à á¯à®áâà ­ïîâ ­¥¢ë­®á¨¬ãî ¢®­ì. ‹î¤¨ 㬨à îâ ¢­¥§ ¯­®. Žâ ¡®«¥§­¥©. ®â ¯ã«¨, ¢ë¯ã饭­®© ¢ ᯨ­ã. Žâ ­®¦ , ª®â®àë© ª®£¤  ⮠१ « áëà,   ⥯¥àì ०¥â 祫®¢¥ç¥áªãî ¯«®âì. ƒ®á¯®¤ì § ¤ã¬ « £«®¡ «ì­ãî ç¨áâªã. �â® ­¥  à¬ £¥¤¤®­. ‚릨¢è¨¥ ¨ ãá⠢訥. ‹î¤¨, ¯®å®¦¨¥ ¡®«ìè¥ ­  §¢¥à¥©. —¥«®¢¥ç¥á⢮ ¢ í⮬ £®à®¤¥ ¯¥à¥áâ «® áãé¥á⢮¢ âì. ‚ë¡à âìáï ¨§ ­¥£® ­¥à¥ «­® - â¥, ªâ® ¯ëâ «áï § ¬¥à§«¨ ¢ ¤®à®£¥. ˆ«¨ ¡ë«¨ 㡨âë. …¤¨­á⢥­­ë© ¢ë室 - 㡨¢ âì, £à ¡¨âì, ¢ë¦¨¢ âì. „¥à¦ âìáï £à㯯 ¬¨. „®¢¥àïâì «î¤ï¬, ª®â®àë¥ à冷¬, ­® ⮫쪮 ª®£¤  âë ®á®§­ ¥èì, çâ® ®­¨ ­ã¦¤ îâáï ¢ ⥡¥. ’®â, ªâ® ­¥ ­ã¦¥­ - ¡ã¤¥â 㡨â. �¥¤¥«î ­ § ¤, ­ è ⮢ à¨éì, ¬®© ¤à㣠¤¥âá⢠, ‚®¢ ... ®­ § ¡®«¥« 宫¥à®©. Š ª ⮫쪮 ¬ë íâ® ¯®­ï«¨ - ¬ë á¢ï§ «¨ ¥ã à㪨 ¨ ­®£¨, ®â­¥á«¨ ­  ®¡®ç¨­ã, ¨ ï ¯ãá⨫ ¥¬ã ¯ã«î ¢ «®¡.
+
+Ž­  ¢á¯®¬¨­ «  ¤­¨, ª®£¤  §¢¥§¤ ­¥ ¡ë«® ¢¨¤­®. € §¢¥§¤ë ®âà ¦ «¨áì ¢ ¥ñ £« § å. Œë ¢á¥ ¡ë«¨ ¤à㣨¬¨. ’¥¯¥àì ï ¢¨¦ã çâ® ®­  áç á⫨¢ . Ž­  ¯®â¥àï«  ॡ¥­ª . Ž­  㡨¢ « , ¡ë«  ᢨ¤¥â¥«¥¬ ⮣®, ª ª 㡨¢ «¨ ¥ñ ¤à㧥©. Ž­  ᬨਫ áì á ⥬, ç⮠㦥 ­¨ª®£¤  ­¥ ¡ã¤¥â ¢ ¥ñ ¦¨§­¨ ⥯«®£® ¤ãè , ª®ä¥, £®àï祩 ¬ ¬¨­®© ¯®å«¥¡ª¨. ‹¥­ . ˆ ï å®çã à §¤¥«¨âì ⢮¥ áç áâì¥. ’ë ¯®§¢®«ï¥èì ¬­¥ â¥¡ï ®¡­ïâì. ’ë 㦥 ­¥ ¤ã¬ ¥èì ® ¦¥á⮪®á⨠¦¨§­¨, § áâ ¢¨¢è¥© ¨¤â¨ â¥¡ï ­  ¯ ­¥«ì. ’ë ¤®¢®«ì­ . ’¢®ï ¬¥áâì ᢥà訫 áì. ’®à¦¥á⢮ ¡ëâ¨ï á⮨«® ¯®â¥à¨ ¤¥¢®çª¨, ª®â®àãî âë «î¡¨« . ’¥¯¥àì ¬ë á« ¢¨¬ ¡®£  §  â®, çâ® ®­ ¤ « ­ ¬ íâ®â ¬®¬¥­â áç áâìï. ’¥¯¥àì ¬ë ¢¥à¨¬ ¢ ­¥£®. ’¥¯¥àì ¬ë ­¥ áãé¥áâ¢ã¥¬. Œë ¦¨¢¥¬. Œë ¢á¥ ¯®â¥à﫨 ¤¥¢á⢥­­®áâì. Œë ¯®«ã稫¨ ®¯ëâ. � á ¨§­®á¨«®¢ « £®á¯®¤ì ¡®£! �® ¯®ç¥¬ã ¦¥ ¬ë ᥩç á â ª áç á⫨¢ë????
+

tests/configs/testtextB.cp866

@@ -0,0 +1,184 @@
+— ª �€‹€�ˆŠ
+Šˆ˜Šˆ
+
+‚¤®å­¨â¥.
+
+� ¡¥à¨â¥ ª ª ¬®¦­® ¡®«ìè¥ ¢®§¤ãå .
+
+�â  ¨áâ®à¨ï § ­¨¬ ¥â ஢­® á⮫쪮 ¢à¥¬¥­¨, ­ áª®«ìª® ¢ë ¬®¦¥â¥ § ¤¥à¦ âì ¤ëå ­¨¥, ¨ ¥é¥ çãâì-çãâì. ’ ª çâ® á«ã蠩⥠ª ª ¬®¦­® ᪮॥.
+
+Ž¤¨­ ¬®© ¤àã£, ª®£¤  ¥¬ã ¡ë«® 13 «¥â, ãá«ëè « ® ¯¥££¨­£¥ . �¥££¨­£ íâ® ¯ à­ï âà å îâ ¢ § ¤­¨æã ¨áªãá⢥­­ë¬ ç«¥­®¬. �® á«ãå ¬, ¥á«¨ á⨬㫨஢ âì ¯à®áâ âã ¤®áâ â®ç­® ᨫ쭮, ¬®¦­® ¤®¡¨âìáï ¬­®¦¥á⢠ ïàª¨å ®à£ §¬®¢ ¡¥§ ¯®¬®é¨ àãª. ‚ ¢®§à á⥠13 «¥â íâ®â ¤à㣠¡ë« ¬ «¥­ìª¨¬ ᥪáã «ì­ë¬ ¬ ­ì类¬. Ž­ ¢¥ç­® ­®¢ë¥ ¯ã⨠¯®«ã祭¨ï ®ç¥à¥¤­®£® ®à£ §¬ . Ž­ ¨¤¥â ¢ á㯥ଠથâ, çâ®¡ë ªã¯¨âì ¬®àª®¢ì ¨ ¢ §¥«¨­. —â®¡ë ¯à®¢¥á⨠­¥¡®«ì讥 ­¥§ ¢¨á¨¬®¥ à áá«¥¤®¢ ­¨¥. ’®£¤  ®­ ¢¤à㣠¯à¥¤áâ ¢«ï¥â ᥡ¥, ª ª ¢á¥ íâ® ¡ã¤¥â ¢ë£«ï¤¥âì ã ª ááë ¢ á㯥ଠથâ¥, ®¤¨­®ª ï ¬®àª®¢ì ¨ ¡ ­®çª  ¢ §¥«¨­  ­  ¯®¤¢¨¦­®© «¥­â¥ ª ááë. ˆ ¢á¥ ᬮâàïâ. ‚ᥠ¯®­¨¬ îâ, çâ® ¯ à¥­ì à¥è¨« ¯®¤ à¨âì ᥡ¥ § ¬¥ç â¥«ì­ë© ¢¥ç¥à.
+
+ˆâ ª, ¬®© ¤à㣠¯®ªã¯ ¥â ¬®«®ª® ¨ ï©æ  ¨ á å à ¨ ¬®àª®¢ì, ¢á¥ ¨­£à¥¤¨¥­âë ¤«ï ¬®àª®¢­®£® ¯¨à®£ . ˆ ¢ §¥«¨­.
+
+Š ª ¡ã¤â® ¤®¬  ®­ ᮡࠫáï § áã­ãâì ᥡ¥ ¢ § ¤­¨æã ¬®àª®¢­ë© ¯¨à®£.
+
+„®¬  ®­ ¢ë१ ¥â £àã¡®¢ âë© ¬®àª®¢­ë© ç«¥­. Ž­ ®¡¬ §ë¢ ¥â ¥£® ¢ §¥«¨­®¬ ¨ ãá¥à¤­® § á®¢ë¢ ¥â ¥£® ᥡ¥ ¢ § ¤­¨æã. �¨ç¥£® ­¥ ¯à®¨á室¨â. �¨ª ª®£® ®à£ §¬ . �¨ç¥£® ­¥ ¯à®¨á室¨â ªà®¬¥ ⮣®, çâ® § ¤­¨æ  ¡®«¨â.
+
+’ãâ ¥£® ¬ âì §®¢¥â ¥£® 㦨­ âì. ˆ¤¨ á, ¯®à  ¥áâì, £®¢®à¨â ®­ .
+
+Ž­ ¢ëâ áª¨¢ ¥â ¬®àª®¢ì ¨§ § ¤­¨æë ¨ ¯àïç¥â ᪮«ì§ªãî, £à吝ãî ¬®àª®¢ì ¯®¤ ªà®¢ âìî á।¨ £à吝®£® ¡¥«ìï.
+
+�®ã¦¨­ ¢, ®­ ¨¤¥â §  ¬®àª®¢ìî, ­® ¥¥ â ¬ ­¥â. �®ª  ®­ 㦨­ «, ¬ âì § ¡à «  ¥£® £à吝®¥ ¡¥«ì¥, çâ®¡ë ¯®áâ¨à âì. Ž­  ­¥ ¬®£«  ­¥ § ¬¥â¨âì ¬®àª®¢ì, âé â¥«ì­® ®áâà㣠­­ãî ªãå®­­ë¬ ­®¦®¬, ¡¥«áâïéãî ®â ᬠ§ª¨, ¢®­îçãî.
+
+‘«¥¤ãî騥 ¬¥áïæë íâ®â ¬®© ¤à㣠¦¨¢¥â ª ª ¯®¤ ç¥à­®© âã祩. Ž­ ®¦¨¤ ¥â ¢ëïá­¥­¨ï ®â­®è¥­¨©. �® í⮣® ­¥ ¯à®¨á室¨â. �¨ª®£¤ . „ ¦¥ ª®£¤  ®­ ¢ëà®á, íâ  ¬®àª®¢ì ­¥§à¨¬® ­ ¢¨á «  ­ ¤ ª ¦¤ë¬ ஦¤¥­á⢥­áª¨¬ 㦨­®¬, ­ ¤ ª ¦¤ë¬ ᥬ¥©­ë¬ ¯à §¤­¨ª®¬. Š ¦¤ ï ¯ áå , ª®£¤  ¥£® ᮡá⢥­­ë¥ ¤¥â¨, ¢­ãª¨ ¥£® த¨â¥«¥©, ¨éãâ á¯àïâ ­­ë¥ ¯ áå «ì­ë¥ ï©æ , íâ  ¬®àª®¢ì ­ ¢¨á ¥â ­¤ ­¨¬¨ ¢á¥¬¨.
+
+‘«¨èª®¬ ®â¢à â¨â¥«ì­®, çâ®¡ë ¨¬¥âì ­ §¢ ­¨¥.
+
+“ äà ­æ㧮¢ ¥áâì ¢ëà ¦¥­¨¥: íä䥪⠫¥áâ­¨æë . �®-äà ­æã§áª¨ Esprit d Escalier, íá¯à¨ ¤ í᪠«ì¥. Ž­® ®â­®á¨âáï ª ¬®¬¥­âã, ª®£¤  âë ­ å®¤¨èì ¯à ¢¨«ì­ë© ®â¢¥â, ­® 㦥 ¯®§¤­®. � ¯à¨¬¥à, ­  ¢¥ç¥à¨­ª¥ â¥¡ï ªâ®-â® ®áª®à¡«ï¥â. ’ë ¤®«¦¥­ ª ª-â® ®â¢¥â¨âì. Š®£¤  ­  â¥¡ï ¢á¥ á¬®âà¨â, ª®£¤  ­  ⥡ï íâ® ¤ ¢¨â, âë £®¢®à¨èì çâ®-â® ­¥ã¡¥¤¨â¥«ì­®¥. �® ¢¥¤ì ¯®â®¬ âë ã室¨èì á ¢¥ç¥à¨­ª¨.
+
+ˆ ¨¬¥­­® ¢ â®â ¬®¬¥­â, ª®£¤  ­ ç¨­ ¥èì á¯ã᪠âìáï ¯® «¥áâ­¨æ¥ ¢¤à㣠®, ç㤮. ’¥¡¥ ¯à¨å®¤¨â ¢ £®«®¢ã ¨¤¥ «ì­ë© ®â¢¥â. ˆ íâ® ®ª®­ç â¥«ì­®¥ ã­¨¦¥­¨¥.
+
+‚®â çâ® â ª®¥ íä䥪⠫¥áâ­¨æë
+
+�஡«¥¬  ¢ ⮬, çâ® ¤ ¦¥ ã äà ­æ㧮¢ ­¥â ­ §¢ ­¨© ¤«ï ­¥ª®â®àëå £«ã¯®á⥩, ª®â®àë¥ ¬ë ¤¥« ¥¬ ¯®¤ ¢«¨ï­¨¥¬ ¬®¬¥­â . ‚ᥠí⨠­ è¨ £«ã¯ë¥, ®âç ï­­ë¥ ¤¥©áâ¢¨ï ¨ ¯®áâ㯪¨.
+
+�¥ª®â®àë¥ ¯®áâ㯪¨ ᫨誮¬ ­¨§ª¨, çâ®¡ë ¨¬¥âì ­ §¢ ­¨¥. ‘«¨¦ª®¬ ­¨§ª¨, çâ®¡ë ¨å ®¡á㦤 âì.
+
+‘¥©ç á ¬­®£¨¥ ¤¥â᪨¥ ¯á¨å®«®£¨ ¨ ¯¥¤ £®£¨ £®¢®àïâ, ¡®«ìè ï ç áâì ¯®¤à®á⪮¢ëå á ¬®ã¡¨©á⢠¯à®¨á室¨â ¢ १ã«ìâ â¥ ®­ ­¨§¬ , ª®£¤  ¯®¤à®á⮪ ¯à¨¤ã訢 ¥â á¥¡ï ¤«ï ®áâà®âë ®éã饭¨©. �à¨å®¤ïâ த¨â¥«¨ ¨ ­ å®¤ïâ ॡ¥­ª  ¢ á⥭­®¬ èª ä¥ ¢ ᢮¥© ᯠ«ì­¥ á ¯®«®â¥­æ¥¬, ¯à¨¢ï§ ­­ë¬ ª ¯¥à¥ª« ¤¨­¥ ¤«ï ¢¥è «®ª. Œ¥à⢮£®. ‘ ¬¥à⢮© ᯥମ© ¯®¢áî¤ã. Š®­¥ç­®, த¨â¥«¨ ¯à¨¡¨à îâáï. � ¤¥¢ îâ ­  âà㯠èâ ­ë. ‘â à îâáï ᤥ« âì â ª, ç⮡ë íâ® ¢ë£«ï¤¥«® «ãçè¥. ‘â à îâáï, ¯® ªà ©­¥© ¬¥à¥. Ž¡ëç­®¥ ­¥áç áâ­®¥ ¯®¤à®á⪮¢®¥ á ¬®ã¡¨©á⢮.
+
+„à㣮© ¬®© 誮«ì­ë© ¤àã£, ã ­¥£® ¡à â á«ã¦¨« ¢ ¢®¥­­®¬ ä«®â¥, íâ®â ¡à â à á᪠§ «, çâ® ¯ à­¨ ­  �«¨¦­¥¬ ‚®á⮪¥ § ­¨¬ îâáï ®­ ­¨§¬®¬ ᮢᥬ ­¥ â ª, ª ª ¬ë. �à â á«ã¦¨« ¢ ª ª®©-â® ¢¥à¡«î¦ì¥© áâà ­¥, £¤¥ ­  àë­ª å ¯à®¤ ¢ «®áì ­¥çâ®, ¯®å®¦¥¥ ­  ¯à¨ç㤫¨¢ë© ­®¦ ¤«ï ®âªà뢠­¨ï ¯¨á¥¬. ’®­ª¨© áâ¥à¦¥­ì ¨§ ¡à®­§ë ¨«¨ á¥à¥¡à , ¤«¨­®© ¯à¨¬¥à­® á « ¤®­ì á è à¨ª®¬ ­  ª®­æ¥ ¨ ªà á¨¢®© १­®© à㪮ï⪮©, ª ª ã ª¨­¦ « . �â®â ¡à â-¬®àïª à á᪠§ «, ª ª ¯®á«¥ ⮣®, ª ª ç«¥­ ¢áâ ­¥â,  à ¡ë ¢â몠îâ íâ®â áâ¥à¦¥­ì ᥡ¥ ¢ ç«¥­ ­  ¢áî ¤«¨­ã. �®â®¬ ®­¨ ¤à®ç â, ¯®ª  áâ¥à¦¥­ì ¢­ãâà¨, ¨ ®â í⮣® «¤ãçè¥ ª®­ç îâ. ‘¨«ì­¥¥.
+
+€ ¥é¥ íâ®â ¡à â ¥§¤¨â ¯® ¢á¥¬ã ¬¨àã, ¨ ¯à¨áë« ¥â äà ­æã§áª¨¥ äà §ë. �ãá᪨¥ äà §ë. �®«¥§­ë¥ ¯®¤áª §ª¨.
+
+�®á«¥ í⮣® ¢ ®¤¨­ ¯à¥ªà á­ë© ¤¥­ì ¬®© ¤à㣠­¥ ¯à¨å®¤¨â ¢ 誮«ã. ‚¥ç¥à®¬ ®­ §¢®­¨â ¨ ¯à®á¨â ¬¥­ï ¯®«ãç âì ¥£® ¤®¬ è­¨¨ à ¡®âë, ¯ àã ­¥¤¥«ì. �®â®¬ã çâ® ®­ ¢ ¡®«ì­¨æ¥.
+
+Ž­ ¢ ®¤­®© ª®¬­ â¥ á® áâ à¨ª ¬¨, ª®â®àë¬ à¥¦ãâ ª¨èª¨. Ž­ à á᪠§ë¢ ¥â, çâ® ¢ ¯ « â¥ ⮫쪮 ®¤¨­ ⥫¥¢¨§®à. —â® ¥£® «¨ç­®¥ ¯à®áâà ­á⢮ ®£®à®¦¥­® ¢á¥£® «¨èì § ­ ¢¥áª®©. —⮠த¨â¥«¨ ª ­¥¬ã ­¥ ¯à¨å®¤ïâ. �® ⥫¥ä®­ã ®­ à á᪠§ë¢ ¥â, ç⮠த¨â¥«¨ £®â®¢ë 㡨âì áâ à襣® ¡à â , ª®â®àë© á«ã¦¨â ¢ ¢®¥­­®¬ ä«®â¥.
+
+�® ⥫¥ä®­ã íâ®â ¯ æ ­ ¬­¥ à á᪠§ë¢ ¥â, çâ® ­ ª ­ã­¥ ®­ «¨èì ­¥¬­®£® ¢ë¯¨«. —â® ¢ «ï«áï ­  ªà®¢ â¨ ¢ ᢮¥© ª®¬­ â¥. —â® ®­ § ¦¥£ ᢥçªã ¨ «¥­¨¢® ¯à®á¬ âਢ « áâ àë¥ ¯®à­®¦ãà­ «ë, ᮡ¨à ïáì ¯®¤à®ç¨âì. �â® ¯®á«¥ ⮣®, ª ª ®­ ¯à®ç¨â « ¯¨á쬮 ¡à â . ‘ ⥬ ¯®«¥§­ë¬ á¯®á®¡ë¬ ¯à¨¥¬®¬ ®­ ­¨§¬ . � æ ­ ®£«ï¤ë¢ ¥âáï ¢ ¯®¨áª å 祣®-­¨¡ã¤ì, çâ® ¬®¦­® ¨á¯®«ì§®¢ âì ¤«ï í⮩ 楫¨. ˜ à¨ª®¢ ï àã窠 ᫨誮¬ ⮫áâ ï. Š à ­¤ è ⮦¥ ᫨誮¬ ⮫áâë© ª ⮬㠦¥ £àã¡ë©. �  ᢥ窥 ¯®â¥ª ¢®áª  â®­ª¨©, £« ¤¨© áâ¥à¦¥­ì ¨§ ¢®áª , ª®â®àë© ¢¯®«­¥ ¬®£ ¡ë ¯®¤®©â¨. � æ ­ ­®£â¥¬ ®âª®¢ëਢ ¥â ¤«¨­­ë© â®­ª¨© á⮫¡¨ª ¢®áª ¨ âà¥â ¬¥¦¤ã « ¤®­ï¬¨. „«¨­­ë© ¨ â®­ª¨© ¨ £« ¤ª¨©.
+
+�ìï­ë© ¨ ¢®§¡ã¦¤¥­­ë©, ®­ ¢áâ ¢«ï¥â ¢®áª®¢ë© áâ¥à¦¥­ì ᥡ¥ ¢ ¯¥à¥æ, ¢á¥ £«ã¡¦¥ ¨ £«ã¡¦¥ ¢ ª ­ «. — áâì áâ¥à¦­ï ®áâ ¥âáï â®àç âì á­ à㦨, ¨ ®­ ­ ç¨­ ¥â.
+
+„ ¦¥ ᥩç á ®­ £®¢®à¨â, çâ®  à ¡ë ç¥à⮢᪨ ã¬­ë¥ à¥¡ïâ . Ž­¨ ¯à¨¤ã¬ «¨ ᮢᥬ ¤à㣮© ®­ ­¨§¬. � à¥­ì «¥¦¨â ­  ᯨ­¥, ¨ ¢á¥ ¯®«ãç ¥âáï â ª ªàãâ®, çâ® ®­ § ¡ë¢ ¥â ¯à® ¢®áª. …¬ã ®áâ ¥âáï ¤¥à­ãâì ¢á¥£® ®¤¨­ à §, çâ®¡ë ª®­ç¨âì, ª®£¤  ®ª §ë¢ ¥âáï, çâ® ¢®áª ¡®«ìè¥ ­¥ â®àç¨â ­ àã¦ã.
+
+�â®â â®­ª¨© ¢®áª®¢ë© á¥à¦¥­ì, ®­ ¯à®¢ «¨«áï ¢­ãâàì. ‘®¢á¥¬ ¢­ãâàì, ¤® ª®­æ . ’ ª £«ã¡®ª®, çâ® ®­ ­¥ ¬®¦¥â ¥£® ­ é㯠âì ¤ ¦¥ ¢ á ¬®¬ ­ ç «¥ ª ­ « .
+
+ˆ§ ªãå­¨ ¬ âì §®¢¥â ¥£® 㦨­ âì. ˆ¤¨ á, ᥩç á ¦¥ £®¢®à¨â ®­ . �â®â ¯ à¥­ì á ¢®áª®¬ ¨ ¯ à¥­ì á ¬®àª®¢ìî ᮢᥬ ­¥ ¯®å®¦¨ ¤à㣠­  ¤à㣠, ­® ¬ë ¢á¥ ¦¨¢¥¬ ¯à¨¬¥à­® ®¤¨­ ª®¢®.
+
+ˆ ¯®á«¥ 㦨­  ã ¯ à­ï ­ ç¨­ ¥â ¡®«¥âì ¦¨¢®â. �â® ¢®áª, ¨ ®­ à¥è ¥â, çâ® ¢®áª ¢á¥ à ¢­® à á⠥⠨ ¢ë©¤¥â ¢¬¥áâ¥ á ¬®ç®©. ’¥¯¥àì ã ­¥£® ¡®«¨â ¥é¥ ¨ ᯨ­ . �®«ïâ ¯®çª¨. Ž­ ­¥ ¬®¦¥â à á¯àﬨâìáï.
+
+‚ᥠíâ® ®­ à á᪠§ë¢ ¥â ¯® ⥫¥ä®­ã á ¡®«ì­¨ç­®© ª®©ª¨, ¢¤ «¥ª¥ á«ëè¨âáï §¢ãª £®­£  ¨ ॢ ⮫¯ë. ‘¯®à⨢­ë© ¬ âç.
+
+�¥­â£¥­ ¯®ª §ë¢ ¥â ¯à ¢¤ã, çâ®-â® â®­ª®¥ ¨ ¤«¨­­®¥, ᮣ­ã⮥ ¢¤¢®¥ ¢ ¥£® ¬®ç¥¢®¬ ¯ã§ëà¥. �â  ¤«¨­­ ï, â®­ª ï ¡ãª¢  V ᮡ¨à ¥â ­  ᥡ¥ ¢á¥ ¬¨­¥à «ë ¨§ ¥£® ¬®ç¨. Ž­  áâ ­®¢¨âáï â®«é¥ ¨ £àã¡¥¥, ¯®ªà뢠¥âáï ªà¨áâ «« ¬¨ ª «ìæ¨ï, ¡®«â ¥âáï â㤠-á, æ à ¯ ï ­¥¦­ãî ®¡®«®çªã ¬®ç¥¢®£® ¯ã§ëàï, ­¥ ¤ ¢ ï ¬®ç¥ ¢ë©â¨ ­ àã¦ã. …£® ¯®çª¨ ¯¥à¥£à㦥­ë. ’® ­¥¬­®£®¥, çâ® ¢ë⥪ ¥â ¨§ ¥£® ç«¥­  ªà á­®¥ ®â ªà®¢¨.
+
+‘⮨⠯ à¥­ì ï ¥£® ᥬìï, ¨ ᬮâàïâ ­  ç¥à­®-¡¥«ë© á­¨¬®ª, à冷¬ ¤®ªâ®à ¨ ¬¥¤á¥áâàë, ¨ ¡ãª¢  V á¨ï¥â ¡¥«ë¬ ᢥ⮬ ã ¢á¥å ­  ¢¨¤ã, ¨ ¥¬ã ¯à¨å®¤¨âáï ᪠§ âì ¯à ¢¤ã. Ž ⮬, ª ª ª®­ç îâ  à ¡ë. Ž 祬 ¥¬ã ­ ¯¨á « áâ à訩 ¡à â, ª®â®àë© á«ã¦¨â ­  ¢®¥­­®¬ ä«®â¥.
+
+�àאַ ᥩç á, ¯® ⥫¥ä®­ã, ®­ ­ ç¨­ ¥â ¯« ª âì.
+
+�®¤¨â¥«¨ § ¯« â¨«¨ §  ®¯¥à æ¨î ¤¥­ì£ ¬¨, ®â«®¦¥­­ë¬¨ ­  ¥£® ®¡à §®¢ ­¨¥ ¢ ª®««¥¤¦¥. Ž¤­  £«ã¯®áâì, ¨ ®­ 㦥 ­¨ª®£¤  ­¥ áâ ­¥â îà¨á⮬.
+
+‚¥é¨ ¢­ãâਠ⥡ï. ’ë ¢­ãâਠ¢¥é¥©. ‘¢¥çª  ¢ ç«¥­¥ ¨«¨ â¢®ï £®«®¢  ¢ ¯¥â«¥ ¬ë §­ «¨, çâ® ¢¥à­ë© ᯮᮡ ­ ¦¨âì ᥡ¥ £¥¬®àë.
+
+Œ®¨ £¥¬®àë ­ ç «¨áì ¨§-§  ¦¥¬ç㦭®£® ­ëàï­¨ï , ª ª ï íâ® ­ §ë¢ « ï ¤à®ç¨« ¯®¤ ¢®¤®©, ­  ®¤­®¬ ¤ëå ­¨¨, á¨¤ï ­  ¤­¥ த¨â¥«ì᪮£® ¡ áᥩ­  ¢ á ¬®© £«ã¡®ª®© ¥£® ç áâ¨. ‚¤®å­ã¢ ¢®§¤ãå , ï ¡ëáâà® ­ëàï« ¨ áâ¢ « á ¥¡ï ¯« ¢ª¨. Ž¡ëç­® ï ᨤ¥« ­  ¤­¥ ¢ â¥ç¥­¨¥ ¤¢ãå, âà¥å, ç¥âëà¥å ¬¨­ãâ.
+
+’®«ìª® ¨§-§  ᢮¥£® ®­ ­¨§¬  ï 㤨¢¨â¥«ì­ë¬ ®¡à §®¬ à §¢¨« ᯮᮡ­®á⨠᢮¨å «¥£ª¨å. …᫨ ï ®áâ ¢ «áï ®¤¨­, ª®£¤  ¢¥áì ¤®¬ ®áâ ¢ «áï ¢ ¬®¥¬ à á¯®à殮­¨¨, ï ®¡ëç­® § ­¨¬ «áï í⨬ ¢¥áì ¤¥­ì. ˆ ¯®á«¥ ⮣®, ª ª ï ¢ëª ç¨¢ « ¨§ ᥡï íâã èâãªã, ᯥà¬ã ®­  ¡®«â « áì ¢ ¢®¤¥ ¡®«ì訬¨ ¦¨à­ë¬¨, ¬®«®ç­®-¡¥«ë¬¨ ª®¬ª ¬¨.
+
+�®á«¥ í⮣® á­®¢  ¡ë«® ­ëàï­¨¥, ç⮡ë ᮡà âì í⨠ª®¬ª¨ ¨ ¢ëâ¥à¥âì ¨å ® ¯®«®â¥­æ¥. �®í⮬ã ï ¨ ­ §ë¢ « íâ® ¦¥¬çã¦­ë¬ ­ëàï­¨¥¬. „ ¦¥ å®âï ¢®¤  ¡ë«  å«®à¨à®¢ ­­ ï, ï ­¥ ¬®£ ­¥ ¡¥á¯®ª®¨âìáï ® á¥áâà¥. ˆ«¨, 㯠ᨠ¡®¦¥, ® ¬ ¬¥.
+
+�â® ¡ë« ¬®© á ¬ë© ¡®«ì让 ¢ ¦¨§­¨ áâà å: ¬®ï á¥áâà -¤¥¢âᢥ­­¨æ  ¤ã¬ ¥â çâ® ®­  ¯à®á⮠⮫á⥥â,   ¯®â®¬ ஦ ¥â ¤¢ã壮«®¢®£® ॡ¥­ª -®«¨£®ä७ . ˆ ®¡¥ £®«®¢ë ¢ë«¨âë© ï. Ÿ, ®â¥æ ¨ ®¤­®¢à¥¬¥­­® ¤ï¤ï.
+
+�® ®¡ëç­® á ⮡© á«ãç ¥âáï ᮢᥬ ­¥ â®, ® 祬 âë ¡¥á¯®ª®¨èìáï.
+
+‹ãç訬 ¬®¬¥­â®¬ ¦¥¬ç㦭®£® ­ëàï­¨ï ¡ë«® ᫨¢­®¥ ®â¢¥àá⨥ ¡ áᥩ­  á 䨫ìâ஬ ¨ ­ á®á®¬ ¤«ï ®âª ç¨¢ ­¨ï ¢®¤ë. ‘ ¬ë© ª ©ä ¡ë« ¢ ⮬, ç⮡ë áâ é¨âì á ᥡï âàãáë ¨ á¥áâì ­  ­¥£®.
+
+Š ª £®¢®àïâ äà ­æã§ë à §¢¥ å®âì ª®¬ã-â® ­¥ ­à ¢¨âáï, ª®£¤  ¥£® § ¤­¨æ㠢뫨§ë¢ îâ? Ž¤­ ª® ¨­®£¤  âë ¯à®áâ® ®­ ­¨àãî騩 ¯®¤à®á⮪ ¨ ¢¤à㣠宯! ¨ ⥡¥ 㦥 ­¨ª®£¤  ­¥ áâ âì îà¨á⮬.
+
+Ž¤­ ¦¤ë ï ᨦ㠭  ¤­¥ ¡ áᥩ­ , ¨ ­ ¤® ¬­®© ¢®«­¨á⮥ ¢®¤ï­®¥ ­¥¡®, ¢®á¥¬ì äã⮢ ᢥ⫮-£®«ã¡®© ¢®¤ë ­ ¤ ¬®¥© £®«®¢®©. ‚ ¬¨à¥ æ à¨â â¨è¨­ , §  ¨áª«î祭¨¥¬ ¯ã«ìá  ¢ ¬®¨å ãè å. Œ®¨ ¦¥«âë¥ ¯®«®á âë¥ ¯« ¢ª¨ ®¡¬®â ­ë ¢®ªà㣠襨 ­  ¢á直© á«ãç ©: ¢¤ã࣠§ £«ï­¥â á®á¥¤, §­ ª®¬ë© ¨«¨, ­ ¯à¨¬¥à, 䨧àãª, ¦¥« î騩 ¯®¨­â¥à¥á®¢ âìáï ¯®ç¥¬ã ï ¯à®¯ãá⨫ äãâ¡®«ì­ãî â७¨à®¢ªã. ‘â ¡¨«ì­®¥ á®áã饥 â¥ç¥­¨¥ ᫨¢­®£® ®â¢¥àáâ¨ï « áª ¥â ¬®î ª®¦ã ¨ ï ¢¥àçã ᢮¥© ª®áâ«ï¢®© ¡«¥¤­®© § ¤­¨æ¥©, çâ®¡ë ¯®©¬ âì íâ® ®éã饭¨¥.
+
+“ ¬¥­ï ¥é¥ ¤®áâ â®ç­® ¢®§¤ãå  ¢ «¥£ª¨å, ¨ à㪠 ᦨ¬ ¥â ç«¥­. �®¤¨â¥«¨ ­  à ¡®â¥,   á¥áâà  ­  § ­ïâ¨ïå ¡ «¥â­®© 誮«ë. „® ¯à¨å®¤  ¯à¥¤ª®¢ ®áâ ¥âáï ¥é¥ ­¥áª®«ìª® ç á®¢. Œ®ï à㪠 ¯à¨¡«¨¦ ¥â ¨ ¯à¨¡«¨¦ ¥â ®à£ §¬. Ÿ ®áâ ­ ¢«¨¢ îáì, ¢ë­¨à¨¢ î, çâ®¡ë ¢¤®å­ãâì ¢®§¤ãå , ¨ ­ëàïî ®¡à â­®, çâ®¡ë ¯à®¤®«¦¨âì.
+
+Ÿ ¤¥« î íâ® á­®¢  ¨ á­®¢ .
+
+‚®§¬®¦­®, ¯®í⮬㠤¥¢ã誨 â ª «î¡ïâ ᨤ¥âì ã â¥¡ï ­  «¨æ¥. Žéã饭¨¥ ¢á á뢠­¨ï ª ª ¬¨­¥â, ª®â®àë© ¨­ª®£¤  ­¥ ª®­ç ¥âáï. Š®£¤  ¬®© ç«¥­ á⮨â,   ¢®¤  ®¡«¨§ë¢ îâ ¬®î § ¤­¨æã, ¬­¥ ­¥ ­ã¦¥­ ¢®§¤ãå. ‘ ®£«ãè î騬 á¥à¤æ¥¡¨¥­¨¥¬ ¢ ãè å, ï ®áâ îáì ¯®¤ ¢®¤®© ¤® â¥å ¯®à, ¯®ª  ¯¥à¥¤ £« § ¬¨ ­¥ ¯®ï¢«ï¥âï ன ¬ «¥­ìª¨å ïàª¨å §¢¥§¤®ç¥ª. Ÿ ¢ë¯àשׂïî ­®£¨, ®¡à â­®© áâ®à®© ª®«¥­¥© ª á îáì ¡¥ââ®­®£® ¤­  ¡ áᥩ­ . � «ìæë ­  àãª å ¨ ­®£ å 㦥 ¯®á¨­¥«¨ ¨ ᬮà騫¨áì ®â ¤®«£®£® ¯à¥¡ë¢ ­¨ï ¢ ¢®¤¥.
+
+ˆ âãâ ï ¯®§¢®«ïî í⮬ã á«ãç¨âìáï. ‚ ¢®¤¥ ¯®ï¢«ïîâáï ¡®«ì訥 ¡¥«ë¥ ª®¬ª¨. †¥¬ç㦨­ë.
+
+’¥¯¥àì ¬­¥ ­ã¦¥­ ¢®§¤ãå. �® ª®£¤  ï ¯ëâ îáì ®â⮫ª­ãâìáï ®â ¤­ , ï ­¥ ¬®£ã. Ÿ ­¥ ¬®£ã ¯®¤®£­ãâì ¯®¤ á¥¡ï ­®£¨. Œ®ï § ¤­¨æ  § áâàï« .
+
+‚à ç¨ ᪮ன ¯®¬®é¨ ¬®£ãâ à á᪠§ âì, çâ® ª ¦¤ë© £®¤ ®ª®«® 150 祫®¢¥ª § áâॢ ¥â ¯®¤®¡­ë¬ ®¡à §®¬, ¯à¨á®á ¢è¨áì ª ­ á®áã, ®âª ç¨¢ î饬㠢®¤ã ¨§ ¡ áᥩ­ . ˆ«¨ ­ á®á ­¥ ®â¯ã᪠¥â ¨å § ¤­¨æë ¨«¨ § â¢ ¥â ¨å ¤«¨­­ë¥ ¢®«®áë, ¨ ®­¨ § å«¥¡ë¢ îâáï. �®«ì設á⢮ íâ¨å á«ãç ¥¢ ¯à®¨á室¨â ¢ ”«®à¨¤¥.
+
+�¨ªâ® ®¡ í⮬ ­¥ £®¢®à¨â. „ ¦¥ äà ­æã§ë ­¥ £®¢®àïâ ® ­¥ª®â®àëå ¢¥é å.
+
+ˆ§¢¥à­ã¢ ­®£¨, ¬­¥ 㤠¥âáï ᮣ­ãâì ¥¥ ¢ ª®«¥­¥ ¨ ®¯¥à¥âìáï ¢ ¤­®, ï ­ ¯®«®¢¨­ã ¢áâ î ¨ çã¢áâ¢ãî, ª ª çâ®-â® âﭥ⠬¥­ï §   ­ãá. �®¤áã­ã¢ ¯® á¥¡ï ¢â®àãî ­®£ã, ï ®ââ «ª¨¢ îáì ®â ¤­ . Ÿ ᢮¡®¤­® ¡®«â îáì ¨ «ï£ îáì ¢ ¢®¤¥, ­¥ § ¤¥¢ ï ¡¥â®­ , ­® ¨ ­¥ ¢á¯«ë¢ î.
+
+�à몠ïáì ¨§® ¢á¥å ᨫ, £à¥¡ï ®¡®¨¬¨ à㪠¬¨, ï ­  ¯®«¯ã⨠ª ¢®§¤ãåã, ­® ¡®«â îáì ­  ®¤­®¬ ¨ ⮬ ¦¥ ¬¥áâ¥. ‘â㪠á¥à¤æ  ¢ ãè å áâ ­®¢¨âáï £à®¬ç¥ ¨ ç é¥.
+
+Ÿ ¨§¢®à ç¨¢ îáì ¨ ®£«ï¤ë¢ îáì, ᪢®§ì ¬¨à¨ ¤ë ïàª¨å §¢¥§¤®ç¥ª ¢ £« § å, ­® â® çâ® ï ¢¨¦ã, ­¥ ¯®¤¤ ¥âáï ¯®­¨¬ ­¨î. Š ª ï-⮠⮫áâ ï ¢¥à¥¢ª , ᨭ¥¢ â® ¡«¥¤­ ï, á ¯à®¦¨«ª ¬¨, âï­¥âáï ®â ᫨¢­®£® ®â¢¥àáâ¨ï ª ¬®¥© § ¤­¨æ¥ ¨ ­¥ ®â¯ã᪠¥â ¬¥­ï. ˆ§ ­¥ª®â®àëå ¯à®¦¨«®ª á®ç¨âáï ªà®¢ì,  « ï ªà®¢ì, ª®â®à ï ­  £«ã¡¨­¥ ª ¦¥âáï ç¥à­®©, ®­  áâà㪠¬¨ ¯®ï¢«ï¥âáï ¨§ ¬ «¥­ìª¨å à §à뢮¢ ¢ ¡«¥¤­®© ª®¦¥ í⮩ §¬¥¨. �⨠áâà㪨 ¯®á⥯¥­­® à áâ®àïîâáï ¢ ¢®¤¥;   ¢­ãâਠ§¬¥¨, ¯®¤ ¥¥ â®­ª®© ¡¥«¥á®© ª®¦¥©, ¢¨¤­¥îâáï ª®¬ª¨ ­ ¯®«®¢¨­ã ¯¥à¥¢ à¥­­®© ¥¤ë.
+
+’®£¤  ï ­ ç¨­ î ¯®­¨¬ âì. Š ª®¥-â® ¦ã⪮¥ ¬®à᪮¥ ç㤮¢¨é¥, ¬®àáª ï §¬¥ï, ⢠àì, ­¨ ࠧ㠭¥ ¢¨¤¥¢è ï ᮫­¥ç­®£® ᢥâ , ¯àïâ « áì ¢ ª ­ «¨§ æ¨¨ ¨ ¯®¤¦¨¤ «  ¬®¬¥­â , çâ®¡ë ¢æ¥¯¨âìáï ¬­¥ ¢ § ¤­¨æã.
+
+Ÿ ­ ç¨­ î «ï£ âì ¨ ¯¨­ âì íâã §¬¥î, ¥¥ ᪮«ì§ªãî १¨­®¢ãî ª®¦ã á í⨬¨ ¢¥­ ¬¨, ¨ ¬­¥ ª ¦¥âáï, çâ® ï á㬥« ¢ëâï­ãâì ¥¥ ¨§ ᫨¢­®£® ®â¢¥àáâ¨ï ¥é¥ ­¥¬­®£®. ’¥¯¥àì ®­  ¤«¨­®© ¯à¨¬¥à­® á ¬®î ­®£ã, ­® ¢á¥ à ¢­® ªà¥¯ª® ¤¥à¦¨âáï §  ¬®©  ­ãá. Ÿ ¯¨­ î ¥é¥, ¨ ¯®¤­¨¬ îáì ­  ¤î©¬, ­  ¤î©¬ ¡«¨¦¥ ª ¯®¢¥àå­®áâ¨. •®âï ï çã¢áâ¢ãî, çâ® §¬¥ï ¢á¥ ¥é¥ ¤¥à¦¨âáï §  ¬®î ¤ëàªã, ï ¥é¥ ­  ¤î©¬ ¡«¨¦¥ ª ᯠᥭ¨î.
+
+‚­ãâਠ§¬¥¨ ¢¨¤­¥îâáï ªãá®çª¨ ªãªãàã§ë ¨ ®à¥å®¢. ‚¨¤­¥¥âáï ¯à®¤®«£®¢ â ï ®à ­¦¥¢ ï ª ¯áã« . �â® ª ª®©-â® ¬ã«ì⨢¨â ¬¨­, ¨§ â¥å, çâ® ¤ ¥â ¬­¥ ¯ ¯ , ç⮡ë ï ­ ¡à « ¬ëè¥ç­ãî ¬ ááã. —⮡ë ï ¯®¯ « ¢ äãâ¡®«ì­ãî ª®¬ ­¤ã ¨ ¯®«ãç « ¤®¯®«­¨â¥«ì­ãî á⨯¥­¤¨î. Š ¯áã«  á ®¡®£ é¥­­ë¬ ¦¥«¥§®¬ ¨  ¬¨­®ª¨á«®â ¬¨.
+
+Ÿ ¢¨¦ã íâã â ¡«¥âªã, ª®â®à ï ¤®«¦­  ᯠá⨠¬®î ¦¨§­ì.
+
+�â® ­¥ §¬¥ï. �â® ¬®© ª¨è¥ç­¨ª, ¬®ï ¯àï¬ ï ª¨èª , ª®â®à ï ¢ë¢ «¨« áì ¨§ ¬¥­ï. ’®, çâ® ¢à ç¨ ­ §ë¢ î⠢믠¤¥­¨¥¬ ¯àאַ© ª¨èª¨ . Œ®¨ ª¨èª¨ § âï­ã«® ¢ ᫨¢­®¥ ®â¢¥àá⨥.
+
+‚à ç¨ ᪮ன ¯®¬®é¨ ¬®£ãâ à á᪠§ âì ¢ ¬, çâ® ­ á®á ¤«ï ®âª çª¨ ¢®¤ë ¨§ ¡ áᥩ­  ¯à®¯ã᪠¥â ç¥à¥§ ᥡï 80 £ ««®­®¢ ¢®¤ë ¢ ¬¨­ãâã. —â® ¯® ¢¥áã à ¢­ï¥âáï 400 äã­â ¬. �®«ìè ï ¯à®¡«¥¬  ªà®¥âáï ¢ ⮬, çâ® ª®­æë ¢­ãâਠ­ á ᮥ¤¨­¥­ë, ¨ ⢮©  ­ãá íâ® ¤ «ì­¨© ª®­¥æ ⢮¥£® àâ . …᫨ ï ¯®§¢®«î, ¨ ­ á®á ¡ã¤¥â ¯à®¤®«¦ âì ®âª ç¨¢ âì ¢®¤ã ¢ëâ¢ âì ¨§ ¬¥­ï ¢­ãâ७­®á⨠®­ ¢ ª®­æ¥ ª®­æ®¢ § á®á¥â ¨ ¬®© ï§ëª. �।áâ ¢ì⥠ᥡ¥, çâ® ¢ë ¢ëáà «¨ ¨§ ᥡï 400 äã­â®¢, ¨ ¢ë ¯®©¬¥â¥, çâ® íâ® ¢á¥ à ¢­® çâ® â¥¡ï ¢ë¢¥à­ã«¨ ­ ¨§­ ­ªã.
+
+Œ®£ã ¢ á ®¡à ¤®¢ âì ⥬, çâ® ª¨èª¨ ­¥ çã¢áâ¢ãîâ ¡®«¨. �® ªà ©­¥© ¬¥à¥ ­¥ â ª, ª ª ­ è  ª®¦ . ’®, çâ® ¬ë ¯¥à¥¢ à¨¢ ¥¬, ¢à ç¨ ­ §ë¢ îâ 䥪 «ì­ë¬¨ ¬ áá ¬¨. ‚ ¢¥àå­¥© ç á⨠ª¨èª¨ ï ¢¨¦ã ¦¨¤ªãî ¬ ááã, ¢ ª®â®à®© ¯« ¢ îâ §¥à­  ªãªãàã§ë,  à å¨§ ¨ ªà㣫ïè¨ §¥«¥­®£® £®à®èª .
+
+ˆ ¢®â ¢®ªà㣠¬¥­ï ¯« ¢ ¥â ¢¥áì íâ®â á㯠¨§ ªà®¢¨ ¨ ªãªãàã§ë, ¤¥à쬠 ¨ ᯥà¬ë ¨  à å¨á . �à¨ç¥¬ ¤ ¦¥ ª®£¤  ¨§ ¬¥­ï ¢ëâ¢ îâáï ¬®¨ ª¨èª¨, ¨ ï ¤¥à¦ãáì §  â®, çâ® ®áâ «®áì, ¤ ¦¥ ⮣¤  ¬®¥ £« ¢­®¥ ¦¥« ­¨¥ å®âì ª ª-­¨¡ã¤ì ­ âï­ãâì ¯« ¢ª¨.
+
+�¥ ¤ © �®£ ¯à¥¤ª¨ 㢨¤ïâ ¬®© ç«¥­.
+
+Ž¤­®© à㪮© ï ᦨ¬ î á¢®î ª¨èªã ¢ ªã« ª¥, ¤à㣮© ᤥࣨ¢ î ᢮¨ ¦¥«âë¥ ¯®«®á âë¥ ¯« ¢ª¨ á 襨. �® ­ âï­ãâì ¨å ¢á¥ à ¢­® ­¥¢®§¬®¦­®.
+
+…᫨ ¢ë å®â¨â¥ §­ âì, ª ª ¢ è¨ ª¨èª¨ ¢ë£«ï¤ïâ ­  ®éã¯ì, ªã¯¨â¥ ¯à¥§¥à¢ â¨¢, ᤥ« ­­ë© ¨§ ¡ à ­ì¨å ª¨è®ª [1 - ‚ ‘˜€ ¯à®¤ îâáï ¯à¥§¥à¢ â¨¢ë, ᤥ« ­­ë¥ ¨§ ª¨è®ª ¦¨¢®â­ëå, å®âï ¨å ­ ¤¥¦­®áâì áç¨â ¥âáï £®à §¤® ­¨¦¥ ®¡ëç­ëå. (�ਬ¥ç ­¨¥ ¯¥à¥¢®¤ç¨ª )]. ‚®§ì¬¨â¥ ¥£®, à áª â ©â¥. � ¯®«­¨â¥ ¥£®  à å¨á®¢ë¬ ¬ á«®¬. Ž¡¬ ¦ì⥠¥£® ¢ §¥«¨­®¬ ¨ ¯®â¨áª ©â¥ ¯®¤ ¢®¤®©. �®â®¬, ¯®¯ëâ ©â¥áì à §®à¢ âì ¥£®. � ¯®¯®« ¬. Ž­ ᫨誮¬ ¯à®ç­ë© ¨ í« áâ¨ç­ë©. Ž­ â ª®© ᪮«ì§ª¨©, çâ® §  ­¥£® ­¥¢®§¬®¦­® ª ª á«¥¤ã¥â ã墠â¨âìáï.
+
+�१¥à¢ â¨¢ ¨§ ¡ à ­ì¨å ª¨è®ª íâ® â®â ¦¥ áâ àë© ¤®¡àë© ª¨è¥ç­¨ª 祫®¢¥ª .
+
+‚ë ¢¨¤¨â¥, ª 祬ã ï ¢¥¤ã.
+
+‘⮨⠮â¯ãáâ¨âì ­  ᥪ㭤㠨 ã ¬¥­ï ¡®«ìè¥ ­¥â ª¨è®ª.
+
+‘⮨⠯®¯«ëâì ­ ¢¥àå, ª ¢®§¤ãåã ¨ ã ¬¥­ï ¡®«ìè¥ ­¥â ª¨è®ª.
+
+‘⮨⠮⪠§ âìáï ¯«ëâì ­ ¢¥àå ¨ ï ã⮯«¥­­¨ª.
+
+�â® ¢ë¡®à 㬥à¥âì ᥩç á ¨«¨ ­  ¬¨­ãâã ¯®§¦¥, 祬 ᥩç á.
+
+Œ®¨ ¯à¥¤ª¨ ¢¥à­ãâáï á à ¡®âë ¨ ­ ©¤ãâ ¡®«ì让 £®«ë© í¬¡à¨®­, áªàî祭­ë© ¨ á¤ã¢è¨©áï. �« ¢ î騩 ¢ ¬ãâ­®© ¢®¤¥ ¡ áᥩ­  ­  § ¤­¥¬ ¤¢®à¥. ‘த­¨¢è¨©áï á ¡ áᥩ­®¬ ç¥à¥§ ¯ã¯®¢¨­ã § ¯ãâ ­­ëå ª¨è®ª ¨ ¢¥­. �®«­ ï ¯à®â¨¢®¯®«®¦­®áâì ¯ à­î, á«ãç ©­® 㤠¢¨¢è¥¬ãáï ¢® ¢à¥¬ï ®­ ­¨§¬  ¢ á⥭­®¬ 誠äã. ˆ íâ® ¨å ॡ¥­®ª, ª®â®à®£® ®­¨ ¯à¨¢¥§«¨ ¨§ த¤®¬  13 «¥â ­ § ¤. �¥¡¥­®ª, ª®â®àë©, ª ª ®­¨ ­ ¤¥ï¤¨áì, ¤®«¦¥­ ¡ë« ¯®¯ áâì ¢ äãâ¡®«ì­ãî ª®¬ ­¤ã ¨ ¯®«ãç âì ¤®¯®«­¨â¥«ì­ãî á⨯¥­¤¨î ¨ ¯®«ãç¨âì á⥯¥­ì ¬ £¨áâà . �¥¡¥­®ª, ª®â®àë© § ¡®â¨«áï ¡ë ® ­¨å, ª®£¤  ®­¨ á®áâ àïâáï. ‚ᥠ¨å ­ ¤¥¦¤ë ¨ ¬¥çâë. ‚ ¡ áᥩ­¥, £®«ë© ¨ ¬¥àâ¢ë©. ˆ ¢®ªà㣠­¥£® ¡®«ì訥 ¬®«®ç­®-¡¥«ë¥ ª®¬ìï ᯥà¬ë.
+
+Œ®¦¥â, â ª. € ¬®¦¥â, ¬®¨ ¯à¥¤ª¨ ­ ©¤ãâ ¬¥­ï, § ¢¥à­ã⮣® ¢ ®ªà®¢ ¢«¥­­®¥ ¯®«®â¥­æ¥, ᢠ«¨¢è¥£®áï ¡¥§ ᮧ­ ­¨ï ­  ¯ã⨠ª ⥫¥ä®­ã á ࢠ­ë¬¨ ®è¬¥âª ¬¨ ª¨è®ª, ¡®«â î騬¨áï ¨§-¯®¤ ¦¥«âëå ¯®«®á âëå ¯« ¢®ª.
+
+’®, ® 祬 ­¥ £®¢®àïâ ¤ ¦¥ äà ­æã§ë.
+
+‘â à訩 ¡à â ¢ ¢®¥­­®-¬®à᪮¬ 䫮⥠­ ã稫 ­ á ®¤­®© å®à®è¥© ¯®á«®¢¨æ¥. �ãá᪮© ¯®á«®¢¨æ¥. �®á«®¢¨æ  ® ⮬, çâ® ¬ë,  ¬¥à¨ª ­æë, ­ §ë¢ ¥¬ íâ® ¬­¥ ­ã¦­®, ª ª ¤ëઠ ¢ £®«®¢¥ . �ãá᪨¥ £®¢®àïâ: Œ­¥ íâ® ­ã¦­®, ª ª §ã¡ë ¢ § ¤­¨æ¥ .
+
+Mnye etoh nadoh kahk zoobee v zadnetze. [2 - �ãááª ï ¯®á«®¢¨æ  ¯¥à¥¤ ­  « â¨­¨æ¥© ¢ â®ç­®á⨠⠪, ª ª ¢ ®à¨£¨­ «¥. (�ਬ¥ç ­¨¥ ¯¥à¥¢®¤ç¨ª )]
+
+�⨠¨áâ®à¨¨ ¯à® â®, ª ª ¯®¯ ¢è¨¥ ¢ ª ¯ª ­ §¢¥à¨ ®â£à맠îâ ᥡ¥ ­®£ã. —â® ¦¥, «î¡®© ª®©®â à á᪠¦¥â ¢ ¬, çâ® ¯ à  ¬¨­ãâ ¡®«¨ ç¥à⮢᪨ ªàãç¥ á¬¥àâ¨.
+
+—¥àâ, ¤ ¦¥ ¥á«¨ âë àãá᪨©, ¨­®£¤  ¬®¦¥â ­ áâ㯨âì ¬®¬¥­â, ª®£¤  âë § å®ç¥èì ¨¬¥âì §ã¡ë ¢ ⮬ á ¬®¬ ¬¥áâ¥.
+
+€ ¥á«¨ ¨å ­¥â, ⥡¥ ¯à¨å®¤¨âáï ᤥ« âì ¢®â çâ® ¨§¢¥à­ãâìáï. ’ë 楯«ï¥èì «®ªâ¥¬ á¥¡ï §  ª®«¥­ªã ¨ âï­¥èì á¢®î ­®£ã ª «¨æã. ’ë £à맥èì ¨ ªãá ¥èì ᮡá⢥­­ãî § ¤­¨æã. “ â¥¡ï ª®­ç¨«áï ¢®§¤ãå, ¨ âë ®â£à맥èì ¢á¥, ç⮠㣮¤­®, çâ®¡ë ¢¤®å­ãâì ¥£® ¥é¥ à §.
+
+Ž¡ í⮬ ­¥ à §£®¢ à¨¢ îâ á ¤¥¢ã誮© ­  ¯¥à¢®¬ ᢨ¤ ­¨¨. �® ªà ©­¥© ¬¥à¥, ¥á«¨ ­  ¯à®é ­¨¥ âë ­ ¤¥¥èìáï ¥¥ ¯®æ¥«®¢ âì.
+
+…᫨ ï ᪠¦ã ¢ ¬, ª ª®¢® íâ® ¡ë«® ­  ¢ªãá, ¢ë ¡ë ­¨ª®£¤  ¡®«ìè¥ ­¥ áâ «¨ ¡ë ¥áâì ª «ì¬ à®¢ ¨ ®á쬨­®£®¢, ­¨ª®£¤ .
+
+’à㤭® ᪠§ âì, çâ® ¯®ª § «®áì ¬®¨ ¯à¥¤ª ¬ ¡®«¥¥ ®¬¥à§¨â¥«ì­ë¬ ª ª ï ¯®¯ « ¢ «®¢ãèªã ¨«¨ ª ª ï ¨§ ­¥¥ ¢ëࢠ«áï. Š®£¤  ¬¥­ï ¢ë¯¨á «¨ ¨§ ¡®«ì­¨æë, ¬ ¬  ᪠§ « : ‘ë­®ª, âë ­¥ §­ «, ç⮠⢮ਫ. ’ë ¡ë« ¢ 讪¥ . € ¯®â®¬ ®­  ­ ã稫 áì ¢ à¨âì ï©æ  ¡¥§ ᪮à«ã¯ë ï©æ® à §¡¨¢ ¥âáï ¢ ª¨¯ïéãî ᮫¥­ãî ¢®¤ã. [3 - ‚ à¥­®¥ ï©æ® ¡¥§ ᪮à«ã¯ë (poached egg, ¯®-àãá᪨ ï©æ®-¯ è®â ) ¨§¢¥áâ­® ¢ ¥¢à®¯¥©áª®© ªãå­¥, ­® ¯®ç⨠­¥¨§¢¥áâ­® ¢ àãá᪮© ªãå­¥, ¯®í⮬ã ï ªà âª® ãâ®ç­¨« ¢ ⥪áâ¥, çâ® íâ® â ª®¥. ‘®«¥­ ï ¢®¤  ¤®¢®¤¨âáï ¤® ª¨¯¥­¨ï ¨ à §¬¥è¨¢ ¥âáï â ª, çâ®¡ë ¯®«ã稫áï ¢®¤®¢®à®â. ’㤠 à §¡¨¢ ¥âáï ï©æ® (¬®¦­® ¤¢  ¨«¨ âà¨), ª ª ­  ᪮¢®à®¤ªã, ª®£¤  ¤¥« ¥âáï £« §ã­ìï. —¥à¥§ ¬¨­ãâã ¢®¤  ᫨¢ ¥âáï ç¥à¥§ á¨â®. ‚ १ã«ìâ â¥ ¯®«ãç ¥âï ®ç¥­ì ­¥¦­®¥, «¥£ª® ¯¥à¥¢ à¨¢ ¥¬®¥ ¡«î¤ . (�ਬ¥ç ­¨¥ ¯¥à¥¢®¤ç¨ª )]
+
+ˆ­â¥à¥á­®, ¢á¥ í⨠«î¤¨ ®­¨ ¬¥­ï ¦ «¥«¨ ¨«¨ ¨á¯ëâ뢠«¨ ®â¢à é¥­¨¥?
+
+Ÿ å®çã íâ® §­ âì â ª ¦¥, ª ª ï å®çã ¨¬¥âì §ã¡ë ¢ ᢮¥© § ¤­¨æ¥.
+
+‘¥©ç á «î¤¨ ¯®áâ®ï­­® £®¢®àïâ ¬­¥, çâ® ï ᫨誮¬ å㤮©. Š®£¤  ¬¥­ï ¯à¨£« è îâ ­  㦨­ ï ®âª §ë¢ îáì ¯à¨£®â®¢«¥­­®¥ ¨¬¨ ¦ àª®¥, ®­¨ 㤨¢«ïîâáï ¨ ­ ç¨­ îâ ­¥à¢­¨ç âì. † à¥­®¥ ¬ïá® ¬¥­ï 㡨¢ ¥â. ‡ ¯¥ç¥­­ ï ¢¥â稭 . ‹î¡ ï ¥¤ , ª®â®àãî ­¥«ì§ï ¯¥à¥¢ à¨âì §  ¯ àã ç á®¢, ¢ë室¨â ¨§ ¬¥­ï ª ª ¥¤ . ’ã襭 ï ä á®«ì, ªãá®çª¨ àë¡ë. Ÿ ¢áâ î á 㭨⠧  ¨ â ¬ ®­¨ ¢ «ïîâáï. Š ª ¡ë«¨.
+
+�®á«¥ à ¤¨ª «ì­®© ®¯¥à æ¨¨ ¯® 㪮à ç¨¢ ­¨î ª¨è¥ç­¨ª , ¯¥à¥¢ à¨¢ âì ¬ïá® áâ ­®¢¨âáï ­¥¬­®£® âà㤭®. “ ¡®«ì設á⢠ ¨§ ¢ á ¯ïâì äã⮢ ª¨è¥ç­¨ª . Ÿ áç á⫨¢ ¨¬¥âì ᢮¨ è¥áâì ¤î©¬®¢. ’ ª çâ® ï â ª ¨ ­¥ ¯®«ã稫 äãâ¡®«ì­ãî á⨯¥­¤¨î. �¨ª®£¤  ­¥ áâ « ¬ £¨áâ஬ ª ª¨å-«¨¡® ­ ãª. Ž¡  ¬®¨å ¤à㣠 ¯ æ ­ ᮠᢥ窮© ¨ ¯ æ ­ á ¬®àª®¢ìî ®­¨ ®¡  ¢ëà®á«¨, ¢ë諨 ¢ «î¤¨, ­® ï â ª ¨ ­¥ ¯à¨¡ ¢¨« ­¨ ®¤­®£® äã­â  á â¥å ¯®à, ª ª ¬­¥ ¨á¯®«­¨«®áì 13.
+
+„àã£ ï ¯à®¡«¥¬  ¡ë«  ¢ ⮬, çâ® ¯à¥¤ª ¬ ¯à¨è«®áì ¢ë«®¦¨âì ®£à®¬­ë¥ ¤¥­ì£¨ §  â®â á ¬ë© ¡ áᥩ­. ‚ ª®­æ¥ ª®­æ®¢ ¯ ¯  ᪠§ « ¢®¤®¯à®¢®¤ç¨ªã, çâ® íâ® ¡ë«  ᮡ ª . � è  ᮡ ª  ᢠ«¨« áì ¢ ¡ áᥩ­ ¨ ãâ®­ã« . ’à㯠§ âï­ã«® ¢ ᫨¢­®¥ ®â¢¥àá⨥. „ ¦¥ ª®£¤  ¢®¤®¯à®¢®¤ç¨ª à §®¡à « ­ á®á ¨ ¢ë㤨« ¨§ ­¥£® ¡«¥¤­ãî १¨­®¯®¤®¡­ãî ª¨èªã, ¢®¤ï­¨áâë© ªã᮪ ª¨è¥ç­¨ª  á ¡®«ì让 ®à ­¦¥¢®© ¢¨â ¬¨­­®© â ¡«¥âª®© ¢­ãâà¨, ¤ ¦¥ ⮣¤  ¬®© ¯ ¯  ᪠§ « íâ  ç¥à⮢  ¡¥§¬®§£« ï ᮡ ª  .
+
+„ ¦¥ ¨§ ®ª­  ᢮¥© ª®¬­ âë ï á«ëè «, ª ª ¯ ¯  ᪠§ «: �âã ᮡ ªã ­¥«ì§ï ¡ë«® ®áâ ¢¨âì ¡¥§ ¯à¨á¬®âà  ­¨ ­  ᥪ㭤ã .
+
+€ ¯®â®¬ ã á¥áâàë ¡ë«  § ¤¥à¦ª  ¬¥áïç­ëå.
+
+„ ¦¥ ¯®á«¥ ⮣®, ª ª ¢ ¡ áᥩ­¥ ᬥ­¨«¨ ¢®¤ã, ¤ ¦¥ ¯®á«¥ ⮣®, ¬ë ¯à®¤ «¨ ¤®¬ ¨ ¯¥à¥¥å «¨, ¯®á«¥  ¡®àâ  á¥áâàë, ¤ ¦¥ ⮣¤  ¬®¨ ¯à¥¤ª¨ ­¨ à §ã í⮣® ­¥ 㯮¬¨­ «¨.
+
+�¨ª®£¤ . �â® ­ è  ­¥¢¨¤¨¬ ï ¬®àª®¢ì.
+
+€ ¢ë. ‚ë ¬®¦¥â¥ ⥯¥àì ᤥ« âì ¯®«­ë© ¢¤®å.
+
+Ÿ ¨ ¤® á¨å ¯®à ­¥ ¬®£ã.

tests/mktests.sh

@@ -0,0 +1,102 @@
+#!/bin/bash
+
+# Making tests of BForce
+CURDIR=$(pwd)
+BFBIN=$(pwd)/../source/bin/bforce
+
+function prepconfig() {
+	echo "Preparing configs with $1 as protocol..."
+	cp ${CURDIR}/configs/bforceA.conf ${CURDIR}/etc/bforceA.conf
+	sed -i -e "s/%PROTO%/$1/" ${CURDIR}/etc/bforceA.conf 
+	sed -i -e "s#%TESTZONE%#${CURDIR}#" ${CURDIR}/etc/bforceA.conf 
+	
+	cp ${CURDIR}/configs/bforceB.conf ${CURDIR}/etc/bforceB.conf
+	sed -i -e "s/%PROTO%/$1/" ${CURDIR}/etc/bforceB.conf 
+	sed -i -e "s#%TESTZONE%#${CURDIR}#" ${CURDIR}/etc/bforceB.conf
+	
+	cp ${CURDIR}/configs/00010002.cut ${CURDIR}/outboundA/00010002.cut
+	cp ${CURDIR}/configs/00010001.cut ${CURDIR}/outboundB/00010001.cut
+}
+
+function testcomm() {
+	rm -rf ${CURDIR}/inboundA/*
+	rm -rf ${CURDIR}/inboundB/*
+	
+	mkfifo ${CURDIR}/bforceAtoB 
+	mkfifo ${CURDIR}/bforceBtoA
+	
+	BFCFGA=${CURDIR}/etc/bforceA.conf
+	BFCFGB=${CURDIR}/etc/bforceB.conf
+	
+	# Works for Linux
+	
+	BFCONFIG=${BFCFGA}
+	BFCONFIG=${BFCFGA} ${BFBIN} -o 99:1/2 > ${CURDIR}/bforceAtoB < ${CURDIR}/bforceBtoA &
+	# 
+	
+	BFCONFIG=${BFCFGB}
+	BFCONFIG=${BFCFGB} ${BFBIN} -S"CONNECT 9600" auto < ${CURDIR}/bforceAtoB > ${CURDIR}/bforceBtoA
+	
+	# For [Free]BSD it need to be replaced - pipes are bidirectional:
+	# ./ping <&1 | ./pong >&0
+	
+	rm ${CURDIR}/{bforceAtoB,bforceBtoA}
+	
+	## WE MUST CHECK THAT INBOUND ARE FULL!!! ##
+	FCNTA=$( find ${CURDIR}/inboundA -name *.pkt | wc -l )
+	FCNTB=$( find ${CURDIR}/inboundB -name *.pkt | wc -l )
+	DIFFA=$( diff ${CURDIR}/inboundA/*.pkt ${CURDIR}/configs/00010001.cut && echo $? )
+	DIFFB=$( diff ${CURDIR}/inboundB/*.pkt ${CURDIR}/configs/00010002.cut && echo $? )
+
+	if [[ "${DIFFA}" -eq "0" ]] && [[ "${FCNTA}" -eq "1" ]] 
+	then
+		if [[ "${DIFFB}" -eq "0" ]] && [[ "${FCNTB}" -eq "1" ]] 
+		then
+			echo "....Result: OK"
+		else
+			echo "....Failed DiffB"
+		fi
+	else
+		echo "....Failed DiffA"
+	fi
+	
+	cat ${CURDIR}/logsA/bf-debug >> ${CURDIR}/debugA.log
+	cat ${CURDIR}/logsB/bf-debug >> ${CURDIR}/debugB.log
+}
+
+if [[ ! -d "${CURDIR}/inboundA" ]] 
+then
+	echo "All clear to begin"
+else
+	echo "Dir exists!"
+	rm -rf {etc,inboundA,inboundB,inbound-unsecureA,inbound-unsecureB,logsA,logsB,outboundA,outboundB}
+fi
+mkdir -p "${CURDIR}"/{etc,inbound-unsecureA,inbound-unsecureB,inboundA,inboundB,logsA,logsB,outboundA,outboundB}
+
+if [[ ! -f "${BFBIN}" ]]
+then
+	# No executable to test!
+	echo "No executable to run! Aborting..."
+else
+	# All doing here
+	echo "Bforce executable found"
+	
+	prepconfig "ZMO"
+	echo -n "--> Running ZMO test..."
+	testcomm
+	
+	prepconfig "ZAP"
+	echo -n "--> Running ZAP test..."
+	testcomm
+	
+	prepconfig "HYD"
+	echo -n "--> Running Hydra test..."
+	testcomm
+	
+	# TODO: make binkd test over netcat possibly
+	
+fi
+
+
+
+rm -rf {etc,inboundA,inboundB,inbound-unsecureA,inbound-unsecureB,logsA,logsB,outboundA,outboundB}