--- ansh/src/utils.c	2011/10/14 07:47:21	1.1.1.1.2.9
+++ ansh/src/utils.c	2011/10/14 13:23:49	1.1.1.1.2.13
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: utils.c,v 1.1.1.1.2.9 2011/10/14 07:47:21 misho Exp $
+ * $Id: utils.c,v 1.1.1.1.2.13 2011/10/14 13:23:49 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -120,10 +120,8 @@ PrepareL2(const char *psDev, int *bpflen)
 		return -1;
 	}
 
-	/*
 	n = fcntl(h, F_GETFL);
 	fcntl(h, F_SETFL, n | O_NONBLOCK);
-	*/
 
 	VERB(3) LOG("Openned device handle %d with bpf buflen %d", h, *bpflen);
 	return h;
@@ -208,6 +206,8 @@ icmpRecv(int s, u_int * __restrict seq, u_short * __re
 			VERB(3) LOG("Channel SECURED:: Plain text communication not supported at this moment ...");
 			return ANSH_FLG_ERR;
 		}
+		if (ntohl(hdr->ansh_nonce) != *crypted)
+			VERB(4) LOG("Detect change of nonce from %x to %x", *crypted, ntohl(hdr->ansh_nonce));
 
 		*crypted = ntohl(hdr->ansh_nonce);
 	}
@@ -386,6 +386,8 @@ _pkt_Recv(u_char * __restrict buf, int rlen, u_int * _
 			VERB(3) LOG("Channel SECURED:: Plain text communication not supported at this moment ...");
 			return ANSH_FLG_ERR;
 		}
+		if (ntohl(hdr->ansh_nonce) != *crypted)
+			VERB(4) LOG("Detect change of nonce from %x to %x", *crypted, ntohl(hdr->ansh_nonce));
 
 		*crypted = ntohl(hdr->ansh_nonce);
 	}
@@ -509,8 +511,37 @@ cryptBuffer(u_char *buf, int rlen, u_int ctr)
 	memcpy(ivec + 8, &ctr, sizeof ctr);
 	memcpy(ivec + 12, &rctr, sizeof rctr);
 
-	if (io_ctr_AES(buf, rlen, &str, (u_char*) "_ansh_ELWIX_", ivec) == -1)
+	if (io_ctr_AES(buf, rlen, &str, (u_char*) Key, ivec) == -1)
 		return NULL;
 
 	return str;
+}
+
+int
+stopProcess(sched_root_task_t * __restrict root, proc_head_t * __restrict h, pid_t pid, sched_task_func_t func)
+{
+	struct tagProc *p;
+
+	FTRACE(3);
+
+	SLIST_FOREACH(p, h, proc_next)
+		if (p->proc_pid == pid) {
+			break;
+		}
+	VERB(3) LOG("pid=%d found=%p\n", pid, p);
+	if (!p)
+		return 1;
+
+	ioFreePTY(p->proc_pty, p->proc_ttyname);
+	if (p->proc_pty)
+		schedCancelby(root, NULL, CRITERIA_FD, (void*) ((intptr_t) p->proc_pty), NULL);
+
+	p->proc_pty = 0;
+	p->proc_pid = 0;
+	p->proc_seq = 0;
+	p->proc_flg = ANSH_FLG_EOF;
+	p->proc_rlen_[FD2NET] = 0;
+
+	schedCallOnce(root, func, p, p->proc_sock);
+	return 0;
 }