--- libaitwww/inc/aitwww.h	2012/08/06 12:02:05	1.4.2.3
+++ libaitwww/inc/aitwww.h	2013/01/17 14:07:19	1.5.4.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitwww.h,v 1.4.2.3 2012/08/06 12:02:05 misho Exp $
+* $Id: aitwww.h,v 1.5.4.1 2013/01/17 14:07:19 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
@@ -50,7 +50,7 @@ SUCH DAMAGE.
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/uio.h>
-#include <aitio.h>
+#include <elwix.h>
 
 
 /* URL staff ... */
@@ -61,17 +61,17 @@ typedef struct _tagURLItem {
 } url_Item_t;
 
 struct tagIOURL {
-	unsigned char	url_line[BUFSIZ];
+	ait_val_t	url_line;
 
-	url_Item_t	url_tech;
-	url_Item_t	url_user;
-	url_Item_t	url_pass;
-	url_Item_t	url_host;
-	url_Item_t	url_port;
-	url_Item_t	url_path;
-	url_Item_t	url_args;
+	ait_val_t	url_tech;
+	ait_val_t	url_user;
+	ait_val_t	url_pass;
+	ait_val_t	url_host;
+	ait_val_t	url_port;
+	ait_val_t	url_path;
+	ait_val_t	url_args;
 
-	char		*url_reserved;
+	unsigned char	*url_reserved;
 };
 
 struct tagReqXML {
@@ -232,7 +232,7 @@ int www_cmptype(const char *ct, const char *type);
  *
  * @str = query string
  * @delim = delimiter
- * return: NULL error or AV pair, must be io_free() after use!
+ * return: NULL error or AV pair, must be e_free() after use!
  */
 ait_val_t *www_getpair(char ** __restrict str, const char *delim);
 /*
@@ -253,12 +253,26 @@ inline void www_unescape(char * __restrict str);
  * www_undot() - Undotted and clean WWW query filename
  *
  * @pname = query filename
- * return: =NULL error or !=NULL allocated valid filename, after use you must call io_freeVar()
+ * return: =NULL error or !=NULL allocated valid filename, after use you must call ait_freeVar()
  */
 ait_val_t *www_undot(const char * __restrict pname);
 
 
 /*
+ * www_URLInit() - Init URL structure and free old one
+ *
+ * @url = Input URL
+ * return: -1 error or 0 ok
+ */
+inline int www_URLInit(struct tagIOURL * __restrict url);
+/*
+ * www_URLFree() - URL free structure
+ *
+ * @url = Input parsed URL
+ * return: none
+ */
+inline void www_URLFree(struct tagIOURL * __restrict url);
+/*
  * www_URLGet() - Parse and get data from input URL
  *
  * @csURL = Input URL line
@@ -266,16 +280,15 @@ ait_val_t *www_undot(const char * __restrict pname);
  * return: 0 error format not find tech:// and return URL like path; 
  *		-1 error:: can`t read; >0 ok, up bits for known elements
  */
-int www_URLGet(const char *csURL, struct tagIOURL *url);
+int www_URLGet(const char *csURL, struct tagIOURL * __restrict url);
 /*
  * www_URLGetFile() - Get file from parsed URL
  *
  * @url = Input parsed URL
- * @psValue = Return filename, if not specified file in url path, replace with /
- * @valLen = Size of psValue array
- * return: -1 error:: can`t read; 0 ok
+ * @value = Return filename, if not specified file in url path, replace with /
+ * return: -1 error, 0 filename from path, 1 filename or 2 not specified filename
  */
-int www_URLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);
+int www_URLGetFile(struct tagIOURL * __restrict url, ait_val_t * __restrict value);
 
 /*
  * www_XMLGet() - Parse and get data from input XML request string 
@@ -286,6 +299,21 @@ int www_URLGetFile(struct tagIOURL *url, char * __rest
  * return: 0 error format incorrect, -1 error:: can`t read; >0 ok readed elements bits
  */
 int www_XMLGet(const char *csXML, struct tagReqXML *xml);
+
+/*
+ * www_b64encode() - Base64 encode function
+ *
+ * @src = source data
+ * return: NULL error or !=NULL encoded variable, after use call ait_freeVar()
+ */
+ait_val_t *www_b64encode(ait_val_t * __restrict src);
+/*
+ * www_b64decode() - Base64 decode function
+ *
+ * @src = source encoded data
+ * return: NULL error or !=NULL decoded variable, after use call ait_freeVar()
+ */
+ait_val_t *www_b64decode(ait_val_t * __restrict src);
 
 
 #endif