zx/bforce
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Compare commits

base: zx:ddf8f3f9e0a86a0e446f86f1c29b68491e356f3f
Branches Tags
zx:master
zx:zx
zx:0.27
zx:0.26.2
zx:0.26.1
zx:0.26
zx:0.25.3
zx:0.25.2
zx:0.25.1
zx:0.25
..
compare: zx:7fb8e32a9b4a1870124d5d5cbe35c51e3bde196c
Branches Tags
zx:zx
zx:master
zx:0.27
zx:0.26.2
zx:0.26.1
zx:0.26
zx:0.25.3
zx:0.25.2
zx:0.25.1
zx:0.25

No commits in common. "ddf8f3f9e0a86a0e446f86f1c29b68491e356f3f" and "7fb8e32a9b4a1870124d5d5cbe35c51e3bde196c" have entirely different histories.
ddf8f3f9e0 ... 7fb8e32a9b

31 changed files with 191 additions and 376 deletions
Show Stats Expand all files Collapse all files

0
.gitea/.gitkeep
View File

42
.gitea/workflows/arch.yaml
View File

@ -1,42 +0,0 @@
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

50
.gitea/workflows/debpkg.yaml
View File

@ -1,50 +0,0 @@
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"

3
.gitignore vendored
View File

@ -7,3 +7,6 @@ source/config.log
source/config.status source/config.status
source/include/config.h source/include/config.h
bforce.geany bforce.geany

6
CHANGES
View File

@ -273,9 +273,3 @@ Alexey Khromov (zx@zxalexis.ru)
0.26 0.26
+ Fixed incorrect binkp protocol realization in unprotected sessions. + 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

2
INSTALL
View File

