uzix/picocom
1
0
Fork 0
mirror of https://github.com/UzixLS/picocom.git synced 2025-07-19 07:21:18 +03:00
Code Issues Projects Releases Wiki Activity

Debugging tweaks

Browse Source
This commit is contained in:
Nick Patavalis
2018-03-03 08:39:55 +02:00
parent 1dc4f04718
commit 1c8e238022
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tn2217.c
View File

@ -57,7 +57,7 @@
#include <arpa/telnet.h> #include <arpa/telnet.h>
#if 0 #if 1
/* Disable debugging code altogether */ /* Disable debugging code altogether */
#define DEBUG 0 #define DEBUG 0
#define DB(fl, ...) /* nothing */ #define DB(fl, ...) /* nothing */
@ -82,6 +82,9 @@
#define DB_MASK (DB_OTH | DB_NEG /* | DB_OPT */ | DB_CMP) #define DB_MASK (DB_OTH | DB_NEG /* | DB_OPT */ | DB_CMP)
#endif #endif
/* Important info / warnings / errors to stderr */
#define pinfof(...) fd_printf(STDERR_FILENO, __VA_ARGS__)
/* We'll ask the remote end to use this modem state mask */ /* We'll ask the remote end to use this modem state mask */
#define MODEMSTATE_MASK (COMPORT_MODEM_CD | \ #define MODEMSTATE_MASK (COMPORT_MODEM_CD | \
COMPORT_MODEM_RI | \ COMPORT_MODEM_RI | \
@ -454,21 +457,21 @@ recv_cmd_partial(struct term_s *t)
if (cmd[cmdlen - 1] == IAC) if (cmd[cmdlen - 1] == IAC)
goto incomplete; /* IAC left at end of cmd[] */ goto incomplete; /* IAC left at end of cmd[] */
if (cmd[--cmdlen] != SE) { /* remove trailing SE */ if (cmd[--cmdlen] != SE) { /* remove trailing SE */
fprintf(stderr, "[BAD TELNET SB]"); pinfof("[BAD TELNET SB]\r\n");
break; break;
} }
if (cmdlen >= 4 && cmd[2] == TELOPT_COMPORT) if (cmdlen >= 4 && cmd[2] == TELOPT_COMPORT)
rval = comport_recv_cmd(t, cmd[3], cmd + 4, cmdlen - 4); rval = comport_recv_cmd(t, cmd[3], cmd + 4, cmdlen - 4);
break; break;
case AYT: case AYT:
fprintf(stderr, "[REMOTE AYT]"); pinfof("[REMOTE AYT]\r\n");
/* writen_ni(t->fd, "\377\361", 2); */ /* respond with NOP? */ /* writen_ni(t->fd, "\377\361", 2); */ /* respond with NOP? */
break; break;
case BREAK: case BREAK:
fprintf(stderr, "[REMOTE BREAK]"); pinfof("[REMOTE BREAK]\r\n");
break; break;
case IP: case IP:
fprintf(stderr, "[REMOTE INTERRUPT]"); pinfof("[REMOTE INTERRUPT]\r\n");
break; break;
default: default:
/* Ignore everything else */ /* Ignore everything else */
@ -1149,10 +1152,13 @@ tn2217_send_break(struct term_s *t)
r = comport_send_cmd1(t, COMPORT_SET_CONTROL, r = comport_send_cmd1(t, COMPORT_SET_CONTROL,
COMPORT_CONTROL_BREAK_ON); COMPORT_CONTROL_BREAK_ON);
if ( r < 0 ) return r; if ( r < 0 ) return r;
DB(DB_CMP, "[sent: COMPORT SET_CONTROL BREAK_ON]\r\n");
usleep(250000); /* 250 msec */ usleep(250000); /* 250 msec */
r = comport_send_cmd1(t, COMPORT_SET_CONTROL, r = comport_send_cmd1(t, COMPORT_SET_CONTROL,
COMPORT_CONTROL_BREAK_OFF); COMPORT_CONTROL_BREAK_OFF);
if ( r < 0 ) return r; if ( r < 0 ) return r;
DB(DB_CMP, "[sent: COMPORT SET_CONTROL BREAK_OFF]\r\n");
return 0; return 0;
} }
@ -1169,6 +1175,7 @@ tn2217_flush(struct term_s *t, int selector)
case TCOFLUSH: val = COMPORT_PURGE_TX; break; case TCOFLUSH: val = COMPORT_PURGE_TX; break;
default: val = COMPORT_PURGE_RXTX; break; default: val = COMPORT_PURGE_RXTX; break;
} }
DB(DB_CMP, "[sent: COMPORT PURGE_DATA %d]\r\n", val);
return comport_send_cmd1(t, COMPORT_PURGE_DATA, val); return comport_send_cmd1(t, COMPORT_PURGE_DATA, val);
} }
@ -1265,7 +1272,7 @@ read_and_proc(struct term_s *t, void *buf, unsigned bufsz)
/* We are currently appending to the command accumulator. */ /* We are currently appending to the command accumulator. */
if (s->cmdbuflen >= sizeof s->cmdbuf - 1) { if (s->cmdbuflen >= sizeof s->cmdbuf - 1) {
s->cmdbuflen = 0; /* Abandon on overflow */ s->cmdbuflen = 0; /* Abandon on overflow */
fprintf(stderr, "[overlong IAC command]\r\n"); pinfof("[overlong IAC command]\r\n");
break; break;
} }
s->cmdbuf[s->cmdbuflen++] = *in++; s->cmdbuf[s->cmdbuflen++] = *in++;