flush_text(f);
f->obuf = mp = cmsg_new(paclen+1, f->sort, f);
}
- *mp->inp++ = nl;
+ if (nl == '\r')
+ *mp->inp++ = nl;
+ else {
+ *mp->inp++ = '\r';
+ *mp->inp++ = '\n';
+ }
if (!f->buffer_it)
flush_text(f);
}
-void send_msg(fcb_t *f, char let, char *s, int l)
+void send_msg(fcb_t *f, char let, unsigned char *s, int l)
{
cmsg_t *mp;
int ln;
int myl = strlen(call)+2+l;
mp = cmsg_new(myl+4+1, f->sort, f);
- ln = htonl(myl);
- memcpy(mp->inp, &ln, 4);
- mp->inp += 4;
*mp->inp++ = let;
strcpy(mp->inp, call);
mp->inp += strlen(call);
*mp->inp++ = '|';
if (l > 0) {
- memcpy(mp->inp, s, l);
- mp->inp += l;
- }
+ unsigned char *p;
+ for (p = s; p < s+l; ++p) {
+ if (mp->inp >= mp->data + (myl - 4)) {
+ int off = mp->inp - mp->data;
+ myl += 256;
+ mp = realloc(mp, myl);
+ mp->inp = mp->data + off;
+ }
+
+ if (*p < 0x20 || *p > 0x7e || *p == '%') {
+ sprintf(mp->inp, "%%%02X", *p & 0xff);
+ mp->inp += strlen(mp->inp);
+ } else
+ *mp->inp++ = *p;
+ }
+ }
+ *mp->inp++ = '\n';
*mp->inp = 0;
cmsg_send(f->outq, mp, 0);
f->sp->flags |= SEL_OUTPUT;
{
fcb_t *f = sp->fcb;
cmsg_t *mp, *omp;
+ unsigned char c;
/* input modes */
if (in) {
case EAGAIN:
goto lout;
default:
- if (f->sort == MSG)
- send_Z = 0;
+/* if (f->sort == MSG)
+ send_Z = 0; */
+ dbg(DBUF,"got errno %d in input", errno);
ending++;
return 0;
}
} else if (r == 0) {
- if (f->sort == MSG)
- send_Z = 0;
+/* if (f->sort == MSG)
+ send_Z = 0; */
+ dbg(DBUF, "ending normally");
ending++;
return 0;
}
case MSG:
p = buf;
while (r > 0 && p < &buf[r]) {
+ unsigned char ch = *p++;
+
+ if (mp->inp >= mp->data + (MAXBUFL-1)) {
+ mp->state = 0;
+ mp->inp = mp->data;
+ dbg(DMSG, "Message longer than %d received", MAXBUFL);
+ }
- /* build up the size into the likely message length (yes I know it's a short) */
switch (mp->state) {
- case 0:
- case 1:
- mp->state++;
- break;
- case 2:
- case 3:
- mp->size = (mp->size << 8) | (*p++ & 0xff);
- if (mp->size > MAXBUFL)
- die("Message size too big from node (%d > %d)", mp->size, MAXBUFL);
- mp->state++;
- break;
- default:
- if (mp->inp - mp->data < mp->size) {
- *mp->inp++ = *p++;
- }
- if (mp->inp - mp->data >= mp->size) {
+ case 0:
+ if (ch == '%') {
+ c = 0;
+ mp->state = 1;
+ } else if (ch == '\n') {
/* kick it upstairs */
+ *mp->inp = 0;
dbgdump(DMSG, "QUEUE MSG", mp->data, mp->inp - mp->data);
cmsg_send(f->inq, mp, 0);
mp = f->in = cmsg_new(MAXBUFL+1, f->sort, f);
+ } else if (ch < 0x20 || ch > 0x7e) {
+ dbg(DMSG, "Illegal character (0x%02X) received", *p);
+ mp->inp = mp->data;
+ } else {
+ *mp->inp++ = ch;
}
+ break;
+
+ case 1:
+ mp->state = 2;
+ if (ch >= '0' && ch <= '9')
+ c = (ch - '0') << 4;
+ else if (ch >= 'A' && ch <= 'F')
+ c = (ch - 'A' + 10) << 4;
+ else if (ch >= 'a' && ch <= 'a')
+ c = (ch - 'a' + 10) << 4;
+ else {
+ dbg(DMSG, "Illegal hex char (%c) received in state %d", ch, mp->state);
+ mp->inp = mp->data;
+ mp->state = 0;
+ }
+ break;
+
+ case 2:
+ if (ch >= '0' && ch <= '9')
+ *mp->inp++ = c | (ch - '0');
+ else if (ch >= 'A' && ch <= 'F')
+ *mp->inp++ = c | (ch - 'A' + 10);
+ else if (ch >= 'a' && ch <= 'a')
+ *mp->inp++ = c | (ch - 'a' + 10);
+ else {
+ dbg(DMSG, "Illegal hex char (%c) received in state %d", ch, mp->state);
+ mp->inp = mp->data;
+ }
+ mp->state = 0;
}
}
break;
case EAGAIN:
goto lend;
default:
- if (f->sort == MSG)
- send_Z = 0;
+/* if (f->sort == MSG)
+ send_Z = 0; */
+ dbg(DBUF,"got errno %d in output", errno);
ending++;
return;
}
if (in && in->t_set)
tcsetattr(0, TCSANOW, &in->t);
if (node) {
+ shutdown(node->cnum, 3);
close(node->cnum);
}
exit(i);
void terminate(int i)
{
if (node && send_Z && call) {
- send_msg(node, 'Z', "", 0);
+ send_msg(node, 'Z', "bye", 3);
}
signal(SIGALRM, term_timeout);
}
if (in && in->t_set)
tcsetattr(0, TCSADRAIN, &in->t);
- if (node)
+ if (node) {
+ shutdown(node->cnum, 3);
close(node->cnum);
+ }
exit(i);
}
/* is this a login? */
if (eq(call, "LOGIN")) {
char buf[MAXPACLEN+1];
- int r;
+ char callsign[MAXCALLSIGN+1];
+ int r, i;
int f = xopen("data", "issue", 0);
if (f > 0) {
while ((r = read(f, buf, paclen)) > 0) {
signal(SIGALRM, login_timeout);
alarm(timeout);
write(0, "login: ", 7);
- r = read(0, buf, 20);
- if (r <= 0)
- die("No login or error (%d)", errno);
+ dbgdump(DBUF, "<-out", "login: ", 7);
+ for (i = 0;;) {
+ char *p;
+ r = read(0, buf, 20);
+ dbgdump(DBUF, "in ->", buf, r);
+ if (r <= 0)
+ die("No login or error (%d)", errno);
+ write(0, buf, r);
+ dbgdump(DBUF, "<-out", buf, r);
+ for (p = buf; p < buf+r; ++p) {
+ if (i < MAXCALLSIGN) {
+ if (*p == '\r' || *p == '\n')
+ goto lgotcall;
+ else if (isalnum(*p) || *p == '-')
+ callsign[i++] = *p;
+ else
+ die("%c is not a valid callsign character", *p);
+ } else
+ die("callsign entered is too long");
+ }
+ }
+lgotcall:
signal(SIGALRM, SIG_IGN);
alarm(0);
- while (r > 0) {
- if (buf[r-1] == ' ' || buf[r-1] == '\r' || buf[r-1] == '\n')
- --r;
- else
- break;
- }
- buf[r] = 0;
- call = strupper(buf);
+ callsign[i]= 0;
+ call = strupper(callsign);
}
/* check the callsign */
in = fcb_new(0, TEXT);
in->sp = sel_open(0, in, "STDIN", fcb_handler, TEXT, SEL_INPUT);
if (tcgetattr(0, &in->t) < 0) {
- echo = 0;
+/* echo = 0; */
in->t_set = 0;
} else {
struct termios t = in->t;
projects / spider.git / blobdiff