X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fclient.c;h=cd11c78b53b45446b654744c721f4abb7b672b6f;hb=bd95f04650a16c15d5691a7a318d51ed764e8b39;hp=b50514fa618f47bb0895bbdb61977ac1c43d0402;hpb=f686f4454acf8431eca458918c7caeb385a9c9e3;p=spider.git

diff --git a/src/client.c b/src/client.c
index b50514fa..cd11c78b 100644
--- a/src/client.c
+++ b/src/client.c
@@ -44,7 +44,10 @@
 #define MAXPATHLEN 256
 #endif
 
+#define DEFPACLEN 128
 #define MAXPACLEN 236
+#define MAXCALLSIGN 9
+
 #define DBUF 1
 #define DMSG 2
 
@@ -84,15 +87,27 @@ char echo = 1;					/* echo characters on stdout from stdin */
 char int_tabs = 0;				/* interpret tabs -> spaces */
 char *root = "/spider";         /* root of data tree, can be overridden by DXSPIDER_ROOT  */
 int timeout = 60;				/* default timeout for logins and things */
-int paclen = 128;				/* default buffer size for outgoing packets */
+int paclen = DEFPACLEN;			/* default buffer size for outgoing packets */
 int tabsize = 8;				/* default tabsize for text messages */
 
 myregex_t iscallreg[] = {		/* regexes to determine whether this is a reasonable callsign */
 	{
-		"^[A-Z]+[0-9]+[A-Z]+", 0
+		"^[A-Z]+[0-9]+[A-Z]+[1-9]?$", 0	               /* G1TLH G1TLH1 */
+	},
+	{
+		"^[0-9]+[A-Z]+[0-9]+[A-Z]+[1-9]?$", 0          /* 2E0AAA 2E0AAA1 */
+	},
+	{
+		"^[A-Z]+[0-9]+[A-Z]+-[1-9]$", 0                /* G1TLH-2 */
+	},
+	{
+		"^[0-9]+[A-Z]+[0-9]+[A-Z]+-[1-9]$", 0          /* 2E0AAA-2 */
+	},
+	{
+		"^[A-Z]+[0-9]+[A-Z]+-1[0-5]$", 0               /* G1TLH-11 */
 	},
 	{
-		"^[0-9]+[A-Z]+[0-9]+[A-Z]+", 0
+		"^[0-9]+[A-Z]+[0-9]+[A-Z]+-1[0-5]$", 0         /* 2E0AAA-11 */
 	},
 	{
 		0, 0
@@ -154,6 +169,10 @@ int xopen(char *dir, char *name, int mode)
 int iscallsign(char *s)
 {
 	myregex_t *rp;
+
+	if (strlen(s) > MAXCALLSIGN)
+		return 0;
+	
 	for (rp = iscallreg; rp->in; ++rp) {
 		if (regexec(rp->regex, s, 0, 0, 0) == 0)
 			return 1;
@@ -198,6 +217,10 @@ void send_text(fcb_t *f, char *s, int l)
 		f->obuf = mp = cmsg_new(paclen+1, f->sort, f);
 	}
 
+	/* remove trailing spaces  */
+	while (l > 0 &&isspace(s[l-1]))
+		--l;
+
 	for (p = s; p < s+l; ) {
 		if (mp->inp >= mp->data + paclen) {
 			flush_text(f);
@@ -209,29 +232,45 @@ void send_text(fcb_t *f, char *s, int l)
 		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;
@@ -245,6 +284,7 @@ int fcb_handler(sel_t *sp, int in, int out, int err)
 {
 	fcb_t *f = sp->fcb;
 	cmsg_t *mp, *omp;
+	unsigned char c;
 	
 	/* input modes */
 	if (in) {
@@ -260,14 +300,16 @@ int fcb_handler(sel_t *sp, int in, int out, int err)
 			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;
 		}
@@ -349,30 +391,60 @@ int fcb_handler(sel_t *sp, int in, int out, int err)
 		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;
@@ -408,8 +480,9 @@ lout:;
 				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;
 				}
@@ -488,6 +561,11 @@ lerr:
 		nl = '\n';
 		echo = 1;
 	}
+
+	/* this is kludgy, but hey so is the rest of this! */
+	if (!eq(connsort, "ax25") && paclen == DEFPACLEN) {
+		paclen = MAXPACLEN;
+	}
 }
 
 void connect_to_node()
@@ -527,6 +605,7 @@ void term_timeout(int i)
 	if (in && in->t_set)
 		tcsetattr(0, TCSANOW, &in->t);
 	if (node) {
+		shutdown(node->cnum, 3);
 		close(node->cnum);
 	}
 	exit(i);
@@ -535,7 +614,7 @@ void term_timeout(int 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);
@@ -547,8 +626,10 @@ void terminate(int i)
 	}
 	if (in && in->t_set)
 		tcsetattr(0, TCSADRAIN, &in->t);
-	if (node) 
+	if (node) {
+		shutdown(node->cnum, 3);
 		close(node->cnum);
+	}
 	exit(i);
 }
 
@@ -676,7 +757,8 @@ main(int argc, char *argv[])
 	/* 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) {
@@ -694,29 +776,44 @@ main(int argc, char *argv[])
 		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))
+						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);
-		if (!iscallsign(call)) {
-			die("Sorry, %s isn't a valid callsign", buf);
-		}
+		callsign[i]= 0;
+		call = strupper(callsign);
+	}
+
+	/* check the callsign */
+	if (!iscallsign(call)) {
+		die("Sorry, %s isn't a valid callsign", call);
 	}
 	
 	/* connect up stdin */
 	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;