Changed mbcico isdoing information

This commit is contained in:
Michiel Broek 2002-07-06 17:37:55 +00:00
parent a1a014f0d9
commit 8e70add5ce
4 changed files with 17 additions and 14 deletions

View File

@ -4,6 +4,9 @@ $Id$
v0.35.03 06-Jul-2002 v0.35.03 06-Jul-2002
mbcico:
Changed IsDoing information.
v0.35.02 22-Jun-2002 - 06-Jul-2002 v0.35.02 22-Jun-2002 - 06-Jul-2002

View File

@ -112,7 +112,7 @@ int answer(char *stype)
IsDoing("Answer EMSI"); IsDoing("Answer EMSI");
} else if (strncmp(stype,"ibn",3) == 0) { } else if (strncmp(stype,"ibn",3) == 0) {
st=SESSION_BINKP; st=SESSION_BINKP;
IsDoing("Answer Binkp"); IsDoing("Answer binkp");
} else { } else {
st=SESSION_UNKNOWN; st=SESSION_UNKNOWN;
IsDoing("Answer unknown"); IsDoing("Answer unknown");

View File

@ -64,7 +64,7 @@ int resync(off_t);
static int orgbinkp(void); static int orgbinkp(void);
static int ansbinkp(void); static int ansbinkp(void);
static int binkp_batch(file_list *); static int binkp_batch(file_list *, int);
extern char *ttystat[]; extern char *ttystat[];
extern int Loaded; extern int Loaded;
@ -102,13 +102,11 @@ int binkp(int role)
if (role == 1) { if (role == 1) {
Syslog('+', "BINKP start outbound session"); Syslog('+', "BINKP start outbound session");
IsDoing("Binkp %s outb", ascfnode(remote->addr, 0x0f));
if (orgbinkp()) { if (orgbinkp()) {
rc = 5; rc = 5;
} }
} else { } else {
Syslog('+', "BINKP start inbound session"); Syslog('+', "BINKP start inbound session");
IsDoing("Answer binkp");
if (ansbinkp()) { if (ansbinkp()) {
rc = 5; rc = 5;
} }
@ -140,7 +138,7 @@ int binkp(int role)
request = NULL; request = NULL;
} }
rc = binkp_batch(tosend); rc = binkp_batch(tosend, role);
tidy_filelist(tosend, (rc == 0)); tidy_filelist(tosend, (rc == 0));
tosend = NULL; tosend = NULL;
@ -157,7 +155,7 @@ int binkp(int role)
tosend = create_filelist(eff_remote, nonhold_mail, 0); tosend = create_filelist(eff_remote, nonhold_mail, 0);
for (tmpfl = tosend; tmpfl->next; tmpfl = tmpfl->next); for (tmpfl = tosend; tmpfl->next; tmpfl = tmpfl->next);
tmpfl->next = respond; tmpfl->next = respond;
rc = binkp_batch(tosend); rc = binkp_batch(tosend, role);
tmpfl->next = NULL; tmpfl->next = NULL;
} }
@ -413,6 +411,7 @@ SM_STATE(waitconn)
Loaded = FALSE; Loaded = FALSE;
Syslog('+', "Start binkp session with %s", ascfnode(remote->addr, 0x1f)); Syslog('+', "Start binkp session with %s", ascfnode(remote->addr, 0x1f));
IsDoing("Connect binkp %s", ascfnode(remote->addr, 0x1f));
b_banner(TRUE); b_banner(TRUE);
binkp_send_control(MM_NUL,"OPT MB CRC"); binkp_send_control(MM_NUL,"OPT MB CRC");
@ -794,7 +793,7 @@ void debug_binkp_list(binkp_list **bll)
int binkp_batch(file_list *to_send) int binkp_batch(file_list *to_send, int role)
{ {
int rc = 0, NotDone, rxlen = 0, txlen = 0, rxerror = FALSE; int rc = 0, NotDone, rxlen = 0, txlen = 0, rxerror = FALSE;
static char *txbuf, *rxbuf; static char *txbuf, *rxbuf;
@ -820,6 +819,7 @@ int binkp_batch(file_list *to_send)
batchnr++; batchnr++;
Syslog('+', "Binkp: starting batch %d", batchnr); Syslog('+', "Binkp: starting batch %d", batchnr);
IsDoing("Binkp %s %s", (role == 1)?"out":"inb", ascfnode(remote->addr, 0x1f));
txbuf = calloc(MAX_BLKSIZE + 3, sizeof(unsigned char)); txbuf = calloc(MAX_BLKSIZE + 3, sizeof(unsigned char));
rxbuf = calloc(MAX_BLKSIZE + 3, sizeof(unsigned char)); rxbuf = calloc(MAX_BLKSIZE + 3, sizeof(unsigned char));
rname = calloc(512, sizeof(char)); rname = calloc(512, sizeof(char));

View File

@ -90,7 +90,6 @@ int session(faddr *a, node *nl, int role, int tp, char *dt)
if (role) { if (role) {
Syslog('s', "Start outbound session type %s with %s", typestr(type), ascfnode(a,0x1f)); Syslog('s', "Start outbound session type %s with %s", typestr(type), ascfnode(a,0x1f));
IsDoing("Outb %s", ascfnode(a, 0x0f));
} else } else
Syslog('s', "Start inbound session type %s", typestr(type)); Syslog('s', "Start inbound session type %s", typestr(type));
@ -98,18 +97,19 @@ int session(faddr *a, node *nl, int role, int tp, char *dt)
Syslog('s', "TCP connection: len=%d, family=%hd, port=%hu, addr=%s", Syslog('s', "TCP connection: len=%d, family=%hd, port=%hu, addr=%s",
addrlen,peeraddr.sin_family, peeraddr.sin_port, inet_ntoa(peeraddr.sin_addr)); addrlen,peeraddr.sin_family, peeraddr.sin_port, inet_ntoa(peeraddr.sin_addr));
if (role == 0) { if (role == 0) {
if (tcp_mode == TCPMODE_IBN) if (tcp_mode == TCPMODE_IBN) {
Syslog('+', "Incoming IBN/TCP connection from %s", inet_ntoa(peeraddr.sin_addr)); Syslog('+', "Incoming IBN/TCP connection from %s", inet_ntoa(peeraddr.sin_addr));
else if (tcp_mode == TCPMODE_ITN) IsDoing("Incoming IBN/TCP");
} else if (tcp_mode == TCPMODE_ITN) {
Syslog('+', "Incoming ITN/TCP connection from %s", inet_ntoa(peeraddr.sin_addr)); Syslog('+', "Incoming ITN/TCP connection from %s", inet_ntoa(peeraddr.sin_addr));
else if (tcp_mode == TCPMODE_IFC) IsDoing("Incoming ITN/TCP");
} else if (tcp_mode == TCPMODE_IFC) {
Syslog('+', "Incoming IFC/TCP connection from %s", inet_ntoa(peeraddr.sin_addr)); Syslog('+', "Incoming IFC/TCP connection from %s", inet_ntoa(peeraddr.sin_addr));
else if (tcp_mode == TCPMODE_NONE) { IsDoing("Incoming IFC/TCP");
} else if (tcp_mode == TCPMODE_NONE) {
WriteError("Unknown TCP connection, parameter missing"); WriteError("Unknown TCP connection, parameter missing");
die(101); die(101);
} }
IsDoing("Answer TCP");
} }
session_flags |= SESSION_TCP; session_flags |= SESSION_TCP;
} }