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

netspool fixes

Browse Source
This commit is contained in:
Sergey Dorofeev 2012-02-04 22:56:07 +04:00
parent b5f3f48f0d
commit b1adc98f2d
11 changed files with 4525 additions and 4976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.fidoman
View File

@ -1,3 +1,7 @@
=== 2012-02 ===
Netspool support
=== 2011-12-25 === === 2011-12-25 ===
Cmdline processing code is partially rewritten. Cmdline processing code is partially rewritten.

2
source/Makefile.in
View File

@ -101,7 +101,7 @@ BFORCE_OBJS = bforce/bforce.o \
bforce/u_misc.o bforce/u_string.o \ bforce/u_misc.o bforce/u_string.o \
bforce/u_time.o bforce/u_file.o \ bforce/u_time.o bforce/u_file.o \
bforce/u_pkt.o bforce/u_recode.o \ bforce/u_pkt.o bforce/u_recode.o \
bforce/u_plock.o bforce/u_plock.o bforce/netspool.o
.c.o: .c.o:
@echo Compiling $*.c @echo Compiling $*.c

27
source/bforce/netspool.c
View File

@ -8,11 +8,10 @@
#include <sys/types.h> #include <sys/types.h>
#include <netdb.h> #include <netdb.h>
#include "includes.h"
#include "netspool.h" #include "netspool.h"
const char *RHOST = "172.31.251.3"; #ifdef NETSPOOL
const char *RPORT = "24555";
int readstr(int s, char *buf, int len) { int readstr(int s, char *buf, int len) {
char c=0; char c=0;
@ -99,7 +98,7 @@ void netspool_start(s_netspool_state *state, const char *host, const char *port,
if( r ) { if( r ) {
state->state = NS_ERROR; state->state = NS_ERROR;
state->error = gai_error(r); state->error = gai_strerror(r);
return; return;
} }
@ -118,7 +117,7 @@ void netspool_start(s_netspool_state *state, const char *host, const char *port,
if(r==-1) { if(r==-1) {
state->state = NS_ERROR; state->state = NS_ERROR;
state->error = "could not connect\n" state->error = "could not connect";
return; return;
} }
@ -139,7 +138,10 @@ void netspool_start(s_netspool_state *state, const char *host, const char *port,
void netspool_query(s_netspool_state *state, const char *what) void netspool_query(s_netspool_state *state, const char *what)
{ {
int r = sendstr(state->socket, "GET ALL"); char strbuf[STRBUF];
int r;
snprintf(strbuf, STRBUF, "GET %s", what); /* ALL or comma separated NETMAIL, ECHOMAIL... */
r = sendstr(state->socket, strbuf);
if( r ) { if( r ) {
state->state = NS_ERROR; state->state = NS_ERROR;
state->error = "IO error"; state->error = "IO error";
@ -153,7 +155,7 @@ void netspool_receive(s_netspool_state *state)
char strbuf[STRBUF]; char strbuf[STRBUF];
int r; int r;
r = readstr(s, strbuf, STRBUF); r = readstr(state->socket, strbuf, STRBUF);
if( r ) { state->state = NS_ERROR; state->error = "IO error"; return; } if( r ) { state->state = NS_ERROR; state->error = "IO error"; return; }
puts(strbuf); puts(strbuf);
if(strcmp(strbuf, "QUEUE EMPTY")==0) { if(strcmp(strbuf, "QUEUE EMPTY")==0) {
@ -162,15 +164,15 @@ void netspool_receive(s_netspool_state *state)
} }
if(strncmp(strbuf, "FILENAME ", 9)==0) { if(strncmp(strbuf, "FILENAME ", 9)==0) {
strcpy(filename, strbuf+9); strcpy(state->filename, strbuf+9);
puts(filename); puts(state->filename);
} else { } else {
state->state = NS_ERROR; state->state = NS_ERROR;
state->error = "expected filename or queue empty" state->error = "expected filename or queue empty";
return; return;
} }
r = readstr(s, strbuf, STRBUF); r = readstr(state->socket, strbuf, STRBUF);
if( r ) { state->state = NS_ERROR; state->error = "IO error"; return; } if( r ) { state->state = NS_ERROR; state->error = "IO error"; return; }
if(strncmp(strbuf, "BINARY ", 7)==0) { if(strncmp(strbuf, "BINARY ", 7)==0) {
/*if(filename[0]==0) { /*if(filename[0]==0) {
@ -182,7 +184,7 @@ void netspool_receive(s_netspool_state *state)
state->state = NS_RECVFILE; state->state = NS_RECVFILE;
} else { } else {
state->state = NS_ERROR; state->state = NS_ERROR;
state->error = "expected binary" state->error = "expected binary";
return; return;
} }
@ -265,3 +267,4 @@ void savefile(const char *fn, unsigned long long l, int s)
close(f); close(f);
} }
*/ */
#endif

28
source/bforce/prot_common.c
View File

@ -102,7 +102,9 @@ static int prot_get_next_file(s_filelist **dest, s_protinfo *pi)
/* network queue */ /* network queue */
#ifdef NETSPOOL #ifdef NETSPOOL
log("start netspool");
if(state.netspool.state == NS_NOTINIT) { if(state.netspool.state == NS_NOTINIT) {
log("netspool connection");
char password[9]; char password[9];
char address[300]; char address[300];
char *host = conf_string(cf_netspool_host); char *host = conf_string(cf_netspool_host);
@ -122,19 +124,24 @@ static int prot_get_next_file(s_filelist **dest, s_protinfo *pi)
} }
} }
if(state.netspool_state == NS_READY) { if(state.netspool.state == NS_READY) {
log("netspool request");
netspool_query(&state.netspool, "ALL"); netspool_query(&state.netspool, "ALL");
} }
if(state.netspool_state == NS_RECEIVING) { if(state.netspool.state == NS_RECEIVING) {
log("netspool begin receive");
netspool_receive(&state.netspool); netspool_receive(&state.netspool);
} }
if(state.netspool_state == NS_RECVFILE) { if(state.netspool.state == NS_RECVFILE) {
log("netspool start file");
*dest = NULL; *dest = NULL;
return 0; return 0;
} }
log("netspool gives no more files");
#endif #endif
return 1; return 1;
@ -292,7 +299,7 @@ get_next_file:
pi->send->action = ptrl->action; pi->send->action = ptrl->action;
pi->send->flodsc = ptrl->flodsc; pi->send->flodsc = ptrl->flodsc;
#idef NETSPOOL #ifdef NETSPOOL
} }
#endif #endif
@ -435,8 +442,8 @@ int p_tx_fclose(s_protinfo *pi)
logerr("send: cannot truncate file \"%s\"", pi->send->fname); logerr("send: cannot truncate file \"%s\"", pi->send->fname);
break; break;
#ifdef NETSPOOL #ifdef NETSPOOL
case ACTION_ACKNOWLEDE: case ACTION_ACKNOWLEDGE:
netspool_acknowlede(&state.netspool); netspool_acknowledge(&state.netspool);
break; break;
#endif #endif
} }
@ -465,8 +472,8 @@ int p_tx_readfile(char *buffer, size_t buflen, s_protinfo *pi)
long ftell_pos; long ftell_pos;
#ifdef NETSPOOL #ifdef NETSPOOL
if(pi->send->fname==NULL && strcmp(pi->send->localname, "NETSPOOL")==0 ) { if(pi->send->fname==NULL && strcmp(pi->send->local_name, "NETSPOOL")==0 ) {
if( state->state != NS_RECVFILE ) { if( state.netspool.state != NS_RECVFILE ) {
log("send: wrong netspool state"); log("send: wrong netspool state");
pi->send->status = FSTAT_SKIPPED; pi->send->status = FSTAT_SKIPPED;
return -2; return -2;
@ -475,7 +482,7 @@ int p_tx_readfile(char *buffer, size_t buflen, s_protinfo *pi)
pi->send->eofseen = state.netspool.length == 0; pi->send->eofseen = state.netspool.length == 0;
if( n==-1 ) { if( n==-1 ) {
log("send: netspool error"); log("send: netspool error");
log(netspool->state->error); log(state.netspool.error);
pi->send->status = FSTAT_SKIPPED; pi->send->status = FSTAT_SKIPPED;
return -2; return -2;
} }
@ -1278,6 +1285,9 @@ void p_session_cleanup(s_protinfo *pi, bool success)
} }
#ifdef NETSPOOL #ifdef NETSPOOL
if(state.netspool.state==NS_ERROR) {
log("netspool error %s", state.netspool.error);
}
netspool_end(&state.netspool); netspool_end(&state.netspool);
#endif #endif
} }

9148
source/configure vendored
View File

File diff suppressed because it is too large Load Diff

5
source/configure.in
View File

@ -82,6 +82,11 @@ AC_ARG_ENABLE(syslog, [ --enable-syslog use syslog for logging [experimen
AC_DEFINE([USE_SYSLOG], [1], [Use syslog for logging]) AC_DEFINE([USE_SYSLOG], [1], [Use syslog for logging])
fi], [AC_DEFINE([USE_SYSLOG], [1], [Use syslog for logging])]) fi], [AC_DEFINE([USE_SYSLOG], [1], [Use syslog for logging])])
AC_ARG_ENABLE(netspool, [ --enable-netspool network attached inbound/outbound],
[if test $enableval = yes; then
AC_DEFINE([NETSPOOL], [1], [Use netspool])
fi], [AC_DEFINE([NETSPOOL], [1], [Use netspool])])
AC_ARG_ENABLE(buggy_emsi, [ --disable-buggy-emsi disable buggy emsi support (default)], AC_ARG_ENABLE(buggy_emsi, [ --disable-buggy-emsi disable buggy emsi support (default)],
[if test $enableval = yes; then [if test $enableval = yes; then
AC_DEFINE([BUGGY_EMSI], [1], [Disable buggy emsi]) AC_DEFINE([BUGGY_EMSI], [1], [Disable buggy emsi])

22
source/include/acconfig.h
View File

@ -1,22 +0,0 @@
/* Do you want debug code to be compiled? */
#undef DEBUG
/* Do you want use DCD line control? */
#undef MODEM_WATCH_CARRIER
/* Do you want hangup to watch for modem DCD line? */
#undef MODEM_HANGUP_WATCH_CARRIER
/* Version string */
#undef RELEASE_VERSION
/* Disable passwords logging? */
#undef BFORCE_LOG_PASSWD
/* Path to the UUCP lock files directory */
#undef BFORCE_LOCK_DIR
/* Do you want use .csy locks? */
#undef BFORCE_USE_CSY

3
source/include/config.h.in
View File

@ -62,6 +62,9 @@
/* Do you want to use syslog? */ /* Do you want to use syslog? */
#undef USE_SYSLOG #undef USE_SYSLOG
/* Netspool */
#undef NETSPOOL
/* Do you want use .csy locks? */ /* Do you want use .csy locks? */
#undef BFORCE_USE_CSY #undef BFORCE_USE_CSY

33
source/include/netspool.h
View File

@ -1,4 +1,18 @@
/*
* binkleyforce -- unix FTN mailer project
*
* Copyright (c) 1998-2000 Alexander Belkin, 2:5020/1398.11
*
* 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 of the License, or
* (at your option) any later version.
*
* $Id$
*/
#ifndef _NETSPOOL_H_
#define _NETSPOOL_H_
#define NS_NOTINIT (0) #define NS_NOTINIT (0)
#define NS_UNCONF (1) #define NS_UNCONF (1)
@ -6,15 +20,28 @@
#define NS_READY (3) #define NS_READY (3)
#define NS_RECEIVING (4) #define NS_RECEIVING (4)
#define NS_RECVFILE (5) #define NS_RECVFILE (5)
#define NS_CLOSED (6)
#define STRBUF (1024) #define STRBUF (1024)
typedef struct { typedef struct {
int state; int state;
char *error; const char *error;
int socket; int socket;
int filename[STRBUF]; char filename[STRBUF];
unsigned long long length; unsigned long long length;
} s_netspool_state; } s_netspool_state;
/* create socket and start session */
void netspool_start(s_netspool_state *state, const char *host, const char *port, const char *address, const char *password);
/* request for outbound */
void netspool_query(s_netspool_state *state, const char *what);
/* receive next file */
void netspool_receive(s_netspool_state *state);
/* read data */
int netspool_read(s_netspool_state *state, void *buf, int buflen);
/* acknowledge successful file transmission */
void netspool_acknowledge(s_netspool_state *state);
/* end session */
void netspool_end(s_netspool_state *state);
#endif

1
source/include/outbound.h
View File

@ -27,6 +27,7 @@
#define ACTION_UNLINK 0x001 /* Unlink file if send successful */ #define ACTION_UNLINK 0x001 /* Unlink file if send successful */
#define ACTION_TRUNCATE 0x002 /* Truncate file if send successful */ #define ACTION_TRUNCATE 0x002 /* Truncate file if send successful */
#define ACTION_FORCEUNLINK 0x004 /* Unlink file in any case after ses.*/ #define ACTION_FORCEUNLINK 0x004 /* Unlink file in any case after ses.*/
#define ACTION_ACKNOWLEDGE 0x008 /* Report success to netspool server */
#define TYPE_UNKNOWN 0x000 #define TYPE_UNKNOWN 0x000
#define TYPE_NETMAIL 0x001 #define TYPE_NETMAIL 0x001

2
source/openwrt-conf
View File

@ -11,4 +11,4 @@ CC=$PREFIX-gcc
export PATH CC CPP export PATH CC CPP
#./configure --prefix=/opt/bforce --host=mips-openwrt-linux --disable-syslog #./configure --prefix=/opt/bforce --host=mips-openwrt-linux --disable-syslog --enable-netspool