[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3247 - in GNUnet/libwebserver: include src
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r3247 - in GNUnet/libwebserver: include src |
|
Date: |
Fri, 18 Aug 2006 16:00:18 -0700 (PDT) |
Author: grothoff
Date: 2006-08-18 16:00:08 -0700 (Fri, 18 Aug 2006)
New Revision: 3247
Added:
GNUnet/libwebserver/src/outstream.c
GNUnet/libwebserver/src/outstream.h
Removed:
GNUnet/libwebserver/src/config.h
GNUnet/libwebserver/src/debug.h
GNUnet/libwebserver/src/error.c
GNUnet/libwebserver/src/error.h
GNUnet/libwebserver/src/gethandler.c
GNUnet/libwebserver/src/gethandler.h
GNUnet/libwebserver/src/logo.h
GNUnet/libwebserver/src/module.c
GNUnet/libwebserver/src/module.h
GNUnet/libwebserver/src/outgif.c
GNUnet/libwebserver/src/outgif.h
GNUnet/libwebserver/src/outstream.c
GNUnet/libwebserver/src/outstream.h
GNUnet/libwebserver/src/server.h
GNUnet/libwebserver/src/socket.c
GNUnet/libwebserver/src/weblog.c
GNUnet/libwebserver/src/weblog.h
Modified:
GNUnet/libwebserver/include/webserver_gnunet.h
GNUnet/libwebserver/src/Makefile.am
GNUnet/libwebserver/src/client.c
GNUnet/libwebserver/src/client.h
GNUnet/libwebserver/src/clientinfo.c
GNUnet/libwebserver/src/clientinfo.h
GNUnet/libwebserver/src/memory.c
GNUnet/libwebserver/src/memory.h
GNUnet/libwebserver/src/server.c
GNUnet/libwebserver/src/socket.h
GNUnet/libwebserver/src/utils.c
GNUnet/libwebserver/src/utils.h
Log:
first round of API cleanup
Modified: GNUnet/libwebserver/include/webserver_gnunet.h
===================================================================
--- GNUnet/libwebserver/include/webserver_gnunet.h 2006-08-18 21:41:52 UTC
(rev 3246)
+++ GNUnet/libwebserver/include/webserver_gnunet.h 2006-08-18 23:00:08 UTC
(rev 3247)
@@ -0,0 +1,44 @@
+/*
+ This file is part of GNUnet.
+ (C) 2006 Christian Grothoff (and other contributing authors)
+ (C) 2002 Luis Figueiredo (address@hidden)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file include/webserver_gnunet.h
+ * @brief public interface to libwebserver_gnunet
+ *
+ * @author Christian Grothoff
+ * @author Luis Figueiredo
+ */
+
+struct web_server;
+
+int web_server_init(struct web_server * handle,
+ int port,
+ int flags);
+
+void web_server_shutdown(struct web_server *);
+
+int web_server_addhandler(struct web_server * hande,
+ const char *,
+ void (*handler)(),
+ void * hctx);
+
+int web_server_run(struct web_server *);
+
Modified: GNUnet/libwebserver/src/Makefile.am
===================================================================
--- GNUnet/libwebserver/src/Makefile.am 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/Makefile.am 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,25 +1,20 @@
SUBDIRS = .
-INCLUDES = -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/include
lib_LTLIBRARIES = libwebserver_gnunet.la
AM_CFLAGS = \
- -D_SERVER_VERSION="\"0.6.3-GNUnet\""
+ -D_SERVER_VERSION="\"0.6.3-GNUnet\""
libwebserver_gnunet_la_SOURCES = \
clientinfo.c \
server.c \
client.c \
gethandler.c \
- socket.c \
memory.c \
- outstream.c \
- weblog.c \
utils.c \
- fnmatch.c \
- outgif.c \
- error.c
+ fnmatch.c
libwebserver_gnunet_la_LDFLAGS = \
-version-info 0:0:0
Modified: GNUnet/libwebserver/src/client.c
===================================================================
--- GNUnet/libwebserver/src/client.c 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/client.c 2006-08-18 23:00:08 UTC (rev 3247)
@@ -14,12 +14,9 @@
#include "client.h"
+#include "outstream.h"
+#include "clientinfo.h"
-
-extern char *_libwebserver_version; // Defined in server.c
-
-
-struct web_client *current_web_client;
int WEBTIMEOUT=10000;
/*********************************************************************************************************/
@@ -30,7 +27,6 @@
struct web_client *ret;
ret=__ILWS_malloc(sizeof(struct web_client));
if(ret==NULL) {
- LWSERR(LE_MEMORY);
return NULL;
};
#ifdef HAVE_OPENSSL
@@ -182,7 +178,7 @@
} else {
datasize=node->rbufsize-node->headersize;
if(node->contentlength==0) { // well if it 0
read all at once
- __ILWS_init_clientinfo(); // always
call this?
+ __ILWS_init_clientinfo(); // always call this?
node->contentlength=atol(ClientInfo->Header("Content-Length"));
// range for resuming
if((tmp3=strstr(ClientInfo->Header("Range"),"bytes="))) { // if it is in bytes
(i hope, always)
@@ -212,7 +208,6 @@
node->rbufsize+=tmp;
tmp2=__ILWS_realloc(node->rbuf,node->rbufsize+1);
if(tmp2==NULL) {
- LWSERR(LE_MEMORY);
node->stat=5;
return;
@@ -420,10 +415,7 @@
return;
};
- }else {
- LWSERR(LE_FILESYS);
-
- };
+ }
node->stat=4;
if(node->HTTPdirective==NULL) {
if(node->range>0) {
@@ -475,7 +467,6 @@
if(tstream->next->fname!=NULL) {
if(tstream->next->fstream==NULL) {
if((tstream->next->fstream=fopen(tstream->next->fname,"rb"))==NULL) {
- LWSERR(LE_FILESYS);
__ILWS_delete_next_outstream(tstream);
//node->outstream->next=tstream->next;
return;
@@ -506,7 +497,6 @@
if(namesize>0) {
if(namesize==1) { // this is $;
for sure
if(!(tmp3=__ILWS_malloc(2))) {
-
LWSERR(LE_MEMORY);
node->stat=5;
return;
};
@@ -514,7 +504,6 @@
tmp3[namesize]=0;
} else {
if(!(tmp3=__ILWS_malloc(namesize))) {
-
LWSERR(LE_MEMORY);
node->stat=5;
return;
};
@@ -547,7 +536,6 @@
tstream->next->rsize=(beginsize+varsize);
tstream->next->varsize+=(varsize-namesize)-1;
} else {
- LWSERR(LE_MEMORY);
__ILWS_free(tmp3);
node->stat=5;
return;
@@ -655,7 +643,6 @@
if(size<1) return NULL;
if(!(ret=__ILWS_malloc(size+1))) {
- LWSERR(LE_MEMORY);
return NULL;
};
memcpy(ret,current_web_client->rbuf,size);
@@ -677,7 +664,6 @@
if(size<1) return NULL;
if(!(ret=__ILWS_malloc(size+1))) {
- LWSERR(LE_MEMORY);
return NULL;
};
memcpy(ret,current_web_client->rbuf,size);
@@ -704,7 +690,6 @@
nfd=dup(fileno(stdout));
nfile=fdopen(nfd,"wb+");
if(!__ILWS_add_outstream(current_web_client->outstream,fname,nfile,1)) {
- LWSERR(LE_MEMORY);
return 0;
};
};
@@ -913,7 +898,6 @@
struct web_var *__ILWS_init_var_list() {
struct web_var *ret;
if(!(ret=__ILWS_malloc(sizeof(struct web_var)))) {
- LWSERR(LE_MEMORY);
return NULL;
};
ret->name=NULL;
@@ -934,19 +918,16 @@
};
if(!(node->next=__ILWS_malloc(sizeof(struct web_var)))) {
- LWSERR(LE_MEMORY);
return 0;
};
if(!(node->next->name=__ILWS_malloc(namesize+1))) {
- LWSERR(LE_MEMORY);
return 0;
};
memcpy(node->next->name,name,namesize);
node->next->name[namesize]=0;
if(!(node->next->value=__ILWS_malloc(valuesize+1))) {
- LWSERR(LE_MEMORY);
return 0;
};
memcpy(node->next->value,value,valuesize);
Modified: GNUnet/libwebserver/src/client.h
===================================================================
--- GNUnet/libwebserver/src/client.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/client.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -25,41 +25,12 @@
#include <string.h>
#include <errno.h>
-
-
-#ifdef HAVE_OPENSSL
-
-#include <openssl/rsa.h> /* SSLeay stuff */
-#include <openssl/crypto.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
-#endif
-
-
#include "socket.h"
-
#include "memory.h"
-#include "outstream.h"
-
-
-#include "gethandler.h"
-
-
-
-#include "weblog.h"
#include "utils.h"
#include "fnmatch.h"
-#include "outgif.h"
-#include "error.h"
-#include "debug.h"
-
-
#include "clientinfo.h"
-
#ifdef WIN32
#include "flock.h" // my flock
#include "dirent.h"
@@ -68,89 +39,98 @@
#include <dirent.h>
#endif
+struct gethandler {
+ char * str;
+ void (*func)();
+ void * ctx;
+ struct gethandler * next;
+};
+
+
+
#define READMAX 100000 // 1Mb upload
+
#define WRITEMAX 100000 // 1Mb download 1mb per client? // smaller is better
for multi read bigger is better for big downloads
+
#define MAXURLSIZE 2000 //
extern int WEBTIMEOUT; //to be changed externaly
//#define WEBTIMEOUT 10000 // TIMEOUT WITHOUT RECEIVING DATA (not in seconds
but in read tries)
-
struct web_var {
- char *name;
- char *value;
- struct web_var *next;
+ char *name;
+ char *value;
+ struct web_var *next;
};
struct web_client {
-
- int socket;
- struct sockaddr_in sa;
- unsigned int salen;
- char *HTTPdirective;
- unsigned char stat; /* 0001b idle,0010b down streaming, 0011 done down
streaming, 0100b out streaming,0101 done out streaming */
- // Read control
- char *rbuf;
- unsigned long rbufsize;
- int newdata_try;
- unsigned long contentlength; // for read propose (optimize speed 0.5.1)
- unsigned long headersize;
-
- // Write control
- struct outstream *outstream;
- struct web_var *varlist;
- char *cookies; // cookie header (0.5.1)
- long writelength;
- long readsize;
- long range;
- int skipped;
- long wheadersize;
-// clock_t oldcl,curcl;
-
-#ifdef HAVE_OPENSSL
- SSL *ssl;
- X509* cert;
-#else
- void *pad[2];
-#endif
- struct web_client *next;
+ int socket;
+ struct sockaddr_in sa;
+ unsigned int salen;
+ char *HTTPdirective;
+ unsigned char stat; /* 0001b idle,0010b down streaming, 0011 done down
streaming, 0100b out streaming,0101 done out streaming */
+ // Read control
+ char *rbuf;
+ unsigned long rbufsize;
+ int newdata_try;
+ unsigned long contentlength; // for read propose (optimize speed 0.5.1)
+ unsigned long headersize;
+
+ // Write control
+ struct outstream *outstream;
+ struct web_var *varlist;
+ char *cookies; // cookie header (0.5.1)
+ long writelength;
+ long readsize;
+ long range;
+ int skipped;
+ long wheadersize;
+ struct web_client * next;
};
-extern struct web_client *current_web_client;
-struct web_client *__ILWS_init_client_list();
-int __ILWS_add_client(struct web_client *,struct web_client *);
+struct web_client *__ILWS_init_client_list(void);
+
+int __ILWS_add_client(struct web_client *,
+ struct web_client *);
+
void __ILWS_delete_next_client(struct web_client *);
+
void __ILWS_delete_client_list(struct web_client *);
void __ILWS_read_client(struct web_client *);
+
void __ILWS_process_client(struct web_client *,struct gethandler *);
+
void __ILWS_output_client(struct web_client *);
void __ILWS_web_client_writef(struct web_client *,const char *,...);
int web_client_addfile(char *);
+
void web_client_contenttype(char *); // new on 0.5.2
-void web_client_gifsetpalette(const char *);
-
-extern unsigned char __ILWS_GLOBALGIFPAL[256][3];
-
-int web_client_gifoutput(char *,int,int,int);
-
void web_client_HTTPdirective(char *);
char *__ILWS_web_client_getreqline();
+
char *__ILWS_web_client_getreq();
+
// new (0.5.1)
int web_client_setvar(char *,char *);
+
char *web_client_getvar(char *);
+
int web_client_delvar(char *);
// put in var.h
struct web_var *__ILWS_init_var_list();
+
int __ILWS_add_var(struct web_var *, char *, char *);
+
int __ILWS_del_var(struct web_var *, char *);
+
void __ILWS_delete_var_list(struct web_var *);
+
char *__ILWS_get_var(struct web_var *list , char *name);
int __ILWS_lws_list(char *); // new on 0.5.2
Modified: GNUnet/libwebserver/src/clientinfo.c
===================================================================
--- GNUnet/libwebserver/src/clientinfo.c 2006-08-18 21:41:52 UTC (rev
3246)
+++ GNUnet/libwebserver/src/clientinfo.c 2006-08-18 23:00:08 UTC (rev
3247)
@@ -14,20 +14,16 @@
#include "clientinfo.h"
-
-struct ClientInfo *ClientInfo; // tochange
-
/*********************************************************************************************************/
/*
* Initialize ClientInfo structure
*/
-void __ILWS_init_clientinfo() {
+void __ILWS_init_clientinfo(struct ClientInfo *ClientInfo) {
char *t;
struct outstream *tstream=current_web_client->outstream;
ClientInfo=__ILWS_malloc(sizeof(struct ClientInfo));
if(ClientInfo==NULL) {
- LWSERR(LE_MEMORY);
return;
};
@@ -74,26 +70,24 @@
}
-/*********************************************************************************************************/
/*
* Free ClientInfo structure
*/
-void __ILWS_free_clientinfo() {
- if(ClientInfo==NULL) {
- return;
- };
- __ILWS_delete_buffer_list(ClientInfo->mem);
-
- __ILWS_free(ClientInfo);
- ClientInfo=NULL;
+void __ILWS_free_clientinfo(struct ClientInfo *ClientInfo) {
+ if(ClientInfo==NULL) {
+ return;
+ };
+ __ILWS_delete_buffer_list(ClientInfo->mem);
+
+ __ILWS_free(ClientInfo);
+ ClientInfo=NULL;
}
-/*********************************************************************************************************/
/*
* Header function for ClientInfo->Header("x")
*/
-char *__ILWS_Header(char *str) {
+char *__ILWS_Header(struct ClientInfo *ClientInfo, char *str) {
char *tmp1,*tmp2,*tmp3,*ret;
struct _Header *hl=ClientInfo->HeaderList;
char *defret="";
@@ -106,7 +100,6 @@
ClientInfo->HeaderList=__ILWS_add_buffer(ClientInfo->mem,sizeof(struct
_Header));
if(ClientInfo->HeaderList==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
ClientInfo->HeaderList->next=NULL;
@@ -129,11 +122,9 @@
/* Doesn't exists */
strsize=strlen(str);
if(!(hl->next=__ILWS_add_buffer(ClientInfo->mem,sizeof(struct
_Header)))) {
- LWSERR(LE_MEMORY);
return defret;
};
if(!(hl->next->id=__ILWS_add_buffer(ClientInfo->mem,strsize+1))) {
- LWSERR(LE_MEMORY);
return defret;
};
@@ -143,7 +134,6 @@
hl->next->next=NULL;
if(!(tmp3=__ILWS_malloc(strsize+3))) {
- LWSERR(LE_MEMORY);
return defret;
};
snprintf(tmp3,strsize+3,"%s: ",str);
@@ -169,13 +159,10 @@
return ret;
}
-
-
-/*********************************************************************************************************/
/*
* Function for Querydata
*/
-char *__ILWS_Query(char *handle) {
+char *__ILWS_Query(struct ClientInfo *ClientInfo, char *handle) {
char *tmp1,*tmp2,*tmp3,*tmp4,*ret;
char *defret="";
size_t strsize;
@@ -198,7 +185,6 @@
if(ClientInfo->QueryList==NULL) {
ClientInfo->QueryList=__ILWS_add_buffer(ClientInfo->mem,sizeof(struct _Query));
if(ClientInfo->QueryList==NULL) {
- LWSERR(LE_MEMORY);
if(rw) return 0;
return defret;
};
@@ -301,13 +287,11 @@
// Working here ^
ql->next=__ILWS_add_buffer(ClientInfo->mem,sizeof(struct
_Query));
if(ql->next==NULL) {
- LWSERR(LE_MEMORY);
if(handle[0]=='#') rw=1;
return defret;
};
ql->next->id=__ILWS_add_buffer(ClientInfo->mem,strsize+1);
if(ql->next->id==NULL) {
- LWSERR(LE_MEMORY);
if(handle[0]=='#') rw=1;
return defret;
};
@@ -339,7 +323,6 @@
ql->next->data=__ILWS_add_buffer(ClientInfo->mem,size+1);
if(ql->next->data==NULL) {
- LWSERR(LE_MEMORY);
if(handle[0]=='#') rw=1;
return defret;
};
@@ -353,7 +336,6 @@
tmp1=__ILWS_malloc(3);
if(tmp1==NULL) {
- LWSERR(LE_MEMORY);
if(rw) return 0;
return defret;
};
@@ -378,13 +360,10 @@
return ret;
}
-
-
-/*********************************************************************************************************/
/*
* Function for Postdata
*/
-char *__ILWS_Post(char *handle) {
+char *__ILWS_Post(struct ClientInfo *ClientInfo, char *handle) {
char *tmp1,*tmp2,*tmp3,*ret;
struct _Post *pl=ClientInfo->PostList;
char *defret="";
@@ -408,7 +387,6 @@
/* Allocate the list */
if(ClientInfo->PostList==NULL) {
if(!(ClientInfo->PostList=__ILWS_add_buffer(ClientInfo->mem,sizeof(struct
_Post)))) {
- LWSERR(LE_MEMORY);
if(rw) return 0;
return defret;
};
@@ -491,13 +469,11 @@
pl->next=__ILWS_add_buffer(ClientInfo->mem,sizeof(struct
_Post));
if(pl->next==NULL) {
- LWSERR(LE_MEMORY);
if(rw) return 0;
return defret;
};
pl->next->id=__ILWS_add_buffer(ClientInfo->mem,strsize+1);
if(pl->next->id==NULL) {
- LWSERR(LE_MEMORY);
if(rw) return 0;
return defret;
};
@@ -526,7 +502,6 @@
pl->next->data=__ILWS_add_buffer(ClientInfo->mem,size+1);
if(pl->next->data==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
j=0;
@@ -539,7 +514,6 @@
tmp1=__ILWS_malloc(3);
if(tmp1==NULL) {
- LWSERR(LE_MEMORY);
if(rw) return 0;
return defret;
};
@@ -566,13 +540,10 @@
return ret;
}
-
-
-/*********************************************************************************************************/
/*
* Function for MultiPart formdata
*/
-struct _MultiPart __ILWS_MultiPart(char *handle) {
+struct _MultiPart __ILWS_MultiPart(struct ClientInfo *ClientInfo, char
*handle) {
char *tmp1,*tmp2,*tmp3;
int i;
char *name;
@@ -588,7 +559,6 @@
if(ClientInfo->MultiPartList==NULL) {
ClientInfo->MultiPartList=__ILWS_add_buffer(ClientInfo->mem,sizeof(struct
_MultiPart));
if(ClientInfo->MultiPartList==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
ClientInfo->MultiPartList->next=NULL;
@@ -613,12 +583,10 @@
strsize=strlen(handle);
ml->next=__ILWS_add_buffer(ClientInfo->mem,sizeof(struct _MultiPart));
if(ml->next==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
ml->next->id=__ILWS_add_buffer(ClientInfo->mem,strsize+1);
if(ml->next->id==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
memcpy(ml->next->id,handle,strsize);
@@ -637,7 +605,6 @@
boundarysize=tmp2-tmp1;
boundary=__ILWS_add_buffer(ClientInfo->mem,boundarysize+3);
if(boundary==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
memcpy(boundary,tmp1,boundarysize);
@@ -648,7 +615,6 @@
namesize=boundarysize+41+strlen(handle);
name=__ILWS_add_buffer(ClientInfo->mem,namesize+1);
if(name==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
snprintf(name,namesize,"%s\r\nContent-Disposition: form-data;
name=",boundary);
@@ -681,7 +647,6 @@
tmp3=strstr(tmp2,"\r\n");
ml->next->filename=__ILWS_add_buffer(ClientInfo->mem,(tmp3-tmp2)+1);
if(ml->next->filename==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
memcpy(ml->next->filename,tmp2,tmp3-tmp2);
@@ -704,7 +669,6 @@
// copy data to node
if(!(ml->next->data=__ILWS_add_buffer(ClientInfo->mem,(tmp3-tmp2)+1))) {
- LWSERR(LE_MEMORY);
return defret;
};
memcpy(ml->next->data,tmp2,tmp3-tmp2);
@@ -718,11 +682,10 @@
};
-/*********************************************************************************************************/
/*
* Function for CookieData
*/
-char *__ILWS_Cookie(char *handle) {
+char *__ILWS_Cookie(struct ClientInfo *ClientInfo, char *handle) {
char *defret="";
char *tmp1,*tmp2,*ret;
int size;
@@ -743,7 +706,6 @@
ClientInfo->CookieList=__ILWS_add_buffer(ClientInfo->mem,sizeof(struct
_Cookie));
if(ClientInfo->CookieList==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
ClientInfo->CookieList->next=NULL;
@@ -764,11 +726,9 @@
strsize=strlen(handle);
if(!(cl->next=__ILWS_add_buffer(ClientInfo->mem,sizeof(struct
_Cookie)))) {
- LWSERR(LE_MEMORY);
return defret;
};
if(!(cl->next->id=__ILWS_add_buffer(ClientInfo->mem,strsize+1))) {
- LWSERR(LE_MEMORY);
return defret;
};
memcpy(cl->next->id,handle,strsize);
@@ -801,7 +761,6 @@
ret=__ILWS_add_buffer(ClientInfo->mem,size+1);
if(ret==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
@@ -811,13 +770,10 @@
return cl->next->data;
};
-
-
-/*********************************************************************************************************/
/*
* get whole query string
*/
-char *__ILWS_clientinfo_getquerystring() {
+char *__ILWS_clientinfo_getquerystring(struct ClientInfo *ClientInfo) {
char *tmp1,*tmp2,*ret;
char *defret="";
size_t size;
@@ -830,7 +786,6 @@
size=(tmp2-tmp1)-1;
ret=__ILWS_add_buffer(ClientInfo->mem,size+1);
if(ret==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
memcpy(ret,tmp1,size);
@@ -838,12 +793,10 @@
return ret;
};
-
-/*********************************************************************************************************/
/*
* get whole post data
*/
-char *__ILWS_clientinfo_getpostdata() {
+char *__ILWS_clientinfo_getpostdata(struct ClientInfo *ClientInfo) {
char *tmp1,*ret;
char *defret="";
size_t size;
@@ -855,7 +808,6 @@
size=(current_web_client->rbuf+current_web_client->rbufsize)-tmp1;
ret=__ILWS_add_buffer(ClientInfo->mem,size+1);
if(ret==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
memcpy(ret,tmp1,size);
@@ -863,126 +815,10 @@
return ret;
}
-
-/*********************************************************************************************************/
-/*
- * Get authorization username
- */
-char *__ILWS_clientinfo_getauthuser() {
- char *tmp1,*tmp2,*ret, *out=NULL;
- char *defret="";
- size_t size;
-
- tmp1=strstr(current_web_client->rbuf,"Authorization: Basic");
- if(tmp1==NULL) {
-
- return defret;
- };
-
- tmp1+=21;
- tmp2=strstr(tmp1,"\r\n");
- if(tmp2==NULL) return defret;
- size=(int)(tmp2-tmp1);
-
- ret=__ILWS_malloc(size+1);
- if(ret==NULL) {
- LWSERR(LE_MEMORY);
- return defret;
- };
- memcpy(ret,tmp1,size);
- ret[size]=0;
-
- out=__ILWS_malloc(size+1);
- if(out==NULL) {
- LWSERR(LE_MEMORY);
- __ILWS_free(ret);
- return defret;
- };
-
- size=__ILWS_base64decode(out,ret);
- out[size]='\0';
-
-
- __ILWS_free(ret);
- tmp2=strstr(out,":");
- if(tmp2==NULL) return defret;
-
- ret=__ILWS_add_buffer(ClientInfo->mem,(tmp2-out)+1);
- if(ret==NULL) {
- LWSERR(LE_MEMORY);
- __ILWS_free(out);
- return defret;
- };
- memcpy(ret,out,tmp2-out);
- ret[tmp2-out]=0;
-
- __ILWS_free(out);
- return ret;
-}
-
-
-/*********************************************************************************************************/
/*
- * get authorization password
- */
-char *__ILWS_clientinfo_getauthpass() {
- char *tmp1,*tmp2,*ret, *out=NULL;
- char *defret="";
- size_t size;
-
- tmp1=strstr(current_web_client->rbuf,"Authorization: Basic");
- if(tmp1==NULL) {
-
- return defret;
- };
-
- tmp1+=21;
- tmp2=strstr(tmp1,"\r\n");
- if(tmp2==NULL) return defret;
- size=(int)(tmp2-tmp1);
-
- ret=__ILWS_malloc(size+1);
- if(ret==NULL) {
- LWSERR(LE_MEMORY);
- return defret;
- };
- memcpy(ret,tmp1,size);
- ret[size]=0;
-
- out=__ILWS_malloc(size+1);
- if(out==NULL) {
- LWSERR(LE_MEMORY);
- __ILWS_free(ret);
- return defret;
- };
-
- size=__ILWS_base64decode(out,ret);
- out[size]='\0';
-
-
- __ILWS_free(ret);
- tmp1=strstr(out,":")+1;
- tmp2=out+strlen(out);
-
- ret=__ILWS_add_buffer(ClientInfo->mem,(tmp2-tmp1)+1);
- if(ret==NULL) {
- LWSERR(LE_MEMORY);
- __ILWS_free(out);
- return defret;
- };
- memcpy(ret,tmp1,tmp2-tmp1);
- ret[tmp2-tmp1]=0;
-
- __ILWS_free(out);
- return ret;
-}
-
-
-/*********************************************************************************************************/
-/*
* get method (GET POST HEAD etc)
*/
-char *__ILWS_clientinfo_getmethod() {
+char *__ILWS_clientinfo_getmethod(struct ClientInfo *ClientInfo) {
char *tmp1,*ret;
char *defret="";
size_t size;
@@ -993,7 +829,6 @@
size=tmp1-current_web_client->rbuf;
ret=__ILWS_add_buffer(ClientInfo->mem,size+1);
if(ret==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
memcpy(ret,current_web_client->rbuf,size);
@@ -1001,12 +836,10 @@
return ret;
}
-
-/*********************************************************************************************************/
/*
* get request name (GET /taltal HTTP/1.0) returning /taltal
*/
-char *__ILWS_clientinfo_getreqname() {
+char *__ILWS_clientinfo_getreqname(struct ClientInfo *ClientInfo) {
char *ret;
char *tmp1=strstr(current_web_client->rbuf,"/"); // Must have /
char *tmp2=strstr(tmp1,"?");
@@ -1025,7 +858,6 @@
return defret;
ret=__ILWS_add_buffer(ClientInfo->mem,size+1);
if(ret==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
j=0;
@@ -1038,7 +870,6 @@
tmp2=__ILWS_malloc(3);
if(tmp2==NULL) {
- LWSERR(LE_MEMORY);
return defret;
};
strncpy(tmp2,&tmp1[j+1],2);
@@ -1058,67 +889,5 @@
ret[size]=0;
return ret;
}
-/*********************************************************************************************************/
-/*
- * Get config entry (new on 0.5.0)
- */
-char *__ILWS_Conf(const char *topic,const char *key) {
- struct web_server *server=current_web_server;
- FILE *tmpf;
- struct stat statf; // tested only on WIN
- char *defret="";
- char *dataconf;
- char *tmp1,*tmp2,*tmp3;
- long tmpsize=0;
- int sizec;
- // Config revive tested only on WIN
- if(server->conffile!=NULL) {
- stat(server->conffile,&statf);
- if(statf.st_mtime>server->conffiletime) {
- tmpf=fopen(server->conffile,"r");
- if(tmpf!=NULL) {
- free(server->dataconf);
- fseek(tmpf,SEEK_SET,SEEK_END);
- sizec=ftell(tmpf);
- fseek(tmpf,0,SEEK_SET);
- server->dataconf=malloc(sizec+1);
- fread(server->dataconf,sizec,1,tmpf);
- server->dataconf[sizec-9]=0; // 9 is temporary
- server->conffiletime=statf.st_mtime;
- fclose(tmpf);
- };
- };
- };
-
- dataconf=__ILWS_stristr(server->dataconf,topic);
- if(dataconf==NULL) {
- return defret;
- };
- dataconf+=strlen(topic);
-
- do {
- tmp1=__ILWS_stristr(dataconf,key);
- dataconf+=1;
- if(dataconf[0]==0) {
- return defret;
- };
- if(dataconf[0]=='[' && dataconf[-1]=='\n') {
- return defret;
- };
- }while(!(tmp1!=NULL && tmp1[-1]=='\n' && tmp1[strlen(key)]=='='));
-
-
- tmp1+=strlen(key)+1;
- tmp2=__ILWS_stristr(tmp1,"\n");
- if(tmp2==NULL) {
- tmp2=tmp1+strlen(tmp1);
- };
- tmpsize=tmp2-tmp1;
- tmp3=__ILWS_add_buffer(ClientInfo->mem,tmpsize+1);
- memcpy(tmp3,tmp1,tmpsize);
- tmp3[tmpsize]=0;
- return tmp3;
-
-
-
-};
+
+
Modified: GNUnet/libwebserver/src/clientinfo.h
===================================================================
--- GNUnet/libwebserver/src/clientinfo.h 2006-08-18 21:41:52 UTC (rev
3246)
+++ GNUnet/libwebserver/src/clientinfo.h 2006-08-18 23:00:08 UTC (rev
3247)
@@ -16,23 +16,13 @@
#ifndef _CLIENTINFO_H_
#define _CLIENTINFO_H_
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
-
-#include "outstream.h"
#include "client.h"
#include "utils.h"
#include "memory.h"
-#include "server.h"
-#include "error.h"
-
-
/*
* Next's structs are redudant but it is an case of logic (spell)
*/
@@ -70,8 +60,7 @@
struct _Cookie *next;
};
-
-extern struct ClientInfo {
+struct ClientInfo {
int outfd;
char *inetname;
char *request;
@@ -83,7 +72,6 @@
char *(*Query)(char *);
char *(*Post)(char *);
char *(*Cookie)(char *); // TODO
- char *(*Conf)(const char *,const char *); // new on 0.5.0
struct _MultiPart (*MultiPart)(char *);
// not necessary for web_server.h
char *QueryString;
@@ -95,24 +83,21 @@
struct _Post *PostList; // Not necessary for web_server.h
struct _MultiPart *MultiPartList; // Not necessary for web_server.h
struct _Cookie *CookieList; // Not necessary for web_server.h
-} *ClientInfo; //tochange
+};
-void __ILWS_init_clientinfo();
-void __ILWS_free_clientinfo();
-char *__ILWS_clientinfo_getauthuser();
-char *__ILWS_clientinfo_getauthpass();
-char *__ILWS_clientinfo_getquerystring();
-char *__ILWS_clientinfo_getpostdata();
-char *__ILWS_clientinfo_getcookiestring();
-char *__ILWS_clientinfo_getmethod();
-char *__ILWS_clientinfo_getreqname();
-char *__ILWS_Header(char *);
-char *__ILWS_Query(char *);
-char *__ILWS_Post(char *);
-struct _MultiPart __ILWS_MultiPart(char *);
-char *__ILWS_Cookie(char *);
-char *__ILWS_Conf(const char *,const char *);
+void __ILWS_init_clientinfo(struct ClientInfo *ClientInfo);
+void __ILWS_free_clientinfo(struct ClientInfo *ClientInfo);
+char *__ILWS_clientinfo_getquerystring(struct ClientInfo *ClientInfo);
+char *__ILWS_clientinfo_getpostdata(struct ClientInfo *ClientInfo);
+char *__ILWS_clientinfo_getcookiestring(struct ClientInfo *ClientInfo);
+char *__ILWS_clientinfo_getmethod(struct ClientInfo *ClientInfo);
+char *__ILWS_clientinfo_getreqname(struct ClientInfo *ClientInfo);
+char *__ILWS_Header(struct ClientInfo *ClientInfo, char *);
+char *__ILWS_Query(struct ClientInfo *ClientInfo, char *);
+char *__ILWS_Post(struct ClientInfo *ClientInfo, char *);
+struct _MultiPart __ILWS_MultiPart(struct ClientInfo *ClientInfo, char *);
+char *__ILWS_Cookie(struct ClientInfo *ClientInfo, char *);
#endif
Deleted: GNUnet/libwebserver/src/config.h
===================================================================
--- GNUnet/libwebserver/src/config.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/config.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,133 +0,0 @@
-/* include/config.h. Generated from config.h.in by configure. */
-/* include/config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-/* #undef HAVE_DOPRNT */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `inet_ntoa' function. */
-#define HAVE_INET_NTOA 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
- to 0 otherwise. */
-#define HAVE_MALLOC 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if your system has a GNU libc compatible `realloc' function,
- and to 0 otherwise. */
-#define HAVE_REALLOC 1
-
-/* Define to 1 if you have the `select' function. */
-#define HAVE_SELECT 1
-
-/* Define to 1 if you have the `socket' function. */
-#define HAVE_SOCKET 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strchr' function. */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the `strftime' function. */
-#define HAVE_STRFTIME 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strncasecmp' function. */
-#define HAVE_STRNCASECMP 1
-
-/* Define to 1 if you have the `strstr' function. */
-#define HAVE_STRSTR 1
-
-/* Define to 1 if you have the `strtol' function. */
-#define HAVE_STRTOL 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `vprintf' function. */
-#define HAVE_VPRINTF 1
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "address@hidden"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "libwebserver"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libwebserver 0.5.3-GNUnet"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libwebserver"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.5.3-GNUnet"
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef TM_IN_SYS_TIME */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to rpl_malloc if the replacement function should be used. */
-/* #undef malloc */
-
-/* Define to rpl_realloc if the replacement function should be used. */
-/* #undef realloc */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
Deleted: GNUnet/libwebserver/src/debug.h
===================================================================
--- GNUnet/libwebserver/src/debug.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/debug.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,29 +0,0 @@
-/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
- *
- * See the LICENSE file
- *
- * The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits must appear in the documentation.
- *
- * date: Sat Mar 30 14:16:05 GMT 2002
- *
- * DEBUG macros
- *
- */
-
-#ifndef _DEBUG_H_
-#define _DEBUG_H_
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef DEBUG
- #define IFDEBUG(x) x
-#else
- #define IFDEBUG(x)
-#endif
-
-
-#endif
Deleted: GNUnet/libwebserver/src/error.c
===================================================================
--- GNUnet/libwebserver/src/error.c 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/error.c 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,34 +0,0 @@
-/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
- *
- * See the LICENSE file
- *
- * The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits must appear in the documentation.
- *
- * date: Wed Oct 9 19:56:22 GMT 2002
- *
- * -- Error functions
- *
- */
-
-
-#include "error.h"
-
-
-const char *libws_error_table[]={
- "Memory error",
- "Filesystem error",
- "Network error"
-};
-
-
-void libws_error(unsigned int code, const char *fmt, ...) {
- va_list args;
-
- va_start(args,fmt);
- fprintf(stderr,"%s: ",libws_error_table[code]);
- vfprintf(stderr,fmt,args);
- va_end(args);
- fflush(stderr);
-};
Deleted: GNUnet/libwebserver/src/error.h
===================================================================
--- GNUnet/libwebserver/src/error.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/error.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,33 +0,0 @@
-/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
- *
- * See the LICENSE file
- *
- * The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits must appear in the documentation.
- *
- * date: Tue 9 Sep 06:45:13 2003 GMT
- *
- * libwebserver error codes
- *
- */
-
-
-#ifndef _ERROR_H_
-#define _ERROR_H_
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-
-#define LE_MEMORY 0 // memory error
-#define LE_FILESYS 1 // file error
-#define LE_NET 2 // net error
-
-#define LWSERR(x) libws_error(x,"file: %s - line: %d\n",__FILE__, __LINE__);
-
-void libws_error(unsigned int, const char *,...);
-
-
-#endif
Deleted: GNUnet/libwebserver/src/gethandler.c
===================================================================
--- GNUnet/libwebserver/src/gethandler.c 2006-08-18 21:41:52 UTC (rev
3246)
+++ GNUnet/libwebserver/src/gethandler.c 2006-08-18 23:00:08 UTC (rev
3247)
@@ -1,96 +0,0 @@
-/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
- *
- * See the LICENSE file
- *
- * The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits must appear in the documentation.
- *
- * date: Sat Mar 30 14:44:42 GMT 2002
- *
- * -- handlers functions
- *
- */
-
-
-
-#include "gethandler.h"
-
-
-/*********************************************************************************************************/
-/*
- * initializate (allocate) handler list
- */
-struct gethandler *__ILWS_init_handler_list() {
- struct gethandler *ret;
-
- ret=__ILWS_malloc(sizeof(struct gethandler));
- if(ret==NULL) {
- LWSERR(LE_MEMORY);
- return NULL;
- };
- ret->next=NULL;
- ret->hdl.func=NULL; // or path
- ret->flag=0;
- ret->str=NULL;
- return ret;
-}
-
-/*********************************************************************************************************/
-/*
- * add an handler to list
- */
-int __ILWS_add_handler(struct gethandler *handler, const char *mstr, void
(*func)(), char *path, int flag, int type) {
- struct gethandler *temp=handler;
- while(temp->next!=NULL)temp=temp->next;
-
- temp->next=__ILWS_malloc(sizeof(struct gethandler));
- if(temp->next==NULL) {
- LWSERR(LE_MEMORY);
- return 0;
- };
-
- temp->next->str=__ILWS_malloc(strlen(mstr)+1);
- if(temp->next->str==NULL) {
- __ILWS_free(temp->next); // free last malloced
- LWSERR(LE_MEMORY);
- return 0;
- };
- memcpy(temp->next->str,mstr,strlen(mstr));
- temp->next->str[strlen(mstr)]='\0';
-
- temp->next->type=type;
- switch (temp->next->type) {
- case 0:
- temp->next->hdl.func=func; // for function
- break;
- case 1: // new on 0.5.2 // directory or cgi
- case 2:
- if(!(temp->next->hdl.path=strdup(path))) {
- __ILWS_free(temp->next->str);
- __ILWS_free(temp->next);
- LWSERR(LE_MEMORY);
- return 0;
- };
-
- break;
- };
-
- temp->next->flag=flag;
- temp->next->next=NULL;
- return 1;
-}
-
-/*********************************************************************************************************/
-/*
- * Deletes the entire handler list
- */
-void __ILWS_delete_handler_list(struct gethandler *handler) {
- struct gethandler *next;
-
- while(handler) {
- next = handler->next;
- __ILWS_free(handler);
- handler = next;
- }
-}
Deleted: GNUnet/libwebserver/src/gethandler.h
===================================================================
--- GNUnet/libwebserver/src/gethandler.h 2006-08-18 21:41:52 UTC (rev
3246)
+++ GNUnet/libwebserver/src/gethandler.h 2006-08-18 23:00:08 UTC (rev
3247)
@@ -1,60 +0,0 @@
-/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
- *
- * See the LICENSE file
- *
- * The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits must appear in the documentation.
- *
- * date: Sat Mar 30 14:44:42 GMT 2002
- *
- *
- * --
- *
- */
-
-
-#ifndef _GETHANDLER_H_
-#define _GETHANDLER_H_
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <stdio.h>
-
-
-#include "memory.h"
-#include "error.h"
-
-
-#define MATCHMAX 200
-
-//#define WS_LOCAL 0x1
-#define WS_DYNVAR 0x8
-#define WS_USELEN 0x10
-
-
-/*********************
- * get handler types *
- *********************/
-#define GH_FUNCTION 0 // new on 0.5.2
-#define GH_DIRECTORY 1 // new on 0.5.2
-#define GH_CGI 2 // new on 0.5.2 (just the flag)
-
-
-struct gethandler {
- char *str;
- int type; // new on 0.5.2 types
- union hdl_u{ // changed on 0.5.3 named union (Hilobok Andrew
(address@hidden) said that wasn't compiling on FreeBSD)
- void (*func)(); // it is a function
- char *path; // it is a path (dir or cgi)
- }hdl;
- int flag;
- struct gethandler *next;
-};
-
-struct gethandler *__ILWS_init_handler_list();
-int __ILWS_add_handler(struct gethandler *,const char *,void (*func)(),char *,
int,int);
-void __ILWS_delete_handler_list(struct gethandler *);
-
-#endif
Deleted: GNUnet/libwebserver/src/logo.h
===================================================================
--- GNUnet/libwebserver/src/logo.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/logo.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,396 +0,0 @@
-/*
- * by data2header by Luis Figueiredo (address@hidden)
- */
-#ifndef __LOGO_H_
-#define __LOGO_H_
-
-char
_logo[]="\x47\x49\x46\x38\x39\x61\x5\x1\x45\x0\xE7\x0\x0\x2\x2\x2\xFE\xFE\xFD\xF0\xF2\xF5\xE8\xED\xF0"
-"\xDC\xE8\xEE\xBD\xC1\xC6\x68\x71\x7C\x60\x16\x7\x7A\x1C\xA\xA9\xC8\xDD\x9E\xC3\xDA\x94\xBD\xD8\x8C\xBB"
-"\xD6\x86\xB6\xD6\x15\x26\x3F\x1B\x2C\x49\x1F\x32\x4D\x24\x38\x54\x30\x4A\x66\x4E\x5C\x68\x6E\x7E\x85\xAB"
-"\xAE\xB2\xF6\xF6\xF7\xD6\xE1\xE8\xC8\xDA\xE6\xC5\xC7\xC0\xB0\xBC\xC6\x97\xAA\xB5\x8E\x96\x9B\x5F\x60\x62"
-"\x39\x45\x48\x1F\x26\x23\x7\xA\xD\x4A\x10\x6\x34\xB\x3\x3D\xE\x6\x70\x1C\xB\x9F\x24\xE\xE7\x5C"
-"\x45\x3B\x5C\x78\xD3\xD4\xD4\x7C\x89\x90\xF\x12\x10\x54\x13\x6\xCA\x36\x1C\xB0\xD1\xE5\x5D\x94\xB3\x3D"
-"\x62\x7F\x1F\x22\x19\xD6\x4C\x35\x70\xB0\xD0\xA\x22\x43\x2C\x44\x60\x2E\x2F\x1F\xE9\x69\x4F\xBB\xD4\xE6"
-"\x80\xCA\xEB\x7D\xC6\xE8\x79\xC0\xE1\x73\xB8\xDA\x69\xAA\xCA\x66\xA4\xC6\x58\x9B\xC4\x4D\x8D\xB5\x51\x82"
-"\xA1\x4A\x76\x94\x33\x4E\x68\x28\x3E\x5A\x4D\x4D\x4F\x78\x80\x87\x3D\x3E\x3D\xF\x16\x1B\x8C\x20\xC\xFC"
-"\x7F\x64\x83\xD0\xF1\x41\x68\x85\x2A\x38\x3E\x3F\x45\x2F\x13\x1A\x23\x35\x54\x71\x62\x9C\xBD\x12\x1E\x2B"
-"\x49\x72\x8F\x4E\x7C\x9B\xD0\x41\x27\x58\x88\xA6\x28\x68\x93\x38\x53\x5E\x17\x22\x26\xDA\x56\x3B\x5B\x8E"
-"\xAB\xF6\x72\x5C\x6F\x6F\x42\xFC\xFC\xD1\xFD\xFE\xC6\x66\x4A\xC\x99\xEE\xFE\x45\x6E\x8C\xE0\xE1\x8C\xEE"
-"\xE9\x8B\x21\x6\x2\xA3\xFC\xFE\xC8\xFE\xFD\xFD\xFE\xDF\xFA\xFB\xB8\xFD\xFC\xA4\x86\xA6\x7A\xB0\xA8\x2E"
-"\xF4\xF0\x88\x9A\xA4\x72\x58\x3B\x1E\x18\x16\x2\xB3\xB0\x5D\xD0\xCF\x64\xFD\xFD\x71\xFE\xFD\x89\xFE\xFC"
-"\x5C\xFE\xFD\x49\xFE\xFD\x20\x70\x6B\x15\x3C\x39\x13\x89\x81\x1E\x4B\x4A\x2B\xB9\x2B\x10\xBC\xC0\x7E\x28"
-"\x26\xB\x9C\x98\x40\xF2\xEC\x69\xC7\xB8\x3E\x90\x8C\x3F\x7B\x7B\x32\x31\x2F\xB\x1A\x6\x2\x1C\x1A\x7"
-"\x7D\x98\x9F\xEC\xE2\x6A\x1F\x2E\x35\x90\xDD\xF9\x46\x56\x60\x88\xDF\xFE\x61\x5A\x13\x7C\x7E\x3E\x50\x49"
-"\xF\xFE\xFB\x32\xCC\xC5\x49\x7E\x71\x2E\xBC\xB5\x2C\x9A\x91\x17\xD2\xC5\x21\x97\xA8\x84\xFD\xEE\x1D\x6E"
-"\x7E\x4A\xDF\xD6\x3D\xF3\xE7\x41\x71\x6E\x2C\xB4\xD4\xAE\xFE\xD0\x5E\x82\x5C\x28\x20\x1E\x5\x51\x54\x2A"
-"\xD0\x98\x34\xFB\xF0\x4B\xD5\xA7\x2F\xFA\xC6\x5E\xB9\x9A\x1F\xFE\xBD\x3F\xFE\xD9\x37\x92\x91\x78\xF6\xAA"
-"\x3D\x8E\x5A\x1D\x38\x82\xB0\x5A\x6B\x69\xB5\x5E\x23\x42\x26\x1A\x51\x55\x44\xCE\xB7\x21\x25\x22\x7\xE5"
-"\xD9\x18\x7C\x32\x19\xAA\x5B\x2A\x8A\x38\x1C\x9E\x4A\x20\xA8\x3E\x26\xB6\x72\x26\xDC\x91\x26\xAE\x5A\x22"
-"\xCE\xC3\x67\xB7\x80\x28\x98\x6E\x22\x68\x30\x17\x56\x2A\xE\x4E\x26\xE\x96\x56\x1C\xAE\x70\x20\x2B\xB"
-"\x3\x36\x39\x2B\x16\x22\x3D\x17\x22\x2A\x9\xE\x11\x7E\xB0\xCF\x7A\xAF\xD1\x71\xA9\xCA\x31\x7B\xAB\x2E"
-"\x75\xA6\x1A\x48\x68\xD\x2E\x47\x42\x89\xB6\x84\xAF\xCA\x80\xB7\xD6\x73\x98\xB0\x4E\x98\xC5\x86\xA7\xAE"
-"\x63\x7E\x8C\x50\x6A\x7B\x65\x86\x7E\x75\x8B\x9A\xAA\xAA\x78\xCD\xD3\xC8\x5D\xB0\xE4\x8A\xA2\x66\xFE\xFE"
-"\xE6\xD9\xFE\xEF\xEA\xEA\xA8\xD8\xE2\xA4\x8A\xAA\x62\xD5\xD4\x87\x82\x80\x50\xCC\xC5\x84\x6C\x6F\x5E\xDC"
-"\xDB\x9F\x5B\x5B\x34\x28\x74\xA4\x23\x6E\xA0\x1B\x68\x9B\x19\x60\x8F\xF\x5F\x94\x1B\x54\x79\x22\x5F\x87"
-"\x9C\xD4\xF3\xC2\xE8\xF4\xC4\xF6\xFE\xA8\xE2\xFE\xA8\xE6\xF8\x54\xA8\xDD\xE2\xFC\xFE\x5E\x5E\x4B\xDE\xDD"
-"\xB6\xB8\xBF\xA8\xBB\xBF\x95\xFE\x42\x1E\xD9\xDA\xC0\x13\x39\x53\x34\x8C\xC5\xFE\xAE\x9A\xFF\xFF\xFF\xFF"
-"\xFF\xFF\x21\xFE\x12\x62\x79\x20\x4C\x75\x69\x73\x20\x46\x69\x67\x75\x65\x69\x72\x65\x64\x6F\x0\x21\xF9"
-"\x4\x1\xA\x0\xFF\x0\x2C\x0\x0\x0\x0\x5\x1\x45\x0\x0\x8\xFE\x0\xFF\x9\x1C\xF8\xF\x0\x80"
-"\x0\x6\x1\x8\x48\x38\x20\x21\x81\x84\x5\x12\x1A\x48\x78\x20\x21\x82\x84\x9\x12\x2A\xD0\x98\x70\x41"
-"\x42\x6\x9\x1B\x24\x3C\x96\x10\x59\x42\x19\x9\x93\x25\xEC\xB1\x32\xA1\x8B\x84\x53\x12\x3E\x49\x58\x2C"
-"\x61\x88\x84\x24\x12\xDA\x48\xA8\x8C\xA7\x4F\x83\x3D\xD\x2E\x4B\x38\x54\x28\xD1\x84\xE7\x90\x2A\x35\x98"
-"\xD4\x20\xBA\x84\x4F\x9D\x26\x4C\x37\x35\xA1\xBA\x84\xCC\x12\xEE\x4B\x38\x23\xA1\x57\x11\x38\x75\x26\x5C"
-"\x37\xB6\xAC\x41\xB2\x67\xCD\x2\x40\xBB\x36\x21\xC1\xB7\x70\x5\x3A\x78\x0\x21\x82\x84\x9\x14\x2A\x4"
-"\xB0\x20\xA0\xEF\x80\xBF\x4\x8\x5C\xC0\x90\x41\xC3\x6\xE\x14\x3A\x78\xF8\x0\x22\x84\x88\x11\x24\x4A"
-"\x98\x30\x91\xA0\xB2\x82\x4\xA\x32\x6B\x5E\xA0\x60\x81\xE7\x5\xC\x42\x33\x68\x40\x9A\xC1\xB1\xD3\xA7"
-"\x91\x21\x3B\x86\x2C\x99\xEB\xD7\xC9\x7A\xC8\x9E\xD\x5\x8A\xF\x17\x3F\x7E\x4C\x59\xB6\xE4\xC5\x13\x66"
-"\x11\x9A\x45\x1\x71\x60\xC5\x88\xC7\x2B\x10\xEC\x89\x91\x24\x8B\xB2\xE7\xD0\xA3\x3F\x5F\xA6\x6C\x99\x75"
-"\xEA\xD7\xAB\x5F\xB7\x7E\x6E\xD9\xB9\xEF\xE0\xC1\xFE\xA3\x3B\x37\x1E\x9D\xF9\xF3\xE4\xCF\xAB\x4F\x87\x8E"
-"\x7D\xBA\xF7\xEF\xD5\xC9\x5F\xC7\xAE\x3E\xB3\xFB\xFB\xF6\x35\x6B\x36\x63\xC6\x11\x63\x6\xAD\x10\xC2\x71"
-"\x8F\x85\x40\x2\x12\x7B\x50\x61\xC3\x16\x59\xB0\xB0\xCE\x83\x10\x46\x28\xE1\x84\x12\xB2\x33\x61\x5C\x70"
-"\x19\x74\x42\x42\xE\x24\xE4\x41\x42\x8\x19\xB4\x90\x41\x28\x24\x94\x42\x42\x2A\x24\xB4\x42\x42\x2C\x24"
-"\xD4\x2\x47\x6\x6D\x64\x90\x47\x33\x76\x14\xD2\x48\x25\xE5\x68\x90\x4A\x6\xB1\x64\x90\x16\x9\x2D\x91"
-"\x10\x4\x2A\xDA\x94\x90\x9\x9\xA9\xF2\x13\x0\x41\x31\xB9\x64\x93\x45\x1\x10\x65\x53\x0\x50\x69\xE5"
-"\x52\x0\x44\x55\x25\x96\x54\x19\xD4\x8E\x5A\x59\x19\xD4\x4C\x42\x0\x1A\x74\x93\x99\x9\xED\x91\x50\x16"
-"\x56\xA9\xC5\xD6\x9B\x6E\xAA\x85\xA1\x40\x2E\x25\xF4\x2\x87\x9\x49\x90\x90\x5\x9\x5D\x90\x10\x7\x9"
-"\xC1\x60\xA4\x41\x31\xB8\x68\xA8\x41\x19\xC5\x8\x23\x0\x34\x2\x0\x92\x41\x22\x19\x44\x92\x41\x26\xED"
-"\xD8\x92\x41\x2F\x19\x14\x44\x42\x34\x78\x95\x10\x58\x84\x26\xE4\x4C\x92\x4F\x96\xA\xD4\x51\x46\x31\x85"
-"\xE5\x95\xAA\x4A\xE5\x6A\x96\xFE\x55\x19\xC4\xE\x56\x9\x8D\x69\xD0\x11\x45\x1A\x4\x2A\x0\x48\x24\xB4"
-"\x45\xAC\x0\x5C\x95\xD6\xB0\x6D\x11\xB\xE7\x59\x73\x9E\x54\xA7\x41\x77\x1A\xD4\x95\x41\x9D\x1A\xD4\x90"
-"\x41\x15\x24\x54\xC3\xA7\x62\x19\x74\xC3\xA1\x0\x24\xDA\xED\xA2\x8D\x36\xFA\x28\x0\x91\x2\x30\x29\x0"
-"\x95\x2\xC0\x23\x0\x50\xC0\x94\x67\x42\x20\x60\x6B\x90\x9A\x6\xFD\x20\x2A\xA9\xA7\xE6\xEB\xA4\xBE\x51"
-"\xF6\xBB\xEA\xBF\xAF\x6A\xA9\x65\x97\xC1\xD2\x6A\xD0\x56\xCE\x52\x24\x2F\x0\x39\x19\xB4\x93\xB1\x71\x42"
-"\x2C\xF1\x5A\x18\xE2\x90\xC3\xC5\x3A\xE8\xB0\xC3\xE\x32\xF0\xD0\xC3\x6D\x3F\x0\x11\xC4\xB\x42\xF4\x37"
-"\xC3\x5C\x11\xC\x41\xC4\x4\x6\x54\xC0\x41\x11\x1D\x18\x71\xC4\x1\xC7\x85\x80\x4\xB\x49\xB0\x70\xC1"
-"\xCE\x18\xF4\x7C\xC3\xCF\x2D\x4\x9D\x40\xB\x95\x61\x86\x99\x66\x9D\x75\xF6\x19\x68\xA2\x91\xD6\x0\x3"
-"\xCF\x40\x83\x1A\x6B\xAC\xB9\x16\xD\x14\x2E\x54\x1\xC4\x14\x61\xF8\x46\x3\x13\xE\xE0\x2A\xA0\x8\x22"
-"\x18\x58\x2\xB\x5B\x98\xC0\x42\x6E\xB9\x39\xE3\xB6\xDB\xAA\x38\xA3\x8A\x2A\xD2\xD5\x4D\xDD\x74\xD6\x69"
-"\xB7\xDD\xFE\x75\xDD\x85\x27\x9E\xDF\xE9\xA5\xA7\x1E\x3A\x56\x58\xF1\x5E\x3B\xF2\xD5\xC7\xE\x7E\xFA\xF1"
-"\xE7\x1F\x80\xC5\xD\x48\xF6\x8\x2B\x1C\xB8\xDC\x82\xD\xA6\xB3\x8E\x3A\x9A\x6F\xDE\xF9\xE6\x14\x86\x7E"
-"\x21\x5C\x4A\x24\x84\x43\x42\x3A\x28\x6B\x90\xF\x41\x72\x95\x10\x13\x9\x35\xB1\xF0\xC3\x0\x3C\x64\x90"
-"\x9F\x6\x61\xC0\xED\x8B\x88\x2E\x2A\x23\xA3\x36\x42\x8A\xA3\xA5\x6\x55\x61\x27\x4D\x9\x8D\x60\xD1\x9A"
-"\x9\x49\x93\x90\xBD\x6\x8D\x6A\x90\x92\xFA\x36\x69\xFD\x92\xFE\xB6\xBA\xA5\xF6\xAC\xC2\x6A\x10\xC1\xC2"
-"\x2\x10\x26\x0\xB6\x2\x50\x26\x0\x67\xA2\x9F\x26\xF3\xDF\x3\x1B\xFE\xB1\xC5\xC6\x4F\x56\x86\xA5\x1B"
-"\x54\x3F\x0\xA7\x1B\x94\xBA\x41\x28\xAD\xDE\xBA\x41\x4E\x48\x8\xAE\xC\xA2\xBC\x50\x49\xCB\x21\x7D\x4A"
-"\x88\xEE\xC\xC2\xBB\x6F\xF5\x4E\x51\x10\x4\x9E\x41\xC6\x35\xAE\x73\x45\xE3\x7F\x0\x40\xC4\xA0\x18\x96"
-"\x2D\x0\x64\xA\x0\xD0\x3\xE1\xBD\xA2\x87\xAF\x7D\x99\xF0\x7A\xA9\x92\x12\xC0\xB6\xC7\x42\x2D\x59\xA1"
-"\x4D\x6\x19\x5F\xF9\x6\x8\x80\x15\xE9\x2A\x21\xBD\x32\xC8\xAF\xDA\x67\x90\xF0\x11\xC\x7C\xFE\x11\x2B"
-"\xD6\x5B\x0\x90\x83\x84\xDC\xEF\x7E\xF9\x3\xC0\xFE\x0\xD0\x3F\xF\xCA\x4\x5E\x1B\x6C\x91\x88\x18\x92"
-"\xC0\xDC\x25\x64\x5B\xC\xC4\x88\x16\x23\x18\xAE\x8F\x24\xE4\x19\x9\x69\x97\x41\xA4\x90\x90\x8\xE4\xAA"
-"\x86\xBE\x4A\x8\xEB\xFC\x57\xAF\xE7\x8D\x10\x0\xD4\x3B\xA1\xA9\x54\x98\xC2\x29\xAD\x90\x4A\x2F\xF4\x52"
-"\x42\x66\x75\x30\xD7\x19\xA4\x22\x37\x34\xC8\x45\x1C\x6\x2C\x82\xC1\xEF\x90\x72\x1A\x48\xC6\x32\x76\x31"
-"\x1C\x38\x12\x7\x4A\x88\xA4\x24\x1F\x99\x83\x45\x6E\x4C\x6\x3D\x80\x42\xC8\x96\x70\x2\x1A\x40\x60\x38"
-"\xE8\x7B\xCC\x1\x24\x63\x82\xBC\x58\x80\x2F\x7E\x1\x4C\x60\x4\xB3\xB3\xC1\xF4\xC\x3\x40\xBB\x81\xD0"
-"\x8A\x66\x19\xA4\x25\x6D\x69\xC\x58\xC0\xD3\x9E\xF1\x8C\x64\x4C\x23\x1A\x2E\xA0\x6\x35\xAA\x71\x2\x21"
-"\xD0\x0\x11\xC3\x39\x80\x63\x44\x89\x20\x13\x6C\x81\xA\xB3\xF1\xC1\xC7\x7C\x40\x4D\x1F\x48\x43\x1A\x3F"
-"\xC0\x26\xDB\xDE\x6\x37\xB8\xD1\xAD\x6E\xE0\xCC\xCE\xDE\xC6\x9\x38\xF2\xFC\xAD\x70\xE9\xB0\x82\x3A\xDA"
-"\xA1\xB8\xFB\x30\xA3\x71\xFD\xF9\xF\x0\x22\x47\x36\xE4\x44\xE6\x72\x5B\xFE\x88\xC1\x1E\xE0\xC3\xCF\x74"
-"\x70\x8E\x73\x9A\x8B\x8F\xE7\x20\xA4\x8E\x9\x19\x64\x20\x4A\x44\x5D\x42\x8A\x68\x3F\x23\x9A\x6E\xA1\x61"
-"\x7C\xD7\x1F\x71\x98\x90\x21\x24\x64\x3\x7B\xA2\xA2\x41\x6C\x7\x0\xDC\x1\x60\x81\x0\x68\x60\x3\xBD"
-"\xF5\xBB\xDF\x35\x6A\x1A\x9\xB1\x46\x42\x84\xE0\xA9\x40\x2\x80\xA\x97\x2\x80\x8F\xD8\xA5\xC6\xE6\xB9"
-"\x91\x84\x38\x95\x63\xF5\xB0\x87\x2A\x16\x76\x2F\x8F\x0\xE0\xA3\xF8\x6A\x45\xA6\xD\xA6\x8F\x5E\x0\x28"
-"\x14\xF\x1\xF0\xC3\x42\xBA\xCF\x53\x74\xDA\x81\x42\xF5\x7\xD1\x86\x5A\x15\x7F\x9\xE1\xC1\xF1\x26\x2A"
-"\x48\x3F\x2\xC0\x8C\x6\xC1\xA8\x41\xF8\x74\xC0\x8D\x56\xF1\xA3\xBB\xDB\x22\x0\x4A\xFA\xC5\x84\x5C\x23"
-"\x21\x8A\x40\xD1\xC2\x90\xBA\xAE\x99\xCE\x74\x8D\x0\xC0\xAB\xF3\xDA\x98\x53\xE9\xE9\xF4\xAF\x28\xA4\xA3"
-"\x4F\x13\x2\xD4\x2F\xC5\x90\xA8\xB7\x3A\xE3\xAE\x4A\x90\xC6\xA5\x36\x75\xA9\xE1\xF3\x21\x54\xB\xD2\xC4"
-"\x26\x4A\x95\xAA\x6\x61\x28\x56\xAF\x7A\x59\x0\x90\xB1\xA5\x80\xF4\xAC\x57\xC1\xA\x0\x40\x4D\xB1\xAC"
-"\xB5\x3B\x2B\x48\x47\xAA\xD6\xDF\x95\xEB\x82\x6\x99\xFE\x40\x42\x2\xE8\x52\xC6\x1A\x44\x8A\xEA\x8A\xE9"
-"\x4C\xC5\x8\x80\xBD\x8A\x90\xAF\x0\xF0\x6B\x1C\x3\x1B\xD8\xEC\x9\x96\x4A\x5A\x32\x6C\x50\xB5\xE2\xD5"
-"\xD0\xEE\x6A\x90\x0\xD8\x21\x53\x9D\xEA\x58\x18\xC6\xCF\x2D\x3D\xE0\x81\x76\x65\xC0\x5D\x19\x6C\xEC\xBB"
-"\x1A\x5B\x24\x23\x2D\xF6\x48\x25\x58\x4C\x7\x98\x74\xC1\x14\x96\x20\x4\x8\xCC\xAC\x66\x8\xC0\x19\x15"
-"\xB2\x6\x4\x29\x58\xA1\x64\xFD\x41\x19\xD\xAE\x60\x0\xE\x9C\x12\x95\x7F\x51\x25\x2B\x79\xF6\xCA\x9F"
-"\x1\x8D\x68\xB4\xB4\xCC\x2\x34\x0\xB5\x69\x18\x22\x1A\xD6\x18\xE6\x4\x3C\xC0\x4\x44\xA4\xC8\x38\x5"
-"\x42\x40\x9\x98\x93\x5\xD5\xB4\x6\x36\x3D\x88\xCD\x6C\x68\x53\x9B\x6A\xDE\xE6\x9A\xDA\xDC\x26\x37\xBD"
-"\xF9\x4D\x70\x56\x7\x3A\x77\x13\xE7\x76\xBE\xB3\xC\xC2\x11\xAE\x1D\x38\xB6\xF\x7E\xF6\x13\x4F\xC8\x85"
-"\x60\x99\x65\x4B\x4E\x9\xF0\xA9\xCF\x7E\x1A\xF9\xC8\xEF\x59\x87\x3F\xE3\xE3\x95\x82\xCC\x54\xAB\xFC\x4B"
-"\x48\x67\x97\xB8\x44\xCD\x2E\xD1\x78\x6\xC1\xC2\x6\xD9\x64\x10\xDE\x6E\x2A\x61\x6\x21\x6D\xA\xE2\xA5"
-"\x90\x84\x8C\x28\xB5\xB7\x53\xE0\xFE\x15\x5B\x9B\x10\x94\x1A\x84\x1A\xAF\xDB\x60\x68\xA5\x7B\xAE\x74\xD5"
-"\x55\xB7\x35\x35\x88\x6F\x43\xE8\x57\xBF\x12\x77\x8E\xC6\x4D\xAE\xC1\xC8\x57\x54\x34\x19\x1A\x0\x48\x55"
-"\xAA\xF7\xA6\x5B\xDD\x46\x37\x59\xA6\x31\x85\x32\x13\xA5\x3C\xD5\x84\x62\x16\x0\x40\x32\x88\x45\x9\xD8"
-"\x58\x22\x56\xFA\xCB\x0\x78\xD6\x57\x4D\x64\x66\x8D\xA2\xB9\xA3\x6A\xD6\x96\x5A\xC5\xA\x0\xA\x24\xE4"
-"\xA\xA\xB\x50\xA7\xA1\x31\x3C\x74\xA5\x4\xCF\x3D\xCA\x73\x6F\x6F\x1A\xDC\x37\xFE\x79\xA7\x29\x14\xF4"
-"\x61\xC5\x24\x40\xC5\x26\xC4\xB6\xD1\x5\xD6\xC0\xA8\xCB\xE8\x47\x7F\x90\xB7\x4F\x56\x1D\x0\x3A\x4B\xED"
-"\x84\x64\x1A\x0\x12\xE0\x42\x17\xBC\xF0\x85\x4E\x83\x21\x21\xDF\xCE\xB5\x41\x62\x2\x66\x0\x10\xC9\x20"
-"\x45\x28\x35\x6A\x39\xEA\xD1\xD5\x6\xF\x0\x6F\x35\x48\x35\x62\xD\x80\x2\x2\x80\xCB\xE4\xAA\xB5\x9D"
-"\x6F\x2D\x6E\x48\x77\x59\xD7\x21\xE4\x73\x9\x7F\x6D\x42\x3B\x1A\x4\xA8\x42\x45\x58\xA8\xE9\xFD\xDC\x4E"
-"\x2F\xDB\xD1\x8F\xF5\x94\x16\x5C\x40\x71\x17\x60\xAD\x36\x50\xE8\xC1\xE\x1A\xE9\x48\x49\x46\x12\xBD\xDE"
-"\xFD\x2E\x77\xFE\x33\xE9\x2\x20\x74\x4D\x8\x62\xF0\xC2\x18\xB8\x40\x86\x15\x90\x32\x92\x65\x30\xC3\x19"
-"\xBC\x80\x86\x34\xA8\x1\xA\xDC\xF5\x58\xF\x28\xBE\xB5\x30\xFC\xC6\x64\xCD\x88\x80\x5D\x26\x50\x84\xA"
-"\xFC\x37\x95\x3\x58\xE5\x80\x5D\x9\x4B\xA2\x69\x60\x1\x1B\x70\xF0\x35\xAE\x81\x8D\x33\x58\xDD\xB\x83"
-"\xF8\x31\xD9\x42\x30\x4A\x16\xD8\xC0\x6\x2C\x0\xCD\xD3\x46\xD3\x80\x63\x48\xD\x35\x1E\xFE\xB0\x6B\x42"
-"\x3C\x62\xD9\x64\xBC\xC4\xD4\x84\x2\x8A\x53\xDC\xB6\x1F\xAC\x78\x6E\xCA\x68\xB1\x8B\xF1\x66\x1D\xF3\x14"
-"\xE\xC7\xEC\x74\x67\x7E\x1C\x27\x4F\x65\x2\x99\xEB\x1A\xDE\x43\x16\xB6\x60\x83\x18\xA8\x87\x3C\xEC\x39"
-"\x7\x7C\xDA\xE3\x1E\x23\xB7\x14\xCB\x4E\xFC\xF7\x55\x8F\x28\xED\x26\x7E\x50\x8\x6B\x60\x43\x1B\xDC\x90"
-"\x10\x98\xDA\xEF\xD\x70\x10\x43\x1A\xE2\xF0\x81\x49\x1B\xA4\xB3\x33\x25\xF7\xC2\xC3\x9C\x10\x57\x9F\x16"
-"\x0\xD3\x3A\xB5\x47\x33\xF0\x27\x83\xA0\x5E\xF5\x71\xB8\x96\x4B\x91\x2A\x2E\x2F\x4A\xAA\xD6\xE7\x5A\x97"
-"\xA4\x77\xAB\xEB\x3D\xBF\xD1\xCF\x80\x86\x4A\x42\x94\x2B\x43\x28\x1E\xFA\xA8\x9\x51\xB4\xC0\xA4\xFE\xFF"
-"\x2A\x82\x79\xA\xF3\xD7\xCE\x94\x1C\xE6\x20\x87\xF2\xD3\xA1\xE\x76\x48\xFF\x1D\xC\x22\x69\xCF\xE7\x9"
-"\xF\x79\xD0\xC3\x1B\xD6\x77\xE9\x34\xF0\xA1\xF\xD3\x7E\xE8\xEB\x63\xA\x4\xAF\x3E\xA0\xF6\x19\xB5\x6E"
-"\xA9\x6\x0\xD5\x62\x10\x44\x0\x0\x73\xC0\x7\xC2\x57\x6F\x14\x65\x10\xA6\x27\x41\x8E\x62\x7C\x0\x40"
-"\x6B\xC7\x47\x29\xFC\x6\x0\xCB\x17\x53\x7A\xC5\x6B\x7D\x36\x70\x3C\xA5\x47\xB2\xC2\x5C\x89\x25\x6B\xB5"
-"\xD5\x41\x5A\x82\x5C\xCA\xD6\x52\xE3\x96\x10\x98\x87\x65\x70\xE0\x7\x6B\xF0\x7\x74\x0\x8\x81\x90\x7"
-"\x82\x70\x7\x83\xD0\x6F\x33\xF5\x79\x9\x41\x8\xC7\x56\x69\xAB\x57\x8\xF9\x67\x10\x49\xA4\x59\xB0\xE7"
-"\x2E\xE5\xF6\x7F\x6\x31\x11\x63\x5\x22\x67\xA5\x1\x0\x38\x7\xBA\x80\x7F\x9C\xD6\x55\x6\x81\x24\x11"
-"\xE4\xE\xE0\xA2\x6F\x55\x35\x81\xB8\x46\x53\x6C\x94\x57\x36\xD5\x57\xD1\x77\x70\x7B\x34\x68\xA2\x66\x43"
-"\x0\xD0\x70\x3A\xB4\x24\xDB\xD7\x7D\x2A\x38\x5\x72\x38\x87\x40\x50\x87\x5A\x23\x5\x12\x0\x1\x42\x60"
-"\x8\x87\x20\x8\x58\x10\x5\x51\x80\x5\x88\xF0\x4\x55\x80\x71\x24\x56\x1B\xFE\x25\x27\x5\x57\x0\x1"
-"\x2A\x20\x39\x36\x23\x5F\x19\x93\x8\x89\xB0\x7A\x8A\x0\x4\x8B\x50\x6\x98\x58\x6\x60\x90\x8\x91\x84"
-"\x3\x8B\x0\x6\xA0\x8\x6\x8B\xB0\x8\x4A\xB0\x3\x1E\x83\x35\x2E\xE0\x3\x5A\xA0\xC\x2F\xC0\x1F\xE"
-"\xD0\xC\xF\x10\x1\x34\x70\x2\x45\xA0\x1\x1\x70\x8B\xB8\x18\x0\x3\x80\x1\xD9\x50\x0\x1A\xE0\x32"
-"\x1C\x90\x2\x72\x0\x9\x78\xE0\x4\x2A\x40\x2\xCA\x34\x2\x5C\x87\x20\x8B\x17\x3\x97\xA1\x0\x2D\xF0"
-"\xE\xF0\xD0\xD\xF0\x50\x8D\xF1\x10\xF\xF2\xF0\xE\xF1\xC0\x34\x64\xD7\x0\xD0\xC0\x0\xEE\x80\x8D\xD7"
-"\x98\x8\xEE\x80\x3\x1A\xF3\x61\xB3\xB1\x71\xE7\xA5\x3\x3C\x0\x5\xDA\xB0\x71\x17\xB3\x3\xDA\x80\x4D"
-"\x3E\x30\xF\xF3\xA0\xD\xF6\x38\xF\xD8\xE4\xC\xFC\x30\x77\xD7\xC4\xF\x74\x53\x63\x85\x53\x38\x37\xD6"
-"\xE\xF7\xC1\x63\x47\x10\x2F\x86\x37\x2\xCA\x78\x0\x1A\x76\x36\x36\x90\x4\x49\x60\x3\xFC\x0\x90\xDF"
-"\x61\x1E\x82\x23\x38\xE5\xA1\x25\x9\x1\x6A\xB2\xD7\x7F\x6\x21\x24\x8C\x20\x7\x82\xB0\x55\x60\x78\x92"
-"\x4D\x24\x7B\x5E\xD1\x30\x43\x88\x80\x71\x90\x83\x65\x90\xFE\x10\x31\x79\x55\x33\x9\x0\x35\xB9\x44\x8B"
-"\x90\x10\xDA\xE0\x55\x16\x5\xB\x77\xC0\x7\x77\xC0\x8\x9E\x10\x22\x0\x90\xD\x9\x51\x2D\x74\x0\x9"
-"\x7A\xB0\x3C\x24\x8\x0\xB4\x13\xF\x9\x41\xF\x5C\x40\xE\x77\x80\x6\x9\xD1\xD\xEF\xA6\x85\x6\x61"
-"\x6\x77\xD0\x95\xF0\x0\xB\x16\x48\x3C\x0\x90\x93\xFB\x67\x10\x8B\xD0\x4\x9A\x50\xF\x5A\x9\x0\xF7"
-"\xD3\x59\x7E\xB5\x93\x6\x31\xF\x3D\xA5\x24\x3E\x9\xE\x41\x9\xB\xE5\x43\x66\xF3\x44\x6F\xF9\x60\x80"
-"\xFD\x60\x0\x1F\xD2\x3D\x6F\xD8\x52\x9F\x5\x0\x1E\x69\x6D\x0\x30\x92\x8D\xC0\x82\xCB\x92\x79\x4C\xE4"
-"\x8\xE9\xF7\x8\x75\x30\x99\x39\xD8\x94\x48\x35\x7\x7F\xB0\x94\x67\x30\x7E\x69\x30\x7\x90\xC0\x8\x0"
-"\x90\x8\x6\x1\x99\x93\x39\x7E\x73\x20\x3B\x4B\x64\x6\xE4\x37\x99\x76\x60\x9\x7D\x0\x6A\xDB\x50\x7"
-"\x74\x70\x7E\x93\x59\x7\xA1\x80\x7\x69\x66\x10\x11\x61\x7\x99\x50\x92\x93\x10\xA\xA6\x9\x9\xA9\xC0"
-"\x3E\x0\x40\xF\x0\xE0\x8\x73\xB0\x9A\x73\xC0\xD\x69\x10\xA\x75\x90\x6\xB8\x9\x81\x66\x0\x0\x77"
-"\x50\x7\x68\x10\x0\x69\x80\x7E\x69\xFE\x50\xE\xC3\x50\x67\x6\x61\xF\xB9\xB8\x9\x6\xA1\x9\x68\x20"
-"\x7\x76\x50\x7\x72\xE0\x7\x6\x1\x6\x5E\x90\x6\x72\x40\x7\x76\x40\x7\x9A\x10\x6\x6\x91\x8B\xB7"
-"\x78\x1\xD7\xD2\x24\xEE\x70\x6\x1\xC0\xD\xED\x39\x7\x75\x90\x9\xD1\x49\x43\x7\x80\x9\x5E\x80\x8B"
-"\xA7\x0\x0\x2C\x40\x1\xF6\xC9\x1\xCA\x25\x98\x2A\x8\x0\xF4\x39\x46\x1D\xC9\x98\x8C\x30\x7\x91\xC0"
-"\x98\xC5\xD3\x98\x5A\x30\x8\x92\x30\x9\x93\x40\x9\x76\x40\x9\x95\xA9\x3E\xE\x98\x10\xE5\x77\x7\xE5"
-"\xC7\x7\x7E\xE0\x7\x80\xC0\x6\x9E\xC9\x50\x78\x90\x9\xE9\x47\x9\x7E\xA0\x9\xF8\xB7\x44\xB\xA0\xB"
-"\xBA\x40\x7\xA1\xB0\x6\x77\xF0\x6\x58\x16\xB\x72\x90\x9\x7E\xF0\x9\x4D\x80\x7\x8C\x0\x8\xCE\x59"
-"\x92\x71\x65\x10\x46\x99\x7E\x6B\x60\x9\x8F\x0\x8\x20\xA\x8\x74\x30\x8C\xF3\x87\x5B\x1\xD0\x4\xED"
-"\xE9\x7\x7A\x80\x7\x4D\x90\x7\x90\x90\x6\x69\x0\x8\x54\xF8\x3B\x66\x30\x6\x5E\xC0\x6\x93\xF0\x9"
-"\x62\xCA\x5\x80\x60\x9\x73\xC0\x7B\x15\x58\x0\x15\x90\x1\xDC\x10\x0\xBA\x23\x6\xFE\x19\x7\x7C\x10"
-"\x7\x94\xB0\x6\xFE\x39\x38\xD\xE5\xE0\xD\x6D\xBA\x6\x82\x30\x8\x61\x32\xE\xF6\xC0\xD\xDC\x50\x0"
-"\xA7\x40\xE\x29\x22\x3D\x3\x10\x0\x2\xC0\x1\xE6\x40\x4\x4D\x50\xF\x7C\xD0\x99\x25\x19\x5\x14\x1"
-"\x8\x6B\xF0\xA\x72\x90\x6\x6D\x0\x0\xDE\x70\x8B\x28\x50\x0\x28\x80\x2\x15\xF0\xA4\x83\xA5\x3D\x5E"
-"\xB1\x4\x61\x60\xAB\x61\x90\xAB\x61\x20\x5\xBC\xCA\xAB\x53\xA0\x5\x95\x30\x7\x82\xF0\x0\x27\x20\x87"
-"\x75\x8\x4\x55\x90\xAC\xC9\xAA\x5\xC9\x1A\x4\x27\xE0\x5E\xE\xC0\x4\x96\x20\x9\xD7\xE2\x18\x23\x30"
-"\x4A\x93\xC1\x3\x19\xF3\x9E\x7C\x30\x9\x7A\xF0\x1\x51\x0\x1\x57\x70\x9\x98\x40\x7\x87\x90\x5D\x1F"
-"\x3\x9\x99\xA0\x9\x4D\x20\xAE\x3C\x80\x89\xA4\xE8\x3\x41\xA0\x5\x9\x0\x9\x9F\x80\x8\x42\x80\x3"
-"\x60\x0\xA0\x4A\x9\x88\x58\x80\x5\xD1\xEA\x7\x1\xEA\xA\xC4\x40\x17\x43\xA0\x8\xAB\x80\x7E\x1F\xEA"
-"\x8\xB4\xE5\x9\x5F\x10\x7\x74\x80\x9\x7\x42\x5\x8C\x17\x0\x5E\xE0\x5\xE2\x50\x3\x35\xC0\x4\xC3"
-"\x20\x4\x97\xB0\x6\x71\x10\x8\x13\xB0\xA\xCF\x0\x8D\xD3\x78\x8B\xE1\x40\x4\x1F\x0\x3\x4C\xC0\xFE"
-"\x4\x34\x50\xD\x70\x40\x7\x96\xB0\xD\xD1\x60\x76\xC7\x10\xD\x2F\xE0\x1\x52\x80\x1\xDC\x80\x1\x3"
-"\x20\x0\xA7\x40\x4\x1A\xDB\x4\x70\x8A\x8\x27\xD0\x1B\xD6\x20\x6\xE1\x70\x5\xE\x30\x88\x40\xA0\xA"
-"\x61\x60\xD\x1B\x30\xE\xF5\x50\xC\xE1\xFA\x2\xF7\x78\x8B\xD9\x40\x4\x4E\x60\xC\x47\xE0\x4\xE1\xDA"
-"\x6\x69\x80\x6\x9F\x30\x3\x51\x20\x4F\xC2\x40\x6\x64\xB0\x6\x75\x40\xA\xAF\xC0\x6\xA7\xE0\x6\xB0"
-"\xD0\xA\x6E\x40\x4\x46\xE0\x0\xCC\x60\x5\xE5\x64\x4E\xE3\xD1\x52\x42\x62\x10\x13\x2A\xA1\xEE\x72\xA1"
-"\x19\xBA\x82\x86\xB\x0\x98\x7\x92\x0\xB0\x21\x8F\x40\x9\x54\xB8\x86\x9D\x46\x7\xEB\x3A\x8\x1D\x12"
-"\x92\x0\x80\x7\x6C\x10\xA\x85\xAB\x3\x77\x10\xA\x7E\x0\x6B\x5B\xA9\x9\x42\xB8\x3F\x7C\x0\x9\xC2"
-"\x57\x6\x90\xF9\x8\x25\x89\x29\x30\x71\x8\x75\x0\x8\x9B\x6\x0\x1D\x12\xA0\x77\x0\x96\x0\x40\x43"
-"\x5F\x90\x9\xBD\x19\x5A\x26\x20\x7\x7F\xD0\x7\x4C\x8\x0\x50\xA8\x2\x6B\x10\x9\x9E\x90\x45\xC7\xB9"
-"\x6D\x1D\x0\x0\xF3\x66\x10\x6E\xE6\xD\x68\x0\x8\xB8\xF2\x5A\x0\x70\xF\x1\xFE\x70\xF\xA7\xE0\xA"
-"\x20\x50\xB9\xA3\xB6\xA1\x0\x0\x9\x87\xC0\x5\xC0\xA5\xD\xA1\x0\x7\xB0\xA0\x84\x0\xA0\xD\x44\x70"
-"\x8B\xC1\x4B\x7D\x3\x70\x6\xF8\xA0\x41\x6\xA1\x97\xBA\x70\x6\x34\xF8\x9\x64\xA6\x86\x6A\x68\x70\x82"
-"\xE5\x29\x7F\xB\x0\xFF\x1B\xB8\x31\xC1\x8\x6C\x50\xB8\x86\xA9\xA1\x0\xA0\xB8\x8A\x4B\x46\xAF\xFB\xB8"
-"\xBB\x22\x5D\x76\x10\x7\x8E\x80\x6D\x11\x5\x0\x70\x10\xA\x92\x0\x20\x3A\x30\x8\x75\x40\x9\xAB\x90"
-"\x10\xE4\x17\x7\x9E\x6\x0\xDC\x0\x7\x65\x52\x6\x22\x1A\xB\x2A\xB5\x9E\x9\xB1\x8\x8C\x90\x94\x1F"
-"\xC\x2D\x0\xD0\xC1\x13\x3C\x82\xF5\x36\xA5\x92\xF0\xB\xBE\xE2\xBB\x8E\x80\x45\x7\xE1\x7B\x5C\x40\x66"
-"\xBC\x13\x7\x76\x80\x9\x60\xE9\xC3\xD3\x99\x98\x72\x30\xE\xB2\xE3\x66\x0\xA0\x85\xF8\xC0\xD\xE4\x20"
-"\x7C\xCD\xB\x0\xB2\xD7\x3F\x8C\x10\xA\x80\x20\x28\x33\x25\xF\x75\x90\x7\x14\xFC\x7A\xD9\x10\x0\xF6"
-"\xF0\xBF\x21\x14\x6\x1D\x10\x0\x19\x20\x5B\x36\xFC\xA\x73\xC0\x5\xAD\xE0\x15\xD0\x95\xB\x3D\x65\x5C"
-"\x9E\xD2\x2C\x0\x80\xC7\xFF\x4B\x46\x8C\xF0\x7\x6\x5C\x98\xFE\x1F\x24\x7B\xB2\x47\x46\x33\xB8\x80\xBB"
-"\x82\x6F\x8D\x9B\x83\x81\xEB\x23\x78\x10\xB1\xB8\x29\x55\x87\x90\x9\x97\x90\x10\x92\x49\x8C\xA9\xC3\x5"
-"\xDC\x90\xA0\x6\x51\x6\x72\xD0\xC1\xA\xC0\x8\x5D\xD9\xD\x5D\x79\x7\xDD\xA0\x9\x72\x20\x9\xE2\x6B"
-"\x10\xFD\x97\x94\xD1\x9\x0\x7A\x19\x2\x83\x30\xA2\xDD\x66\x10\x49\xF0\x9B\x74\x30\x7\x79\x0\xCA\xDC"
-"\xB0\x7E\x4\xB8\x66\x8\x18\x0\x12\xCC\x8\x5D\xD0\x95\x1D\x70\x6\x9A\xA0\x9\x2A\x2A\x9\x13\xC\x5B"
-"\x4F\xC\x0\xF8\x60\x1\xF5\x70\x81\xDE\x69\x10\x45\xFA\x9\x98\x96\x10\xDC\xC0\x6\xD6\xFC\xBF\x3B\xD0"
-"\x5\x1\x80\x2\xD3\x50\xF\x1D\x40\xE\xEE\x40\xE\xE4\x60\x0\xE5\x7C\xBD\xD1\x6C\x10\xA2\x6A\x10\xA3"
-"\xC0\x6\x13\xEC\x83\x6\x91\x43\x0\x90\x4\x75\xDC\x53\x5E\x71\x2\xFA\xAC\xCF\x2F\xD0\xCF\x2F\xD0\x1B"
-"\x4B\xB0\x4\xBC\xDA\x6\x87\x10\x9\xE\x20\x4\xBA\x1A\x6\x40\xE0\x2\x9B\xF0\x7\x29\xF0\x2\x52\x10"
-"\x4\x12\xCD\xAB\x2\xBD\x4\x33\xD8\x7\x2A\x40\x1C\x8E\xF1\x88\x49\x10\x3\x3C\x30\xA2\x4D\x20\x1\x40"
-"\x50\x1B\x6E\xC7\x3\x32\x20\xB9\x5C\x70\xFE\x2\x1A\xB7\x9\x9E\x5B\x5\x60\xD0\xD\x35\x5A\x9\x39\x50"
-"\x6\x5D\x90\x6\xAE\x40\x3\x2E\x30\x8A\x73\x40\x7\x94\x80\x9\xE9\x77\x9E\x59\x5A\x7E\x72\xA0\xB\x82"
-"\x10\xD2\x55\x90\x5D\x50\x30\x8C\x35\x80\x5\x10\xF0\x0\x4E\x40\x66\xC5\xC1\x9B\x5F\x20\x2\xF1\x95\x5"
-"\xAC\xF0\xA\xB1\x20\x9B\x41\x6D\x9A\xDF\xA0\x1\x9\x30\x18\xF4\x40\xF\xE6\x9\x9\xE5\xE0\x9E\x76\x70"
-"\xAA\x17\xDB\x9E\xE3\x20\x8\x7A\xA0\x8\x86\xC0\x19\xB\x10\x34\x73\x80\x6\x37\x4D\xD\xD3\xD0\x8D\x65"
-"\x37\x35\x52\x83\xF\x73\x0\x7\xD5\xA0\x5\x3A\x90\x8\xF2\xE0\x5\xD8\x80\x8\x43\x0\x4\xB2\xB1\x31"
-"\x73\x90\x6\x8E\xBA\xA7\xF6\xC9\xAA\x6\x60\x4\x51\xF0\x0\xFB\xE0\x0\xFE\x1\x2\xF8\x80\x6\x6E\x40"
-"\x8\x64\x80\x1C\x7\x80\x4\x67\x63\x2\x49\x60\x2\x54\xA0\x37\x7A\x73\x1D\x2D\xB5\x21\x1A\x62\x92\xF4"
-"\xF9\x5\x9C\xD0\x9\x9\x11\xB8\x55\x0\x8\x72\xC0\x8\xD1\x72\xC0\x14\x3A\x83\xAD\x77\x68\x48\x35\xA2"
-"\xC7\xAB\xB8\xBC\x55\x7\x98\x30\xC1\xC6\x83\x7\xC2\x3D\x7F\x98\x50\x7\x77\x10\xB\x94\x50\x44\x72\xC0"
-"\x7\xC3\xD0\xC2\x69\xFE\x30\x6\x77\xF0\x9\x83\x80\x7\x83\xD0\x4\xD7\x2D\xA6\x83\x50\x3\x7D\x20\xBF"
-"\x9\x25\x7\x71\xF0\x21\xB4\xE7\x15\x8F\x10\xB\x35\x9C\x54\x0\xF0\x6\x9F\x10\x9\x79\x10\x8\x93\xE0"
-"\x7\x92\x10\x7\xA1\xF0\x7\xBC\x8C\x3B\x98\x79\x7\x78\x80\x7\x7A\x30\xC\xD8\x1D\xA6\xC3\x50\x3\x4D"
-"\xC0\x18\x0\xC0\x6A\x50\x29\x9\x96\x60\xE\xEF\x36\x2E\x14\x8\x0\xCF\x90\x6\x62\xA0\x7\x70\x6\x0"
-"\x6C\xAB\xE0\x8E\xB9\x3\x1\xAA\x9\x44\x80\x7\xC3\x30\xC\x46\x10\xE0\x1E\x5E\x3\xC3\xF0\x1\xB4\x65"
-"\x6E\x10\xC1\xD\x46\x0\xB9\x87\x86\x5B\xF\x18\x58\x9E\xA2\xDA\x8B\x9B\x10\x30\x4E\x9F\x9F\xF0\xDA\x18"
-"\x34\x5\xA0\xC0\x9\x8E\x70\x6E\xA2\x45\xA1\xA1\x20\xA\xB\xA8\x86\xC8\x36\xA2\xF8\x27\x7B\x62\x4\xB"
-"\x75\x20\x9\xB8\x9\x92\x93\x69\xCD\x75\x10\xB\x0\x40\x9\x96\x80\x3\x9E\x50\x7\x81\x0\x3B\xF6\xE3"
-"\xD\xDA\x4C\x5A\x58\xE\x0\xB1\xFB\xBF\xA5\x33\x7\x98\x20\xAB\xA0\xEB\xCA\x55\xAE\xE4\x9\xD1\x97\x0"
-"\xA4\x2\x6F\xF0\x6\x4D\xF0\x6\x78\xE0\x7\x99\x20\x9\x29\x62\x3B\x87\x70\x8\x4B\x9\x0\x29\x6E\x10"
-"\xFE\xD1\x6D\x10\xB2\xFA\x3B\xBA\x83\xF\x6C\x60\xE1\x6B\xF5\x6E\xE5\xF2\xC\x6D\x80\x6\x6D\x80\x65\x73"
-"\x0\x8\x42\x68\x6B\xAF\x17\xC9\x3B\x9E\x10\xE8\xCB\xBD\x3C\x1E\xBB\x19\xD0\xA5\xC\x58\x85\x88\x76\x24"
-"\x1F\xD8\x52\x33\x61\x10\xA1\x1E\xE3\x96\xFB\x5\xA3\x0\xDB\xCC\x2\x13\xA4\x50\xA\x78\x0\xDE\x81\x4B"
-"\x9F\x7F\x20\xA\xBB\xBD\x97\x56\x38\xC3\xA6\xB0\x7E\xA0\x26\x46\x93\x60\x7\x81\x90\x22\xE4\xB6\x6\x76"
-"\xA0\xE4\xA1\xB0\x98\x77\xF0\x8\xDF\x10\x9\xB1\xF0\x9\x5D\xAE\x3\x6D\x20\x0\xD8\x80\xC7\xD7\x46\x65"
-"\x9\x21\x9A\x9D\x19\x8\x32\x4E\x13\x81\x40\x7\x81\x30\x7F\xB7\xF5\x8\x93\x0\x0\xC8\xD6\xCE\x6F\xF0"
-"\x8\x6B\x80\x7F\xFA\x60\x10\x7E\x10\xA\xA9\x5A\xE0\xBD\x67\x10\xC6\x89\xBC\x0\xF0\xE\x0\x40\xDB\xEB"
-"\x5C\xE8\x35\x72\xEF\xE\xDE\xA\x68\x10\xE\x28\xE5\x7\x69\xB0\xBA\x90\x3E\x6D\x6D\x20\x7A\x65\x5E\x98"
-"\x8A\x8B\xC7\x7A\x62\x10\x99\x9E\xE2\xE9\xC3\x86\xF5\x3C\x47\x5E\x21\x4\x42\xF0\x4\x13\xFF\x4\x16\x7F"
-"\xF1\xFF\xBC\xAB\xA7\x80\xA\xA9\x40\xAC\x11\xED\xAB\xAA\x80\xA\xA8\xE0\x6\xF\xF0\xFE\x4\x2\x3D\x87"
-"\x53\x50\x5F\x99\x0\xA\x78\xE0\x0\xE\x10\x40\x2B\x20\x4A\x7B\xB0\x5\x5B\x10\xA0\xA2\xB0\xA\x41\x60"
-"\x71\x3D\xE0\x5D\x4A\x60\x7\xB1\xC0\x8\xF\x70\x5\x55\x40\x71\xE0\xF0\x8\x8F\xC0\x7\x6B\xA0\x7\x27"
-"\xA0\x6\x76\xF0\x7\x98\x30\x9\x46\xDD\x5D\xCF\x80\x6\x62\x60\x8\x3D\x10\x49\x8B\x90\x8\x97\x88\x89"
-"\x66\xD0\xD\x39\xB0\x3\x3A\xF0\x89\x60\xD0\x99\x7C\x60\xD\xC8\x6A\x72\x24\x73\x5\xD5\xCC\xD9\x90\x91"
-"\x4\x3E\x7A\xB\x31\xC0\xC\xFD\xD1\xC\x10\x30\x4\x34\x60\x7\x50\xDF\x1\x28\x60\x1\x3\x60\xF\x99"
-"\x80\x9\xD8\x30\xC6\x8F\x8D\x8B\xD9\xA0\x1\x37\xF0\xE\x4\x0\xF\xF4\xD0\xD\x73\x10\xA\x5C\x60\x0"
-"\x9\xF0\xE\x92\xDF\x2\x9B\xA1\x34\xA0\xA1\x4B\x4\xC0\xD\xDF\x20\xF\xDC\x10\xE\x4C\x60\x4\x55\x30"
-"\x35\xAD\xB1\x1\x54\x6F\x8\x2E\x0\xD\x3B\x80\xFA\x60\x5F\x49\x39\x90\x0\x40\xE0\xCF\x2F\x70\x2\xBF"
-"\xB1\xF7\xDA\x3B\x4F\x2\x72\x1C\xCA\x78\x20\x25\x40\x5\xA2\xAD\x36\xE0\xD4\x52\x9\xF\x0\xA3\x3E\xEA"
-"\x9B\xE2\x6\x49\xC0\xA\x48\x88\xB8\xA0\x80\xA\xAD\xC0\xBD\x1F\xFE\xD4\x7F\x99\x80\xA\xAE\x60\x7D\xB4"
-"\x6E\xEB\xAF\x20\xA\xD7\xB6\x3\xB0\x10\xB\x76\x90\x7\xDC\x7E\x6D\x46\x2F\x9\x9A\x80\xE5\x8F\x30\xA2"
-"\x77\x60\xC\x65\xCE\x12\xD8\x80\x6\xDE\x30\xFD\x0\x10\x6E\x0\x0\xD3\x76\xF0\x8\xEA\xB9\xC9\x0\xD0"
-"\x9E\xE1\xA0\xB\xC7\x2B\x46\x7D\xC0\x6\x72\xD0\xEB\x0\x41\x6\xC0\xC0\x60\x75\xEA\x40\x4A\x32\x10\xC0"
-"\x94\x81\xB1\xEC\x44\x2\x1\xC0\x88\x42\x4C\x7F\x32\x39\xA\xA0\x30\xA3\xA3\x47\x76\xE8\x70\x1\x70\x43"
-"\x23\x80\x38\x73\xB6\x29\xEC\xA6\x30\x81\x42\x5\xA\x17\x0\xD0\xD3\x85\x5B\x3D\x34\xE2\x10\x29\x6C\xA0"
-"\x30\x19\x80\x35\x6C\xD8\xB8\x1A\xE8\x4E\xE1\x3B\x39\x5E\xD2\x9C\x52\x8\x44\xE1\x80\x0\xE4\x0\x18\x53"
-"\x18\x22\xAA\x42\x2A\xA\x59\x28\x54\xA6\x50\x2B\x0\x9\xA\xBB\xE\x7C\x32\x50\xD6\x2C\x5A\xB5\xA8\xD8"
-"\x92\x55\xAB\xD6\xAD\x59\x6D\x71\x6D\xC9\xD5\xEA\xE6\x40\x5D\xB8\xEC\x8E\x42\x65\xAA\x14\x28\xBE\xA0\x44"
-"\xED\x7A\x3\xE0\x0\x0\x52\xA8\x32\x89\xE2\xF5\xCA\x94\x28\x46\x8C\xE\x59\x32\x95\x67\x90\xC2\x2A\xA"
-"\x21\xC5\x92\xC4\x68\xAE\xA4\x4C\x7E\x1C\x1\xFE\x78\xA1\xB0\x7\x80\x37\xD8\xC4\x74\xF1\x26\xCE\x8C\xA6"
-"\x40\x74\xE8\xD8\x59\xC3\x88\x89\xC2\x33\x62\xD2\x84\x6B\x63\x7B\xDC\x26\x4D\x70\xD2\xCC\xF1\xD3\x7\x80"
-"\x30\x85\xBC\x5C\x87\xA2\x13\x2B\xF\xA3\x77\x81\x3A\x92\xF2\x34\x70\x86\x42\xF\xA4\x30\xD5\x91\xB3\xFC"
-"\xCE\x99\x50\x72\xE8\xC4\x56\x1\xE0\x2\x80\x3E\xB1\xD2\x60\x9A\x33\x27\x9C\x24\x48\x25\x21\x89\x3\xD0"
-"\x72\xE0\xCA\x81\xF2\xC3\x75\xF9\xC6\xE1\x83\x7\x85\xC\x70\x2\x50\x61\x8D\x43\xE6\x18\x23\x5\x33\xC8"
-"\x9\xC4\x20\xD8\x34\xD3\xC9\x1E\x7D\xEC\x9\x20\x80\xC\x34\xB0\x27\x1B\x14\x32\x40\x6A\x20\xA9\x6\xDA"
-"\x43\x21\x13\x14\x52\x65\x2B\x85\x68\xF0\xAA\x44\x0\x7A\x71\xA3\x17\x5F\x7E\xF9\xC5\x97\x5E\x64\x81\x31"
-"\xC6\x5E\x56\x50\xE1\x3\x85\x58\x61\x25\x97\x5C\xDA\x2\xA6\x96\x54\x82\xB9\x65\x97\x5D\x6E\xF9\x2\x80"
-"\x11\xBE\x28\xE5\xAF\x2F\x3C\xF1\x65\x17\x51\x4C\xE1\xA4\x94\x5D\x1C\x51\xE1\x88\xA4\x14\xDA\xE6\x95\x49"
-"\x6\x99\x8B\x11\x4A\xF2\x10\x2E\x8\x85\xA0\x18\x48\x5\x72\xB0\x29\xA7\x8B\x2E\xBC\x98\x23\x8E\x40\x3E"
-"\x29\x4\x80\x21\x6\x62\xFE\x44\xE\x31\xE0\xE0\x62\x98\x26\xE0\xB0\x2D\xD\x36\xB0\x31\x27\x3C\x0\x36"
-"\x4\xC0\xD\x5D\x26\x69\x64\x8D\x38\xE8\xA8\xE3\x11\x4B\x0\x11\xA4\x6\x85\x42\x1B\xC8\x9\x63\x1C\x21"
-"\x85\x12\x4B\x1E\xA9\x23\x13\x48\x2\x71\x64\x98\xA5\x0\x0\xC4\xB\x31\x28\x91\xC4\xF\x3F\xE0\x88\x3"
-"\x12\x48\x0\xC9\x3\x80\x69\x54\xA2\x15\x0\x57\xF0\x69\xC3\x15\x10\x14\x71\xE9\xBF\xA7\x4\xF1\x3\x13"
-"\x3A\xD2\xF0\x2\x8D\x70\xDE\xF4\x4\x84\xB9\x0\xF8\x6\x8D\x6F\xB2\xC1\xF5\x94\x7B\xB2\xA1\x16\x9F\xC"
-"\x1\x10\x41\x21\x24\x14\x4A\x68\x20\x67\x44\x4\x80\x6\x71\xC7\x1D\x57\x2\x9\x68\x80\x0\x86\x23\xD6"
-"\x3D\xA2\xCA\x76\xDF\x3D\xE2\xD\x27\x9C\x78\x40\x82\x13\x84\x30\xE2\x3\x27\xDE\x88\x37\xDE\x37\xFE\x15"
-"\x46\x5\x15\xC8\x20\x78\x84\x15\x5B\x19\x21\xA\x44\x86\xC1\xA3\xE1\x3E\xA\x39\x2\xB\x1A\x5E\x98\xA2"
-"\x62\x8B\x97\xC8\xC3\x11\x2C\x86\x90\x2\x8\x29\x4\xD1\x98\x86\x29\x5C\x20\x19\xA\x17\xB4\xA8\xE6\x4"
-"\x9\x5C\x71\x85\x88\x26\x8C\x40\xE4\x3\x2C\x98\xB8\x22\x8\x28\x7A\xD0\x62\x95\x26\x10\xA9\x1\x91\x21"
-"\x3C\xFE\xB8\xC2\xE5\x1A\x9C\x10\xD8\x9\x2B\x57\x8\x41\x4\x11\x18\x19\x44\x98\x56\x7C\x71\xC4\x8D\x26"
-"\xF0\x60\x2\xB\x44\xAE\xA8\xC2\x7\x17\x7E\x0\x22\x8C\x13\xF6\x31\xC6\x9\x3C\xA6\xC6\x63\x10\x4F\xDE"
-"\x80\x81\x8\x3\x2A\x40\x61\x80\xB\x2A\x21\x47\xF\x23\x86\xA1\xBB\x6E\x3D\x87\x71\x65\x83\x1B\xF6\x6E"
-"\xA1\x85\x4\xFE\x56\xA0\x81\x14\x8A\x70\xA5\xF\x26\x28\x60\x60\x1\x5\x16\x60\x9C\xF1\x6\xA6\xB1\xA6"
-"\x1A\x45\x3E\xF9\x44\x8F\x97\x63\xB6\x5A\x82\x6A\x80\xA8\x62\x8A\x17\xF4\xA8\x1\x6\xD1\x61\x28\xA4\xF4"
-"\x7D\x7\x16\x61\x4\xA5\x47\x8\x81\x4\x4\xF6\xA0\xC2\x84\x2D\x4C\x60\xE1\x7\x67\xBE\xDD\x6A\xCE\x81"
-"\x48\xDC\x5D\x21\x62\x14\x2A\xC6\x77\x85\x1C\x50\x48\x77\x39\x87\x57\xC8\x9\x85\x22\x1A\x28\xDB\x81\x7A"
-"\x19\x51\x21\x2C\x14\x5A\x42\x21\x86\x6\xAA\x7E\xA0\x2B\x8A\xA7\x4C\x21\x17\xAC\x57\x68\x59\xDE\x1\x18"
-"\x6D\x20\x29\x14\xA\x6B\xA0\x65\x21\x50\x8\xAA\x81\x88\x1B\x68\xB0\x81\x8C\xBF\x1E\x0\x19\xBC\x57\x88"
-"\xFD\x81\x98\x7\x40\x7F\x0\x50\x50\x88\x53\x6\xD2\x1\x85\x10\x70\x20\x5\x50\x8\x6\xFE\x14\xD2\x2"
-"\x85\x18\x40\x21\x1B\x60\x49\x4\x7\x12\xD\x85\xCC\x66\x20\x42\x50\x8\x5\x7\x52\xD\xE4\xD\xC4\x4A"
-"\xFB\x53\xC8\x8\x14\xB2\x2\xAA\x58\x5\x5C\xC7\xEB\x5D\xA\x51\x8\x80\x8\x70\x4F\x85\x18\x4\x4B\xF4"
-"\xE6\xA7\x90\x28\x84\x50\x21\xB6\x98\x14\xFA\x14\x72\x3E\xF3\x29\x24\xC\x3B\xA4\x5E\xF7\x6\xF2\xBD\x21"
-"\x2\x71\x20\x95\x19\x48\xF9\x0\x40\xA6\x22\xE\xE4\x87\x3\x39\x1\xD\x15\xE2\x3C\x0\x6C\x6B\x20\x56"
-"\x4\x80\xE\x14\xA2\xC5\x81\xDC\x6F\x20\xF5\x83\x21\x0\xA6\x33\xC3\x81\x40\x70\x20\x19\x50\x8\x2\x7"
-"\x42\x0\x85\x8C\x67\x20\xA\x1C\xC8\x4B\x6\xC2\xC0\xF9\x48\x10\x0\x72\x4\xC0\x35\x14\x62\x8\x9D\x8"
-"\x11\x34\x2E\x4\xC0\x7\x7\x35\x15\xE\x79\xE8\x84\x2D\x1C\x8\x22\x57\x38\x3E\x46\x9A\x8\x0\x61\x4C"
-"\x1F\x0\x22\x39\x3E\xE2\x69\xC8\x84\xD8\xB\xA2\x13\x7D\x68\x44\x0\x88\xE9\x8B\x57\x3A\xA2\x42\xB4\x80"
-"\xBF\x81\x30\x71\x89\xA2\x41\xE5\x40\x46\x89\xC9\x81\x54\xD2\x48\xA\x41\x80\x42\xB2\xA0\x10\x25\x28\x4"
-"\x7\x5B\x54\x88\x17\x1\x40\x44\x0\x64\x4F\x8C\x80\xD4\x80\x42\x4\xFE\x30\xAA\x81\xB8\x51\x3C\xA\x11"
-"\xC9\x1C\x6B\x5\x0\xFA\xC4\xA7\x57\x71\x54\xC8\x33\x32\xA8\x10\x6A\x28\x64\x7B\x3\xB1\xD1\x40\x48\xD8"
-"\x3C\x6D\x29\x64\xB\xE0\x82\x40\x4\xC2\x19\x1\x72\x92\x73\x8\x11\x18\x42\x3A\xD3\x49\x2E\x1A\x9C\x4B"
-"\x5C\xE6\x32\x97\x10\x24\x20\x4\x7A\xD2\xF3\x9\x4F\xA0\xA7\xB9\xCE\x9\x1\x7\x58\x6A\x50\xA9\x3B\x40"
-"\x9\x4C\x60\x82\x17\x14\xF4\x5\x4B\x40\x68\x42\x11\x1A\x6\x86\x32\x54\xA\xF\x95\x42\x10\x22\x1A\x4"
-"\x8A\x5A\xAC\x62\x40\xC0\x28\xE7\xAA\xB0\xD1\x2A\x68\xC1\xA3\x24\x3\x29\x14\x44\x2A\xD2\x1E\xDC\x6C\xA4"
-"\x24\xEB\x5C\x10\x96\x70\x82\x2B\xC\x1\x11\x35\x3C\x40\xD2\x44\x10\x82\x3\x20\x81\x5\x26\xB0\x1\x15"
-"\x70\xB0\x53\x25\xF4\xB4\xA7\x38\x50\xC2\x4E\x73\x90\x3\x1D\xE8\x60\x7\x47\x95\x41\x49\xB5\x6\x84\x29"
-"\x78\x6D\x8\x33\x80\xEA\x3\x20\x30\x4\x9\x4C\x80\x2\x15\xB0\x80\x5\x4\xB0\xD5\x1\x74\x95\x0\x5F"
-"\x25\xC0\x5\xC4\x7A\x1\xC\x94\x15\x3\x7C\xBB\x41\xDF\xFE\xB6\xD6\x4\x28\xC0\xAD\x6F\x5D\x1C\xE3\x18"
-"\xC0\x80\x67\x3C\x63\x1A\xD3\x88\x46\x34\xAE\x51\xFE\x5\x6A\x48\xA1\x1A\x2F\x50\x84\x4\x86\x0\x1\x7D"
-"\x81\xE0\x0\x48\x53\x5D\xEA\x56\x40\x2\x24\xC0\xCE\x6\x5B\x98\xE5\x56\xFC\xA7\x48\x45\x1A\xCF\x78\x8D"
-"\x1C\xC8\x57\x1E\xA9\xC3\xCC\x86\x4F\x21\xF2\xAB\x62\xE\x7\x42\xA9\x5E\x66\x12\x0\x4F\x4\x0\xF\x3B"
-"\x9\xBE\x4F\x86\xD2\xB5\x0\x58\xE5\x2E\xC7\x34\x5B\x55\x6E\x32\x91\x23\xC4\xED\x40\xBE\x39\x90\x1C\xD0"
-"\xD2\xB7\x3\xB9\xE5\x40\xB8\x68\x3F\x85\xF8\x80\x93\x63\x5C\xA1\x19\x1\x60\x1\x62\x2\x80\x8D\xC5\x4C"
-"\xE0\x2\xA5\x5B\xC7\xFA\x3C\x13\x0\xC8\x50\x88\x1E\x37\x28\x43\x0\xF0\x4F\x84\xDA\x54\x48\xC\x4E\xF8"
-"\x80\xFC\x29\x84\xB2\xE6\x5\x24\x66\xB9\xE2\xC8\xF1\x91\x37\x7E\xB0\x54\x48\x14\x47\x6B\x5A\x5F\xFA\x12"
-"\xB5\xA8\x55\x6D\xFD\xEA\x87\x44\x0\xF0\x37\xB6\xBC\xE4\x65\x6C\x55\x6B\x3C\xD0\x12\xEA\x43\xC2\x55\x48"
-"\x6F\x7\x52\xCB\x5\xFF\x16\x0\xA\x26\x6E\x29\x8F\x8B\xDE\x32\x2A\x84\xB9\x3\x19\x80\x42\x9E\x7B\xCC"
-"\x37\x4E\x17\x0\x74\x64\xA6\x1D\x73\x32\x41\x6A\x52\x27\x79\x84\x1C\x64\x21\xC1\xE5\x5E\x0\xB0\xD8\x7F"
-"\x93\xA5\xF0\x22\xB9\xAB\x5E\xFE\x16\x6B\x5\xB4\xF2\x5\x0\x8E\x71\x4C\xDA\xFA\xDA\xF6\xB4\x9C\xF4\xE4"
-"\x42\x40\xD9\x5F\x51\x92\x92\xC8\x3D\x54\xA1\x56\xA8\x58\x95\x81\xEC\x0\x97\xBC\xB5\xA5\x83\x83\x9B\xC5"
-"\x5C\xD2\x36\xB5\xA\x41\xAE\x22\x39\x20\xCC\xE6\x6E\xD8\x98\x70\xFC\xF0\x32\xE5\x73\x47\x85\xCC\x6A\x20"
-"\xD5\x84\xA2\x42\xB2\x9\x80\x6D\x62\xAB\x9B\x22\x72\x40\x9C\x1D\xF0\x0\x3A\xD7\xB9\xCE\x10\xC0\xB3\x38"
-"\xF5\x5C\x4E\x3E\xAB\x73\x9D\xEC\x1C\xD7\x3E\x11\xE1\x80\x28\x84\xE7\x0\xAA\xB\x81\x4D\x93\xC0\x82\x7B"
-"\x3E\xE1\x4\x8E\x3E\x41\xA4\x23\xFD\x82\x13\x18\xB4\xA0\xA\xC5\x74\x43\xC3\x0\x51\x88\x52\xD4\xD3\x16"
-"\x9D\x42\x46\x39\xDA\x51\x8F\x72\x94\xA9\x53\x90\xC2\x12\x28\x2D\x4\x97\x16\x3A\xA6\xAA\x1B\xC1\xA\x5E"
-"\x17\x83\x24\x64\xE1\xA8\x47\x35\x6A\x51\x75\x9D\x3\x1C\xF0\x9A\xA7\x3E\x5\x76\xAF\x87\x5A\x54\xA4\xF2"
-"\xA0\xA4\x2E\xA8\x82\xC7\xAC\x20\x4\xA8\xCE\x60\xCE\x11\xA0\xC1\x15\xC\xC0\x81\xAC\x6A\x55\x0\x5D\xF5"
-"\xEA\x57\xC7\x4A\x56\xB3\xEE\x8D\x6F\x7E\xF3\x9B\x5B\x35\xB0\x0\x6\x6C\xC0\xAE\x86\xC8\x2B\x35\xA8\xB1"
-"\xA\xC9\xFE\x9\xC1\x3\x4C\x28\xEC\x61\x43\x90\xD8\x10\xC8\xBA\xB1\x70\xEE\x60\x8B\x15\xC2\x62\x16\x9F"
-"\xF7\xB6\x64\xC\x17\x20\x97\xE5\x5D\x43\xA6\xD9\xE0\x39\x16\xED\x1F\x59\x59\xDA\x85\xAB\x36\xC8\x41\xAE"
-"\x9F\x52\x5E\xCB\xDF\x20\x5F\x33\x90\x53\x54\x48\x9\x2E\x9\x0\x27\x23\xD8\xE3\xF\x8E\x72\x83\x81\xFB"
-"\x64\x8E\x5B\x39\xC8\x59\x56\x48\xA\x98\x37\xCC\x81\xB0\xDC\xB9\x6D\x8C\xEE\x40\x92\x19\xE2\x81\x8C\x18"
-"\x0\x7C\x1C\x88\x3\x55\x48\xF0\xF7\x82\xEB\x77\x3\xF9\xB9\xBE\x7\xE2\xE2\x7D\xC7\xD8\xDF\x2B\x34\x9E"
-"\xFF\xDC\xE7\x66\xDD\x72\x56\x92\xF1\x85\xFA\xC1\x7B\xAC\x49\xAA\xFF\x78\x20\xF\x67\x2D\x0\x24\xAE\x75"
-"\x4E\x46\x32\x78\x96\x1C\x48\x2C\x7\x72\xE0\x8\x97\xFC\xE3\xC3\x9D\x32\x83\x1\xA0\x76\xB5\x43\xB8\xE3"
-"\xE4\x53\xC8\xC9\x63\x9C\x2\x2E\x63\x58\xC3\x30\xEF\xB0\x32\x7\x12\xCC\x81\x98\x19\x0\x68\x6\x0\x11"
-"\x4E\xC\xF6\x14\x8B\x28\xE8\x87\xCF\x37\xBF\x8B\x3E\x10\x18\xFF\x9B\x85\x8B\x7\x10\xC6\x9B\x7E\x41\xA7"
-"\x47\x32\x92\x3A\x4E\xF8\xD4\x19\x6E\xF5\x2B\x5F\x3D\xEB\xF5\x53\x6D\x24\x5D\x49\x28\xD0\xEE\xFE\x16\x0"
-"\x3C\xA8\x72\x93\x15\xF2\xF6\xE1\x42\x38\xED\x21\xA7\xB2\xEA\x25\xDC\xDA\x5F\x32\x5E\x21\x45\xA8\x3B\x0"
-"\x32\xBC\x46\xBC\x87\x64\x99\x7E\xD7\x2E\x0\x78\x85\xCD\xDC\x32\x7D\x2B\x51\x20\x46\xF2\x95\xBF\x7C\xE6"
-"\xCB\x79\xCE\x76\x86\x0\x9D\xF1\x9C\xE7\xE9\xF3\x99\xCF\x10\x40\xC4\x3\x88\x51\xE8\x88\x24\x6D\x4\x1"
-"\x1D\x28\x3C\xE1\x59\x4F\x21\x34\xDA\xD1\x8D\x7E\xB4\xA4\x25\x4D\x69\xF6\x1B\x54\xA1\x61\x48\xA8\xA6\xA5"
-"\xB0\x69\x4E\x7B\xBA\xA2\x14\x7D\x28\x42\x23\x2D\x4\x1A\x30\x1\x2\xC5\x8\xF\xA4\x51\x9A\xD6\x29\x1"
-"\x2A\x98\x9D\x3D\xE8\x81\x4\x4C\x40\x1E\x60\x40\x1E\x90\x81\x7\x94\x81\x5B\xC3\xB5\x1D\xD0\xB5\xA2\xEA"
-"\xB5\x9D\xFA\x35\x60\xB\xAA\x5E\xD3\xB5\x62\x4B\x40\x92\x61\xAA\x30\x78\x2\x66\x68\xB6\x66\x20\xA7\xAA"
-"\x2A\x2\xAC\xCA\x2A\xAE\xCA\x36\x6D\x13\xAB\xB2\xBA\x81\x6C\xF8\x1B\xD\xD0\x80\xD\xD8\x0\x43\x30\x84"
-"\x6B\xA0\x6\x3\x58\x85\x9\x50\x84\x77\x8B\x37\x1\x1C\x40\xC3\x13\x1E\xA0\x2B\x42\x0\x70\x25\x57\x52"
-"\x3C\xDB\x63\xC2\xC7\x1B\x3A\x85\x10\x24\x42\x61\xB2\xF5\xA2\xBC\x2A\x7C\xFE\xBA\x18\x3A\xB8\x1D\xCB\x3C"
-"\xD3\xC2\xAF\xB8\xF3\xC2\xAA\xC3\x31\xFF\x1\xAD\xEF\x2\x80\xC8\x3A\xA5\x24\x52\x8\xD4\xEB\xA2\xD4\x8B"
-"\xBD\x36\x74\x3D\x7\x6B\xBB\xD5\x4B\x25\x21\x93\x8E\x18\xA3\x80\xDC\xDB\xBD\x97\xCB\x3B\x9A\x93\x95\x12"
-"\x1B\x8\xFE\x0\xA1\x81\x20\xC3\xAD\x40\x3C\x23\x34\x44\x0\x28\x44\x24\x84\x3C\xA2\x6B\x42\x16\x53\x1E"
-"\xC2\xEB\x10\x15\x1A\x1F\xCD\x82\x24\xA7\xC3\xBC\x83\xE3\x31\xFA\xF2\x31\xD5\x42\xAD\x48\x52\x24\x25\xDB"
-"\x38\x53\x32\x25\x25\x52\xC3\xB2\xD3\xA5\xE1\x6A\x3D\xD8\x63\x3B\xD8\x7B\x3B\x25\xDA\x3A\xE4\x62\xB1\x3B"
-"\x1C\x88\xB\xD3\xBD\xDE\xCB\x6\x85\xA8\x80\x94\x53\x88\xE1\x3\x80\x47\x2C\x3C\x42\x3C\xC2\x44\x14\xC6"
-"\xC4\x5B\x44\xC8\x13\xA4\x36\xD3\x38\x80\x53\x2F\x4A\xAC\x3C\x4B\x8C\x3A\x85\xDB\x3C\xCD\x43\x2D\x5F\xC2"
-"\x31\xB\x7A\xA\xC9\x3\x80\x48\x94\xAD\x26\x3A\x43\xB8\x43\xC3\x35\x4\x47\xB3\x73\x43\x55\x84\x3D\xB7"
-"\x9B\xC3\xFA\x81\xC5\x6\xB2\xB0\xE6\x2\x33\xBE\xBB\xB9\x2\x52\xB3\xE2\xD3\xA\xE4\x4B\x3E\x7A\xDC\x3E"
-"\xE5\xB3\x47\x7B\x64\xBE\x7D\x24\x6\xE7\x7B\x3E\x3B\xFE\xAB\x33\x7\xD8\x3E\xA2\x89\x88\x43\x9B\x29\x45"
-"\x63\x1\x3F\xA3\x81\x21\x0\xB4\x73\x11\xBF\x78\xAA\x27\xF3\x43\xBF\xF3\x53\x3F\xF5\xB3\x34\x4C\x7B\x3F"
-"\x4C\xA3\xB4\x47\x93\xA7\x73\x72\x80\x62\xB0\x92\x98\x5A\x9D\x9A\xDA\x3\xD9\xA1\x82\x8F\x2\x29\x17\x30"
-"\x99\x91\x22\x29\x5\x34\x36\x6\x4C\x6\x8\x8C\x40\x9\xC4\xB5\xA\x1C\x2A\x5F\x3\x2A\xD\xDC\xC0\x61"
-"\x23\xB6\x1D\x90\x1\x63\x33\x19\xAE\x91\x82\x65\x6B\xB6\x67\xA3\x1\x45\x98\xB6\x6A\xBB\xB6\x1\x20\x0"
-"\x7D\xC0\x80\x6C\xC8\x80\x2\xA8\x0\x1B\xE4\x80\xC1\x31\x80\xE\xF8\xC1\x61\x88\xB7\x10\x20\x94\x60\xF4"
-"\xCA\x43\x1C\xC6\x43\x54\xC2\x7C\xF3\x45\xAD\x20\x81\x18\xBB\x2C\xEE\xD2\x2C\x66\xC4\xC2\x2B\x44\xB8\x2C"
-"\x7C\x46\xCD\xA3\x46\x40\xAA\x21\xC2\x13\x3B\x0\x20\x3B\xFE\xE2\x25\x51\x9C\x43\x25\xD2\xA5\xB7\x63\xBD"
-"\x4\x23\x47\x91\x3\x39\xD9\xF3\x46\xAE\xAB\xC3\x27\x1C\x88\x55\xC8\x3D\x30\xCB\xC5\x81\xA0\xBB\x81\x10"
-"\xBC\x40\x24\x42\xB0\xFC\x4A\x44\xBC\xCC\x44\x4C\xC2\xC1\xDB\x8A\x36\xD3\xC6\xCA\x9A\x31\x47\x62\x4B\xB7"
-"\xBC\xBC\x67\x24\xAD\x4C\x5C\x38\xFE\x1C\xD3\xAC\xAF\x2B\x3C\xD0\xEA\x96\x23\x83\xCD\xBD\xB4\x32\x25\xF2"
-"\x4B\x39\x34\xCC\x54\x1C\x39\xC2\x54\xBB\x29\x1B\x2E\x57\x2C\x2F\xC5\x4\x0\xE\xE2\xBD\x3\x52\x88\x2D"
-"\x1B\x88\x9\x50\x88\x38\xF1\xB9\xCC\x64\x4E\xCB\x1C\x88\xBA\xC4\xCC\x43\x2C\x4B\x14\x9B\xC2\xA3\xB3\xAC"
-"\xD0\xEC\x2C\x2B\xB4\x3C\x67\xC4\xC4\x84\xC3\x31\x4A\x2A\x3E\x42\xB1\x81\xAC\xE3\x2F\xFF\x32\xB2\x51\x9C"
-"\x43\x5D\xFA\x4B\x92\x43\x3B\x38\x14\x4C\xC3\x54\x22\xDC\x1\x80\x7D\x80\x3C\xE4\x1C\x88\x5B\x1C\x88\x36"
-"\x50\x8\xC6\x54\x1F\x70\xF9\x7\x7C\x4\xD0\x7A\xC\xD0\x7B\x14\xD0\x2\x25\xD0\xE5\xCB\x47\x7C\x8C\x82"
-"\x75\x31\x6\x10\xE8\x3E\x80\x12\x28\x13\x90\xAA\xE9\x1B\x27\xEB\x33\x27\x3F\x63\x48\x76\x72\xA7\x87\x24"
-"\x3F\x7C\x92\xC8\x7B\x4A\xBF\x8A\xAC\xB4\x11\x95\xB4\x7B\x92\x27\x1A\x88\x80\xEC\x5B\x50\xC3\x9A\x37\xC5"
-"\x9A\xB5\x5A\xB\x2\x50\x13\x35\x8E\xD2\x2\x52\x4B\xC9\x92\x61\xC9\x9B\x51\xC0\x1E\x60\x40\x99\x8C\xC0"
-"\x99\xBC\xB5\xA\xD4\x81\x9B\xC4\xC0\x9C\xC\x36\xC\xAC\x40\x9F\x4C\x6\xA5\xD2\x82\x1F\x68\xAA\xAF\x29"
-"\x4A\xA9\x1A\xFE\x2\x45\x58\x85\x14\x90\xCA\xA\xA8\xCA\x22\x20\x87\xE\x20\x2\x23\x90\x94\xAD\xF8\x7"
-"\xE8\xC\xCB\xE8\x24\xD3\x31\x4D\x44\xE8\xF4\x45\xFE\xA1\xA2\xD7\x7C\x31\xA3\x4B\x2F\xEC\xA4\xC2\xCD\x6A"
-"\xCB\xED\xEC\xCE\x83\xD3\xAC\x81\xC3\xC6\xAB\xF0\x3C\xDA\xDB\x2F\x3F\x92\xCD\xD9\x3B\xCC\xDA\x34\xCC\xC0"
-"\x84\xB2\xDC\x5C\x3B\x7\x83\xB0\xDE\xF4\xA3\xF1\x9\x3A\x40\x4\x80\x6B\x99\x4C\xAD\xF8\x87\x49\x6D\xCE"
-"\x32\xAD\xD4\x31\x15\x24\x35\xF5\xA6\x62\x74\xBC\xA3\x53\x24\xF5\x1A\x9F\x30\xAA\xC4\xB6\xBC\x44\xB7\xD4"
-"\x2C\x45\xD2\xD4\x81\x48\xC6\x6C\xFC\x42\x3A\x44\x4C\xD8\x34\x4F\x6E\x44\xCF\x6F\x2C\x3B\xC0\x24\x39\x8"
-"\x5B\x45\xC2\x4C\xD4\x34\x1C\x32\x46\xAD\x20\x78\x4\x53\x4A\x75\x4E\x4B\x1D\x56\x33\x3D\xC2\x34\xC5\x46"
-"\x33\x1C\x4B\xE0\x6C\x3C\x27\x74\xD6\xB4\x54\xA1\xB5\x54\x88\x51\x25\x4D\x47\xF2\x1F\x41\x79\xA5\x2B\xA"
-"\x2F\x20\xFB\xBC\x21\x8B\xD5\x6D\xEC\x46\xDA\x64\xC3\xF5\x3C\xBB\xC1\x3C\xD4\x42\x15\x47\xDF\x4\x38\x5F"
-"\x5C\x16\x85\x98\xD4\x49\x3D\xD0\x4\x35\x50\x79\x8D\xD7\x1\xCD\xC7\x19\x88\x82\x19\x98\x17\x6\xFE\x75"
-"\x50\x36\x4B\x9A\x44\x63\x81\x45\xEB\x47\x39\x7B\x80\x7F\x84\xBE\x9\xCD\xB3\x3E\xBB\xD0\x75\x52\x27\x40"
-"\x7B\xA7\xF1\xEB\xD0\xF2\xFB\x50\x7C\x3A\xD1\x74\x4A\x51\x81\x3C\x2\xA8\x10\x42\x9A\x2A\x1\x16\x98\x1D"
-"\x16\x58\x2\xF9\xAB\xBF\x4F\xB3\x18\xA6\xC2\xA8\x51\xAB\x51\x94\xBC\xD1\x1C\xDD\xD1\x5\x74\x40\x1F\xA5"
-"\x49\xA\xB4\xC9\xA1\xC2\x40\x9D\xDC\x40\xE\x24\xB6\x9F\x14\x29\xAE\x51\x29\x95\xD9\x87\x8C\x5D\x3A\x49"
-"\x7D\x57\x78\xBD\xD4\xA2\x1D\x56\x64\x85\xC4\x23\x5C\x56\xA1\xEB\x9F\xDF\x74\x56\xD0\x54\x46\xB5\x9C\xD6"
-"\x66\xB4\x42\x45\xF2\xC5\x36\x6B\xB3\xD7\xBC\x2F\x6E\xE5\x53\x3F\xD2\xCB\xF3\xEC\x4B\x36\xB4\xD5\x8F\x7B"
-"\x43\xDD\x7C\x4F\x71\x34\xAE\x85\x13\x91\xA1\x65\xDB\x62\x35\x5A\x62\x25\x53\xE8\x5C\x3A\x64\xBC\xCC\xCD"
-"\x4\x4E\x46\x7C\xDA\x37\x95\x44\x47\x12\x55\x47\x32\x1E\xD6\x6C\x33\x3\xE3\xC2\x4D\x6C\x55\xFD\xF2\x5A"
-"\x23\xFB\xD3\x40\xED\xA3\x70\x24\xD4\x36\x7C\x3D\xC2\x1C\x2E\x5D\x3A\xA1\x81\x60\xDB\xB6\x9D\xDC\xCB\xC5"
-"\xDC\xCC\xD5\xDC\xCD\xE5\xDC\xCE\xF5\xDC\xCF\x5\xDD\xD0\x15\xDD\xD1\x25\xDD\x3E\xC9\xAD\xDC\xCA\x2D\xDD"
-"\xD4\x55\xDD\xD5\x65\xDD\xD6\x75\xDD\xD7\x65\xDD\xD3\x3D\x5D\xD8\xA5\xDD\xDA\xB5\xDD\xDB\xC5\xDD\xDC\x5"
-"\x0\xD9\xE5\x5D\xDD\xF5\xDD\xDF\x5\xDE\xE0\xC5\x5D\xDE\x25\xDE\xA1\x15\xDE\xE3\x45\xDE\xE4\x55\x5E\xA1"
-"\xE5\xDD\x80\x0\x0\x3B";
-
-#endif
Modified: GNUnet/libwebserver/src/memory.c
===================================================================
--- GNUnet/libwebserver/src/memory.c 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/memory.c 2006-08-18 23:00:08 UTC (rev 3247)
@@ -12,144 +12,74 @@
*/
#include "memory.h"
-IFDEBUG(int _t=0;)
+struct memrequest {
+ char *ptr;
+ struct memrequest *next;
+};
-/*********************************************************************************************************/
/*
- * same as malloc with error reporting and libwebserver debug
- */
-void * __ILWS_malloc(size_t s) {
- void *ret;
-
- ret=malloc(s);
- if(ret==NULL) {
- IFDEBUG(fprintf(stderr,"memory.c: malloc: %s (size
%d)\n",strerror(errno),s);fflush(stderr));
- return NULL;
- };
- IFDEBUG(_t++;);
-
- IFDEBUG(fprintf(stderr,"memory.c (%d): Allocated %d bytes to
%p\n",_t,s,ret);fflush(stderr));
- return ret;
-}
-
-/*********************************************************************************************************/
-/*
- * same as calloc with error reporting and libwebserver debug
- */
-void * __ILWS_calloc(size_t nmemb,size_t s) {
- void *ret;
- ret=calloc(nmemb,s);
- if(ret==NULL) {
- IFDEBUG(fprintf(stderr,"memory.c: calloc
%s\n",strerror(errno));fflush(stderr));
- return NULL;
- };
- IFDEBUG(_t++;);
- IFDEBUG(fprintf(stderr,"memory.c (%d): Allocated %d bytes to
%p\n",_t,s*nmemb,ret);fflush(stderr));
- return ret;
-}
-
-/*********************************************************************************************************/
-/*
- * same as realloc with error reporting and libwebserver debug
- */
-void * __ILWS_realloc(void *buf,size_t s) {
- void *ret;
- ret=realloc(buf,s);
-#ifdef DEBUG
- if(buf==NULL) {
- _t++;
- IFDEBUG(fprintf(stderr,"memory.c (%d): Allocated %d bytes to
%p\n",_t,s,ret);fflush(stderr));
- };
-#endif
- if(ret==NULL) {
- IFDEBUG(fprintf(stderr,"memory.c: realloc:
%s\n",strerror(errno));fflush(stderr));
- return NULL;
- };
- IFDEBUG(fprintf(stderr,"memory.c: Realloc buffer %p to
%d\n",buf,s);fflush(stderr));
- return ret;
-}
-
-
-/*********************************************************************************************************/
-/*
- * same as free with error report and libwebserver debug
- */
-void __ILWS_free(void *ptr) {
- if(ptr!=NULL) {
- free(ptr);
- IFDEBUG(fprintf(stderr,"memory.c (%d): Buffer %p
freed\n",_t,ptr);fflush(stderr));
- IFDEBUG(_t--;);
- };
-}
-
-
-/*********************************************************************************************************/
-/*
* Add a buffer to memrequest list
*/
void *__ILWS_add_buffer(struct memrequest *list,unsigned int size) {
- struct memrequest *tmem;
- if(size==0) {
- return NULL;
- };
- if(list!=NULL) {
- tmem=list;
- }else {
- return NULL;
- };
- while(tmem->next!=NULL)tmem=tmem->next;
- tmem->next=__ILWS_malloc(sizeof(struct memrequest));
- if(tmem->next==NULL) return NULL; // ERROR
- tmem->next->ptr=__ILWS_malloc(size);
- tmem->next->next=NULL;
- return tmem->next->ptr;
+ struct memrequest *tmem;
+ if(size==0) {
+ return NULL;
+ };
+ if(list!=NULL) {
+ tmem=list;
+ }else {
+ return NULL;
+ };
+ while(tmem->next!=NULL)tmem=tmem->next;
+ tmem->next=__ILWS_malloc(sizeof(struct memrequest));
+ if(tmem->next==NULL) return NULL; // ERROR
+ tmem->next->ptr=__ILWS_malloc(size);
+ tmem->next->next=NULL;
+ return tmem->next->ptr;
}
-/*********************************************************************************************************/
/*
* Initialize memrequest list of buffers
*/
struct memrequest *__ILWS_init_buffer_list() {
- struct memrequest *newlist;
- newlist=__ILWS_malloc(sizeof(struct memrequest));
- if(newlist==NULL) return NULL;
-
- newlist->next=NULL;
- newlist->ptr=NULL;
- return newlist;
+ struct memrequest *newlist;
+ newlist=__ILWS_malloc(sizeof(struct memrequest));
+ if(newlist==NULL)
+ return NULL;
+ newlist->next=NULL;
+ newlist->ptr=NULL;
+ return newlist;
}
-/*********************************************************************************************************/
/*
* Delete memrequest buffer node (free)
*/
void __ILWS_delete_buffer(struct memrequest *mem) {
- __ILWS_free(mem->ptr);
- __ILWS_free(mem);
+ __ILWS_free(mem->ptr);
+ __ILWS_free(mem);
}
-/*********************************************************************************************************/
/*
* Delete memrequest next buffer
*/
void __ILWS_delete_next_buffer(struct memrequest *mem) {
- struct memrequest *tmem;
- tmem=mem->next;
- mem->next=mem->next->next;
- __ILWS_delete_buffer(tmem);
+ struct memrequest *tmem;
+ tmem=mem->next;
+ mem->next=mem->next->next;
+ __ILWS_delete_buffer(tmem);
}
-/*********************************************************************************************************/
/*
* Delete whole memrequest buffer list
*/
void __ILWS_delete_buffer_list(struct memrequest *list) {
- struct memrequest *tmem=list;
- if(tmem==NULL) return;
-
- while(tmem->next!=NULL) {
- __ILWS_delete_next_buffer(tmem);
- };
- __ILWS_delete_buffer(tmem);
+ struct memrequest *tmem=list;
+ if (tmem==NULL)
+ return;
+
+ while(tmem->next!=NULL) {
+ __ILWS_delete_next_buffer(tmem);
+ };
+ __ILWS_delete_buffer(tmem);
}
Modified: GNUnet/libwebserver/src/memory.h
===================================================================
--- GNUnet/libwebserver/src/memory.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/memory.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -14,33 +14,27 @@
#ifndef _MEMORY_H_
#define _MEMORY_H_
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <errno.h> // Johannes E. Schindelin
+#include <errno.h>
-#include "debug.h"
+#define __ILWS_malloc malloc
+#define __ILWS_calloc calloc
+#define __ILWS_realloc realloc
+#define __ILWS_free free
-extern int errno;
+struct memrequest;
-void *__ILWS_malloc(size_t);
-void *__ILWS_calloc(size_t,size_t);
-void *__ILWS_realloc(void *,size_t);
-void __ILWS_free(void *);
-
-struct memrequest {
- char *ptr;
- struct memrequest *next;
-};
struct memrequest *__ILWS_init_buffer_list();
-void *__ILWS_add_buffer(struct memrequest *,unsigned int);
+
+void *__ILWS_add_buffer(struct memrequest *,
+ unsigned int);
+
void __ILWS_delete_buffer(struct memrequest *);
+
void __ILWS_delete_next_buffer(struct memrequest *);
+
void __ILWS_delete_buffer_list(struct memrequest *);
#endif
Deleted: GNUnet/libwebserver/src/module.c
===================================================================
--- GNUnet/libwebserver/src/module.c 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/module.c 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,22 +0,0 @@
-/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
- *
- * See the LICENSE file
- *
- * The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits must appear in the documentation.
- *
- * date: Wen Jul 30 06:57:42 GMT 2003
- *
- * -- module function
- *
- * Tested on WIN32 only
- */
-#include "module.h"
-
-
-
-
-
-
-
Deleted: GNUnet/libwebserver/src/module.h
===================================================================
--- GNUnet/libwebserver/src/module.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/module.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-#ifndef _MODULE_H_
-#define _MODULE_H_
-
-struct module {
- const char *handle;
- void (func)();
-
-};
-
-
-
-
-#endif
\ No newline at end of file
Deleted: GNUnet/libwebserver/src/outgif.c
===================================================================
--- GNUnet/libwebserver/src/outgif.c 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/outgif.c 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,587 +0,0 @@
-/*
- * Luis Figueiredo - why remake the wheel, this functions feets perfectly
- * and the credits still here :)
- */
-
-
-/*
- * xvgifwr.c - handles writing of GIF files. based on flgife.c and
- * flgifc.c from the FBM Library, by Michael Maudlin
- *
- * Contains:
- * WriteGIF(fp, pic, ptype, w, h, rmap, gmap, bmap, numcols, colorstyle,
- * comment)
- *
- * Note: slightly brain-damaged, in that it'll only write non-interlaced
- * GIF files (in the interests of speed, or something)
- *
- */
-
-
-
-/*****************************************************************
- * Portions of this code Copyright (C) 1989 by Michael Mauldin.
- * Permission is granted to use this file in whole or in
- * part for any purpose, educational, recreational or commercial,
- * provided that this copyright notice is retained unchanged.
- * This software is available to all free of charge by anonymous
- * FTP and in the UUNET archives.
- *
- *
- * Authors: Michael Mauldin (address@hidden)
- * David Rowley (address@hidden)
- *
- * Based on: compress.c - File compression ala IEEE Computer, June 1984.
- *
- * Spencer W. Thomas (decvax!harpo!utah-cs!utah-gr!thomas)
- * Jim McKie (decvax!mcvax!jim)
- * Steve Davies (decvax!vax135!petsd!peora!srd)
- * Ken Turkowski (decvax!decwrl!turtlevax!ken)
- * James A. Woods (decvax!ihnp4!ames!jaw)
- * Joe Orost (decvax!vax135!petsd!joe)
- *****************************************************************/
-
-
-#include "outgif.h"
-
-static int __ILWS_Width, __ILWS_Height;
-static int __ILWS_curx, __ILWS_cury;
-static long __ILWS_CountDown;
-static int __ILWS_Interlace;
-//static unsigned char bw[2] = {0, 0xff};
-
-static void __ILWS_putword PARM((int, FILE *));
-static void __ILWS_compress PARM((int, FILE *, unsigned char *, int));
-static void __ILWS_output PARM((int));
-static void __ILWS_cl_block PARM((void));
-static void __ILWS_cl_hash PARM((count_int));
-static void __ILWS_char_init PARM((void));
-static void __ILWS_char_out PARM((int));
-static void __ILWS_flush_char PARM((void));
-
-
-static unsigned char pc2nc[256],r1[256],g1[256],b1[256];
-
-
-/*************************************************************/
-int __ILWS_WriteGIF(FILE *fp, unsigned char *pic, int w, int h, unsigned char
*rmap, unsigned char *gmap, unsigned char *bmap, int numcols, int
colorstyle,int transparency,
- char *comment)
-{
- int RWidth, RHeight;
- int LeftOfs, TopOfs;
- int ColorMapSize, InitCodeSize, Background, BitsPerPixel;
- int i,j,nc;
- unsigned char *pic8;
- //unsigned char rtemp[256],gtemp[256],btemp[256];
-
- pic8 = pic;
-
-
-
- __ILWS_Interlace = 0;
- Background = 0;
-
-
- for (i=0; i<256; i++) { pc2nc[i] = r1[i] = g1[i] = b1[i] = 0; }
-
- /* compute number of unique colors */
- nc = 0;
-
- for (i=0; i<numcols; i++) {
- /* see if color #i is already used */
- for (j=0; j<i; j++) {
- if (rmap[i] == rmap[j] && gmap[i] == gmap[j] &&
- bmap[i] == bmap[j]) break;
- }
-
- if (j==i) { /* wasn't found */
- pc2nc[i] = nc;
- r1[nc] = rmap[i];
- g1[nc] = gmap[i];
- b1[nc] = bmap[i];
- nc++;
- }
- else pc2nc[i] = pc2nc[j];
- }
-
-
- /* figure out 'BitsPerPixel' */
- for (i=1; i<8; i++)
- if ( (1<<i) >= nc) break;
-
- BitsPerPixel = i;
-
- ColorMapSize = 1 << BitsPerPixel;
-
- RWidth = __ILWS_Width = w;
- RHeight = __ILWS_Height = h;
- LeftOfs = TopOfs = 0;
-
- __ILWS_CountDown = w * h; /* # of pixels we'll be doing */
-
- if (BitsPerPixel <= 1) InitCodeSize = 2;
- else InitCodeSize = BitsPerPixel;
-
- __ILWS_curx = __ILWS_cury = 0;
-
- if (!fp) {
- fprintf(stderr, "WriteGIF: file not open for writing\n" );
- return (1);
- }
-
-
- if (comment && strlen(comment) > (size_t) 0)
- fwrite("GIF89a", (size_t) 1, (size_t) 6, fp); /* the GIF magic number */
- else
- fwrite("GIF87a", (size_t) 1, (size_t) 6, fp); /* the GIF magic number */
-
- __ILWS_putword(RWidth, fp); /* screen descriptor */
- __ILWS_putword(RHeight, fp);
-
- i = 0x80; /* Yes, there is a color map */
- i |= (8-1)<<4; /* OR in the color resolution (hardwired 8) */
- i |= (BitsPerPixel - 1); /* OR in the # of bits per pixel */
- fputc(i,fp);
-
- fputc(Background, fp); /* background color */
-
- fputc(0, fp); /* future expansion unsigned char */
-
-
- if (colorstyle == 1) { /* greyscale */
- for (i=0; i<ColorMapSize; i++) {
- j = MONO(r1[i], g1[i], b1[i]);
- fputc(j, fp);
- fputc(j, fp);
- fputc(j, fp);
- }
- }
- else {
- for (i=0; i<ColorMapSize; i++) { /* write out Global colormap */
- fputc(r1[i], fp);
- fputc(g1[i], fp);
- fputc(b1[i], fp);
- }
- }
-
- if (comment && strlen(comment) > (size_t) 0) { /* write comment blocks */
- char *sp;
- int i, blen;
-
- fputc(0x21, fp); /* EXTENSION block */
- fputc(0xF9,fp); // graphic control extension// Luis Figueiredo
- fputc(4,fp); // blocksize
- fputc(0x1,fp); // transparency flag
- fputc(100,fp);// delay (unsigned?)
- fputc(100,fp);// delay (unsigned?)
- fputc(transparency,fp); // Luis figueiredo
- fputc(0, fp); /* zero-length data subblock to end extension */
- fputc(0x21, fp); /* EXTENSION block */
- fputc(0xFE, fp); /* comment extension */
- sp = comment;
- while ( (blen=strlen(sp)) > 0) {
- if (blen>255) blen = 255;
- fputc(blen, fp);
- for (i=0; i<blen; i++, sp++) fputc(*sp, fp);
- }
- fputc(0, fp); /* zero-length data subblock to end extension */
- }
-
-
- fputc( ',', fp ); /* image separator */
-
- /* Write the Image header */
- __ILWS_putword(LeftOfs, fp);
- __ILWS_putword(TopOfs, fp);
- __ILWS_putword(__ILWS_Width, fp);
- __ILWS_putword(__ILWS_Height, fp);
- if (__ILWS_Interlace) fputc(0x40, fp); /* Use Global Colormap, maybe
Interlace */
- else fputc(0x00, fp);
-
- fputc(InitCodeSize, fp);
- __ILWS_compress(InitCodeSize+1, fp, pic8, w*h);
-
- fputc(0,fp); /* Write out a Zero-length packet (EOF) */
- fputc(';',fp); /* Write GIF file terminator */
-
-
- if (ferror(fp)) return -1;
- return (0);
-}
-
-
-
-
-/******************************/
-static void __ILWS_putword(int w, FILE *fp)
-{
- /* writes a 16-bit integer in GIF order (LSB first) */
- fputc(w & 0xff, fp);
- fputc((w>>8)&0xff, fp);
-}
-
-
-
-
-/***********************************************************************/
-
-
-static unsigned long __ILWS_cur_accum = 0;
-static int __ILWS_cur_bits = 0;
-
-
-
-
-#define min(a,b) ((a>b) ? b : a)
-
-#define XV_BITS 12 /* BITS was already defined on some systems */
-#define MSDOS 1
-
-#define HSIZE 5003 /* 80% occupancy */
-
-typedef unsigned char char_type;
-
-
-static int __ILWS_n_bits; /* number of bits/code */
-static int __ILWS_maxbits = XV_BITS; /* user settable max # bits/code
*/
-static int __ILWS_maxcode; /* maximum code, given n_bits */
-static int __ILWS_maxmaxcode = 1 << XV_BITS; /* NEVER generate this */
-
-#define MAXCODE(n_bits) ( (1 << (n_bits)) - 1)
-
-static count_int __ILWS_htab [HSIZE];
-static unsigned short __ILWS_codetab [HSIZE];
-#define HashTabOf(i) __ILWS_htab[i]
-#define CodeTabOf(i) __ILWS_codetab[i]
-
-static int __ILWS_hsize = HSIZE; /* for dynamic table sizing */
-
-/*
- * To save much memory, we overlay the table used by compress() with those
- * used by decompress(). The tab_prefix table is the same size and type
- * as the codetab. The tab_suffix table needs 2**BITS characters. We
- * get this from the beginning of htab. The output stack uses the rest
- * of htab, and contains characters. There is plenty of room for any
- * possible stack (stack used to be 8000 characters).
- */
-
-#define tab_prefixof(i) CodeTabOf(i)
-#define tab_suffixof(i) ((char_type *)(htab))[i]
-#define de_stack ((char_type *)&tab_suffixof(1<<XV_BITS))
-
-static int __ILWS_free_ent = 0; /* first unused entry */
-
-/*
- * block compression parameters -- after all codes are used up,
- * and compression rate changes, start over.
- */
-static int __ILWS_clear_flg = 0;
-
-static long int __ILWS_in_count = 1; /* length of input */
-static long int __ILWS_out_count = 0; /* # of codes output (for
debugging) */
-
-/*
- * compress stdin to stdout
- *
- * Algorithm: use open addressing double hashing (no chaining) on the
- * prefix code / next character combination. We do a variant of Knuth's
- * algorithm D (vol. 3, sec. 6.4) along with G. Knott's relatively-prime
- * secondary probe. Here, the modular division first probe is gives way
- * to a faster exclusive-or manipulation. Also do block compression with
- * an adaptive reset, whereby the code table is cleared when the compression
- * ratio decreases, but after the table fills. The variable-length output
- * codes are re-sized at this point, and a special CLEAR code is generated
- * for the decompressor. Late addition: construct the table according to
- * file size for noticeable speed improvement on small files. Please direct
- * questions about this implementation to ames!jaw.
- */
-
-static int __ILWS_g_init_bits;
-static FILE *__ILWS_g_outfile;
-
-static int __ILWS_ClearCode;
-static int __ILWS_EOFCode;
-
-
-/********************************************************/
-static void __ILWS_compress(int init_bits, FILE *outfile, unsigned char *data,
int len)
-
-{
- register long fcode;
- register int i = 0;
- register int c;
- register int ent;
- register int disp;
- register int hsize_reg;
- register int hshift;
-
- /*
- * Set up the globals: g_init_bits - initial number of bits
- * g_outfile - pointer to output file
- */
- __ILWS_g_init_bits = init_bits;
- __ILWS_g_outfile = outfile;
-
- /* initialize 'compress' globals */
- __ILWS_maxbits = XV_BITS;
- __ILWS_maxmaxcode = 1<<XV_BITS;
- memset((char *) __ILWS_htab,0, sizeof(__ILWS_htab));
- memset((char *) __ILWS_codetab,0, sizeof(__ILWS_codetab));
- __ILWS_hsize = HSIZE;
- __ILWS_free_ent = 0;
- __ILWS_clear_flg = 0;
- __ILWS_in_count = 1;
- __ILWS_out_count = 0;
- __ILWS_cur_accum = 0;
- __ILWS_cur_bits = 0;
-
-
- /*
- * Set up the necessary values
- */
- __ILWS_out_count = 0;
- __ILWS_clear_flg = 0;
- __ILWS_in_count = 1;
- __ILWS_maxcode = MAXCODE(__ILWS_n_bits = __ILWS_g_init_bits);
-
- __ILWS_ClearCode = (1 << (init_bits - 1));
- __ILWS_EOFCode = __ILWS_ClearCode + 1;
- __ILWS_free_ent = __ILWS_ClearCode + 2;
-
- __ILWS_char_init();
- ent = pc2nc[*data++];
- len--;
-
- hshift = 0;
- for ( fcode = (long) __ILWS_hsize; fcode < 65536L; fcode *= 2L )
- hshift++;
- hshift = 8 - hshift; /* set hash code range bound */
-
- hsize_reg = __ILWS_hsize;
- __ILWS_cl_hash( (count_int) hsize_reg); /* clear hash table */
-
- __ILWS_output(__ILWS_ClearCode);
-
- while (len) {
- c = pc2nc[*data++]; len--;
- __ILWS_in_count++;
-
- fcode = (long) ( ( (long) c << __ILWS_maxbits) + ent);
- i = (((int) c << hshift) ^ ent); /* xor hashing */
-
- if ( HashTabOf (i) == fcode ) {
- ent = CodeTabOf (i);
- continue;
- }
-
- else if ( (long)HashTabOf (i) < 0 ) /* empty slot */
- goto nomatch;
-
- disp = hsize_reg - i; /* secondary hash (after G. Knott) */
- if ( i == 0 )
- disp = 1;
-
-probe:
- if ( (i -= disp) < 0 )
- i += hsize_reg;
-
- if ( HashTabOf (i) == fcode ) {
- ent = CodeTabOf (i);
- continue;
- }
-
- if ( (long)HashTabOf (i) >= 0 )
- goto probe;
-
-nomatch:
- __ILWS_output(ent);
- __ILWS_out_count++;
- ent = c;
-
- if ( __ILWS_free_ent < __ILWS_maxmaxcode ) {
- CodeTabOf (i) = __ILWS_free_ent++; /* code -> hashtable */
- HashTabOf (i) = fcode;
- }
- else
- __ILWS_cl_block();
- }
-
- /* Put out the final code */
- __ILWS_output(ent);
- __ILWS_out_count++;
- __ILWS_output(__ILWS_EOFCode);
-}
-
-
-/*****************************************************************
- * TAG( output )
- *
- * Output the given code.
- * Inputs:
- * code: A n_bits-bit integer. If == -1, then EOF. This assumes
- * that n_bits =< (long)wordsize - 1.
- * Outputs:
- * Outputs code to the file.
- * Assumptions:
- * Chars are 8 bits long.
- * Algorithm:
- * Maintain a BITS character long buffer (so that 8 codes will
- * fit in it exactly). Use the VAX insv instruction to insert each
- * code in turn. When the buffer fills up empty it and start over.
- */
-
-static
-unsigned long __ILWS_masks[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F,
- 0x001F, 0x003F, 0x007F, 0x00FF,
- 0x01FF, 0x03FF, 0x07FF, 0x0FFF,
- 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };
-
-static void __ILWS_output(int code)
-{
- __ILWS_cur_accum &= __ILWS_masks[__ILWS_cur_bits];
-
- if (__ILWS_cur_bits > 0)
- __ILWS_cur_accum |= ((long)code << __ILWS_cur_bits);
- else
- __ILWS_cur_accum = code;
-
- __ILWS_cur_bits += __ILWS_n_bits;
-
- while( __ILWS_cur_bits >= 8 ) {
- __ILWS_char_out( (int) (__ILWS_cur_accum & 0xff) );
- __ILWS_cur_accum >>= 8;
- __ILWS_cur_bits -= 8;
- }
-
- /*
- * If the next entry is going to be too big for the code size,
- * then increase it, if possible.
- */
-
- if (__ILWS_free_ent > __ILWS_maxcode || __ILWS_clear_flg) {
-
- if( __ILWS_clear_flg ) {
- __ILWS_maxcode = MAXCODE (__ILWS_n_bits = __ILWS_g_init_bits);
- __ILWS_clear_flg = 0;
- }
- else {
- __ILWS_n_bits++;
- if ( __ILWS_n_bits == __ILWS_maxbits )
- __ILWS_maxcode = __ILWS_maxmaxcode;
- else
- __ILWS_maxcode = MAXCODE(__ILWS_n_bits);
- }
- }
-
- if( code == __ILWS_EOFCode ) {
- /* At EOF, write the rest of the buffer */
- while( __ILWS_cur_bits > 0 ) {
- __ILWS_char_out( (int)(__ILWS_cur_accum & 0xff) );
- __ILWS_cur_accum >>= 8;
- __ILWS_cur_bits -= 8;
- }
-
- __ILWS_flush_char();
-
- fflush( __ILWS_g_outfile );
-
-#ifdef FOO
- if( ferror( g_outfile ) )
- FatalError("unable to write GIF file");
-#endif
- }
-}
-
-
-/********************************/
-static void __ILWS_cl_block () /* table clear for block compress */
-{
- /* Clear out the hash table */
-
- __ILWS_cl_hash ( (count_int) __ILWS_hsize );
- __ILWS_free_ent = __ILWS_ClearCode + 2;
- __ILWS_clear_flg = 1;
-
- __ILWS_output(__ILWS_ClearCode);
-}
-
-
-/********************************/
-static void __ILWS_cl_hash(register count_int hsize) /* reset code
table */
-{
- register count_int *htab_p = __ILWS_htab+hsize;
- register long i;
- register long m1 = -1;
-
- i = hsize - 16;
- do { /* might use Sys V memset(3) here */
- *(htab_p-16) = m1;
- *(htab_p-15) = m1;
- *(htab_p-14) = m1;
- *(htab_p-13) = m1;
- *(htab_p-12) = m1;
- *(htab_p-11) = m1;
- *(htab_p-10) = m1;
- *(htab_p-9) = m1;
- *(htab_p-8) = m1;
- *(htab_p-7) = m1;
- *(htab_p-6) = m1;
- *(htab_p-5) = m1;
- *(htab_p-4) = m1;
- *(htab_p-3) = m1;
- *(htab_p-2) = m1;
- *(htab_p-1) = m1;
- htab_p -= 16;
- } while ((i -= 16) >= 0);
-
- for ( i += 16; i > 0; i-- )
- *--htab_p = m1;
-}
-
-
-/******************************************************************************
- *
- * GIF Specific routines
- *
-
******************************************************************************/
-
-/*
- * Number of characters so far in this 'packet'
- */
-static int __ILWS_a_count;
-
-/*
- * Set up the 'unsigned char output' routine
- */
-static void __ILWS_char_init()
-{
- __ILWS_a_count = 0;
-}
-
-/*
- * Define the storage for the packet accumulator
- */
-static char __ILWS_accum[ 256 ];
-
-/*
- * Add a character to the end of the current packet, and if it is 254
- * characters, flush the packet to disk.
- */
-static void __ILWS_char_out(int c)
-{
- __ILWS_accum[ __ILWS_a_count++ ] = c;
- if( __ILWS_a_count >= 254 )
- __ILWS_flush_char();
-}
-
-/*
- * Flush the packet to disk, and reset the accumulator
- */
-static void __ILWS_flush_char()
-{
- if( __ILWS_a_count > 0 ) {
- fputc(__ILWS_a_count, __ILWS_g_outfile );
- fwrite(__ILWS_accum, (size_t) 1, (size_t) __ILWS_a_count, __ILWS_g_outfile
);
- __ILWS_a_count = 0;
- }
-}
Deleted: GNUnet/libwebserver/src/outgif.h
===================================================================
--- GNUnet/libwebserver/src/outgif.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/outgif.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,63 +0,0 @@
-/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
- *
- * See the LICENSE file
- *
- * The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits must appear in the documentation.
- *
- * file: web_outgif.h
- *
- * description: output gif outgif.c is copyrighted by
- */
- /*****************************************************************
- * Portions of this code Copyright (C) 1989 by Michael Mauldin.
- * Permission is granted to use this file in whole or in
- * part for any purpose, educational, recreational or commercial,
- * provided that this copyright notice is retained unchanged.
- * This software is available to all free of charge by anonymous
- * FTP and in the UUNET archives.
- *
- *
- * Authors: Michael Mauldin (address@hidden)
- * David Rowley (address@hidden)
- *
- * Based on: compress.c - File compression ala IEEE Computer, June 1984.
- *
- * Spencer W. Thomas (decvax!harpo!utah-cs!utah-gr!thomas)
- * Jim McKie (decvax!mcvax!jim)
- * Steve Davies (decvax!vax135!petsd!peora!srd)
- * Ken Turkowski (decvax!decwrl!turtlevax!ken)
- * James A. Woods (decvax!ihnp4!ames!jaw)
- * Joe Orost (decvax!vax135!petsd!joe)
- *****************************************************************/
-/*
- *
- * date: 20:57,13-57-2002
- */
-
-#ifndef _WEB_OUTGIF_H_
-#define _WEB_OUTGIF_H_
-
-#include <stdio.h>
-#include <string.h>
-
-#include "debug.h"
-
-#undef PARM
-#ifdef __STDC__
-# define PARM(a) a
-#else
-# define PARM(a) ()
-# define const
-#endif
-
-/* MONO returns total intensity of r,g,b triple (i = .33R + .5G + .17B) */
-#define MONO(rd,gn,bl) ( ((int)(rd)*11 + (int)(gn)*16 + (int)(bl)*5) >> 5)
-
-typedef long int count_int;
-
-
-int __ILWS_WriteGIF(FILE *, unsigned char *, int, int, unsigned char *,
unsigned char *, unsigned char *, int, int, int, char *);
-
-#endif
Deleted: GNUnet/libwebserver/src/outstream.c
===================================================================
--- GNUnet/libwebserver/src/outstream.c 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/outstream.c 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,122 +0,0 @@
-/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
- *
- * See the LICENSE file
- *
- * The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits must appear in the documentation.
- *
- * date: Sat Mar 30 14:25:25 GMT 2002
- *
- * -- stream list functions
- */
-
-
-#include "outstream.h"
-
-/*********************************************************************************************************/
-/*
- * add_outstream, add a file to output (client) stream
- */
-int __ILWS_add_outstream(struct outstream *list,char *fname,FILE* stream,int
istmp){
- struct outstream *temp=list;
- FILE *tmp;
- while(temp->next!=NULL)temp=temp->next;
-
- if(!(temp->next=__ILWS_malloc(sizeof(struct outstream)))) {
- LWSERR(LE_MEMORY);
- return 0;
- };
- // file check (0.5.3);
- tmp=fopen(fname,"rb");
- if(tmp==NULL) {
- __ILWS_free(temp->next);
- temp->next=NULL;
- return 0;
- };
- fclose(tmp);
- // --
- temp->next->fname=NULL;
- if(fname!=NULL) {
- if(!(temp->next->fname=__ILWS_malloc(strlen(fname)+1))) {
- __ILWS_free(temp->next);
- temp->next=NULL;
- LWSERR(LE_MEMORY);
- return 0;
- };
- memcpy(temp->next->fname,fname,strlen(fname));
- temp->next->fname[strlen(fname)]='\0';
- };
- temp->next->todelete=istmp;
- temp->next->fstream=stream;
- temp->next->wsize=1;
- temp->next->rsize=0;
- temp->next->wrotesize=0;
- temp->next->varsize=0;
- temp->next->next=NULL;
- return 1;
-}
-
-/*********************************************************************************************************/
-/*
- * Initializate (allocate) outstream list
- */
-struct outstream *__ILWS_init_outstream_list() {
- struct outstream *ret;
-
-
- if(!(ret=__ILWS_malloc(sizeof(struct outstream)))) {
- LWSERR(LE_MEMORY);
- return NULL;
- };
- ret->todelete=0;
- ret->fname=NULL;
- ret->flags=0;
- ret->fstream=NULL;
- ret->next=NULL;
- return ret;
-}
-
-/*********************************************************************************************************/
-/*
- * Delete a especific node
- */
-void __ILWS_delete_outstream(struct outstream *node) { // Changed
- int rt;
- if(node->fstream!=NULL)fclose(node->fstream); // better here;
- if(node->todelete) { // is temporary file
- rt=unlink(node->fname);
- if(rt==-1) {
- LWSERR(LE_FILESYS);
- };
-
- };
- if(node->fname!=NULL)__ILWS_free(node->fname);
- __ILWS_free(node);
-}
-
-/*********************************************************************************************************/
-/*
- * delete next node
- */
-void __ILWS_delete_next_outstream(struct outstream *node) {
- struct outstream *temp=node->next;
- node->next=node->next->next;
- __ILWS_delete_outstream(temp);
-}
-
-/*********************************************************************************************************/
-/*
- * delete all nodes on the list (reset list)
- */
-void __ILWS_delete_outstream_list(struct outstream *list) {
- struct outstream *temp=list;
- while(temp->next!=NULL) {
-
- __ILWS_delete_next_outstream(temp);
- };
-
- __ILWS_delete_outstream(temp);
-
-}
-
Added: GNUnet/libwebserver/src/outstream.c
===================================================================
--- GNUnet/libwebserver/src/outstream.c 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/outstream.c 2006-08-18 23:00:08 UTC (rev 3247)
@@ -0,0 +1,118 @@
+/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
+ *
+ * See the LICENSE file
+ *
+ * The origin of this software must not be misrepresented, either by
+ * explicit claim or by omission. Since few users ever read sources,
+ * credits must appear in the documentation.
+ *
+ * date: Sat Mar 30 14:25:25 GMT 2002
+ *
+ * -- stream list functions
+ */
+
+
+#include "outstream.h"
+
+/*********************************************************************************************************/
+/*
+ * add_outstream, add a file to output (client) stream
+ */
+int __ILWS_add_outstream(struct outstream *list,char *fname,FILE* stream,int
istmp){
+ struct outstream *temp=list;
+ FILE *tmp;
+ while(temp->next!=NULL)temp=temp->next;
+
+ if(!(temp->next=__ILWS_malloc(sizeof(struct outstream)))) {
+ return 0;
+ };
+ // file check (0.5.3);
+ tmp=fopen(fname,"rb");
+ if(tmp==NULL) {
+ __ILWS_free(temp->next);
+ temp->next=NULL;
+ return 0;
+ };
+ fclose(tmp);
+ // --
+ temp->next->fname=NULL;
+ if(fname!=NULL) {
+ if(!(temp->next->fname=__ILWS_malloc(strlen(fname)+1))) {
+ __ILWS_free(temp->next);
+ temp->next=NULL;
+ return 0;
+ };
+ memcpy(temp->next->fname,fname,strlen(fname));
+ temp->next->fname[strlen(fname)]='\0';
+ };
+ temp->next->todelete=istmp;
+ temp->next->fstream=stream;
+ temp->next->wsize=1;
+ temp->next->rsize=0;
+ temp->next->wrotesize=0;
+ temp->next->varsize=0;
+ temp->next->next=NULL;
+ return 1;
+}
+
+/*********************************************************************************************************/
+/*
+ * Initializate (allocate) outstream list
+ */
+struct outstream *__ILWS_init_outstream_list() {
+ struct outstream *ret;
+
+
+ if(!(ret=__ILWS_malloc(sizeof(struct outstream)))) {
+ return NULL;
+ };
+ ret->todelete=0;
+ ret->fname=NULL;
+ ret->flags=0;
+ ret->fstream=NULL;
+ ret->next=NULL;
+ return ret;
+}
+
+/*********************************************************************************************************/
+/*
+ * Delete a especific node
+ */
+void __ILWS_delete_outstream(struct outstream *node) { // Changed
+ int rt;
+ if(node->fstream!=NULL)fclose(node->fstream); // better here;
+ if(node->todelete) { // is temporary file
+ rt=unlink(node->fname);
+ if(rt==-1) {
+ };
+
+ };
+ if(node->fname!=NULL)__ILWS_free(node->fname);
+ __ILWS_free(node);
+}
+
+/*********************************************************************************************************/
+/*
+ * delete next node
+ */
+void __ILWS_delete_next_outstream(struct outstream *node) {
+ struct outstream *temp=node->next;
+ node->next=node->next->next;
+ __ILWS_delete_outstream(temp);
+}
+
+/*********************************************************************************************************/
+/*
+ * delete all nodes on the list (reset list)
+ */
+void __ILWS_delete_outstream_list(struct outstream *list) {
+ struct outstream *temp=list;
+ while(temp->next!=NULL) {
+
+ __ILWS_delete_next_outstream(temp);
+ };
+
+ __ILWS_delete_outstream(temp);
+
+}
+
Property changes on: GNUnet/libwebserver/src/outstream.c
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: GNUnet/libwebserver/src/outstream.h
===================================================================
--- GNUnet/libwebserver/src/outstream.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/outstream.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,53 +0,0 @@
-/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
- *
- * See the LICENSE file
- *
- * The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits must appear in the documentation.
- *
- * date: Sat Mar 30 14:25:25 GMT 2002
- *
- * stream functions
- */
-
-#ifndef _OUTSTREAM_H_
-#define _OUTSTREAM_H_
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef WIN32
-#include <unistd.h>
-#endif
-
-#include "debug.h"
-#include "memory.h"
-#include "error.h"
-
-
-
-
-
-struct outstream {
- FILE *fstream;
- char *fname;
- int todelete;
- int wsize,rsize;
- long wrotesize;
- long varsize;
- int flags;
- struct outstream *next;
-};
-
-int __ILWS_add_outstream(struct outstream *, char *,FILE *,int);
-struct outstream *__ILWS_init_outstream_list();
-void __ILWS_delete_next_outstream(struct outstream *);
-void __ILWS_delete_outstream_list(struct outstream *);
-void __ILWS_delete_outstream(struct outstream *);
-#endif
Added: GNUnet/libwebserver/src/outstream.h
===================================================================
--- GNUnet/libwebserver/src/outstream.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/outstream.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -0,0 +1,47 @@
+/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
+ *
+ * See the LICENSE file
+ *
+ * The origin of this software must not be misrepresented, either by
+ * explicit claim or by omission. Since few users ever read sources,
+ * credits must appear in the documentation.
+ *
+ * date: Sat Mar 30 14:25:25 GMT 2002
+ *
+ * stream functions
+ */
+
+#ifndef _OUTSTREAM_H_
+#define _OUTSTREAM_H_
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef WIN32
+#include <unistd.h>
+#endif
+
+#include "memory.h"
+
+struct outstream {
+ FILE *fstream;
+ char *fname;
+ int todelete;
+ int wsize,rsize;
+ long wrotesize;
+ long varsize;
+ int flags;
+ struct outstream *next;
+};
+
+int __ILWS_add_outstream(struct outstream *, char *,FILE *,int);
+struct outstream *__ILWS_init_outstream_list();
+void __ILWS_delete_next_outstream(struct outstream *);
+void __ILWS_delete_outstream_list(struct outstream *);
+void __ILWS_delete_outstream(struct outstream *);
+#endif
Property changes on: GNUnet/libwebserver/src/outstream.h
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: GNUnet/libwebserver/src/server.c
===================================================================
--- GNUnet/libwebserver/src/server.c 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/server.c 2006-08-18 23:00:08 UTC (rev 3247)
@@ -12,437 +12,268 @@
*
*/
-#include "server.h"
-#include "logo.h"
+#include "webserver_gnunet.h"
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include "memory.h"
+#include "client.h"
+#include "socket.h"
+
#ifdef WIN32
- #define _SERVER_VERSION "libwebserver/0.5.3(win32)" // update allways
when changing version (damn win)
+#define SHUT_RDWR SD_BOTH
#endif
-#ifndef _SERVER_VERSION
- #define _SERVER_VERSION "libwebserver/(unknow)"
-#endif
+struct web_server {
+ int socket;
+ unsigned int port;
+ struct gethandler * gethandler;
+ struct web_client *client;
+};
-#ifdef DEBUG
- char *_libwebserver_version= _SERVER_VERSION "(debug)";
-#else
- char *_libwebserver_version= _SERVER_VERSION;
-#endif
-struct web_server *current_web_server;
-
-
-/*********************************************************************************************************/
/*
- * Define certificate file (open_ssl)
+ * initializate (allocate) handler list
*/
-void web_server_useSSLcert(struct web_server *server,const char *file) {
-#ifdef HAVE_OPENSSL
- if(!(server->cert_file=__ILWS_malloc(strlen(file)+1))) {
- LWSERR(LE_MEMORY);
- return;
- };
- memcpy(server->cert_file,file,strlen(file));
- server->cert_file[strlen(file)]=0;
-#else
- printf("OpenSSL not supported in this compilation\n");
-#endif
+struct gethandler *__ILWS_init_handler_list() {
+ struct gethandler *ret;
+
+ ret = __ILWS_malloc(sizeof(struct gethandler));
+ if (ret==NULL)
+ return NULL;
+ ret->next = NULL;
+ ret->func = NULL;
+ ret->ctx = NULL;
+ ret->str = NULL;
+ return ret;
}
-void web_server_useMIMEfile(struct web_server *server,const char *file) {
- if(!(server->mimefile=__ILWS_malloc(strlen(file)+1))) {
- LWSERR(LE_MEMORY);
- return;
- };
- memcpy(server->mimefile,file,strlen(file));
- server->mimefile[strlen(file)]=0;
-};
-/*********************************************************************************************************/
-/*
- * Handler for libwebserver logotipe
+/*
+ * add an handler to list
*/
-void _web_server_logo() {
- printf("Content-type: image/gif\r\n\r\n");
- fwrite((char *)_logo,sizeof(_logo),1,stdout);
-}
+static int __ILWS_add_handler(struct gethandler * head,
+ const char * mstr,
+ void (*func)(),
+ void * ctx) {
+ struct gethandler * temp = head;
+ while (temp->next != NULL)
+ temp = temp->next;
+
+ temp->next = __ILWS_malloc(sizeof(struct gethandler));
+ if (temp->next==NULL)
+ return 0;
+ temp = temp->next;
+ temp->str=__ILWS_malloc(strlen(mstr)+1);
+ if (temp->str==NULL) {
+ __ILWS_free(temp);
+ return 0;
+ };
+ memcpy(temp->str,
+ mstr,
+ strlen(mstr) + 1);
+ temp->func = func;
+ temp->ctx = ctx;
+ temp->next = NULL;
+ return 1;
+}
-
-/*********************************************************************************************************/
-/*
- * Add an handler to request data
+/*
+ * Deletes the entire handler list including the head
*/
-int web_server_addhandler(struct web_server *server,const char *mstr,void
(*func)(),int flag) {
- _logfile=server->weblog;
- // xor?
- flag ^= (server->flags & WS_LOCAL); // global flag to handler flag
- flag ^= (server->flags & WS_DYNVAR); // global flag to handler flag
- flag ^= (server->flags & WS_USELEN); // global flag to handler flag
- web_log("[%s] Adding handler %s
<--%s%s%s\n",__ILWS_date(time(NULL),"%d/%b/%Y:%H:%M:%S %z"),mstr, ((flag &
WS_LOCAL) == WS_LOCAL && !((server->flags & WS_LOCAL) == WS_LOCAL))?"[LOCAL]
":"", ((flag & WS_DYNVAR) == WS_DYNVAR)?"[DYNVAR]":"", ((flag & WS_USELEN) ==
WS_USELEN)?"[USELEN]":"");
- return __ILWS_add_handler((struct gethandler
*)server->gethandler,mstr,func,NULL,flag,GH_FUNCTION);
+static void __ILWS_delete_handler_list(struct gethandler * handler) {
+ struct gethandler * next;
+
+ while (handler) {
+ next = handler->next;
+ if (handler->str != NULL)
+ __ILWS_free(handler->str);
+ __ILWS_free(handler);
+ handler = next;
+ }
}
-/*********************************************************************************************************/
/*
- * Add an alias dir (new on 0.5.2)
+ * to add a listen socket
*/
-int web_server_aliasdir(struct web_server *server, const char *str, char
*path,int flag) {
- char *mstr;
- int ret;
- mstr=__ILWS_malloc(strlen(str)+7);
- if(!strlen(str)) {
- snprintf(mstr,strlen(str)+7,"* /*");
- } else {
- snprintf(mstr,strlen(str)+7,"* /%s/*",str);
- };
- _logfile=server->weblog;
- flag ^= (server->flags & WS_LOCAL); // global flag to handler flag
- flag ^= (server->flags & WS_DYNVAR); // global flag to handler flag
- flag ^= (server->flags & WS_USELEN); // global flag to handler flag
- web_log("[%s] Adding directory %s
<--%s%s%s\n",__ILWS_date(time(NULL),"%d/%b/%Y:%H:%M:%S %z"),mstr, ((flag &
WS_LOCAL) == WS_LOCAL && !((server->flags & WS_LOCAL) == WS_LOCAL))?"[LOCAL]
":"", ((flag & WS_DYNVAR) == WS_DYNVAR)?"[DYNVAR]":"", ((flag & WS_USELEN) ==
WS_USELEN)?"[USELEN]":"");
- ret=__ILWS_add_handler((struct gethandler
*)server->gethandler,mstr,NULL,path,flag,GH_DIRECTORY);
- __ILWS_free(mstr);
- return ret;
-};
+static int __ILWS_listensocket(short port,
+ int saddr) {
+ struct sockaddr_in sa;
+ int ret;
+ int sockopt=1;
+ sa.sin_addr.s_addr=saddr;
+ sa.sin_port=htons((short)port);
+ sa.sin_family=AF_INET;
+ ret=socket(AF_INET,SOCK_STREAM,6); // tcp
+ if(ret==-1)
+ return -1;
+
+ setsockopt(ret,
+ SOL_SOCKET,
+ SO_REUSEADDR,
+ (char *)&sockopt,
+ sizeof(sockopt));
+
+ if (bind(ret,
+ (struct sockaddr *)&sa,
+ sizeof(sa))==-1) {
+ close(ret);
+ return -1;
+ }
+
+ if (listen(ret,512)==-1) { // 512 backlog
+ close(ret);
+ return -1;
+ }
+ return ret;
+}
-/*********************************************************************************************************/
-/*
- * Personal config (new on 0.5.0)
- */
-char *web_server_getconf(struct web_server *server, const char *topic,const
char *key) {
- char *dataconf;
- char *tmp1,*tmp2,*tmp3;
- long tmpsize=0;
- dataconf=__ILWS_stristr(server->dataconf,topic);
- if(dataconf==NULL) {
- return NULL;
- };
- dataconf+=strlen(topic);
- tmp1=__ILWS_stristr(dataconf,key);
- do {
- tmp1=__ILWS_stristr(dataconf,key);
- dataconf+=1;
- if(dataconf[0]==0) {
- return NULL;
- };
- if(dataconf[0]=='[' && dataconf[-1]=='\n') {
- return NULL;
- };
- }while(!(tmp1!=NULL && tmp1[-1]=='\n' && tmp1[strlen(key)]=='='));
-
- tmp1+=strlen(key)+1;
- tmp2=__ILWS_stristr(tmp1,"\n");
- if(tmp2==NULL) {
- tmp2=tmp1+strlen(tmp1);
- };
- tmpsize=tmp2-tmp1;
- if(!(tmp3=__ILWS_malloc(tmpsize+1))) {
- LWSERR(LE_MEMORY);
- return NULL;
- };
- memcpy(tmp3,tmp1,tmpsize);
- tmp3[tmpsize]=0;
- return tmp3;
-};
-
-/*********************************************************************************************************/
/*
- * Define config file to setup server (new on 0.5.0)
+ * Add an handler to request data
*/
-int web_server_setup(struct web_server *server,const char *conffile) {
- FILE *tmpf;
- char *tmp3;
- //long tmpsize=0;
- long sizec;
- struct stat statf; // tested only on win
+int web_server_addhandler(struct web_server *server,
+ const char *mstr,
+ void (*func)(),
+ void * hctx) {
+ return __ILWS_add_handler(server->gethandler,
+ mstr,
+ func,
+ hctx);
+}
- if(!(server->conffile=__ILWS_malloc(strlen(conffile)+1))) {
- LWSERR(LE_MEMORY);
- return 0;
- };
-
- memcpy(server->conffile,conffile,strlen(conffile));
- server->conffile[strlen(conffile)]=0;
-
- tmpf=fopen(server->conffile,"r");
- if(tmpf==NULL) {
- printf("no config file found\r\n");
- server->dataconf="";
- return(0);
- };
- fseek(tmpf,SEEK_SET,SEEK_END);
- sizec=ftell(tmpf);
- fseek(tmpf,0,SEEK_SET);
- if(!(server->dataconf=__ILWS_malloc(sizec+1))) {
- LWSERR(LE_MEMORY);
- return 0;
- };
- fread(server->dataconf,sizec,1,tmpf);
- server->dataconf[sizec]=0; // Hilobok Andrew (address@hidden) said to
remove the -9 :)
- fclose(tmpf);
-
- stat(server->conffile,&statf); // tested only on win
- server->conffiletime=statf.st_mtime; // tested only on win
-
- if((server->logfile=web_server_getconf(server,"LIBWEBSERVER","LOG"))) {
- web_log("\nUsing logfile [%s]\n",server->logfile);
- server->weblog=open_weblog(server->logfile);
- } else {
- web_log("\nLOG entry not found\r\n");
- server->weblog=NULL;
- };
- if((tmp3=web_server_getconf(server,"LIBWEBSERVER","PORT"))) {
- web_log("\nListen port [%s]\n",tmp3);
- server->port=atoi(tmp3);
- __ILWS_free(tmp3);
- } else {
- web_log("PORT entry not found\r\n");
- server->port=0;
- };
-#ifdef HAVE_OPENSSL
- // Fetch SSL
- if((tmp3=web_server_getconf(server,"LIBWEBSERVER","USESSL"))) {
- if(tmp3[0]=='1') {
- server->flags = server->flags | WS_USESSL;
- }else if(tmp3[0]=='0') {
- server->flags = server->flags & ~WS_USESSL;
- } else {
- fprintf(stderr,"[USESSL=] argument invalid\n");
- };
- __ILWS_free(tmp3);
- }
- // Fetch CERTFILE
- server->cert_file=web_server_getconf(server,"LIBWEBSERVER","CERTFILE");
- server->mimefile=web_server_getconf(server,"LIBWEBSERVER","MIMEFILE");
-#endif
- // Fetch LOCAL
- if((tmp3=web_server_getconf(server,"LIBWEBSERVER","LOCAL"))) {
- if(tmp3[0]=='1') {
- server->flags = server->flags | WS_LOCAL;
- } else if(tmp3[0]=='0') {
- server->flags=server->flags & ~WS_LOCAL;
- }else {
- fprintf(stderr,"[LOCAL=] argument invalid\n");
- };
- __ILWS_free(tmp3);
- }
-
- return 1;
-};
-
-/*********************************************************************************************************/
/*
* This function initialize one web_server handler
*/
-int web_server_init(struct web_server *server,int port,const char *logfile,int
flags) {
+int web_server_init(struct web_server *server,
+ int port,
+ int flags) {
#ifdef WIN32
- unsigned long t=IOC_INOUT;
- WSADATA WSAinfo;
- WSAStartup(2,&WSAinfo); // Damn w32 sockets
+ unsigned long t=IOC_INOUT;
+ WSADATA WSAinfo;
+ WSAStartup(2,&WSAinfo); // Damn w32 sockets
#endif
-
- current_web_server=server;
- server->port=port;
- server->conffile=NULL;
- server->mimefile=NULL;
- server->weblog=NULL;
- server->usessl=0;
- server->flags=flags;
- server->dataconf="";
- if((flags & WS_USEEXTCONF) == WS_USEEXTCONF) {
- if(!(web_server_setup(server,logfile))) {
+ server->port=port;
+ // Create a listen socket port 'port' and listen addr (0) (all interfaces)
+ server->socket=__ILWS_listensocket((short)server->port,0);
+ if (server->socket==-1) {
#ifdef WIN32
- WSACleanup();
+ WSACleanup();
#endif
- return 0;
- };
- _logfile=server->weblog; // Set current log stream
- web_log("%s using config file
%s\n",_libwebserver_version,logfile);
- };
- // Create a listen socket port 'port' and listen addr (0) (all
interfaces)
- server->socket=__ILWS_listensocket((short)server->port,0);
- if(server->socket==-1) {
- LWSERR(LE_NET);
-#ifdef WIN32
- WSACleanup();
-#endif
- return 0;
- };
+ return 0;
+ };
#ifdef WIN32
- ioctlsocket(server->socket,FIONBIO,&t); //non blocking sockets for
win32
+ ioctlsocket(server->socket,
+ FIONBIO,
+ &t); //non blocking sockets for win32
#else
- fcntl(server->socket,F_SETFL,O_NONBLOCK);
+ fcntl(server->socket,
+ F_SETFL,
+ O_NONBLOCK);
#endif
- // Setup FILE structure of logfile
- if(logfile!=NULL && !((flags & WS_USEEXTCONF) == WS_USEEXTCONF)) {
- server->logfile=__ILWS_malloc(strlen(logfile)+1);
- memcpy(server->logfile,logfile,strlen(logfile));
- server->logfile[strlen(logfile)]=0;
- server->weblog=open_weblog(logfile); // Create File stream for
log
- };
-
- web_log("\n[%s] Server started at port %d
(%s)\n",__ILWS_date(time(NULL),"%d/%b/%Y:%H:%M:%S
%z"),server->port,_libwebserver_version);
-
- // Setup Flags
-
- // openssl
-#ifdef HAVE_OPENSSL
- if((server->flags & WS_USESSL) == WS_USESSL) {
- web_log("[%s] (FLAG) Using SSL in
connections\n",__ILWS_date(time(NULL),"%d/%b/%Y:%H:%M:%S %z"));
- web_log(" +-- %s certificate
file\n",server->cert_file);
- SSL_load_error_strings();
- SSLeay_add_ssl_algorithms();
- server->ctx=SSL_CTX_new (SSLv23_server_method());
- if (SSL_CTX_use_certificate_file(server->ctx,
server->cert_file, SSL_FILETYPE_PEM) <= 0) {
- ERR_print_errors_fp(stderr);
- exit(3);
- }
- if (SSL_CTX_use_PrivateKey_file(server->ctx, server->cert_file,
SSL_FILETYPE_PEM) <= 0) {
- ERR_print_errors_fp(stderr);
- exit(4);
- }
- if (SSL_CTX_check_private_key(server->ctx)<= 0) {
- ERR_print_errors_fp(stderr);
- exit(4);
- };
- server->usessl=1;
- };
-#endif
- if((server->flags & WS_LOCAL) == WS_LOCAL) {
- web_log("[%s] (FLAG) Accepting only local
connections\n",__ILWS_date(time(NULL),"%d/%b/%Y:%H:%M:%S %z"));
- };
- server->client=__ILWS_init_client_list();
// Initializate client list
- server->gethandler=__ILWS_init_handler_list();
// Initializate handlers list
- web_server_addhandler(server,"* /libwebserver.gif",_web_server_logo,0);
// Add logo default handler
-
+
+ // Setup Flags
+ server->client = __ILWS_init_client_list();
+ server->gethandler = __ILWS_init_handler_list();
+
#ifndef WIN32
- signal(SIGPIPE,SIG_IGN);
+ signal(SIGPIPE, SIG_IGN);
#endif
- return 1;
+ return 1;
}
-
-/*********************************************************************************************************/
/*
* This function shuts down a running web server, frees its allocated memory,
* and closes its socket. If called on a struct web_server that has already
* been shut down, this is a noop.
*/
-void web_server_shutdown(struct web_server *server) {
- // free and close things in opposite order of web_server_init
-
- __ILWS_delete_handler_list(server->gethandler);
- server->gethandler = NULL;
- __ILWS_delete_client_list(server->client);
- server->client = NULL;
-
- if(server->socket > 0) {
+void web_server_shutdown(struct web_server * server) {
+ // free and close things in opposite order of web_server_init
+ __ILWS_delete_handler_list(server->gethandler);
+ server->gethandler = NULL;
+ __ILWS_delete_client_list(server->client);
+ server->client = NULL;
+ if(server->socket > 0) {
#ifdef WIN32
- closesocket(server->socket);
+ closesocket(server->socket);
#else
- close(server->socket);
+ close(server->socket);
#endif
- server->socket = -1;
- }
-
- if(server->weblog) {
- fclose(server->weblog);
- server->weblog = NULL;
- __ILWS_free(server->logfile);
- server->logfile = NULL;
- }
-
+ server->socket = -1;
+ }
#ifdef WIN32
- WSACleanup();
+ WSACleanup();
#endif
}
-/*********************************************************************************************************/
/*
* Core function, return 2 if no client to process, 1 if some client
processed, 0 if error
*/
int web_server_run(struct web_server *server) {
- struct web_client *client;
- int rt;
- int tsalen=0;
- int tsocket=0;
- struct sockaddr_in tsa;
- _logfile=server->weblog;
- current_web_server=server;
- if(server->client->next==NULL) {
- //if(__ILWS_newdata(server->socket)); // does nothing but act
like usleep
- };
-// search for client
- tsalen=sizeof(client->sa);
- tsocket=accept(server->socket,(struct sockaddr *)&tsa,&tsalen);
- if(tsocket==-1) {
+ struct web_client * client;
+ struct web_client * pos;
+ int rt;
+ size_t tsalen=0;
+ int tsocket=0;
+ int cond;
+ struct sockaddr_in tsa;
+
+ tsalen = sizeof(client->sa);
+ tsocket = accept(server->socket,
+ (struct sockaddr *)&tsa,
+ &tsalen);
+ if (tsocket == -1) {
#ifdef WIN32
- if(WSAGetLastError()!=WSAEWOULDBLOCK) {
+ cond = WSAGetLastError() != WSAEWOULDBLOCK;
#else
- if(errno!=EAGAIN) {
+ cond = errno!=EAGAIN;
#endif
- fprintf(stderr,"What kind of error is this?\n"); //
REMOVE
- // client fucked up? warn somebody? (error or log or
something?)
- return 0; // don't process nothing
- };
- } else {
- client=__ILWS_malloc(sizeof(struct web_client));
- if(client==NULL) {
- rt=shutdown(tsocket,SHUT_RDWR);
+ if (cond) {
+ // client fucked up? warn somebody? (error or log or something?)
+ return 0;
+ }
+ } else {
+ client = __ILWS_malloc(sizeof(struct web_client));
+ if (client == NULL) {
+ rt = shutdown(tsocket,
+ SHUT_RDWR);
#ifdef WIN32
- rt=closesocket(tsocket);
+ rt=closesocket(tsocket);
#else
- rt=close(tsocket);
+ rt=close(tsocket);
#endif
- LWSERR(LE_MEMORY);
- return 0;
- };
- client->salen=tsalen;
- client->socket=tsocket;
- client->sa=tsa;
-#ifdef HAVE_OPENSSL
- if((server->flags & WS_USESSL) == WS_USESSL) {
- client->ssl = SSL_new(server->ctx);
- SSL_set_fd(client->ssl,client->socket);
- SSL_accept(client->ssl);
- //client->cert = SSL_get_peer_certificate (client->ssl);
- } else {
- client->ssl=NULL;
- };
-#endif
- if(!__ILWS_add_client(server->client,client)) {
- fprintf(stderr,"No client?\n"); // REMOVE
- return 0;
- }else {
- web_log("%s - - [%s]
Connected\n",inet_ntoa(client->sa.sin_addr),__ILWS_date(time(NULL),"%d/%b/%Y:%H:%M:%S
%z")); //REMOBE
- };
- };
- // end search for client
- client=server->client; // init list
- if(!client->next) { // think of Rocco Carbone (address@hidden)
- return 2; // i don't need to process the list (nothing next)
returns 2 if there is no client to process
- };
- while(client->next!=NULL) { // Process the client and swap to next;
- current_web_client=client->next;
- switch(client->next->stat) {
- case 1: {
- __ILWS_read_client(current_web_client);
- };break;
- case 2: {
-
__ILWS_process_client(current_web_client,server->gethandler);
- };break;
- case 4: {
- __ILWS_output_client(current_web_client);
- };break;
- case 5: {
- __ILWS_delete_next_client(client);
- continue;
- };break;
- };
- client=client->next;
-
- };
- return 1; // return 1 if something processed
+ return 0;
+ };
+ client->salen=tsalen;
+ client->socket=tsocket;
+ client->sa=tsa;
+ if(!__ILWS_add_client(server->client,client))
+ return 0;
+ };
+ // end search for client
+ client = server->client; // init list
+ if(!client->next) { // think of Rocco Carbone (address@hidden)
+ return 2; // i don't need to process the list (nothing next) returns 2 if
there is no client to process
+ }
+ while (client->next != NULL) { // Process the client and swap to next;
+ pos = client->next;
+ switch (pos->stat) {
+ case 1:
+ __ILWS_read_client(pos);
+ break;
+ case 2:
+ __ILWS_process_client(pos, server->gethandler);
+ break;
+ case 4:
+ __ILWS_output_client(pos);
+ break;
+ case 5:
+ __ILWS_delete_next_client(client);
+ continue;
+ }
+ client=client->next;
+ }
+ return 1; // return 1 if something processed
}
Deleted: GNUnet/libwebserver/src/server.h
===================================================================
--- GNUnet/libwebserver/src/server.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/server.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,86 +0,0 @@
-/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
- *
- * See the LICENSE file
- *
- * The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits must appear in the documentation.
- *
- * date: Sat Mar 30 14:44:42 GMT 2002
- *
- *
- * --
- *
- */
-
-#ifndef _SERVER_H_
-#define _SERVER_H_
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <signal.h>
-#include <time.h>
-
-
-#include "memory.h"
-#include "client.h"
-#include "gethandler.h"
-#include "socket.h"
-#include "error.h"
-
-#include "debug.h"
-
-#ifdef WIN32
-
-#define SHUT_RDWR SD_BOTH
-#endif
-
-
-
-
-extern char *_libwebserver_version;
-extern struct web_server *current_web_server;
-struct web_server {
- int socket;
- unsigned int port;
- char *logfile;
- char *conffile;
- time_t conffiletime; // tested only on win
- char *mimefile;
- char *dataconf;
- FILE *weblog;
- int flags;
- struct gethandler *gethandler;
- struct web_client *client;
- int usessl;
-#ifdef HAVE_OPENSSL
- char *cert_file;
- SSL_CTX *ctx;
-#else
- void *pad[2];
-#endif
-
-};
-#define WS_LOCAL 1 // Can be only accessed by localhost
-#define WS_USESSL 2 // Use ssl conections (openssl lib required)
-#define WS_USEEXTCONF 4 // Use external config file (new 0.5.0)
-
-
-void web_server_useSSLcert(struct web_server *,const char *); // Mandatory if
WS_USESSL set
-void web_server_useMIMEfile(struct web_server*,const char *); // new on 0.5.2
-int web_server_init(struct web_server *,int,const char *,int);
-void web_server_shutdown(struct web_server *);
-int web_server_addhandler(struct web_server *,const char *,void (*)(),int);
-int web_server_aliasdir(struct web_server *, const char *, char *,int );
-int web_server_run(struct web_server *);
-int web_server_setup(struct web_server *server,const char *conffile); // (new
on 0.5.0)
-char *web_server_getconf(struct web_server *, const char *,const char *); //
(new on 0.5.0)
-
-
-#include "weblog.h"
-
-#endif
-
Deleted: GNUnet/libwebserver/src/socket.c
===================================================================
--- GNUnet/libwebserver/src/socket.c 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/socket.c 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,74 +0,0 @@
-/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
- *
- * See the LICENSE file
- *
- * The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits must appear in the documentation.
- *
- * date: Sat Mar 30 14:44:42 GMT 2002
- *
- * -- Basic socket operations
- *
- */
-
-
-#include "socket.h"
-
-
-/*********************************************************************************************************/
-/*
- * socket operations
- */
-int __ILWS_newdata(int sock) {
- int ret;
- struct timeval tv;
- fd_set rfds;
- FD_ZERO(&rfds);
- FD_SET((unsigned)sock,&rfds);
- tv.tv_usec=2;
- tv.tv_sec=0;
- ret=select(sock+1,&rfds,NULL,NULL,&tv);
- FD_CLR((unsigned)sock,&rfds);
- return ret;
-}
-
-/*********************************************************************************************************/
-/*
- * to add a listen socket
- */
-int __ILWS_listensocket(short port, int saddr) {
- struct sockaddr_in sa;
- int ret;
- int sockopt=1; /* Rocco Was Here */
- sa.sin_addr.s_addr=saddr;
- sa.sin_port=htons((short)port);
- sa.sin_family=AF_INET;
- ret=socket(AF_INET,SOCK_STREAM,6); // tcp
- if(ret==-1) {
- return -1;
- };
- /* Rocco Was Here */
- setsockopt(ret,SOL_SOCKET,SO_REUSEADDR,(char
*)&sockopt,sizeof(sockopt)); // why? Rocco
-
- if(bind(ret,(struct sockaddr *)&sa,sizeof(sa))==-1) {
- close(ret); /* Rocco Was Here */
- return -1;
- };
-
- if(listen(ret,512)==-1) { // 512 backlog
- close(ret); /* Rocco Was Here */
- return -1;
- };
- IFDEBUG(fprintf(stderr,"socket.c: Listen on port %d\n",port));
- return ret;
-}
-
-/*********************************************************************************************************/
-/*
- * as the read function
- */
-int __ILWS_read(int sock,void *buf,size_t s) {
- return recv(sock,buf,s,0);
-}
-
Modified: GNUnet/libwebserver/src/socket.h
===================================================================
--- GNUnet/libwebserver/src/socket.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/socket.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -16,10 +16,6 @@
#ifndef _SOCKET_H_
#define _SOCKET_H_
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <stdio.h>
#include <stdarg.h>
@@ -35,17 +31,7 @@
#include <sys/types.h> // freebsd need it i gues that is no problem if other
system includes it
#endif
+#define __ILWS_read recv
-
-
-
-#include "debug.h"
-
-extern int errno;
-
-int __ILWS_newdata(int);
-int __ILWS_listensocket(short, int);
-int __ILWS_read(int,void *,size_t);
-
#endif
Modified: GNUnet/libwebserver/src/utils.c
===================================================================
--- GNUnet/libwebserver/src/utils.c 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/utils.c 2006-08-18 23:00:08 UTC (rev 3247)
@@ -55,9 +55,7 @@
if(tmpdir==NULL) {
tmpdir=P_tmpdir; // defined in stdio.h
};
- IFDEBUG(fprintf(stderr,"utils.c: Allocating temporary file name: "));
if(!(ret=__ILWS_malloc(strlen(tmpdir)+strlen(_tmpnameprefix)+TMPNAMESIZE+2))) {
- LWSERR(LE_MEMORY);
return NULL;
};
srand(time(NULL)); // seed
@@ -68,7 +66,6 @@
}
nam[i]=0;
snprintf(ret,strlen(tmpdir)+strlen(_tmpnameprefix)+TMPNAMESIZE+2,"%s/%s%s",tmpdir,_tmpnameprefix,nam);
// include '0'
- IFDEBUG(fprintf(stderr,"Temporary filename is: %s,
stat:%d\n",ret,stat(ret,&foostat)));
}while((stat(ret,&foostat)!=-1) && (lstat(ret,&foostat)!=-1)); //
redundancy if win32 // <- race condition?
return ret;
};
Modified: GNUnet/libwebserver/src/utils.h
===================================================================
--- GNUnet/libwebserver/src/utils.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/utils.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -16,10 +16,6 @@
#ifndef _UTILS_H_
#define _UTILS_H_
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -32,20 +28,15 @@
#include <time.h>
#endif
-#include "debug.h"
-#include "error.h"
#include "memory.h"
#ifdef WIN32
-
#define strncasecmp strnicmp
#define snprintf _snprintf
#define lstat stat
#define vsnprintf _vsnprintf
-
#endif
-
#define TMPNAMESIZE 8
extern char *_tmpnameprefix;
Deleted: GNUnet/libwebserver/src/weblog.c
===================================================================
--- GNUnet/libwebserver/src/weblog.c 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/weblog.c 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,43 +0,0 @@
-/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
- *
- * See the LICENSE file
- *
- * The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits must appear in the documentation.
- *
- * date: Sat Mar 30 14:44:42 GMT 2002
- *
- * -- web_log operations
- *
- */
-
-
-
-#include "weblog.h"
-
-FILE *_logfile=NULL;
-/*********************************************************************************************************/
-/*
- * Open weblog file
- */
-FILE *open_weblog(const char *logfile) {
- FILE *ret;
- ret=fopen(logfile,"a+");
- _logfile=ret;
- return ret;
-}
-
-/*********************************************************************************************************/
-/*
- * Log to _logfile;
- */
-void web_log(const char *fmt,...) {
- va_list args;
- if(_logfile) {
- va_start(args,fmt);
- vfprintf(_logfile,fmt,args);
- va_end(args);
- fflush(_logfile);
- }
-}
Deleted: GNUnet/libwebserver/src/weblog.h
===================================================================
--- GNUnet/libwebserver/src/weblog.h 2006-08-18 21:41:52 UTC (rev 3246)
+++ GNUnet/libwebserver/src/weblog.h 2006-08-18 23:00:08 UTC (rev 3247)
@@ -1,40 +0,0 @@
-/* Copyrights 2002 Luis Figueiredo (address@hidden) All rights reserved.
- *
- * See the LICENSE file
- *
- * The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits must appear in the documentation.
- *
- * date: Sat Mar 30 14:25:25 GMT 2002
- *
- * memory functions
- */
-
-#ifndef _WEBLOG_H_
-#define _WEBLOG_H_
-
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#ifdef WIN32
-#define snprintf _snprintf
-#endif
-
-
-
-#include "debug.h"
-
-extern FILE *_logfile;
-
-void web_log(const char *,...);
-FILE *open_weblog(const char *);
-char *mydate();
-#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3247 - in GNUnet/libwebserver: include src,
grothoff <=