--- ansh/src/utils.c	2011/10/14 13:23:49	1.1.1.1.2.13
+++ ansh/src/utils.c	2012/01/23 16:13:07	1.3.2.1
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: utils.c,v 1.1.1.1.2.13 2011/10/14 13:23:49 misho Exp $
+ * $Id: utils.c,v 1.3.2.1 2012/01/23 16:13:07 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -128,14 +128,14 @@ PrepareL2(const char *psDev, int *bpflen)
 }
 
 int
-PrepareL3(const struct sockaddr *sa, int *bpflen)
+PrepareL3(const io_sockaddr_t *sa, int *bpflen)
 {
 	int h, n = 1;
 
 	FTRACE(3);
 	assert(sa);
 
-	h = socket(sa->sa_family, SOCK_RAW, IPPROTO_ICMP);
+	h = socket(sa->sa.sa_family ? sa->sa.sa_family : AF_INET, SOCK_RAW, IPPROTO_ICMP);
 	if (h == -1) {
 		printf("Error:: Cant open raw socket #%d - %s\n", errno, strerror(errno));
 		return -1;
@@ -147,7 +147,7 @@ PrepareL3(const struct sockaddr *sa, int *bpflen)
 		return -1;
 	}
 	*/
-	if (bind(h, sa, sizeof(struct sockaddr)) == -1) {
+	if (sa->sa.sa_family && bind(h, &sa->sa, sa->sa.sa_len) == -1) {
 		printf("Error:: Cant bind to raw socket #%d - %s\n", errno, strerror(errno));
 		close(h);
 		return -1;
@@ -163,7 +163,7 @@ PrepareL3(const struct sockaddr *sa, int *bpflen)
 
 char
 icmpRecv(int s, u_int * __restrict seq, u_short * __restrict id, u_int * __restrict crypted, 
-		u_char * __restrict data, int * __restrict datlen, struct sockaddr *sa, socklen_t *salen)
+		u_char * __restrict data, int * __restrict datlen, io_sockaddr_t *sa, socklen_t *salen)
 {
 	int ret = 0;
 	struct icmp *icmp;
@@ -171,7 +171,7 @@ icmpRecv(int s, u_int * __restrict seq, u_short * __re
 	u_char buf[USHRT_MAX] = { 0 };
 	u_int crc;
 
-	ret = recvfrom(s, buf, sizeof buf, 0, sa, salen);
+	ret = recvfrom(s, buf, sizeof buf, 0, &sa->sa, salen);
 	if (ret == -1) {
 		ERR("Receive recvfrom() #%d - %s", errno, strerror(errno));
 		return ANSH_FLG_ERR;
@@ -237,7 +237,7 @@ icmpRecv(int s, u_int * __restrict seq, u_short * __re
 
 int
 icmpSend(int s, u_int seq, u_short id, char flg, u_int crypted, u_char *data, int datlen, 
-		struct sockaddr *sa, socklen_t salen)
+		io_sockaddr_t *sa, socklen_t salen)
 {
 	u_char *pos, buf[USHRT_MAX] = { 0 };
 	struct icmp *icmp;
@@ -270,7 +270,7 @@ icmpSend(int s, u_int seq, u_short id, char flg, u_int
 	icmp->icmp_cksum = crcIP(buf, sizeof(struct icmp) + sizeof(struct ansh_hdr) + datlen);
 
 	if ((ret = sendto(s, buf, sizeof(struct icmp) + sizeof(struct ansh_hdr) + datlen, 
-					0, sa, salen)) == -1) {
+					0, &sa->sa, salen)) == -1) {
 		ERR("Send sendto() #%d - %s", errno, strerror(errno));
 		return ANSH_FLG_ERR;
 	} else
@@ -285,9 +285,9 @@ icmpSend(int s, u_int seq, u_short id, char flg, u_int
 }
 
 static int
-_pkt_Send(int s, u_int seq, char flg, u_int crypted, u_char *data, int datlen, struct io_ether_addr *ea)
+_pkt_Send(int s, u_int seq, char flg, u_int crypted, u_char *data, int datlen, io_ether_addr_t *ea)
 {
-	u_char *pos, buf[USHRT_MAX] = { 0 };
+	u_char *pos, *str, buf[USHRT_MAX] = { 0 };
 	struct ether_header *e = (struct ether_header*) buf;
 	struct ansh_hdr *hdr;
 	int ret = 0;
@@ -303,6 +303,14 @@ _pkt_Send(int s, u_int seq, char flg, u_int crypted, u
 
 	memcpy(pos, data, datlen);
 
+	if (Crypted) {
+		str = cryptBuffer(pos, datlen, Crypted);
+		if (str) {
+			memcpy(pos, str, datlen);
+			free(str);
+		}
+	}
+
 	hdr->ansh_ver = ANSH_VERSION;
 	hdr->ansh_flg = flg;
 	hdr->ansh_len = htons(datlen + sizeof(struct ansh_hdr));
@@ -354,6 +362,7 @@ _pkt_Recv(u_char * __restrict buf, int rlen, u_int * _
 	struct bpf_hdr *bpf;
 	struct ansh_hdr *hdr;
 	u_int crc;
+	u_char *str;
 
 	if (rlen < (sizeof(struct bpf_hdr) + ETHER_HDR_LEN + sizeof(struct ansh_hdr))) {
 		VERB(1) LOG("Discard packet too short %d ...", rlen);
@@ -404,6 +413,16 @@ _pkt_Recv(u_char * __restrict buf, int rlen, u_int * _
 	/* select data */
 	if (data) {
 		*datlen = ntohs(hdr->ansh_len) - sizeof(struct ansh_hdr);
+		if (Crypted) {
+			str = cryptBuffer(buf + bpf->bh_hdrlen + ETHER_HDR_LEN + sizeof(struct ansh_hdr), 
+					*datlen, Crypted);
+			if (str) {
+				memcpy(buf + bpf->bh_hdrlen + ETHER_HDR_LEN + sizeof(struct ansh_hdr), 
+						str, *datlen);
+				free(str);
+			}
+		}
+
 		memcpy(data, buf + bpf->bh_hdrlen + ETHER_HDR_LEN + sizeof(struct ansh_hdr), *datlen);
 	}
 
@@ -534,7 +553,7 @@ stopProcess(sched_root_task_t * __restrict root, proc_
 
 	ioFreePTY(p->proc_pty, p->proc_ttyname);
 	if (p->proc_pty)
-		schedCancelby(root, NULL, CRITERIA_FD, (void*) ((intptr_t) p->proc_pty), NULL);
+		schedCancelby(root, taskMAX, CRITERIA_FD, (void*) ((intptr_t) p->proc_pty), NULL);
 
 	p->proc_pty = 0;
 	p->proc_pid = 0;
@@ -542,6 +561,6 @@ stopProcess(sched_root_task_t * __restrict root, proc_
 	p->proc_flg = ANSH_FLG_EOF;
 	p->proc_rlen_[FD2NET] = 0;
 
-	schedCallOnce(root, func, p, p->proc_sock);
+	schedCallOnce(root, func, p, p->proc_sock, NULL, 0);
 	return 0;
 }