--- libaitio/inc/aitio.h	2011/10/07 10:41:11	1.11.2.25
+++ libaitio/inc/aitio.h	2011/11/02 13:13:48	1.12.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.11.2.25 2011/10/07 10:41:11 misho Exp $
+* $Id: aitio.h,v 1.12.2.3 2011/11/02 13:13:48 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -54,6 +54,10 @@ SUCH DAMAGE.
 #include <openssl/aes.h>
 #include <sys/tty.h>
 #include <sys/ioctl_compat.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <net/if_dl.h>
+#include <netinet/in.h>
 
 
 #define VACUUM_LEFT	1
@@ -232,7 +236,21 @@ typedef struct {
 						AIT_LEN(__val) = 0; \
 					} while (0)
 
+struct io_ether_addr {
+	u_int8_t ether_addr_octet[6];
+};
+typedef struct io_ether_addr io_ether_addr_t;
 
+typedef union {
+	struct sockaddr_storage	ss;
+	struct sockaddr		sa;
+	struct sockaddr_un	sun;
+	struct sockaddr_in	sin;
+	struct sockaddr_in6	sin6;
+	struct sockaddr_dl	sdl;
+} io_sockaddr_t;
+
+
 // io_GetErrno() Get error code of last operation
 inline int io_GetErrno();
 // io_GetError() Get error text of last operation
@@ -240,6 +258,22 @@ inline const char *io_GetError();
 
 
 /*
+ * io_ether_ntoa() Convert ethernet address to string
+ * @n = ethernet address structure, like struct ether_addr
+ * @a = string
+ * @len = string length
+ * return: NULL error or !=NULL string a
+ */
+inline char *io_ether_ntoa(const struct io_ether_addr *n, char * __restrict a, int len);
+/*
+ * io_ether_aton() Convert string to ethernet address
+ * @a = string
+ * @e = ethernet address structure, like struct ether_addr
+ * return: NULL error or !=NULL ethernet address structure
+ */
+inline struct io_ether_addr *io_ether_aton(const char *a, struct io_ether_addr *e);
+
+/*
  * io_vals2buffer() Marshaling data from array with variables to buffer
  * @buf = Buffer
  * @buflen = Size of buffer
@@ -846,6 +880,25 @@ pid_t ioForkPTY(int *ptyfd, char * __restrict name, in
  * return: -1 error or 0 ok
  */
 inline int ioCreatePIDFile(const char *csName, int ifExists);
+
+/*
+ * ioSendFile() AITNET sendfile() userland implementation, not dependant from OS
+ * @s = socket
+ * @csFile = file for send
+ * @sendLen = bytes to send, if 0 send all data
+ * @offset = start file offset
+ * return: 0 error, >0 ok, sended bytes
+ */
+size_t ioSendFile(int s, const char *csFile, size_t sendLen, off_t offset);
+/*
+ * ioRecvFile() Receive file from socket, fastest (zero-copy) way
+ * @s = socket
+ * @csFile = file for receive
+ * @recvLen = receive bytes
+ * @over = overwrite file if exists with mode like 0644
+ * return: 0 error, >0 ok, received bytes
+ */
+size_t ioRecvFile(int s, const char *csFile, size_t recvLen, int over);
 
 
 #endif