X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fclient.c;h=d2ed0c473ed01731063a2a689e8825c75c37fe68;hb=dd0ddcd3ae2d605a2a1f549da0263fa99c44f92d;hp=7864e9d13dc70cfab79b90f3f98e118ea7c7e47d;hpb=1debfcd0628924293008d4c91bc372499d9ece87;p=spider.git diff --git a/src/client.c b/src/client.c index 7864e9d1..d2ed0c47 100644 --- a/src/client.c +++ b/src/client.c @@ -44,7 +44,7 @@ #define MAXPATHLEN 256 #endif -#define DEFPACLEN 128 +#define DEFPACLEN 236 #define MAXPACLEN 236 #define MAXCALLSIGN 9 @@ -387,6 +387,8 @@ int fcb_handler(sel_t *sp, int in, int out, int err) default: if (nl == '\n' && *p == '\r') { /* ignore \r in telnet mode (ugh) */ p++; + } else if (nl == '\r' && *p == '\n') { /* and ignore \n in ax25 mode (double ugh) */ + p++; } else if (*p == nl) { if (mp->inp == mp->data) *mp->inp++ = ' '; @@ -450,10 +452,8 @@ int fcb_handler(sel_t *sp, int in, int out, int err) 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); + dbg(DMSG, "Illegal hex char (%c) received in state 1", ch); mp->inp = mp->data; mp->state = 0; } @@ -464,10 +464,8 @@ int fcb_handler(sel_t *sp, int in, int out, int err) *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); + dbg(DMSG, "Illegal hex char (%c) received in state 2", ch); mp->inp = mp->data; } mp->state = 0;