@ -46,7 +46,7 @@ The simplest way to compile this package is:
Compilers and Options Compilers and Options
===================== =====================
Some systems require unusual options for compilation or linking that Some systems require unusual options for compilation or linking that
the `configure' script does not know about. You can give `configure' the `configure' script does not know about. You can give `configure'
initial values for variables by setting them in the environment. Using initial values for variables by setting them in the environment. Using

4
README.md
View File

@ -1,5 +1,3 @@
![zx branch](https://prj.zxalexis.ru/gitea/zx/bforce/actions/workflows/arch.yaml/badge.svg?branch=zx)
BinkleyForce FTN mailer BinkleyForce FTN mailer
----------------------- -----------------------
@ -58,4 +56,4 @@ Copyright <br>
> (c) 2007-2008 Sergey Babitch<br> > (c) 2007-2008 Sergey Babitch<br>
> (c) 2011-2014 Sergey Dorofeev<br> > (c) 2011-2014 Sergey Dorofeev<br>
> (c) 2014 Alexander Skovpen<br> > (c) 2014 Alexander Skovpen<br>
> (c) 2024-2025 Alexey Khromov<br> > (c) 2024 Alexey Khromov<br>

2
archlinux/PKGBUILD
View File

@ -33,7 +33,6 @@ package() {
mkdir -p ${pkgdir}/usr/bin mkdir -p ${pkgdir}/usr/bin
mkdir -p ${pkgdir}/usr/local/bin mkdir -p ${pkgdir}/usr/local/bin
mkdir -p ${pkgdir}/usr/share/doc/bforce mkdir -p ${pkgdir}/usr/share/doc/bforce
mkdir -p ${pkgdir}/usr/share/man/man1
mkdir -p ${pkgdir}/var/log/bforce mkdir -p ${pkgdir}/var/log/bforce
mkdir -p ${pkgdir}/var/spool/bforce mkdir -p ${pkgdir}/var/spool/bforce
mkdir -p ${pkgdir}/var/spool/bforce/bt/in mkdir -p ${pkgdir}/var/spool/bforce/bt/in
@ -45,7 +44,6 @@ package() {
/usr/bin/install -c ${srcdir}/${pkgname}/source/bin/bfindex ${pkgdir}/usr/bin/bfindex /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/bfstat ${pkgdir}/usr/bin/bfstat
/usr/bin/install -c ${srcdir}/${pkgname}/source/bin/nlookup ${pkgdir}/usr/bin/nlookup /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.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.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/bforce.passwd ${pkgdir}/etc/bforce.passwd.sample

60
archlinux/PKGBUILD.ci
View File

@ -1,60 +0,0 @@
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')

0
man/bfindex.1 → debian/bfindex.1 vendored
View File

0
man/bforce.1 → debian/bforce.1 vendored
View File

0
man/bfstat.1 → debian/bfstat.1 vendored
View File

12
debian/changelog vendored
View File

@ -1,15 +1,3 @@
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 bforce (0.22.9-3) unstable; urgency=low
* fixes in init.d script * fixes in init.d script

2
debian/compat vendored
View File

@ -1 +1 @@
3 4

6
debian/conffiles vendored Normal file
View File

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

4
debian/control vendored
View File

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

1
debian/dirs vendored
View File

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

10
debian/docs vendored
View File

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

0
man/nlookup.1 → debian/nlookup.1 vendored
View File

0
man/outman.1 → debian/outman.1 vendored
View File

18
debian/postinst vendored
View File

@ -26,15 +26,15 @@ set -e
case "$1" in case "$1" in
configure) 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) abort-upgrade|abort-remove|abort-deconfigure)

13
debian/rules vendored
View File

@ -6,7 +6,8 @@
#export DH_VERBOSE=1 #export DH_VERBOSE=1
# This is the debhelper compatibility version to use. # This is the debhelper compatibility version to use.
export DH_COMPAT=11 export DH_COMPAT=3
PACKAGE = bforce PACKAGE = bforce
@ -48,7 +49,7 @@ clean:
rm -f build-stamp configure-stamp rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process. # Add here commands to clean up after the build process.
# -$(MAKE) -C source clean -$(MAKE) -C source clean
dh_clean dh_clean
rm -f source/config.cache source/include/config.h source/config.log\ rm -f source/config.cache source/include/config.h source/config.log\
source/config.status source/Makefile source/config.status source/Makefile
@ -56,7 +57,7 @@ clean:
install: build install: build
dh_testdir dh_testdir
dh_testroot dh_testroot
dh_prep dh_clean -k
dh_installdirs dh_installdirs
# Add here commands to install the package into debian/bforce. # Add here commands to install the package into debian/bforce.
@ -73,7 +74,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 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.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 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)/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 /usr/bin/install $(CURDIR)/contrib/bfha/bfha-debian.pl $(CURDIR)/debian/bforce/usr/lib/bforce/bfha.pl
@ -91,8 +92,8 @@ binary-arch: build install
# dh_installlogrotate # dh_installlogrotate
dh_installinit dh_installinit
# dh_installcron # dh_installcron
dh_installman $(CURDIR)/man/bfindex.1 $(CURDIR)/man/bforce.1 \ dh_installman $(CURDIR)/debian/bfindex.1 $(CURDIR)/debian/bforce.1 \
$(CURDIR)/man/bfstat.1 $(CURDIR)/man/nlookup.1 $(CURDIR)/man/outman.1 $(CURDIR)/debian/bfstat.1 $(CURDIR)/debian/nlookup.1
# dh_installinfo # dh_installinfo
dh_installchangelogs CHANGES dh_installchangelogs CHANGES
dh_link dh_link

6
rpm/bforce.spec
View File

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

2
source/.version
View File

@ -1 +1 @@
0.26.1 0.26

16
source/bforce/conf_get.c
View File

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

25
source/bforce/nodelist.c
View File

@ -56,24 +56,17 @@ int nodelist_checkflag(const char *nodeflags, const char *flag)
const char *searchbase = nodeflags; const char *searchbase = nodeflags;
char *q; char *q;
DEB((D_NODELIST, "nodelist: checking flag \"%s\" in flags \"%s\"", flag, nodeflags)); while( p = strstr(searchbase, flag) )
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) )
{ return 0;
if( (q = strchr(p, ',')) == NULL || (q - p) == strlen(flag) ) { if( (strchrnul(p, ':') - p) == strlen(flag) )
DEB((D_NODELIST, "nodelist: found flag %s", flag)); return 0;
return 0;
}
if( (strchrnul(p, ':') - p) == strlen(flag) ) {
DEB((D_NODELIST, "nodelist: found flag %s", flag));
return 0;
}
}
searchbase = p + 1; // avoid finding again the same
} }
searchbase = p + 1; // avoid finding again the same
} }
return 1; return 1;

33
source/bforce/prot_binkp.c
View File

@ -523,21 +523,20 @@ case 3: // send password on outgoing or pw confirmation on incoming
case 4: case 4:
; char *p;
char pbuf[32]; char pbuf[32];
int pwset = 0; int pwset = 0;
if (bstate->mode==bmode_incoming_handshake) { if (bstate->mode==bmode_incoming_handshake) {
char * p;
DEB((D_24554, "incoming handshake is complete")); DEB((D_24554, "incoming handshake is complete"));
bstate->complete = true; bstate->complete = true;
for (i=0;i<state.n_remoteaddr;i++) for (i=0;i<state.n_remoteaddr;i++)
if( !session_get_password(state.remoteaddrs[i].addr, pbuf, sizeof(pbuf)) ){ if( !session_get_password(state.remoteaddrs[i].addr, pbuf, sizeof(pbuf)) ){
pwset = 1; pwset = 1;
init_keys(bstate->remote_data->keys_in, pbuf[0]?pbuf:"-"); init_keys(bstate->remote_data->keys_in, pbuf?pbuf:"-");
init_keys(bstate->remote_data->keys_out, "-"); init_keys(bstate->remote_data->keys_out, "-");
for (p=pbuf[0]?pbuf:"-"; *p; p++) for (p=pbuf?pbuf:"-"; *p; p++)
update_keys(bstate->remote_data->keys_out, (int)*p); update_keys(bstate->remote_data->keys_out, (int)*p);
} }
//TODO: FIX incoming options //TODO: FIX incoming options
@ -718,17 +717,14 @@ case BPMSG_ADR: /* List of addresses */
bstate->extraislast = false; bstate->extraislast = false;
sprintf(bstate->extracmd+1,"OPT MB CRYPT"); sprintf(bstate->extracmd+1,"OPT MB CRYPT");
s_override ovr; s_override ovr;
DEB((D_24554, "process adr overrides"));
for(i = 0; i < state.n_remoteaddr; i++) { for(i = 0; i < state.n_remoteaddr; i++) {
ovr.sFlags = ""; ovr.sFlags = "";
override_get (&ovr, state.remoteaddrs[i].addr, 0); override_get (&ovr, state.remoteaddrs[i].addr, 0);
DEB((D_24554, "got adr overrides"));
if (nodelist_checkflag (ovr.sFlags, "NR")==0) { if (nodelist_checkflag (ovr.sFlags, "NR")==0) {
strcat (bstate->extracmd+1, " NR"); strcat (bstate->extracmd+1, " NR");
break; break;
} }
} }
DEB((D_24554, "process adr overrides"));
} }
// further use extracmd only for errors // further use extracmd only for errors
@ -955,10 +951,10 @@ got_skip:
check_that_all_files_are_confirmed: check_that_all_files_are_confirmed:
{ {
int j; int i;
for (j = 0; j < bstate->pi->n_sentfiles; j++) { for (i = 0; i < bstate->pi->n_sentfiles; i++) {
if (bstate->pi->sentfiles[i].status == FSTAT_WAITACK) { if (bstate->pi->sentfiles[i].status == FSTAT_WAITACK) {
DEB((D_24554, "sent file %d waits for acknowlede", j)); DEB((D_24554, "sent file %d waits for acknowlede", i));
return 1; return 1;
} }
} }
@ -1157,7 +1153,7 @@ default:
void binkp_process_NUL(s_binkp_sysinfo *remote_data, char *buffer) void binkp_process_NUL(s_binkp_sysinfo *remote_data, char *buffer)
{ {
char *p, *q;
if( strncmp(buffer, "SYS ", 4) == 0 ) if( strncmp(buffer, "SYS ", 4) == 0 )
strnxcpy(remote_data->systname, buffer+4, sizeof(remote_data->systname)); strnxcpy(remote_data->systname, buffer+4, sizeof(remote_data->systname));
@ -1185,11 +1181,9 @@ void binkp_process_NUL(s_binkp_sysinfo *remote_data, char *buffer)
} }
else if( strncmp(buffer, "VER ", 4) == 0 ) else if( strncmp(buffer, "VER ", 4) == 0 )
{ {
char *p;
/* <mailer> [<protocol>/<vermaj>.<vermin>] */ /* <mailer> [<protocol>/<vermaj>.<vermin>] */
if( (p = strchr(buffer+4, ' ')) ) if( (p = strchr(buffer+4, ' ')) )
{ {
char *q;
strnxcpy(remote_data->progname, buffer+4, strnxcpy(remote_data->progname, buffer+4,
MIN(sizeof(remote_data->progname), p - (buffer+4) + 1)); MIN(sizeof(remote_data->progname), p - (buffer+4) + 1));
++p; ++p;
@ -1223,16 +1217,13 @@ void binkp_process_ADR(char *buffer)
{ {
s_faddr addr; s_faddr addr;
char *p, *q; 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) ) 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) ) if( ftn_addrparse(&addr, p, FALSE) )
log("BinkP got unparsable address \"%s\"", string_printable(p)); log("BinkP got unparsable address \"%s\"", string_printable(p));
else { else
session_addrs_add(&state.remoteaddrs, &state.n_remoteaddr, addr); session_addrs_add(&state.remoteaddrs, &state.n_remoteaddr, addr);
DEB((D_24554, "process ADR complete"));
}
} }
} }

2
source/bforce/sess_call.c
View File

@ -536,7 +536,7 @@ defalt:
if ( ! resflg ) if ( ! resflg )
{ {
char *p = string_casestr(pbuf, target); char *p = strcasestr(pbuf, target);
if ( p ) if ( p )
{ {

12
source/bforce/sess_common.c
View File

@ -135,16 +135,14 @@ int override_get(s_override *dest, s_faddr addr, int line)
{ {
s_override *p; s_override *p;
int curline = 0; int curline = 0;
p = conf_override(cf_override, addr); p = conf_override(cf_override, addr);
curline = 0; curline = 0;
if (line > 0) while( p && curline < line )
{ {
while( p && curline < line ) p = p->hidden;
{ ++curline;
p = p->hidden;
++curline;
}
} }
if( p && curline == line ) if( p && curline == line )
@ -154,7 +152,7 @@ int override_get(s_override *dest, s_faddr addr, int line)
} }
else if( line == 0 ) else if( line == 0 )
return 0; return 0;
else else
return 1; return 1;
} }

2
source/bforce/sess_main.c
View File

@ -264,7 +264,7 @@ int session_check_addr(s_faddr addr)
int session_get_password(s_faddr addr, char *buffer, size_t buflen) int session_get_password(s_faddr addr, char *buffer, size_t buflen)
{ {
s_cval_entry *pwd_ptr; s_cval_entry *pwd_ptr;
buffer[0]='\0';
for( pwd_ptr = conf_first(cf_password); pwd_ptr; for( pwd_ptr = conf_first(cf_password); pwd_ptr;
pwd_ptr = conf_next(pwd_ptr) ) pwd_ptr = conf_next(pwd_ptr) )
{ {

234
source/include/confread.h
View File

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