--- ansh/src/utils.c	2012/07/22 22:41:33	1.4
+++ ansh/src/utils.c	2015/05/19 23:25:30	1.5
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: utils.c,v 1.4 2012/07/22 22:41:33 misho Exp $
+ * $Id: utils.c,v 1.5 2015/05/19 23:25:30 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -128,7 +128,7 @@ PrepareL2(const char *psDev, int *bpflen)
 }
 
 int
-PrepareL3(const io_sockaddr_t *sa, int *bpflen)
+PrepareL3(const sockaddr_t *sa, int *bpflen)
 {
 	int h, n = 1;
 
@@ -163,7 +163,7 @@ PrepareL3(const io_sockaddr_t *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, io_sockaddr_t *sa, socklen_t *salen)
+		u_char * __restrict data, int * __restrict datlen, sockaddr_t *sa, socklen_t *salen)
 {
 	int ret = 0;
 	struct icmp *icmp;
@@ -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, 
-		io_sockaddr_t *sa, socklen_t salen)
+		sockaddr_t *sa, socklen_t salen)
 {
 	u_char *pos, buf[USHRT_MAX] = { 0 };
 	struct icmp *icmp;
@@ -285,7 +285,7 @@ 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, io_ether_addr_t *ea)
+_pkt_Send(int s, u_int seq, char flg, u_int crypted, u_char *data, int datlen, ether_addr_t *ea)
 {
 	u_char *pos, *str, buf[USHRT_MAX] = { 0 };
 	struct ether_header *e = (struct ether_header*) buf;
@@ -297,7 +297,7 @@ _pkt_Send(int s, u_int seq, char flg, u_int crypted, u
 		return ANSH_FLG_ERR;
 
 	e->ether_type = ntohs(ANSH_ID);
-	memcpy(e->ether_dhost, ea->ether_addr_octet, ETHER_ADDR_LEN);
+	memcpy(e->ether_dhost, ea->octet, ETHER_ADDR_LEN);
 	hdr = (struct ansh_hdr*) (buf + ETHER_HDR_LEN);
 	pos = ((u_char*) hdr) + sizeof(struct ansh_hdr);
 
@@ -307,7 +307,7 @@ _pkt_Send(int s, u_int seq, char flg, u_int crypted, u
 		str = cryptBuffer(pos, datlen, Crypted);
 		if (str) {
 			memcpy(pos, str, datlen);
-			io_free(str);
+			e_free(str);
 		}
 	}
 
@@ -334,7 +334,7 @@ _pkt_Send(int s, u_int seq, char flg, u_int crypted, u
 }
 
 int
-pktSend(int s, u_int seq, char flg, u_int crypted, u_char *data, int datlen, struct io_ether_addr *ea)
+pktSend(int s, u_int seq, char flg, u_int crypted, u_char *data, int datlen, struct e_ether_addr *ea)
 {
 	int wlen, ret = 0;
 	u_char *pos = data;
@@ -419,7 +419,7 @@ _pkt_Recv(u_char * __restrict buf, int rlen, u_int * _
 			if (str) {
 				memcpy(buf + bpf->bh_hdrlen + ETHER_HDR_LEN + sizeof(struct ansh_hdr), 
 						str, *datlen);
-				io_free(str);
+				e_free(str);
 			}
 		}
 
@@ -446,7 +446,7 @@ pktRecv(int s, u_int * __restrict seq, u_int * __restr
 	else
 		memset(data, 0, *datlen);
 
-	if (!(buf = io_malloc(*datlen))) {
+	if (!(buf = e_malloc(*datlen))) {
 		ERR("malloc() #%d - %s", errno, strerror(errno));
 		return ANSH_FLG_ERR;
 	}
@@ -454,7 +454,7 @@ pktRecv(int s, u_int * __restrict seq, u_int * __restr
 	rlen = read(s, buf, *datlen);
 	if (rlen == -1) {
 		ERR("Receive packet() #%d - %s", errno, strerror(errno));
-		io_free(buf);
+		e_free(buf);
 		return ANSH_FLG_ERR;
 	} else
 		VERB(4) LOG("Get packet with len=%d", rlen);
@@ -462,7 +462,7 @@ pktRecv(int s, u_int * __restrict seq, u_int * __restr
 	/* check header len */
 	if (rlen < (sizeof(struct bpf_hdr) + ETHER_HDR_LEN + sizeof(struct ansh_hdr))) {
 		VERB(1) LOG("Discard packet too short %d ...", rlen);
-		io_free(buf);
+		e_free(buf);
 		return ANSH_FLG_ERR;
 	} else {
 		bpf = (struct bpf_hdr*) buf;
@@ -473,7 +473,7 @@ pktRecv(int s, u_int * __restrict seq, u_int * __restr
 	ptr = next = buf;
 	ptrlen = nextlen = rlen;
 	if ((flg = _pkt_Recv(ptr, ptrlen, seq, crypted, pos, &buflen, &next, &nextlen)) == -1) {
-		io_free(buf);
+		e_free(buf);
 		return ANSH_FLG_ERR;
 	} else {
 		pos += buflen;
@@ -492,7 +492,7 @@ pktRecv(int s, u_int * __restrict seq, u_int * __restr
 			ptrlen = nextlen;
 		}
 
-	io_free(buf);
+	e_free(buf);
 
 	return flg;
 }