[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 4f6abb2f1e
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 4f6abb2f1e5758d098be50b84b744dbf622451c3 |
|
Date: |
Thu, 01 Oct 2009 21:46:40 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".
The branch, master has been updated
via 4f6abb2f1e5758d098be50b84b744dbf622451c3 (commit)
via 90bbb9ea4b86cd3fd21da71e4e324636da974879 (commit)
via c4edd6f156174c55fd6ccaa9a9b9049f76d9b7ef (commit)
from 8041cc793b460b38569e16fb9d7050813ac62f3c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4f6abb2f1e5758d098be50b84b744dbf622451c3
Author: Giuseppe Scrivano <address@hidden>
Date: Thu Oct 1 23:46:33 2009 +0200
Lazy allocate the static PluginInfo::regex object on the first usage.
diff --git a/myserver/include/plugin/plugin_info.h
b/myserver/include/plugin/plugin_info.h
index 51a1c8f..67ac5a4 100644
--- a/myserver/include/plugin/plugin_info.h
+++ b/myserver/include/plugin/plugin_info.h
@@ -1,7 +1,7 @@
/* -*- mode: c++ -*- */
/*
MyServer
-Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
This program 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 3 of the License, or
@@ -36,8 +36,7 @@ class PluginInfo
{
public:
- PluginInfo (string& name, bool enabled = 1, bool global = 0);
-
+ PluginInfo (string& name, bool enabled = 1, bool global = 0);
~PluginInfo ();
bool isEnabled ();
@@ -46,17 +45,11 @@ public:
void addDependence (string, int minVersion, int maxVersion);
int getVersion ();
-
void setVersion (int v);
-
string getName ();
-
int getMyServerMinVersion ();
-
int getMyServerMaxVersion ();
-
int setMyServerMinVersion (int v);
-
int setMyServerMaxVersion (int v);
HashMap<string, pair<int,int>* >::Iterator begin (){return
dependences.begin ();}
@@ -65,27 +58,21 @@ public:
void setPlugin (Plugin* plugin);
Plugin* getPlugin ();
Plugin* removePlugin ();
-
void setEnabled (bool enabled);
-
pair<int,int>* getDependence (string name);
static int convertVersion (string* s);
-
-
-
-
private:
string name;
bool enabled;
- bool global;
- int version;
- int msMinVersion;
- int msMaxVersion;
- Plugin* plugin;
- HashMap<string, pair<int,int>* > dependences;
- static Regex* regex;
+ bool global;
+ int version;
+ int msMinVersion;
+ int msMaxVersion;
+ Plugin* plugin;
+ HashMap<string, pair<int,int>* > dependences;
+ static Regex* regex;
};
#endif
diff --git a/myserver/src/plugin/plugin_info.cpp
b/myserver/src/plugin/plugin_info.cpp
index 540b59d..858dbd7 100644
--- a/myserver/src/plugin/plugin_info.cpp
+++ b/myserver/src/plugin/plugin_info.cpp
@@ -17,11 +17,9 @@
#include <include/plugin/plugin_info.h>
-
using namespace std;
-Regex* PluginInfo::regex = new Regex
("^[1-2]?[1-9]?[0-9](\\.[1-2]?[0-9]?[0-9](\\.[1-2]?[0-9]?[0-9](\\.[1-2]?[0-9]?[0-9])?)?)?$",REG_EXTENDED
| REG_NOSUB);
-
+Regex* PluginInfo::regex = NULL;
/*!
*Construct a plugin info object.
@@ -188,14 +186,20 @@ Plugin* PluginInfo::removePlugin ()
}
/*!
- * Converts a string in the format "a.b.c.d" in an int in the format abcd
where each number takes 8 bit.
+ * Converts a string in the format "a.b.c.d" in an int in the format abcd where
+ * each number takes 8 bit.
*/
int PluginInfo::convertVersion (string* s)
{
+ int ret;
+
+ if (regex == NULL)
+ regex = new Regex
("^[1-2]?[1-9]?[0-9](\\.[1-2]?[0-9]?[0-9](\\.[1-2]?[0-9]?[0-9](\\.[1-2]?[0-9]?[0-9])?)?)?$",
+ REG_EXTENDED | REG_NOSUB);
- int ret = regex->exec (s->c_str (), 0, NULL, 0);
+ ret = regex->exec (s->c_str (), 0, NULL, 0);
- if (ret!=0)
+ if (ret)
return -1;
string::size_type pos = s->find (".",0);
commit 90bbb9ea4b86cd3fd21da71e4e324636da974879
Author: Giuseppe Scrivano <address@hidden>
Date: Thu Oct 1 23:29:52 2009 +0200
Mass update: leave an empty space between the function name and the open
round brace.
diff --git a/myserver/include/base/base64/mime_utils.h
b/myserver/include/base/base64/mime_utils.h
index 403b69c..9d0ca80 100644
--- a/myserver/include/base/base64/mime_utils.h
+++ b/myserver/include/base/base64/mime_utils.h
@@ -25,25 +25,25 @@ class CBase64Utils
private:
int ErrorCode;
public:
- int GetLastError() {return ErrorCode;};
- CBase64Utils();
- ~CBase64Utils();
- char* decode(const char *in, int *bufsize);
- char* encode(const char *in, int bufsize);
- char* mimeDecodeMailHeaderField(char *s);
+ int GetLastError () {return ErrorCode;};
+ CBase64Utils ();
+ ~CBase64Utils ();
+ char* decode (const char *in, int *bufsize);
+ char* encode (const char *in, int bufsize);
+ char* mimeDecodeMailHeaderField (char *s);
};
class CQPUtils
{
private:
- char* expandBuffer(char *buffer, int UsedSize, int *BufSize, int
SingleChar = 1);
+ char* expandBuffer (char *buffer, int UsedSize, int *BufSize, int
SingleChar = 1);
int ErrorCode;
public:
- int getLastError() {return ErrorCode;};
- char* encode(char*in);
- char* decode(char*in);
- CQPUtils();
- ~CQPUtils();
+ int getLastError () {return ErrorCode;};
+ char* encode (char*in);
+ char* decode (char*in);
+ CQPUtils ();
+ ~CQPUtils ();
};
#endif
diff --git a/myserver/include/base/dynamic_lib/dynamiclib.h
b/myserver/include/base/dynamic_lib/dynamiclib.h
index ef9a1ed..09d2b7f 100644
--- a/myserver/include/base/dynamic_lib/dynamiclib.h
+++ b/myserver/include/base/dynamic_lib/dynamiclib.h
@@ -37,13 +37,13 @@ using namespace std;
class DynamicLibrary
{
public:
- int validHandle();
- DynamicLibrary();
- ~DynamicLibrary();
- int loadLibrary(const char* filename, int globally=0);
- void* getProc(const char*);
- int close();
- const char* getFileName(){return fileName.c_str();}
+ int validHandle ();
+ DynamicLibrary ();
+ ~DynamicLibrary ();
+ int loadLibrary (const char* filename, int globally=0);
+ void* getProc (const char*);
+ int close ();
+ const char* getFileName (){return fileName.c_str ();}
private:
string fileName;
void *handle;
diff --git a/myserver/include/base/file/file.h
b/myserver/include/base/file/file.h
index 761d140..beaa148 100644
--- a/myserver/include/base/file/file.h
+++ b/myserver/include/base/file/file.h
@@ -41,35 +41,35 @@ public:
static const u_long FILE_CREATE_ALWAYS;
static const u_long NO_INHERIT;
- File();
- File(char *,int);
- virtual Handle getHandle();
- virtual int setHandle(Handle);
- virtual int writeToFile(const char* ,u_long ,u_long* );
- virtual int createTemporaryFile(const char* );
+ File ();
+ File (char *,int);
+ virtual Handle getHandle ();
+ virtual int setHandle (Handle);
+ virtual int writeToFile (const char* ,u_long ,u_long* );
+ virtual int createTemporaryFile (const char* );
- virtual int openFile(const char*, u_long );
- virtual int openFile(string const &file, u_long opt)
- {return openFile(file.c_str(), opt);}
+ virtual int openFile (const char*, u_long );
+ virtual int openFile (string const &file, u_long opt)
+ {return openFile (file.c_str (), opt);}
- virtual u_long getFileSize();
+ virtual u_long getFileSize ();
virtual int seek (u_long);
virtual u_long getSeek ();
- virtual time_t getLastModTime();
- virtual time_t getCreationTime();
- virtual time_t getLastAccTime();
- virtual const char *getFilename();
- virtual int setFilename(const char*);
- virtual int setFilename(string const &name)
- {return setFilename(name.c_str());}
+ virtual time_t getLastModTime ();
+ virtual time_t getCreationTime ();
+ virtual time_t getLastAccTime ();
+ virtual const char *getFilename ();
+ virtual int setFilename (const char*);
+ virtual int setFilename (string const &name)
+ {return setFilename (name.c_str ());}
virtual int operator =(File);
- virtual int close();
+ virtual int close ();
/*! Inherithed from Stream. */
- virtual int read(char* buffer, u_long len, u_long *nbr);
- virtual int write(const char* buffer, u_long len, u_long *nbw);
+ virtual int read (char* buffer, u_long len, u_long *nbr);
+ virtual int write (const char* buffer, u_long len, u_long *nbw);
virtual int fastCopyToSocket (Socket *dest, u_long offset,
MemBuf *buf, u_long *nbw);
diff --git a/myserver/include/base/file/files_utility.h
b/myserver/include/base/file/files_utility.h
index 6e5e591..9b28de0 100644
--- a/myserver/include/base/file/files_utility.h
+++ b/myserver/include/base/file/files_utility.h
@@ -30,80 +30,80 @@ class FilesUtility
{
private:
/*! Don't allow instances for this class. */
- FilesUtility();
+ FilesUtility ();
public:
- static int getPathRecursionLevel(const char*);
- static int getPathRecursionLevel(string& filename)
- {return getPathRecursionLevel(filename.c_str()); }
+ static int getPathRecursionLevel (const char*);
+ static int getPathRecursionLevel (string& filename)
+ {return getPathRecursionLevel (filename.c_str ()); }
- static time_t getLastModTime(const char *filename);
- static time_t getLastModTime(string const &filename)
- {return getLastModTime(filename.c_str());}
+ static time_t getLastModTime (const char *filename);
+ static time_t getLastModTime (string const &filename)
+ {return getLastModTime (filename.c_str ());}
- static time_t getCreationTime(const char *filename);
- static time_t getCreationTime(string const &filename)
- {return getCreationTime(filename.c_str());}
+ static time_t getCreationTime (const char *filename);
+ static time_t getCreationTime (string const &filename)
+ {return getCreationTime (filename.c_str ());}
- static time_t getLastAccTime(const char *filename);
- static time_t getLastAccTime(string const &filename)
- {return getLastAccTime(filename.c_str());}
+ static time_t getLastAccTime (const char *filename);
+ static time_t getLastAccTime (string const &filename)
+ {return getLastAccTime (filename.c_str ());}
- static int chown(const char* filename, string &uid, string &gid);
- static int chown(string const &filename, string &uid, string &gid)
- {return chown(filename.c_str(), uid, gid);}
+ static int chown (const char* filename, string &uid, string &gid);
+ static int chown (string const &filename, string &uid, string &gid)
+ {return chown (filename.c_str (), uid, gid);}
- static int completePath(char**, int *size, int dontRealloc=0);
- static int completePath(string &fileName);
+ static int completePath (char**, int *size, int dontRealloc=0);
+ static int completePath (string &fileName);
- static int isDirectory(const char*);
- static int isDirectory(const string& dir){return isDirectory(dir.c_str());}
+ static int isDirectory (const char*);
+ static int isDirectory (const string& dir){return isDirectory (dir.c_str
());}
- static int isLink(const char*);
- static int isLink(const string& dir){return isLink(dir.c_str());}
+ static int isLink (const char*);
+ static int isLink (const string& dir){return isLink (dir.c_str ());}
- static int getShortFileName(char*,char*,int);
+ static int getShortFileName (char*,char*,int);
- static int fileExists(const char * );
- static int fileExists(string const &file)
- {return fileExists(file.c_str());}
+ static int fileExists (const char * );
+ static int fileExists (string const &file)
+ {return fileExists (file.c_str ());}
- static int deleteFile(const char * );
- static int deleteFile(string const &file)
- {return deleteFile(file.c_str());}
+ static int deleteFile (const char * );
+ static int deleteFile (string const &file)
+ {return deleteFile (file.c_str ());}
- static int renameFile(const char*, const char*);
- static int renameFile(string const &before, string const &after)
- {return renameFile(before.c_str(), after.c_str());}
+ static int renameFile (const char*, const char*);
+ static int renameFile (string const &before, string const &after)
+ {return renameFile (before.c_str (), after.c_str ());}
- static int copyFile(const char*, const char*, int overwrite);
- static int copyFile(File&, File&);
- static int copyFile(string const &src, string const &dest, int overwrite)
- {return copyFile(src.c_str(), dest.c_str(), overwrite);}
+ static int copyFile (const char*, const char*, int overwrite);
+ static int copyFile (File&, File&);
+ static int copyFile (string const &src, string const &dest, int overwrite)
+ {return copyFile (src.c_str (), dest.c_str (), overwrite);}
- static void getFileExt(char* ext,const char* filename);
- static void getFileExt(string& ext, string const &filename);
+ static void getFileExt (char* ext,const char* filename);
+ static void getFileExt (string& ext, string const &filename);
- static void splitPathLength(const char *path, int *dir, int *filename);
- static void splitPath(const char* path, char* dir, char*filename);
- static void splitPath(string const &path, string& dir, string& filename);
+ static void splitPathLength (const char *path, int *dir, int *filename);
+ static void splitPath (const char* path, char* dir, char*filename);
+ static void splitPath (string const &path, string& dir, string& filename);
- static int getFilenameLength(const char*, int *);
- static void getFilename(const char* path, char* filename);
- static void getFilename(string const &path, string& filename);
+ static int getFilenameLength (const char*, int *);
+ static void getFilename (const char* path, char* filename);
+ static void getFilename (string const &path, string& filename);
static int rmdir (const char *path);
static int rmdir (string const &path)
- { return rmdir (path.c_str()); }
+ { return rmdir (path.c_str ()); }
static int mkdir (const char *path);
static int mkdir (string const &path)
- { return mkdir (path.c_str()); }
+ { return mkdir (path.c_str ()); }
- static void temporaryFileName(u_long tid, string &out);
+ static void temporaryFileName (u_long tid, string &out);
- static void resetTmpPath();
- static void setTmpPath(string & path){tmpPath.assign(path);}
+ static void resetTmpPath ();
+ static void setTmpPath (string & path){tmpPath.assign (path);}
private:
static string tmpPath;
diff --git a/myserver/include/base/files_cache/cached_file.h
b/myserver/include/base/files_cache/cached_file.h
index 27dbed9..8530d02 100644
--- a/myserver/include/base/files_cache/cached_file.h
+++ b/myserver/include/base/files_cache/cached_file.h
@@ -37,20 +37,20 @@ public:
virtual int writeToFile (const char* ,u_long ,u_long* );
virtual int createTemporaryFile (const char* );
- virtual int openFile(const char*, u_long );
- virtual int openFile(string const &file, u_long opt)
- {return openFile(file.c_str(), opt);}
+ virtual int openFile (const char*, u_long );
+ virtual int openFile (string const &file, u_long opt)
+ {return openFile (file.c_str (), opt);}
- virtual u_long getFileSize();
+ virtual u_long getFileSize ();
virtual int seek (u_long);
virtual int operator =(CachedFile);
- virtual int close();
+ virtual int close ();
virtual int fastCopyToSocket (Socket *dest, u_long offset,
MemBuf *buf, u_long *nbw);
- virtual int write(const char* buffer, u_long len, u_long *nbw);
+ virtual int write (const char* buffer, u_long len, u_long *nbw);
protected:
u_long fseek;
CachedFileBuffer* buffer;
diff --git a/myserver/include/base/files_cache/cached_file_buffer.h
b/myserver/include/base/files_cache/cached_file_buffer.h
index 309e6c7..5fa7551 100644
--- a/myserver/include/base/files_cache/cached_file_buffer.h
+++ b/myserver/include/base/files_cache/cached_file_buffer.h
@@ -32,21 +32,21 @@ class CachedFileFactory;
class CachedFileBuffer
{
public:
- void addRef();
- void decRef();
- u_long getReferenceCounter();
+ void addRef ();
+ void decRef ();
+ u_long getReferenceCounter ();
- void setFactoryToNotify(CachedFileFactory *cff);
- CachedFileFactory* getFactoryToNotify(){return factoryToNotify;}
+ void setFactoryToNotify (CachedFileFactory *cff);
+ CachedFileFactory* getFactoryToNotify (){return factoryToNotify;}
- u_long getFileSize(){return fileSize;}
- CachedFileBuffer(const char* filename);
- CachedFileBuffer(File* file);
- CachedFileBuffer(const char* buffer, u_long size);
- ~CachedFileBuffer();
+ u_long getFileSize (){return fileSize;}
+ CachedFileBuffer (const char* filename);
+ CachedFileBuffer (File* file);
+ CachedFileBuffer (const char* buffer, u_long size);
+ ~CachedFileBuffer ();
- const char* getFilename(){return filename.c_str();}
- const char* getBuffer(){return buffer;}
+ const char* getFilename (){return filename.c_str ();}
+ const char* getBuffer (){return buffer;}
protected:
Mutex mutex;
char *buffer;
diff --git a/myserver/include/base/hash_map/hash_map.h
b/myserver/include/base/hash_map/hash_map.h
index 1a1d13e..13d0a03 100644
--- a/myserver/include/base/hash_map/hash_map.h
+++ b/myserver/include/base/hash_map/hash_map.h
@@ -16,10 +16,10 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-//valueType putList( const list <keyType>&, const list <valueType>&);
-//valueType putList( const hashmap <keyType, valueType>&);
-//valueType removeList(const list <keyType>&);
-//valueType removeList(const hashmap <keyType, valueType>&);
+//valueType putList ( const list <keyType>&, const list <valueType>&);
+//valueType putList ( const hashmap <keyType, valueType>&);
+//valueType removeList (const list <keyType>&);
+//valueType removeList (const hashmap <keyType, valueType>&);
#ifndef HASHMAP_H
# define HASHMAP_H
@@ -59,8 +59,8 @@ class MyIterator
template <typename KType, typename VType>
friend class HashMap;
- MyIterator();
- inline KeyType getKey() const;
+ MyIterator ();
+ inline KeyType getKey () const;
inline bool operator==(const MyIterator&) const;
inline bool operator!=(const MyIterator&) const;
@@ -69,7 +69,7 @@ class MyIterator
inline MyIterator operator++(int); //postfix
inline MyIterator& operator--(); //prefix
inline MyIterator operator--(int); //postfix
- //inline MyIterator operator delete(void*);
+ //inline MyIterator operator delete (void*);
private:
@@ -87,22 +87,22 @@ class HashMap
typedef MyIterator<KeyType, ValueType> Iterator;
- HashMap();
- HashMap(int);
- HashMap(const float);
- HashMap(int, const float);
- inline bool empty(void) const;
- inline void clear(void);
- inline int size(void) const;
- inline Iterator begin(void);
- inline Iterator back(void);
- inline Iterator end(void);
- ValueType remove(const Iterator&);
- bool containsKey(const KeyType&);
- ValueType get(const KeyType&);
- Iterator getI(const KeyType&);
- ValueType put(KeyType&, const ValueType&);
- ValueType remove(const KeyType&);
+ HashMap ();
+ HashMap (int);
+ HashMap (const float);
+ HashMap (int, const float);
+ inline bool empty (void) const;
+ inline void clear (void);
+ inline int size (void) const;
+ inline Iterator begin (void);
+ inline Iterator back (void);
+ inline Iterator end (void);
+ ValueType remove (const Iterator&);
+ bool containsKey (const KeyType&);
+ ValueType get (const KeyType&);
+ Iterator getI (const KeyType&);
+ ValueType put (KeyType&, const ValueType&);
+ ValueType remove (const KeyType&);
private:
@@ -115,8 +115,8 @@ class HashMap
int capacity, power, mask, load;
float highLoadFactor, lowLoadFactor;
- void increaseSize(const int);
- void decreaseSize(const int);
+ void increaseSize (const int);
+ void decreaseSize (const int);
unsigned int hash (const char *, int);
};
@@ -127,22 +127,22 @@ class HashMap <string, ValueType>
typedef MyIterator<string, ValueType> Iterator;
- HashMap();
- HashMap(int);
- HashMap(const float);
- HashMap(int, const float);
- inline bool empty(void) const;
- inline void clear(void);
- inline int size(void) const;
- inline Iterator begin(void);
- inline Iterator back(void);
- inline Iterator end(void);
- ValueType remove(const Iterator&);
- bool containsKey(const string&);
- ValueType get(const string&);
- Iterator getI(const string&);
- ValueType put(string&, const ValueType&);
- ValueType remove(const string&);
+ HashMap ();
+ HashMap (int);
+ HashMap (const float);
+ HashMap (int, const float);
+ inline bool empty (void) const;
+ inline void clear (void);
+ inline int size (void) const;
+ inline Iterator begin (void);
+ inline Iterator back (void);
+ inline Iterator end (void);
+ ValueType remove (const Iterator&);
+ bool containsKey (const string&);
+ ValueType get (const string&);
+ Iterator getI (const string&);
+ ValueType put (string&, const ValueType&);
+ ValueType remove (const string&);
private:
@@ -155,8 +155,8 @@ class HashMap <string, ValueType>
int capacity, power, mask, load;
float highLoadFactor, lowLoadFactor;
- void increaseSize(const int);
- void decreaseSize(const int);
+ void increaseSize (const int);
+ void decreaseSize (const int);
unsigned int hash (const char *, int);
};
@@ -167,22 +167,22 @@ class HashMap <char*, ValueType>
typedef MyIterator<char*, ValueType> Iterator;
- HashMap();
- HashMap(int);
- HashMap(const float);
- HashMap(int, const float);
- inline bool empty(void) const;
- inline void clear(void);
- inline int size(void) const;
- inline Iterator begin(void);
- inline Iterator back(void);
- inline Iterator end(void);
- ValueType remove(const Iterator&);
- bool containsKey(const char* const);
- ValueType get(const char* const);
- Iterator getI(const char* const);
- ValueType put(char* const, const ValueType&);
- ValueType remove(const char* const);
+ HashMap ();
+ HashMap (int);
+ HashMap (const float);
+ HashMap (int, const float);
+ inline bool empty (void) const;
+ inline void clear (void);
+ inline int size (void) const;
+ inline Iterator begin (void);
+ inline Iterator back (void);
+ inline Iterator end (void);
+ ValueType remove (const Iterator&);
+ bool containsKey (const char* const);
+ ValueType get (const char* const);
+ Iterator getI (const char* const);
+ ValueType put (char* const, const ValueType&);
+ ValueType remove (const char* const);
private:
@@ -195,8 +195,8 @@ class HashMap <char*, ValueType>
int capacity, power, mask, load;
float highLoadFactor, lowLoadFactor;
- void increaseSize(const int);
- void decreaseSize(const int);
+ void increaseSize (const int);
+ void decreaseSize (const int);
unsigned int hash (const char *, int);
};
@@ -207,22 +207,22 @@ class HashMap <void*, ValueType>
typedef MyIterator<void*, ValueType> Iterator;
- HashMap();
- HashMap(int);
- HashMap(const float);
- HashMap(int, const float);
- inline bool empty(void) const;
- inline void clear(void);
- inline int size(void) const;
- inline Iterator begin(void);
- inline Iterator back(void);
- inline Iterator end(void);
- ValueType remove(const Iterator&);
- bool containsKey(const void* const);
- ValueType get(const void* const);
- Iterator getI(const void* const);
- ValueType put(void* const, const ValueType&);
- ValueType remove(const void* const);
+ HashMap ();
+ HashMap (int);
+ HashMap (const float);
+ HashMap (int, const float);
+ inline bool empty (void) const;
+ inline void clear (void);
+ inline int size (void) const;
+ inline Iterator begin (void);
+ inline Iterator back (void);
+ inline Iterator end (void);
+ ValueType remove (const Iterator&);
+ bool containsKey (const void* const);
+ ValueType get (const void* const);
+ Iterator getI (const void* const);
+ ValueType put (void* const, const ValueType&);
+ ValueType remove (const void* const);
private:
@@ -235,8 +235,8 @@ class HashMap <void*, ValueType>
int capacity, power, mask, load;
float highLoadFactor, lowLoadFactor;
- void increaseSize(const int);
- void decreaseSize(const int);
+ void increaseSize (const int);
+ void decreaseSize (const int);
unsigned int hash (const char *, int);
};
diff --git a/myserver/include/base/home_dir/home_dir.h
b/myserver/include/base/home_dir/home_dir.h
index 14ce349..b288f4d 100644
--- a/myserver/include/base/home_dir/home_dir.h
+++ b/myserver/include/base/home_dir/home_dir.h
@@ -31,11 +31,11 @@ using namespace std;
class HomeDir
{
public:
- HomeDir();
- ~HomeDir();
+ HomeDir ();
+ ~HomeDir ();
- void clear();
- int load();
+ void clear ();
+ int load ();
int getHomeDir (string& userName, string& out);
@@ -43,7 +43,7 @@ public:
private:
Mutex loadMutex;
- int loadImpl();
+ int loadImpl ();
# ifdef WIN32
string data;
diff --git a/myserver/include/base/md5/md5.h b/myserver/include/base/md5/md5.h
index 8344440..4c48e3a 100644
--- a/myserver/include/base/md5/md5.h
+++ b/myserver/include/base/md5/md5.h
@@ -45,15 +45,15 @@ class Md5
public:
Md5();
~Md5();
- void init();
- void update(unsigned char const *buf, unsigned long len);
- void final(unsigned char digest[16]);
- char* end(char *buf);
+ void init ();
+ void update (unsigned char const *buf, unsigned long len);
+ void final (unsigned char digest[16]);
+ char* end (char *buf);
private:
unsigned int buf[4];
unsigned int bytes[2];
unsigned int in[16];
- void transform(unsigned int buf[4], unsigned int const in[16]);
+ void transform (unsigned int buf[4], unsigned int const in[16]);
};
#endif
diff --git a/myserver/include/base/mem_buff/mem_buff.h
b/myserver/include/base/mem_buff/mem_buff.h
index 2465851..1c2a427 100644
--- a/myserver/include/base/mem_buff/mem_buff.h
+++ b/myserver/include/base/mem_buff/mem_buff.h
@@ -1,7 +1,7 @@
/* -*- mode: c++ -*- */
/*
MyServer
-Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
Copyright (C) 2004, Guinet Adrien (grainailleur)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -40,8 +40,8 @@ using namespace std;
# define mem_free(pAdr) (delete [] pAdr)
# else
# include <stdlib.h>
-# define mem_alloc(size) ((char*) malloc(size))
-# define mem_free(pAdr) (free(pAdr))
+# define mem_alloc(size) ((char*) malloc (size))
+# define mem_free(pAdr) (free (pAdr))
# endif
# define end_str '\0'
@@ -49,39 +49,39 @@ using namespace std;
class MemBuf
{
public:
- MemBuf();
- MemBuf(const void* pAdr, u_int size);
- MemBuf(const MemBuf& srcBuf);
- MemBuf(MemBuf& srcBuf, int bCopy);
- ~MemBuf();
-
- void setExternalBuffer(const void* pAdr, u_int size);
- int setBuffer(const void* pAdr, u_int size);
- void setLength(u_int newSize);
-
- void addBuffer(const void* pAdr, u_int size);
- void addBuffer(MemBuf *nmb);
-
- int free();
-
- u_int find(char c, u_int start = 0);
- u_int find(MemBuf *smb, u_int start = 0);
- u_int find(const void* pAdr, u_int size, u_int start = 0);
- void replace(char what, char by);
- char& getAt(u_int nIndex);
+ MemBuf ();
+ MemBuf (const void* pAdr, u_int size);
+ MemBuf (const MemBuf& srcBuf);
+ MemBuf (MemBuf& srcBuf, int bCopy);
+ ~MemBuf ();
+
+ void setExternalBuffer (const void* pAdr, u_int size);
+ int setBuffer (const void* pAdr, u_int size);
+ void setLength (u_int newSize);
+
+ void addBuffer (const void* pAdr, u_int size);
+ void addBuffer (MemBuf *nmb);
+
+ int free ();
+
+ u_int find (char c, u_int start = 0);
+ u_int find (MemBuf *smb, u_int start = 0);
+ u_int find (const void* pAdr, u_int size, u_int start = 0);
+ void replace (char what, char by);
+ char& getAt (u_int nIndex);
char& operator[](u_int nIndex);
- int getPart(u_int nStart, u_int nEnd, MemBuf& result);
- int getPartAsString(u_int nStart, u_int nEnd, MemBuf& result);
+ int getPart (u_int nStart, u_int nEnd, MemBuf& result);
+ int getPartAsString (u_int nStart, u_int nEnd, MemBuf& result);
- char* getBuffersetLength(u_int newSize);
+ char* getBuffersetLength (u_int newSize);
- u_int getLength();
- u_int getRealLength();
+ u_int getLength ();
+ u_int getRealLength ();
- int isValid();
+ int isValid ();
- char* getBuffer();
+ char* getBuffer ();
operator const void*() ;
MemBuf operator+ (MemBuf& src);
MemBuf operator+ (const char* src);
@@ -106,24 +106,24 @@ public:
// We assume that
m_nBlockLength < m_nSizeLimit
void hashMD5(const void* pAdr, u_int nSize);
- void hashCRC(const void* pAdr, u_int nSize);
- void hex(const void* pAdr, u_int nSize);
- void uintToStr(u_int i);
- void intToStr( int i);
- u_int strToUint(const char* pAdr);
- unsigned char hexCharToNumber(unsigned char c);
- MemBuf hexToData(const void* pAdr, u_int nSize);
- int strToInt(const char* pAdr);
- void hex(MemBuf& membuf) ;
+ void hashCRC (const void* pAdr, u_int nSize);
+ void hex (const void* pAdr, u_int nSize);
+ void uintToStr (u_int i);
+ void intToStr ( int i);
+ u_int strToUint (const char* pAdr);
+ unsigned char hexCharToNumber (unsigned char c);
+ MemBuf hexToData (const void* pAdr, u_int nSize);
+ int strToInt (const char* pAdr);
+ void hex (MemBuf& membuf) ;
void hashMD5(MemBuf& membuf);
- void hashCRC(MemBuf& membuf);
- void uintToStr(u_int i, char* pBufToUse, u_int nBufSize) ;
- void xIntToStr(u_int i, int bNegative, char* pBufToUse, u_int nBufSize);
- void intToStr(int i, char* pBufToUse, u_int nBufSize);
+ void hashCRC (MemBuf& membuf);
+ void uintToStr (u_int i, char* pBufToUse, u_int nBufSize) ;
+ void xIntToStr (u_int i, int bNegative, char* pBufToUse, u_int
nBufSize);
+ void intToStr (int i, char* pBufToUse, u_int nBufSize);
protected:
- void xIntToStr(u_int i, int bNegative);
- void allocBuffer(u_int size);
+ void xIntToStr (u_int i, int bNegative);
+ void allocBuffer (u_int size);
char* m_buffer; // Using of char* instead of void* because the C++
Compilator doesn't know the size of a void* !!!!!
u_int m_nSize;
u_int m_nRealSize;
diff --git a/myserver/include/base/multicast/multicast.h
b/myserver/include/base/multicast/multicast.h
index efb2b17..e810462 100644
--- a/myserver/include/base/multicast/multicast.h
+++ b/myserver/include/base/multicast/multicast.h
@@ -33,21 +33,21 @@ template<typename MSG_TYPE, typename ARG_TYPE, typename
RET_TYPE>
class Multicast
{
public:
- virtual RET_TYPE updateMulticast(MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>*, MSG_TYPE&, ARG_TYPE) = 0;
- virtual ~Multicast(){}
+ virtual RET_TYPE updateMulticast (MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>*, MSG_TYPE&, ARG_TYPE) = 0;
+ virtual ~Multicast (){}
};
template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
class MulticastRegistry
{
public:
- void addMulticast(MSG_TYPE, Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*);
- void removeMulticast(MSG_TYPE, Multicast<MSG_TYPE, ARG_TYPE,
RET_TYPE>*);
- void notifyMulticast(MSG_TYPE&, ARG_TYPE);
+ void addMulticast (MSG_TYPE, Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*);
+ void removeMulticast (MSG_TYPE, Multicast<MSG_TYPE, ARG_TYPE,
RET_TYPE>*);
+ void notifyMulticast (MSG_TYPE&, ARG_TYPE);
protected:
- void removeMulticasts(MSG_TYPE);
- vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*>*
getHandlers(MSG_TYPE&);
- void clearMulticastRegistry();
+ void removeMulticasts (MSG_TYPE);
+ vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*>* getHandlers
(MSG_TYPE&);
+ void clearMulticastRegistry ();
private:
HashMap<MSG_TYPE, vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*>*>
handlers;
};
diff --git a/myserver/include/base/pipe/pipe.h
b/myserver/include/base/pipe/pipe.h
index b97f4ef..0490b91 100644
--- a/myserver/include/base/pipe/pipe.h
+++ b/myserver/include/base/pipe/pipe.h
@@ -29,17 +29,17 @@ using namespace std;
class Pipe : public Stream
{
public:
- Pipe();
- int create(bool readPipe = true);
- long getReadHandle();
- long getWriteHandle();
- void inverted(Pipe&);
- virtual int read(char* buffer, u_long len, u_long *nbr);
- virtual int write(const char* buffer, u_long len, u_long *nbw);
- virtual int close();
- void closeRead();
- void closeWrite();
- bool pipeTerminated(){return terminated;}
+ Pipe ();
+ int create (bool readPipe = true);
+ long getReadHandle ();
+ long getWriteHandle ();
+ void inverted (Pipe&);
+ virtual int read (char* buffer, u_long len, u_long *nbr);
+ virtual int write (const char* buffer, u_long len, u_long *nbw);
+ virtual int close ();
+ void closeRead ();
+ void closeWrite ();
+ bool pipeTerminated (){return terminated;}
int waitForData (int sec, int usec);
private:
bool terminated;
diff --git a/myserver/include/base/process/process.h
b/myserver/include/base/process/process.h
index 421c8a9..e7e1ad6 100644
--- a/myserver/include/base/process/process.h
+++ b/myserver/include/base/process/process.h
@@ -78,20 +78,20 @@ class Process
public:
# ifdef HAVE_PTHREAD
static Mutex forkMutex;
- static void forkPrepare();
- static void forkParent();
- static void forkChild();
+ static void forkPrepare ();
+ static void forkParent ();
+ static void forkChild ();
# endif
- static void initialize();
+ static void initialize ();
int exec (StartProcInfo *spi, bool waitEnd = false);
- int terminateProcess();
- int isProcessAlive();
+ int terminateProcess ();
+ int isProcessAlive ();
static int chroot (const char *root);
- static int setuid(const char*);
- static int setgid(const char*);
- static int setAdditionalGroups(u_long len, u_long *groups);
- Process();
- ~Process();
+ static int setuid (const char*);
+ static int setgid (const char*);
+ static int setAdditionalGroups (u_long len, u_long *groups);
+ Process ();
+ ~Process ();
/*! Return the process ID. */
int getPid (){return pid;}
diff --git a/myserver/include/base/process/process_server_manager.h
b/myserver/include/base/process/process_server_manager.h
index 1d5754d..0cb2502 100644
--- a/myserver/include/base/process/process_server_manager.h
+++ b/myserver/include/base/process/process_server_manager.h
@@ -54,12 +54,12 @@ public:
struct ServerDomain *sd;
bool isLocal;
- void terminate()
+ void terminate ()
{
- if(isLocal)
+ if (isLocal)
{
- socket.close();
- process.terminateProcess();
+ socket.close ();
+ process.terminateProcess ();
}
}
};
@@ -69,28 +69,28 @@ public:
string domainName;
HashMap<string, vector<Server*> *> servers;
void (*clear)(Server*);
- ServerDomain()
+ ServerDomain ()
{
clear = 0;
}
};
- ServerDomain *createDomain(const char *name);
- ServerDomain *getDomain(const char *name);
- void clear();
- Server *getServer(const char *domain, const char *name, int seed = 0);
- ProcessServerManager();
- ~ProcessServerManager();
- int connect(Socket *sock, Server *server);
- void setMaxServers(int max){maxServers = max;}
- int getMaxServers(){return maxServers;}
- void removeDomain(const char *domain);
- int domainServers(const char *domain);
- void load();
- Server *runAndAddServer(const char *domain, const char *name,
+ ServerDomain *createDomain (const char *name);
+ ServerDomain *getDomain (const char *name);
+ void clear ();
+ Server *getServer (const char *domain, const char *name, int seed = 0);
+ ProcessServerManager ();
+ ~ProcessServerManager ();
+ int connect (Socket *sock, Server *server);
+ void setMaxServers (int max){maxServers = max;}
+ int getMaxServers (){return maxServers;}
+ void removeDomain (const char *domain);
+ int domainServers (const char *domain);
+ void load ();
+ Server *runAndAddServer (const char *domain, const char *name,
const char *chroot = NULL, int uid = 0,
int gid = 0, u_short port = 0);
- Server *addRemoteServer(const char *domain, const char *name,
+ Server *addRemoteServer (const char *domain, const char *name,
const char *host, u_short port);
private:
int maxServers;
diff --git a/myserver/include/base/regex/myserver_regex.h
b/myserver/include/base/regex/myserver_regex.h
index b5b9706..035c6a4 100644
--- a/myserver/include/base/regex/myserver_regex.h
+++ b/myserver/include/base/regex/myserver_regex.h
@@ -45,23 +45,23 @@ using namespace std;
class Regex
{
public:
- Regex(){compiled = 0;}
- void clone(Regex&);
- Regex(Regex&);
- Regex(const char *pattern, int flags);
- ~Regex();
- int isCompiled();
- int compile(const char *pattern, int flags);
- int exec(const char *string, size_t nmatch, regmatch_t matchptr [],
+ Regex (){compiled = 0;}
+ void clone (Regex&);
+ Regex (Regex&);
+ Regex (const char *pattern, int flags);
+ ~Regex ();
+ int isCompiled ();
+ int compile (const char *pattern, int flags);
+ int exec (const char *string, size_t nmatch, regmatch_t matchptr [],
int eflags);
- void free();
+ void free ();
- Regex(string const &pattern, int flags){Regex(pattern.c_str(), flags);}
- int compile(string const &str, int flags){
- return compile(str.c_str(), flags );}
- int exec(string const &str, size_t nmatch, regmatch_t matchptr [],
+ Regex (string const &pattern, int flags){Regex (pattern.c_str (), flags);}
+ int compile (string const &str, int flags){
+ return compile (str.c_str (), flags );}
+ int exec (string const &str, size_t nmatch, regmatch_t matchptr [],
int eflags)
- {return exec(str.c_str(), nmatch, matchptr, eflags);}
+ {return exec (str.c_str (), nmatch, matchptr, eflags);}
private:
regex_t compiledRegex;
regmatch_t match;
diff --git a/myserver/include/base/safetime/safetime.h
b/myserver/include/base/safetime/safetime.h
index 40f8321..748e5ca 100644
--- a/myserver/include/base/safetime/safetime.h
+++ b/myserver/include/base/safetime/safetime.h
@@ -30,10 +30,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
# include <time.h>
# endif
-void myserver_safetime_init();
-void myserver_safetime_destroy();
-struct tm *myserver_localtime(const time_t *timep, tm* res);
-struct tm *myserver_gmtime(const time_t *timep, tm* res);
+void myserver_safetime_init ();
+void myserver_safetime_destroy ();
+struct tm *myserver_localtime (const time_t *timep, tm* res);
+struct tm *myserver_gmtime (const time_t *timep, tm* res);
#endif
diff --git a/myserver/include/base/socket/socket.h
b/myserver/include/base/socket/socket.h
index e23f53f..f221b9b 100644
--- a/myserver/include/base/socket/socket.h
+++ b/myserver/include/base/socket/socket.h
@@ -73,48 +73,48 @@ class Socket: public Stream
public:
static int startupSocketLib ();
- void setServerSocket(Socket*);
- Socket* getServerSocket();
-
- static void stopBlockingOperations(bool);
- virtual Handle getHandle();
- void setHandle(SocketHandle);
- static MYSERVER_HOSTENT *gethostbyaddr(char* addr, int len, int type);
- static MYSERVER_HOSTENT *gethostbyname(const char*);
- static int gethostname(char*, int);
- int socket(int, int, int);
- int bind(MYSERVER_SOCKADDR*, int);
- int listen(int);
- Socket();
- Socket(Socket*);
- Socket(SocketHandle);
-
- Socket accept(MYSERVER_SOCKADDR*, socklen_t*);
- int setsockopt(int,int, const char*,int);
-
- virtual int connect(MYSERVER_SOCKADDR*, int);
- virtual int close();
- virtual int shutdown(int how);
- virtual int recv(char*, int, int, u_long);
- virtual int recv(char*, int, int);
- virtual u_long bytesToRead();
-
- int ioctlsocket(long, unsigned long*);
- int send(const char*, int, int);
- int connect(const char* host, u_short port);
+ void setServerSocket (Socket*);
+ Socket* getServerSocket ();
+
+ static void stopBlockingOperations (bool);
+ virtual Handle getHandle ();
+ void setHandle (SocketHandle);
+ static MYSERVER_HOSTENT *gethostbyaddr (char* addr, int len, int type);
+ static MYSERVER_HOSTENT *gethostbyname (const char*);
+ static int gethostname (char*, int);
+ int socket (int, int, int);
+ int bind (MYSERVER_SOCKADDR*, int);
+ int listen (int);
+ Socket ();
+ Socket (Socket*);
+ Socket (SocketHandle);
+
+ Socket accept (MYSERVER_SOCKADDR*, socklen_t*);
+ int setsockopt (int,int, const char*,int);
+
+ virtual int connect (MYSERVER_SOCKADDR*, int);
+ virtual int close ();
+ virtual int shutdown (int how);
+ virtual int recv (char*, int, int, u_long);
+ virtual int recv (char*, int, int);
+ virtual u_long bytesToRead ();
+
+ int ioctlsocket (long, unsigned long*);
+ int send (const char*, int, int);
+ int connect (const char* host, u_short port);
int operator==(Socket);
int operator=(Socket);
- int getsockname(MYSERVER_SOCKADDR*,int*);
- int setNonBlocking(int);
+ int getsockname (MYSERVER_SOCKADDR*,int*);
+ int setNonBlocking (int);
bool getNonBLocking () {return isNonBlocking;}
- virtual int dataOnRead(int sec = 0, int usec = 500);
+ virtual int dataOnRead (int sec = 0, int usec = 500);
- u_long getThrottling();
- void setThrottling(u_long);
- static int getLocalIPsList(string&);
+ u_long getThrottling ();
+ void setThrottling (u_long);
+ static int getLocalIPsList (string&);
/*! Inherithed from Stream. */
- virtual int read(char* buffer, u_long len, u_long *nbr);
- virtual int write(const char* buffer, u_long len, u_long *nbw);
+ virtual int read (char* buffer, u_long len, u_long *nbr);
+ virtual int write (const char* buffer, u_long len, u_long *nbw);
protected:
SocketHandle socketHandle;
@@ -131,6 +131,6 @@ protected:
/*! Stop the sockets system. */
static bool denyBlockingOperations;
- virtual int rawSend(const char* buffer, int len, int flags);
+ virtual int rawSend (const char* buffer, int len, int flags);
};
#endif
diff --git a/myserver/include/base/socket/ssl_socket.h
b/myserver/include/base/socket/ssl_socket.h
index ca77c5a..b709141 100644
--- a/myserver/include/base/socket/ssl_socket.h
+++ b/myserver/include/base/socket/ssl_socket.h
@@ -45,27 +45,27 @@ class SslSocket : public Socket
{
public:
- int setSSLContext(SSL_CTX*);
- int sslAccept();
+ int setSSLContext (SSL_CTX*);
+ int sslAccept ();
- int freeSSL();
- SSL* getSSLConnection();
+ int freeSSL ();
+ SSL* getSSLConnection ();
- virtual int close();
- virtual int shutdown(int how);
- virtual int connect(MYSERVER_SOCKADDR* sa, int na);
- virtual int recv(char* buffer,int len,int flags);
- virtual int rawSend(const char* buffer, int len, int flags);
- virtual u_long bytesToRead();
+ virtual int close ();
+ virtual int shutdown (int how);
+ virtual int connect (MYSERVER_SOCKADDR* sa, int na);
+ virtual int recv (char* buffer,int len,int flags);
+ virtual int rawSend (const char* buffer, int len, int flags);
+ virtual u_long bytesToRead ();
# ifdef __HURD__
- virtual int dataOnRead(int sec = 1, int usec = 500);
+ virtual int dataOnRead (int sec = 1, int usec = 500);
# else
- virtual int dataOnRead(int sec = 0, int usec = 500);
+ virtual int dataOnRead (int sec = 0, int usec = 500);
# endif
- SslSocket(Socket*);
- ~SslSocket();
+ SslSocket (Socket*);
+ ~SslSocket ();
protected:
bool externalContext;
diff --git a/myserver/include/base/ssl/ssl.h b/myserver/include/base/ssl/ssl.h
index 0a82a99..46d6dcb 100644
--- a/myserver/include/base/ssl/ssl.h
+++ b/myserver/include/base/ssl/ssl.h
@@ -29,21 +29,21 @@ using namespace std;
class SslContext
{
public:
- SslContext();
+ SslContext ();
- int initialize();
- int free();
+ int initialize ();
+ int free ();
- SSL_CTX* getContext(){return context;}
- SSL_METHOD* getMethod(){return method;}
+ SSL_CTX* getContext (){return context;}
+ SSL_METHOD* getMethod (){return method;}
- string& getCertificateFile(){return certificateFile;}
- string& getPrivateKeyFile(){return privateKeyFile;}
- string& getPassword(){return password;}
+ string& getCertificateFile (){return certificateFile;}
+ string& getPrivateKeyFile (){return privateKeyFile;}
+ string& getPassword (){return password;}
- void setCertificateFile(string& c){certificateFile.assign (c);}
- void setPrivateKeyFile(string& pk){privateKeyFile.assign (pk);}
- void setPassword(string& p){password.assign (p);}
+ void setCertificateFile (string& c){certificateFile.assign (c);}
+ void setPrivateKeyFile (string& pk){privateKeyFile.assign (pk);}
+ void setPassword (string& p){password.assign (p);}
private:
SSL_CTX* context;
@@ -54,7 +54,7 @@ private:
string password;
};
-void initializeSSL();
-void cleanupSSL();
+void initializeSSL ();
+void cleanupSSL ();
#endif
diff --git a/myserver/include/base/string/stringutils.h
b/myserver/include/base/string/stringutils.h
index 02b1ec4..6455c4c 100644
--- a/myserver/include/base/string/stringutils.h
+++ b/myserver/include/base/string/stringutils.h
@@ -59,7 +59,7 @@ void translateEscapeString (char *TargetStr);
void translateEscapeString (string& TargetStr);
int hexToInt (const char *str);
-inline time_t hexToInt (string const& str){ return hexToInt(str.c_str ()); }
+inline time_t hexToInt (string const& str){ return hexToInt (str.c_str ()); }
int getEndLine (const char* str, int max);
inline int getEndLine (string const& str, int max)
diff --git a/myserver/include/base/sync/event.h
b/myserver/include/base/sync/event.h
index 4488b79..12a72fd 100644
--- a/myserver/include/base/sync/event.h
+++ b/myserver/include/base/sync/event.h
@@ -41,11 +41,11 @@ private:
# endif
EventHandle event;
public:
- Event(bool broadcast);
- ~Event();
- int init(bool broadcast);
- int destroy();
- int wait(u_long id = 0, u_long timeout = 0);
- int signal(u_long id = 0);
+ Event (bool broadcast);
+ ~Event ();
+ int init (bool broadcast);
+ int destroy ();
+ int wait (u_long id = 0, u_long timeout = 0);
+ int signal (u_long id = 0);
};
#endif
diff --git a/myserver/include/base/sync/mutex.h
b/myserver/include/base/sync/mutex.h
index 256095d..2206a34 100644
--- a/myserver/include/base/sync/mutex.h
+++ b/myserver/include/base/sync/mutex.h
@@ -32,14 +32,14 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class Mutex
{
public:
- Mutex();
- virtual ~Mutex();
- virtual int init();
- int destroy();
- int lock(u_long id = 0);
- int unlock(u_long id = 0);
- bool isLocked();
- MutexHandle getHandle();
+ Mutex ();
+ virtual ~Mutex ();
+ virtual int init ();
+ int destroy ();
+ int lock (u_long id = 0);
+ int unlock (u_long id = 0);
+ bool isLocked ();
+ MutexHandle getHandle ();
protected:
bool locked;
int initialized;
diff --git a/myserver/include/base/sync/read_write_lock.h
b/myserver/include/base/sync/read_write_lock.h
index 95f5d7d..ea41926 100644
--- a/myserver/include/base/sync/read_write_lock.h
+++ b/myserver/include/base/sync/read_write_lock.h
@@ -25,13 +25,13 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class ReadWriteLock
{
public:
- ReadWriteLock(int maxReaders);
- ~ReadWriteLock();
- void readLock();
- void readUnlock();
+ ReadWriteLock (int maxReaders);
+ ~ReadWriteLock ();
+ void readLock ();
+ void readUnlock ();
- void writeLock();
- void writeUnlock();
+ void writeLock ();
+ void writeUnlock ();
private:
int maxReaders;
Semaphore semaphore;
diff --git a/myserver/include/base/sync/recursive_mutex.h
b/myserver/include/base/sync/recursive_mutex.h
index 277c447..4d93c67 100644
--- a/myserver/include/base/sync/recursive_mutex.h
+++ b/myserver/include/base/sync/recursive_mutex.h
@@ -26,8 +26,8 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class RecursiveMutex : public Mutex
{
public:
- RecursiveMutex();
- virtual ~RecursiveMutex();
- virtual int init();
+ RecursiveMutex ();
+ virtual ~RecursiveMutex ();
+ virtual int init ();
};
#endif
diff --git a/myserver/include/base/sync/semaphore.h
b/myserver/include/base/sync/semaphore.h
index 7ae3eb7..698faf4 100644
--- a/myserver/include/base/sync/semaphore.h
+++ b/myserver/include/base/sync/semaphore.h
@@ -31,14 +31,14 @@ typedef HANDLE SemaphoreHandle;
class Semaphore
{
public:
- Semaphore(int n);
- ~Semaphore();
- int init(int n);
- int destroy();
- int lock(u_long id = 0);
- int unlock(u_long id = 0);
- SemaphoreHandle *getHandle(){return &semaphore;}
- int isInitialized(){return initialized;}
+ Semaphore (int n);
+ ~Semaphore ();
+ int init (int n);
+ int destroy ();
+ int lock (u_long id = 0);
+ int unlock (u_long id = 0);
+ SemaphoreHandle *getHandle (){return &semaphore;}
+ int isInitialized (){return initialized;}
private:
int initialized;
SemaphoreHandle semaphore;
diff --git a/myserver/include/base/thread/thread.h
b/myserver/include/base/thread/thread.h
index 7aaf7b7..2c45c47 100644
--- a/myserver/include/base/thread/thread.h
+++ b/myserver/include/base/thread/thread.h
@@ -25,27 +25,27 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
# ifdef WIN32
typedef unsigned int ThreadID;
-# define DEFINE_THREAD(NAME,PARAM) unsigned int __stdcall NAME(void* PARAM)
+# define DEFINE_THREAD(NAME,PARAM) unsigned int __stdcall NAME (void* PARAM)
# endif
# ifdef HAVE_PTHREAD
typedef pthread_t ThreadID;
-# define DEFINE_THREAD(NAME,PARAM) void* NAME(void* PARAM)
+# define DEFINE_THREAD(NAME,PARAM) void* NAME (void* PARAM)
# endif
class Thread
{
public:
- static void wait(u_long);
- static ThreadID threadID();
+ static void wait (u_long);
+ static ThreadID threadID ();
# ifdef WIN32
- static int create(ThreadID* thread,
+ static int create (ThreadID* thread,
unsigned int (_stdcall *start_routine)(void *), void * arg);
# endif
# ifdef HAVE_PTHREAD
- static int create(ThreadID* thread, void * (*start_routine)(void *),
+ static int create (ThreadID* thread, void * (*start_routine)(void *),
void * arg);
# endif
- static void terminate();
- static int join(ThreadID);
+ static void terminate ();
+ static int join (ThreadID);
};
#endif
diff --git a/myserver/include/base/unix_socket/unix_socket.h
b/myserver/include/base/unix_socket/unix_socket.h
index 73c508e..45f8bcb 100644
--- a/myserver/include/base/unix_socket/unix_socket.h
+++ b/myserver/include/base/unix_socket/unix_socket.h
@@ -37,7 +37,7 @@ class UnixSocket: public Socket
{
public:
UnixSocket ();
- int bind(const char *path);
+ int bind (const char *path);
int shutdown ();
int close ();
int connect (const char* path);
@@ -56,7 +56,7 @@ private:
# ifdef AF_UNIX
void makeAddrInfo (sockaddr_un *info, const char *path)
{
- memset(info, 0, sizeof(struct sockaddr_un));
+ memset (info, 0, sizeof (struct sockaddr_un));
info->sun_family = AF_UNIX;
strcpy (info->sun_path, path);
}
diff --git a/myserver/include/base/xml/xml_parser.h
b/myserver/include/base/xml/xml_parser.h
index f2ab251..d0cbf08 100644
--- a/myserver/include/base/xml/xml_parser.h
+++ b/myserver/include/base/xml/xml_parser.h
@@ -40,10 +40,10 @@ using namespace std;
class XmlXPathResult
{
public:
- XmlXPathResult(xmlXPathObjectPtr obj){xpathObj = obj;}
- ~XmlXPathResult(){if(xpathObj)xmlXPathFreeObject(xpathObj);}
- xmlXPathObjectPtr getObject(){return xpathObj;}
- xmlNodeSetPtr getNodeSet(){return (xpathObj ? xpathObj->nodesetval : NULL);}
+ XmlXPathResult (xmlXPathObjectPtr obj){xpathObj = obj;}
+ ~XmlXPathResult (){if (xpathObj)xmlXPathFreeObject (xpathObj);}
+ xmlXPathObjectPtr getObject (){return xpathObj;}
+ xmlNodeSetPtr getNodeSet (){return (xpathObj ? xpathObj->nodesetval : NULL);}
private:
xmlXPathObjectPtr xpathObj;
};
@@ -54,48 +54,48 @@ private:
class XmlParser
{
public:
- static bool startXML();
- static bool cleanXML();
- XmlParser();
- ~XmlParser();
- xmlDocPtr getDoc();
- int open(const char* filename, bool useXpath = 0);
- int open(string const &filename, bool useXpath = 0){return
open(filename.c_str(), useXpath);};
- int openMemBuf(MemBuf &, bool useXpath = 0);
-
- char *getValue(const char* field);
- char *getValue(string const &field){return getValue(field.c_str());};
- char *getAttr(const char* field, const char *attr);
- int setValue(const char* field, const char *value);
- int close();
-
- int save(const char *filename, int *nbytes = 0);
- int save(string const &filename, int *nbytes = 0){return
save(filename.c_str(), nbytes);};
- int saveMemBuf(MemBuf &, int *nbytes = 0);
-
- void newfile(const char * root);
- void newfile(string const &root){newfile(root.c_str());};
- void addChild(const char * name, const char * value);
- void addChild(string const &name, string& value)
- {addChild(name.c_str(), value.c_str());};
- void addGroup(const char * name);
- void addGroup(string const &name)
- {addGroup(name.c_str());};
- void endGroup();
-
- void setAttr(const char * name, const char * value);
-
- void setAttr(string& name, string& value)
+ static bool startXML ();
+ static bool cleanXML ();
+ XmlParser ();
+ ~XmlParser ();
+ xmlDocPtr getDoc ();
+ int open (const char* filename, bool useXpath = 0);
+ int open (string const &filename, bool useXpath = 0){return open
(filename.c_str (), useXpath);};
+ int openMemBuf (MemBuf &, bool useXpath = 0);
+
+ char *getValue (const char* field);
+ char *getValue (string const &field){return getValue (field.c_str ());};
+ char *getAttr (const char* field, const char *attr);
+ int setValue (const char* field, const char *value);
+ int close ();
+
+ int save (const char *filename, int *nbytes = 0);
+ int save (string const &filename, int *nbytes = 0){return save
(filename.c_str (), nbytes);};
+ int saveMemBuf (MemBuf &, int *nbytes = 0);
+
+ void newfile (const char * root);
+ void newfile (string const &root){newfile (root.c_str ());};
+ void addChild (const char * name, const char * value);
+ void addChild (string const &name, string& value)
+ {addChild (name.c_str (), value.c_str ());};
+ void addGroup (const char * name);
+ void addGroup (string const &name)
+ {addGroup (name.c_str ());};
+ void endGroup ();
+
+ void setAttr (const char * name, const char * value);
+
+ void setAttr (string& name, string& value)
{
- setAttr(name.c_str(), value.c_str());
+ setAttr (name.c_str (), value.c_str ());
};
- void addLineFeed();
- time_t getLastModTime();
+ void addLineFeed ();
+ time_t getLastModTime ();
- XmlXPathResult* evaluateXpath(string & path){return
evaluateXpath(path.c_str());}
- XmlXPathResult* evaluateXpath(const char*);
- bool isXpathEnabled(){return useXpath;}
+ XmlXPathResult* evaluateXpath (string & path){return evaluateXpath
(path.c_str ());}
+ XmlXPathResult* evaluateXpath (const char*);
+ bool isXpathEnabled (){return useXpath;}
private:
xmlXPathContextPtr xpathCtx;
diff --git a/myserver/include/conf/main/xml_main_configuration.h
b/myserver/include/conf/main/xml_main_configuration.h
index 987ae56..2eb30f2 100644
--- a/myserver/include/conf/main/xml_main_configuration.h
+++ b/myserver/include/conf/main/xml_main_configuration.h
@@ -37,7 +37,7 @@ public:
virtual int open (string const &filename)
{
- return open (filename.c_str());
+ return open (filename.c_str ());
};
virtual char *getValue (const char* field)
@@ -47,7 +47,7 @@ public:
virtual char *getValue (string const &field)
{
- return getValue (field.c_str());
+ return getValue (field.c_str ());
};
virtual int close ()
diff --git a/myserver/include/conf/mime/mime_manager.h
b/myserver/include/conf/mime/mime_manager.h
index 1c7a724..d7fef85 100644
--- a/myserver/include/conf/mime/mime_manager.h
+++ b/myserver/include/conf/mime/mime_manager.h
@@ -72,7 +72,7 @@ struct MimeRecord
int addFilter (const char*, bool acceptDuplicate = true);
~MimeRecord ();
void clear ();
- const char* getData(string &name);
+ const char* getData (string &name);
NodeTree<string>* getNodeTree (string &name);
};
diff --git a/myserver/include/conf/security/auth_method.h
b/myserver/include/conf/security/auth_method.h
index 561f374..592f667 100644
--- a/myserver/include/conf/security/auth_method.h
+++ b/myserver/include/conf/security/auth_method.h
@@ -28,7 +28,7 @@ class AuthMethod
{
public:
AuthMethod ();
- virtual ~AuthMethod();
+ virtual ~AuthMethod ();
virtual int getPermissionMask (SecurityToken* st);
};
diff --git a/myserver/include/conf/security/security_domain.h
b/myserver/include/conf/security/security_domain.h
index 28a66f4..3ee5888 100644
--- a/myserver/include/conf/security/security_domain.h
+++ b/myserver/include/conf/security/security_domain.h
@@ -33,7 +33,7 @@ public:
SecurityDomain (string &name);
virtual ~SecurityDomain ();
virtual string *getValue (string &name);
- string& getName(){return name;}
+ string& getName (){return name;}
protected:
string name;
};
diff --git a/myserver/include/conf/security/security_manager.h
b/myserver/include/conf/security/security_manager.h
index 81097a9..26ec2f8 100644
--- a/myserver/include/conf/security/security_manager.h
+++ b/myserver/include/conf/security/security_manager.h
@@ -68,8 +68,8 @@ enum PERMISSION_MASK
class SecurityManager
{
public:
- SecurityManager(ValidatorFactory*, AuthMethodFactory*);
- ~SecurityManager();
+ SecurityManager (ValidatorFactory*, AuthMethodFactory*);
+ ~SecurityManager ();
int getPermissionMask (SecurityToken* st,
SecurityDomain **domains,
diff --git a/myserver/include/conf/security/security_token.h
b/myserver/include/conf/security/security_token.h
index 07f75d0..e5a0241 100644
--- a/myserver/include/conf/security/security_token.h
+++ b/myserver/include/conf/security/security_token.h
@@ -48,8 +48,8 @@ enum SECURITY_RING
class SecurityToken
{
public:
- SecurityToken();
- void reset();
+ SecurityToken ();
+ void reset ();
const char* getData (const char* name, int domains, const char *def = NULL);
NodeTree<string>* getNodeTree (string& key, int domains, NodeTree<string>*
def = NULL);
diff --git a/myserver/include/conf/security/xml_validator.h
b/myserver/include/conf/security/xml_validator.h
index a0c9d97..d172e9a 100644
--- a/myserver/include/conf/security/xml_validator.h
+++ b/myserver/include/conf/security/xml_validator.h
@@ -46,7 +46,7 @@ public:
AuthMethod* authMethod);
private:
- XmlParser* getParser(SecurityToken* st);
+ XmlParser* getParser (SecurityToken* st);
bool doCondition (xmlNodePtr node,
HashMap<string, SecurityDomain*> *hashedDomains);
@@ -69,7 +69,7 @@ private:
int getPermissions (xmlAttr* attrs, xmlChar** user = NULL, xmlChar**
password = NULL);
- SecurityCache *getCache(SecurityToken*);
+ SecurityCache *getCache (SecurityToken*);
SecurityCache *secCache;
Mutex cacheMutex;
};
diff --git a/myserver/include/conf/vhost/ip.h b/myserver/include/conf/vhost/ip.h
index b9b48d9..3d05bc5 100644
--- a/myserver/include/conf/vhost/ip.h
+++ b/myserver/include/conf/vhost/ip.h
@@ -25,31 +25,31 @@
class IpRange
{
public:
- virtual bool InRange(const std::string &ip) = 0;
- virtual bool InRange(const IpRange *pRange) = 0;
+ virtual bool InRange (const std::string &ip) = 0;
+ virtual bool InRange (const IpRange *pRange) = 0;
- static IpRange *RangeFactory(const std::string &ipRange);
+ static IpRange *RangeFactory (const std::string &ipRange);
};
class Ipv4Range : public IpRange
{
public:
- Ipv4Range();
- Ipv4Range(const std::string &sRange);
- Ipv4Range(const std::string &sStartHost, const std::string &sEndHost);
+ Ipv4Range ();
+ Ipv4Range (const std::string &sRange);
+ Ipv4Range (const std::string &sStartHost, const std::string &sEndHost);
- bool SetRange(const std::string &sRange);
- bool SetRange(const std::string &sStartHost, const std::string &sEndHost);
+ bool SetRange (const std::string &sRange);
+ bool SetRange (const std::string &sStartHost, const std::string &sEndHost);
- virtual ~Ipv4Range();
- virtual bool InRange(const std::string &ip);
- virtual bool InRange(const IpRange *pRange);
+ virtual ~Ipv4Range ();
+ virtual bool InRange (const std::string &ip);
+ virtual bool InRange (const IpRange *pRange);
- const unsigned char* GetStart() const { return m_nStart; }
- const unsigned char* GetEnd() const { return m_nEnd; }
+ const unsigned char* GetStart () const { return m_nStart; }
+ const unsigned char* GetEnd () const { return m_nEnd; }
protected:
- bool Init();
- bool InRange(const unsigned char addr[4]);
+ bool Init ();
+ bool InRange (const unsigned char addr[4]);
unsigned char m_nStart[4], m_nEnd[4], m_nMask[4];
};
diff --git a/myserver/include/conf/vhost/vhost.h
b/myserver/include/conf/vhost/vhost.h
index db48120..b2ebdd2 100644
--- a/myserver/include/conf/vhost/vhost.h
+++ b/myserver/include/conf/vhost/vhost.h
@@ -76,7 +76,7 @@ public:
/*! Set the system root. */
void setSystemRoot (const char* n)
- {systemRoot.assign(n);}
+ {systemRoot.assign (n);}
/*! Get the document root. */
const string& getDocumentRoot ()
@@ -97,12 +97,12 @@ public:
int freeSSL ();
/*! Clear the data dictionary. */
- int freeHashedData();
+ int freeHashedData ();
/*! Generate the RSA key for the SSL context. */
void generateRsaKey ();
- SSL_CTX* getSSLContext();
+ SSL_CTX* getSSLContext ();
/*! Get the list of hosts allowed.*/
list<StringRegex*>* getHostList ()
@@ -110,7 +110,7 @@ public:
//TODO: remove
///*! List of IPs allowed by the vhost. */
- //list<StringRegex*>* getIpList()
+ //list<StringRegex*>* getIpList ()
//{return &ipList;}
/*! Return the port used by the host. */
@@ -137,8 +137,8 @@ public:
void setThrottlingRate (u_long tr)
{throttlingRate = tr;}
- Vhost(LogManager* lm);
- ~Vhost();
+ Vhost (LogManager* lm);
+ ~Vhost ();
const char* getData (const char* name);
diff --git a/myserver/include/connection/connection.h
b/myserver/include/connection/connection.h
index dd3bcf7..9cdda51 100644
--- a/myserver/include/connection/connection.h
+++ b/myserver/include/connection/connection.h
@@ -79,7 +79,7 @@ public:
const char* getPassword ();
void setPassword (const char*);
- void setnTries(char);
+ void setnTries (char);
char getnTries ();
void incnTries ();
diff --git a/myserver/include/connections_scheduler/connections_scheduler.h
b/myserver/include/connections_scheduler/connections_scheduler.h
index 4125c19..ecd3549 100644
--- a/myserver/include/connections_scheduler/connections_scheduler.h
+++ b/myserver/include/connections_scheduler/connections_scheduler.h
@@ -44,7 +44,7 @@ class Server;
class ConnectionsSchedulerVisitor
{
public:
- virtual int visitConnection(ConnectionPtr conn, void* param) = 0;
+ virtual int visitConnection (ConnectionPtr conn, void* param) = 0;
};
class ConnectionsScheduler
@@ -59,10 +59,10 @@ public:
Mutex* eventsMutex;
ConnectionsScheduler *scheduler;
Server* server;
- void reset(Socket* sock, u_short p, Server* ser){serverSocket = sock; port
= p; server = ser;}
- ListenerArg(Socket* sock, u_short p, Server* server){reset(sock, p,
server);}
- ListenerArg(){reset(NULL, 0, NULL);}
- ListenerArg(ListenerArg* l){serverSocket = l->serverSocket; port =
l->port; server = l->server;}
+ void reset (Socket* sock, u_short p, Server* ser){serverSocket = sock;
port = p; server = ser;}
+ ListenerArg (Socket* sock, u_short p, Server* server){reset (sock, p,
server);}
+ ListenerArg (){reset (NULL, 0, NULL);}
+ ListenerArg (ListenerArg* l){serverSocket = l->serverSocket; port =
l->port; server = l->server;}
};
struct DispatcherArg
@@ -76,38 +76,38 @@ public:
SocketPair socketPair;
};
- ConnectionsScheduler(Server* server = NULL);
- ~ConnectionsScheduler();
+ ConnectionsScheduler (Server* server = NULL);
+ ~ConnectionsScheduler ();
- void addNewReadyConnection(ConnectionPtr);
- void addReadyConnection(ConnectionPtr);
+ void addNewReadyConnection (ConnectionPtr);
+ void addReadyConnection (ConnectionPtr);
- void addNewWaitingConnection(ConnectionPtr);
- void addWaitingConnection(ConnectionPtr);
+ void addNewWaitingConnection (ConnectionPtr);
+ void addWaitingConnection (ConnectionPtr);
- ConnectionPtr getConnection();
- void release();
- void restart();
- void initialize();
- void listener(struct ListenerArg* );
- void removeListener(struct ListenerArg*);
- u_long getConnectionsNumber();
- void removeConnection(ConnectionPtr connection);
- void terminateConnections();
- void getConnections(list<ConnectionPtr> &out);
+ ConnectionPtr getConnection ();
+ void release ();
+ void restart ();
+ void initialize ();
+ void listener (struct ListenerArg* );
+ void removeListener (struct ListenerArg*);
+ u_long getConnectionsNumber ();
+ void removeConnection (ConnectionPtr connection);
+ void terminateConnections ();
+ void getConnections (list<ConnectionPtr> &out);
- int accept(ConnectionsSchedulerVisitor*, void*);
+ int accept (ConnectionsSchedulerVisitor*, void*);
- void registerConnectionID(ConnectionPtr);
+ void registerConnectionID (ConnectionPtr);
- u_long getNumTotalConnections();
+ u_long getNumTotalConnections ();
- void newData(short event, SocketHandle handle);
+ void newData (short event, SocketHandle handle);
private:
Server* server;
- void addWaitingConnectionImpl(ConnectionPtr, int lock);
- void addReadyConnectionImpl(ConnectionPtr);
+ void addWaitingConnectionImpl (ConnectionPtr, int lock);
+ void addReadyConnectionImpl (ConnectionPtr);
u_long nTotalConnections;
ThreadID dispatchedThreadId;
Semaphore *readySemaphore;
diff --git a/myserver/include/filter/filter.h b/myserver/include/filter/filter.h
index fc4bc13..c6d0f05 100644
--- a/myserver/include/filter/filter.h
+++ b/myserver/include/filter/filter.h
@@ -32,34 +32,34 @@ protected:
Stream *parent;
void* protocolData;
public:
- Protocol* getProtocol()
+ Protocol* getProtocol ()
{
return protocol;
}
- void setProtocol(Protocol* pr)
+ void setProtocol (Protocol* pr)
{
protocol = pr;
}
- void* getProtocolData()
+ void* getProtocolData ()
{
return protocolData;
}
- void setProtocolData(void* prd)
+ void setProtocolData (void* prd)
{
protocolData = prd;
}
- virtual int getHeader(char* buffer, u_long len, u_long* nbw);
- virtual int getFooter(char* buffer, u_long len, u_long* nbw);
- virtual int read(char* buffer, u_long len, u_long*);
- virtual int write(const char* buffer, u_long len, u_long*);
- virtual int flush(u_long*);
- virtual int modifyData();
- virtual const char* getName(char*, u_long);
- void setParent(Stream*);
- Stream* getParent();
- Filter();
+ virtual int getHeader (char* buffer, u_long len, u_long* nbw);
+ virtual int getFooter (char* buffer, u_long len, u_long* nbw);
+ virtual int read (char* buffer, u_long len, u_long*);
+ virtual int write (const char* buffer, u_long len, u_long*);
+ virtual int flush (u_long*);
+ virtual int modifyData ();
+ virtual const char* getName (char*, u_long);
+ void setParent (Stream*);
+ Stream* getParent ();
+ Filter ();
/*! Avoid direct instances of this class. */
- virtual ~Filter()=0;
+ virtual ~Filter ()=0;
};
diff --git a/myserver/include/filter/filters_chain.h
b/myserver/include/filter/filters_chain.h
index 42484dc..a6a6bc4 100644
--- a/myserver/include/filter/filters_chain.h
+++ b/myserver/include/filter/filters_chain.h
@@ -29,42 +29,42 @@ using namespace std;
class FiltersChain : public Stream
{
public:
- Protocol* getProtocol()
+ Protocol* getProtocol ()
{
return protocol;
}
- void setProtocol(Protocol* pr)
+ void setProtocol (Protocol* pr)
{
protocol = pr;
}
- void* getProtocolData()
+ void* getProtocolData ()
{
return protocolData;
}
- void setProtocolData(void* prd)
+ void setProtocolData (void* prd)
{
protocolData = prd;
}
- void setAcceptDuplicates(int);
- int getAcceptDuplicates();
- void setStream(Stream*);
- Stream* getStream();
- Filter* getFirstFilter();
- int isEmpty();
- int addFilter(Filter*,u_long *nbw, int sendData = 1);
- void clearAllFilters();
- int isFilterPresent(Filter*);
- int isFilterPresent(const char*);
- int removeFilter(Filter*);
- int clear();
- void getName(string& out);
- int hasModifiersFilters();
+ void setAcceptDuplicates (int);
+ int getAcceptDuplicates ();
+ void setStream (Stream*);
+ Stream* getStream ();
+ Filter* getFirstFilter ();
+ int isEmpty ();
+ int addFilter (Filter*,u_long *nbw, int sendData = 1);
+ void clearAllFilters ();
+ int isFilterPresent (Filter*);
+ int isFilterPresent (const char*);
+ int removeFilter (Filter*);
+ int clear ();
+ void getName (string& out);
+ int hasModifiersFilters ();
list<string> getFilters ();
- virtual int read(char* buffer, u_long len, u_long*);
- virtual int write(const char* buffer, u_long len, u_long*);
- virtual int flush(u_long*);
- FiltersChain();
- ~FiltersChain();
+ virtual int read (char* buffer, u_long len, u_long*);
+ virtual int write (const char* buffer, u_long len, u_long*);
+ virtual int flush (u_long*);
+ FiltersChain ();
+ ~FiltersChain ();
protected:
Protocol *protocol;
void *protocolData;
diff --git a/myserver/include/filter/filters_factory.h
b/myserver/include/filter/filters_factory.h
index ee1a7fa..c5e6f10 100644
--- a/myserver/include/filter/filters_factory.h
+++ b/myserver/include/filter/filters_factory.h
@@ -38,19 +38,19 @@ public:
class FiltersSource
{
public:
- virtual Filter* createFilter(const char* name) = 0;
- virtual ~FiltersSource(){}
+ virtual Filter* createFilter (const char* name) = 0;
+ virtual ~FiltersSource (){}
};
- int insert(const char*, FILTERCREATE ptr);
- int insert(const char*, FiltersSource* ptr);
- Filter *getFilter(const char*);
- FiltersChain* chain(list<string> &l, Stream* out, u_long *nbw,
+ int insert (const char*, FILTERCREATE ptr);
+ int insert (const char*, FiltersSource* ptr);
+ Filter *getFilter (const char*);
+ FiltersChain* chain (list<string> &l, Stream* out, u_long *nbw,
int onlyNotModifiers = 0);
- int chain(FiltersChain*, list<string> &l, Stream* out, u_long *nbw,
+ int chain (FiltersChain*, list<string> &l, Stream* out, u_long *nbw,
int onlyNotModifiers = 0);
- FiltersFactory();
- ~FiltersFactory();
- void free();
+ FiltersFactory ();
+ ~FiltersFactory ();
+ void free ();
protected:
HashMap<string, FILTERCREATE> staticFilters;
HashMap<string, FiltersSource*> dynamicFilters;
diff --git a/myserver/include/filter/gzip/gzip_decompress.h
b/myserver/include/filter/gzip/gzip_decompress.h
index bdeb21e..92fe2dd 100644
--- a/myserver/include/filter/gzip/gzip_decompress.h
+++ b/myserver/include/filter/gzip/gzip_decompress.h
@@ -42,31 +42,31 @@ public:
};
- GzipDecompress();
- ~GzipDecompress();
+ GzipDecompress ();
+ ~GzipDecompress ();
- u_long updateCRC(char* buffer,int size);
- u_long getFooter(char *str,int size);
- u_long initialize();
- u_long decompress(const char* in, u_long sizeIn,
+ u_long updateCRC (char* buffer,int size);
+ u_long getFooter (char *str,int size);
+ u_long initialize ();
+ u_long decompress (const char* in, u_long sizeIn,
char *out,u_long sizeOut);
- u_long free();
- u_long flush(char *out,u_long sizeOut);
- u_long getHeader(char *buffer,u_long buffersize);
+ u_long free ();
+ u_long flush (char *out,u_long sizeOut);
+ u_long getHeader (char *buffer,u_long buffersize);
- static Filter* factory(const char* name);
+ static Filter* factory (const char* name);
- static u_long headerSize();
- static u_long footerSize();
+ static u_long headerSize ();
+ static u_long footerSize ();
/*! From Filter*/
- virtual int getHeader(char* buffer, u_long len, u_long* nbw);
- virtual int getFooter(char* buffer, u_long len, u_long* nbw);
- virtual int read(char* buffer, u_long len, u_long*);
- virtual int write(const char* buffer, u_long len, u_long*);
- virtual int flush(u_long*);
- virtual int modifyData();
- virtual const char* getName(char* name, u_long len);
+ virtual int getHeader (char* buffer, u_long len, u_long* nbw);
+ virtual int getFooter (char* buffer, u_long len, u_long* nbw);
+ virtual int read (char* buffer, u_long len, u_long*);
+ virtual int write (const char* buffer, u_long len, u_long*);
+ virtual int flush (u_long*);
+ virtual int modifyData ();
+ virtual const char* getName (char* name, u_long len);
private:
int active;
GzipData data;
diff --git a/myserver/include/filter/memory_stream.h
b/myserver/include/filter/memory_stream.h
index 52e5fb5..eaf974a 100644
--- a/myserver/include/filter/memory_stream.h
+++ b/myserver/include/filter/memory_stream.h
@@ -26,15 +26,15 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class MemoryStream : public Stream
{
public:
- virtual int read(char* buffer, u_long len, u_long*);
- virtual int write(const char* buffer, u_long len, u_long*);
- virtual int flush(u_long*);
- int refresh();
- int availableToRead();
- int read(Stream*, u_long len, u_long *nbw);
- MemoryStream();
- MemoryStream(MemBuf*);
- virtual ~MemoryStream();
+ virtual int read (char* buffer, u_long len, u_long*);
+ virtual int write (const char* buffer, u_long len, u_long*);
+ virtual int flush (u_long*);
+ int refresh ();
+ int availableToRead ();
+ int read (Stream*, u_long len, u_long *nbw);
+ MemoryStream ();
+ MemoryStream (MemBuf*);
+ virtual ~MemoryStream ();
private:
int internalData;
MemBuf *data;
diff --git a/myserver/include/filter/stream.h b/myserver/include/filter/stream.h
index ca8c2e8..cdfb7d3 100644
--- a/myserver/include/filter/stream.h
+++ b/myserver/include/filter/stream.h
@@ -39,14 +39,14 @@ typedef int FileHandle;
class Stream
{
public:
- virtual int read(char* buffer, u_long len, u_long*);
- virtual int write(const char* buffer, u_long len, u_long*);
- virtual int flush(u_long*);
- virtual Handle getHandle();
- virtual int close();
- Stream();
+ virtual int read (char* buffer, u_long len, u_long*);
+ virtual int write (const char* buffer, u_long len, u_long*);
+ virtual int flush (u_long*);
+ virtual Handle getHandle ();
+ virtual int close ();
+ Stream ();
/*! Avoid direct instances of this class. */
- virtual ~Stream() = 0;
+ virtual ~Stream () = 0;
};
#endif
diff --git a/myserver/include/http_handler/http_dir/http_dir.h
b/myserver/include/http_handler/http_dir/http_dir.h
index 3bec692..fae68b9 100644
--- a/myserver/include/http_handler/http_dir/http_dir.h
+++ b/myserver/include/http_handler/http_dir/http_dir.h
@@ -39,19 +39,19 @@ public:
virtual int load ();
virtual int unLoad ();
- virtual int send(HttpThreadContext*,
+ virtual int send (HttpThreadContext*,
const char *filenamePath, const char* cgi,
bool execute = false, bool OnlyHeader = false);
- HttpDir();
- virtual ~HttpDir();
+ HttpDir ();
+ virtual ~HttpDir ();
private:
- double formatBytes(u_long bytes, u_int power);
- void formatHtml(string & in, string& out);
- static bool charIsLess(char i, char j);
+ double formatBytes (u_long bytes, u_int power);
+ void formatHtml (string & in, string& out);
+ static bool charIsLess (char i, char j);
static bool compareFileStructByName (HttpDir::FileStruct i,
HttpDir::FileStruct j);
static bool compareFileStructByTime (HttpDir::FileStruct i,
HttpDir::FileStruct j);
static bool compareFileStructBySize (HttpDir::FileStruct i,
HttpDir::FileStruct j);
- void getFormattedSize(u_long bytes, string& out);
+ void getFormattedSize (u_long bytes, string& out);
void generateHeader (MemBuf &out, char sortType, bool sortReverse, const
char *formatString);
void generateElement (MemBuf &out, FileStruct& fs, string &linkPrefix, const
char *formatString);
diff --git a/myserver/include/http_handler/http_file/http_file.h
b/myserver/include/http_handler/http_file/http_file.h
index 933538b..5b0b0b0 100644
--- a/myserver/include/http_handler/http_file/http_file.h
+++ b/myserver/include/http_handler/http_file/http_file.h
@@ -32,8 +32,8 @@ public:
virtual int send (HttpThreadContext* td,
const char *filenamePath, const char* cgi,
bool execute = false, bool OnlyHeader = false);
- HttpFile();
- virtual ~HttpFile();
+ HttpFile ();
+ virtual ~HttpFile ();
protected:
int putFile (HttpThreadContext* td,
diff --git a/myserver/include/http_handler/isapi/isapi.h
b/myserver/include/http_handler/isapi/isapi.h
index 58558d1..bc4a36e 100644
--- a/myserver/include/http_handler/isapi/isapi.h
+++ b/myserver/include/http_handler/isapi/isapi.h
@@ -131,20 +131,20 @@ class Isapi : public HttpDataHandler
{
public:
# ifdef WIN32
- static ConnTableRecord *HConnRecord(HCONN hConn);
- int Redirect(HttpThreadContext* td,ConnectionPtr a,char *URL);
- int Senduri(HttpThreadContext* td,ConnectionPtr a,char *URL);
- int SendHeader(HttpThreadContext* td,ConnectionPtr a,char *URL);
- static BOOL buildAllHttpHeaders(HttpThreadContext* td,ConnectionPtr a,
+ static ConnTableRecord *HConnRecord (HCONN hConn);
+ int Redirect (HttpThreadContext* td,ConnectionPtr a,char *URL);
+ int Senduri (HttpThreadContext* td,ConnectionPtr a,char *URL);
+ int SendHeader (HttpThreadContext* td,ConnectionPtr a,char *URL);
+ static BOOL buildAllHttpHeaders (HttpThreadContext* td,ConnectionPtr a,
LPVOID output, LPDWORD maxLen);
- static BOOL buildAllRawHeaders(HttpThreadContext* td,ConnectionPtr a,
+ static BOOL buildAllRawHeaders (HttpThreadContext* td,ConnectionPtr a,
LPVOID output, LPDWORD maxLen);
# endif
- Isapi();
+ Isapi ();
static Mutex *isapiMutex;
virtual int load ();
- virtual int unLoad();
- virtual int send(HttpThreadContext* td, const char* scriptpath,
+ virtual int unLoad ();
+ virtual int send (HttpThreadContext* td, const char* scriptpath,
const char *cgipath = 0, bool execute = false,
bool onlyHeader = false);
private:
@@ -156,13 +156,13 @@ private:
};
# ifdef WIN32
-BOOL WINAPI ISAPI_ServerSupportFunctionExport(HCONN hConn, DWORD dwHSERRequest,
+BOOL WINAPI ISAPI_ServerSupportFunctionExport (HCONN hConn, DWORD
dwHSERRequest,
LPVOID lpvBuffer, LPDWORD
lpdwSize,
LPDWORD lpdwDataType);
-BOOL WINAPI ISAPI_ReadClientExport(HCONN hConn, LPVOID lpvBuffer, LPDWORD
lpdwSize ) ;
-BOOL WINAPI ISAPI_WriteClientExport(HCONN hConn, LPVOID Buffer, LPDWORD
lpdwBytes,
+BOOL WINAPI ISAPI_ReadClientExport (HCONN hConn, LPVOID lpvBuffer, LPDWORD
lpdwSize ) ;
+BOOL WINAPI ISAPI_WriteClientExport (HCONN hConn, LPVOID Buffer, LPDWORD
lpdwBytes,
DWORD dwReserved);
-BOOL WINAPI ISAPI_GetServerVariableExport(HCONN, LPSTR, LPVOID, LPDWORD);
+BOOL WINAPI ISAPI_GetServerVariableExport (HCONN, LPSTR, LPVOID, LPDWORD);
# endif
#endif
diff --git a/myserver/include/http_handler/mscgi/mscgi.h
b/myserver/include/http_handler/mscgi/mscgi.h
index 9c20357..783cbca 100644
--- a/myserver/include/http_handler/mscgi/mscgi.h
+++ b/myserver/include/http_handler/mscgi/mscgi.h
@@ -53,14 +53,14 @@ typedef int (*CGIMAIN)(const char*, MsCgiData*);
class MsCgi : public HttpDataHandler
{
public:
- virtual int load();
- virtual int unLoad();
- virtual int send(HttpThreadContext*, const char* exec,
+ virtual int load ();
+ virtual int unLoad ();
+ virtual int send (HttpThreadContext*, const char* exec,
const char* cmdLine = 0, bool execute = false,
bool onlyHeader = false);
- int write(const char*, u_long, MsCgiData*);
- int sendHeader(MsCgiData*);
+ int write (const char*, u_long, MsCgiData*);
+ int sendHeader (MsCgiData*);
private:
static DynamicLibrary mscgiModule;
diff --git a/myserver/include/http_handler/mscgi/mscgi_manager.h
b/myserver/include/http_handler/mscgi/mscgi_manager.h
index 9432a3b..2de714e 100644
--- a/myserver/include/http_handler/mscgi/mscgi_manager.h
+++ b/myserver/include/http_handler/mscgi/mscgi_manager.h
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
# define CGI_MANAGER_H
# ifdef WIN32
-# define EXPORTABLE _declspec(dllexport)
+# define EXPORTABLE _declspec (dllexport)
# endif
# include "stdafx.h"
@@ -41,23 +41,23 @@ class MscgiManager
# endif
{
public:
- Server *getServer();
- MsCgiData* getCgiData();
- void setContentType(const char *);
- void addHeader(const char*, const char *);
- int setPageError(int);
- int raiseError(int);
- MscgiManager(MsCgiData* data);
- ~MscgiManager(void);
+ Server *getServer ();
+ MsCgiData* getCgiData ();
+ void setContentType (const char *);
+ void addHeader (const char*, const char *);
+ int setPageError (int);
+ int raiseError (int);
+ MscgiManager (MsCgiData* data);
+ ~MscgiManager (void);
int operator <<(const char*);
char* operator >>(const char*);
- int start(MsCgiData* data);
- int clean();
- void getenv(const char*, char*, u_long*);
- char* getParam(const char*);
- char* postParam(const char*);
- int write(const char*);
- int write(const void*, int);
+ int start (MsCgiData* data);
+ int clean ();
+ void getenv (const char*, char*, u_long*);
+ char* getParam (const char*);
+ char* postParam (const char*);
+ int write (const char*);
+ int write (const void*, int);
private:
HttpThreadContext* td;
MsCgiData* cgidata;
diff --git a/myserver/include/http_handler/scgi/scgi.h
b/myserver/include/http_handler/scgi/scgi.h
index ba0270a..26be4a2 100644
--- a/myserver/include/http_handler/scgi/scgi.h
+++ b/myserver/include/http_handler/scgi/scgi.h
@@ -52,22 +52,22 @@ struct ScgiContext
class Scgi : public HttpDataHandler
{
public:
- Scgi();
- virtual int load();
- virtual int unLoad();
- int send(HttpThreadContext* td, const char* scriptpath,
+ Scgi ();
+ virtual int load ();
+ virtual int unLoad ();
+ int send (HttpThreadContext* td, const char* scriptpath,
const char *cgipath = 0, bool execute = false,
bool onlyHeader = false);
private:
static ProcessServerManager *processServerManager;
static int initialized;
- Socket getScgiConnection();
- int sendPostData(ScgiContext* ctx);
- int sendResponse(ScgiContext* ctx, int onlyHeader, FiltersChain*);
- int buildScgiEnvironmentString(HttpThreadContext*, char*, char*);
- int sendNetString(ScgiContext*, const char*, int);
- ScgiServer* isScgiServerRunning(const char*);
- ScgiServer* runScgiServer(ScgiContext*, const char*);
- ScgiServer* connect(ScgiContext*, const char*);
+ Socket getScgiConnection ();
+ int sendPostData (ScgiContext* ctx);
+ int sendResponse (ScgiContext* ctx, int onlyHeader, FiltersChain*);
+ int buildScgiEnvironmentString (HttpThreadContext*, char*, char*);
+ int sendNetString (ScgiContext*, const char*, int);
+ ScgiServer* isScgiServerRunning (const char*);
+ ScgiServer* runScgiServer (ScgiContext*, const char*);
+ ScgiServer* connect (ScgiContext*, const char*);
};
#endif
diff --git a/myserver/include/http_handler/wincgi/wincgi.h
b/myserver/include/http_handler/wincgi/wincgi.h
index b8bed15..ef422c5 100644
--- a/myserver/include/http_handler/wincgi/wincgi.h
+++ b/myserver/include/http_handler/wincgi/wincgi.h
@@ -28,10 +28,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class WinCgi : public HttpDataHandler
{
public:
- WinCgi();
- ~WinCgi();
+ WinCgi ();
+ ~WinCgi ();
- virtual int send(HttpThreadContext* td, const char* exec,
+ virtual int send (HttpThreadContext* td, const char* exec,
const char* cmdLine = 0, bool execute = false,
bool onlyHeader = false);
};
diff --git a/myserver/include/plugin/plugin_info.h
b/myserver/include/plugin/plugin_info.h
index 27a3770..51a1c8f 100644
--- a/myserver/include/plugin/plugin_info.h
+++ b/myserver/include/plugin/plugin_info.h
@@ -36,41 +36,41 @@ class PluginInfo
{
public:
- PluginInfo(string& name, bool enabled = 1, bool global = 0);
+ PluginInfo (string& name, bool enabled = 1, bool global = 0);
- ~PluginInfo();
+ ~PluginInfo ();
- bool isEnabled();
- bool isGlobal();
+ bool isEnabled ();
+ bool isGlobal ();
- void addDependence(string, int minVersion, int maxVersion);
+ void addDependence (string, int minVersion, int maxVersion);
- int getVersion();
+ int getVersion ();
- void setVersion(int v);
+ void setVersion (int v);
- string getName();
+ string getName ();
- int getMyServerMinVersion();
+ int getMyServerMinVersion ();
- int getMyServerMaxVersion();
+ int getMyServerMaxVersion ();
- int setMyServerMinVersion(int v);
+ int setMyServerMinVersion (int v);
- int setMyServerMaxVersion(int v);
+ int setMyServerMaxVersion (int v);
- HashMap<string, pair<int,int>* >::Iterator begin(){return
dependences.begin();}
- HashMap<string, pair<int,int>* >::Iterator end(){return
dependences.end();}
+ HashMap<string, pair<int,int>* >::Iterator begin (){return
dependences.begin ();}
+ HashMap<string, pair<int,int>* >::Iterator end (){return
dependences.end ();}
- void setPlugin(Plugin* plugin);
- Plugin* getPlugin();
- Plugin* removePlugin();
+ void setPlugin (Plugin* plugin);
+ Plugin* getPlugin ();
+ Plugin* removePlugin ();
- void setEnabled(bool enabled);
+ void setEnabled (bool enabled);
- pair<int,int>* getDependence(string name);
+ pair<int,int>* getDependence (string name);
- static int convertVersion(string* s);
+ static int convertVersion (string* s);
diff --git a/myserver/include/protocol/control/control_header.h
b/myserver/include/protocol/control/control_header.h
index b3804dd..0be8bcf 100644
--- a/myserver/include/protocol/control/control_header.h
+++ b/myserver/include/protocol/control/control_header.h
@@ -31,17 +31,17 @@ class ControlHeader
char version[12];
int length;
public:
- void reset();
- char *getOptions();
- char *getVersion();
- char *getConnection();
- int getLength();
- char *getAuthLogin();
- char *getAuthPassword();
- char *getCommand();
- ControlHeader();
- virtual ~ControlHeader();
- int parse_header(char *buffer, int bufferlen, int*);
+ void reset ();
+ char *getOptions ();
+ char *getVersion ();
+ char *getConnection ();
+ int getLength ();
+ char *getAuthLogin ();
+ char *getAuthPassword ();
+ char *getCommand ();
+ ControlHeader ();
+ virtual ~ControlHeader ();
+ int parse_header (char *buffer, int bufferlen, int*);
};
#endif
diff --git a/myserver/include/protocol/ftp/ftp_common.h
b/myserver/include/protocol/ftp/ftp_common.h
index f5f1323..f4ca64e 100644
--- a/myserver/include/protocol/ftp/ftp_common.h
+++ b/myserver/include/protocol/ftp/ftp_common.h
@@ -30,11 +30,11 @@ struct FtpHost
int p1, p2;
};
-void setFtpHost(FtpHost &out, const FtpHost &in);
-void setFtpHost(FtpHost &out, const char *szIn);
-void getIpAddr(const FtpHost &host, char *pOut, const int &nBuffSize);
-int getPortNo(const FtpHost &host);
-std::string getPortNo(unsigned int nport);
-std::string getHost(const FtpHost &host);
+void setFtpHost (FtpHost &out, const FtpHost &in);
+void setFtpHost (FtpHost &out, const char *szIn);
+void getIpAddr (const FtpHost &host, char *pOut, const int &nBuffSize);
+int getPortNo (const FtpHost &host);
+std::string getPortNo (unsigned int nport);
+std::string getHost (const FtpHost &host);
#endif //__FTP_COMMON_H__
diff --git a/myserver/include/protocol/ftp/ftp_lexer.h
b/myserver/include/protocol/ftp/ftp_lexer.h
index d2de699..e85448f 100644
--- a/myserver/include/protocol/ftp/ftp_lexer.h
+++ b/myserver/include/protocol/ftp/ftp_lexer.h
@@ -1,160 +1,160 @@
#ifndef yyHEADER_H
-# define yyHEADER_H 1
-# define yyIN_HEADER 1
+#define yyHEADER_H 1
+#define yyIN_HEADER 1
-# line 6 "../../../include/protocol/ftp/ftp_lexer.h"
+#line 6 "../../../include/protocol/ftp/ftp_lexer.h"
-# line 8 "../../../include/protocol/ftp/ftp_lexer.h"
+#line 8 "../../../include/protocol/ftp/ftp_lexer.h"
-# define YY_INT_ALIGNED short int
+#define YY_INT_ALIGNED short int
/* A lexical scanner generated by flex */
-# define FLEX_SCANNER
-# define YY_FLEX_MAJOR_VERSION 2
-# define YY_FLEX_MINOR_VERSION 5
-# define YY_FLEX_SUBMINOR_VERSION 35
-# if YY_FLEX_SUBMINOR_VERSION > 0
-# define FLEX_BETA
-# endif
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
/* First, we deal with platform-specific or compiler-specific issues. */
/* begin standard C headers. */
-# include <stdio.h>
-# include <string.h>
-# include <errno.h>
-# include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
/* end standard C headers. */
/* flex integer type definitions */
-# ifndef FLEXINT_H
-# define FLEXINT_H
+#ifndef FLEXINT_H
+#define FLEXINT_H
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
+ * if you want the limit (max/min) macros for int types.
*/
-# ifndef __STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS 1
-# endif
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
-# include <inttypes.h>
+#include <inttypes.h>
typedef int8_t flex_int8_t;
typedef uint8_t flex_uint8_t;
typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t;
-# else
+#else
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
+typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
/* Limits of integral types. */
-# ifndef INT8_MIN
-# define INT8_MIN (-128)
-# endif
-# ifndef INT16_MIN
-# define INT16_MIN (-32767-1)
-# endif
-# ifndef INT32_MIN
-# define INT32_MIN (-2147483647-1)
-# endif
-# ifndef INT8_MAX
-# define INT8_MAX (127)
-# endif
-# ifndef INT16_MAX
-# define INT16_MAX (32767)
-# endif
-# ifndef INT32_MAX
-# define INT32_MAX (2147483647)
-# endif
-# ifndef UINT8_MAX
-# define UINT8_MAX (255U)
-# endif
-# ifndef UINT16_MAX
-# define UINT16_MAX (65535U)
-# endif
-# ifndef UINT32_MAX
-# define UINT32_MAX (4294967295U)
-# endif
-
-# endif /* ! C99 */
-
-# endif /* ! FLEXINT_H */
-
-# ifdef __cplusplus
+#ifndef INT8_MIN
+#define INT8_MIN (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX (4294967295U)
+#endif
+
+#endif /* ! C99 */
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
/* The "const" storage-class-modifier is valid. */
-# define YY_USE_CONST
+#define YY_USE_CONST
-# else /* ! __cplusplus */
+#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
-# if defined (__STDC__)
+#if defined (__STDC__)
-# define YY_USE_CONST
+#define YY_USE_CONST
-# endif /* defined (__STDC__) */
-# endif /* ! __cplusplus */
+#endif /* defined (__STDC__) */
+#endif /* ! __cplusplus */
-# ifdef YY_USE_CONST
-# define yyconst const
-# else
-# define yyconst
-# endif
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
/* An opaque pointer. */
-# ifndef YY_TYPEDEF_YY_SCANNER_T
-# define YY_TYPEDEF_YY_SCANNER_T
+#ifndef YY_TYPEDEF_YY_SCANNER_T
+#define YY_TYPEDEF_YY_SCANNER_T
typedef void* yyscan_t;
-# endif
+#endif
/* For convenience, these vars (plus the bison vars far below)
are macros in the reentrant scanner. */
-# define yyin yyg->yyin_r
-# define yyout yyg->yyout_r
-# define yyextra yyg->yyextra_r
-# define yyleng yyg->yyleng_r
-# define yytext yyg->yytext_r
-# define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
-# define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
-# define yy_flex_debug yyg->yy_flex_debug_r
+#define yyin yyg->yyin_r
+#define yyout yyg->yyout_r
+#define yyextra yyg->yyextra_r
+#define yyleng yyg->yyleng_r
+#define yytext yyg->yytext_r
+#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
+#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
+#define yy_flex_debug yyg->yy_flex_debug_r
/* Size of default input buffer. */
-# ifndef YY_BUF_SIZE
-# ifdef __ia64__
+#ifndef YY_BUF_SIZE
+#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k.
* Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
* Ditto for the __ia64__ case accordingly.
*/
-# define YY_BUF_SIZE 32768
-# else
-# define YY_BUF_SIZE 16384
-# endif /* __ia64__ */
-# endif
-
-# ifndef YY_TYPEDEF_YY_BUFFER_STATE
-# define YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_BUF_SIZE 32768
+#else
+#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
+#endif
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
typedef struct yy_buffer_state *YY_BUFFER_STATE;
-# endif
+#endif
-# ifndef YY_TYPEDEF_YY_SIZE_T
-# define YY_TYPEDEF_YY_SIZE_T
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
-# endif
+#endif
-# ifndef YY_STRUCT_YY_BUFFER_STATE
-# define YY_STRUCT_YY_BUFFER_STATE
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
{
FILE *yy_input_file;
@@ -193,7 +193,7 @@ struct yy_buffer_state
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
-
+
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
@@ -202,7 +202,7 @@ struct yy_buffer_state
int yy_buffer_status;
};
-# endif /* !YY_STRUCT_YY_BUFFER_STATE */
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
void yyrestart (FILE *input_file ,yyscan_t yyscanner );
void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
@@ -222,30 +222,30 @@ void yyfree (void * ,yyscan_t yyscanner );
/* Begin user sect3 */
-# define yywrap(n) 1
-# define YY_SKIP_YYWRAP
+#define yywrap(n) 1
+#define YY_SKIP_YYWRAP
-# define yytext_ptr yytext_r
+#define yytext_ptr yytext_r
-# ifdef YY_HEADER_EXPORT_START_CONDITIONS
-# define INITIAL 0
-# define SHORT_STRING 1
-# define STRING 2
-# define IPV4_ADDR 3
+#ifdef YY_HEADER_EXPORT_START_CONDITIONS
+#define INITIAL 0
+#define SHORT_STRING 1
+#define STRING 2
+#define IPV4_ADDR 3
-# endif
+#endif
-# ifndef YY_NO_UNISTD_H
+#ifndef YY_NO_UNISTD_H
/* Special case for "unistd.h", since it is non-ANSI. We include it way
* down here because we want the user's section 1 to have been scanned first.
* The user has a chance to override it with an option.
*/
-# include <unistd.h>
-# endif
+#include <unistd.h>
+#endif
-# ifndef YY_EXTRA_TYPE
-# define YY_EXTRA_TYPE void *
-# endif
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
int yylex_init (yyscan_t* scanner);
@@ -285,78 +285,78 @@ YYSTYPE * yyget_lval (yyscan_t yyscanner );
void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
YYLTYPE *yyget_lloc (yyscan_t yyscanner );
-
+
void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );
-
+
/* Macros after this point can all be overridden by user definitions in
* section 1.
*/
-# ifndef YY_SKIP_YYWRAP
-# ifdef __cplusplus
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
extern "C" int yywrap (yyscan_t yyscanner );
-# else
+#else
extern int yywrap (yyscan_t yyscanner );
-# endif
-# endif
+#endif
+#endif
-# ifndef yytext_ptr
+#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
-# endif
+#endif
-# ifdef YY_NEED_STRLEN
+#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
-# endif
+#endif
-# ifndef YY_NO_INPUT
+#ifndef YY_NO_INPUT
-# endif
+#endif
/* Amount of stuff to slurp up with each read. */
-# ifndef YY_READ_BUF_SIZE
-# ifdef __ia64__
+#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k */
-# define YY_READ_BUF_SIZE 16384
-# else
-# define YY_READ_BUF_SIZE 8192
-# endif /* __ia64__ */
-# endif
+#define YY_READ_BUF_SIZE 16384
+#else
+#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
+#endif
/* Number of entries by which start-condition stack grows. */
-# ifndef YY_START_STACK_INCR
-# define YY_START_STACK_INCR 25
-# endif
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
/* Default declaration of generated scanner - a define so the user can
* easily add parameters.
*/
-# ifndef YY_DECL
-# define YY_DECL_IS_OURS 1
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
extern int yylex \
(YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t
yyscanner);
-# define YY_DECL int yylex \
+#define YY_DECL int yylex \
(YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t
yyscanner)
-# endif /* !YY_DECL */
+#endif /* !YY_DECL */
/* yy_get_previous_state - get the state just before the EOB char was reached
*/
-# undef YY_NEW_FILE
-# undef YY_FLUSH_BUFFER
-# undef yy_set_bol
-# undef yy_new_buffer
-# undef yy_set_interactive
-# undef YY_DO_BEFORE_ACTION
+#undef YY_NEW_FILE
+#undef YY_FLUSH_BUFFER
+#undef yy_set_bol
+#undef yy_new_buffer
+#undef yy_set_interactive
+#undef YY_DO_BEFORE_ACTION
-# ifdef YY_DECL_IS_OURS
-# undef YY_DECL_IS_OURS
-# undef YY_DECL
-# endif
+#ifdef YY_DECL_IS_OURS
+#undef YY_DECL_IS_OURS
+#undef YY_DECL
+#endif
-# line 341 "ftp_lexer.lpp"
+#line 341 "ftp_lexer.lpp"
-# line 361 "../../../include/protocol/ftp/ftp_lexer.h"
-# undef yyIN_HEADER
+#line 361 "../../../include/protocol/ftp/ftp_lexer.h"
+#undef yyIN_HEADER
#endif /* yyHEADER_H */
diff --git a/myserver/include/protocol/ftp/ftp_parser.h
b/myserver/include/protocol/ftp/ftp_parser.h
index d105256..3d0b19c 100644
--- a/myserver/include/protocol/ftp/ftp_parser.h
+++ b/myserver/include/protocol/ftp/ftp_parser.h
@@ -2,20 +2,20 @@
/* A Bison parser, made by GNU Bison 2.4.1. */
/* Skeleton interface for Bison's Yacc-like parsers in C
-
+
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
-
+
This program 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 3 of the License, or
(at your option) any later version.
-
+
This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
@@ -28,7 +28,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -129,7 +129,7 @@ typedef union YYSTYPE
{
/* Line 1676 of yacc.c */
-# line 15 "ftp_parser.ypp"
+#line 15 "ftp_parser.ypp"
int m_nInt;
char m_nChar;
@@ -139,7 +139,7 @@ typedef union YYSTYPE
/* Line 1676 of yacc.c */
-# line 143 "../../../include/protocol/ftp/ftp_parser.h"
+#line 143 "../../../include/protocol/ftp/ftp_parser.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/myserver/include/protocol/http/dyn_http_command.h
b/myserver/include/protocol/http/dyn_http_command.h
index b873e15..961c0de 100644
--- a/myserver/include/protocol/http/dyn_http_command.h
+++ b/myserver/include/protocol/http/dyn_http_command.h
@@ -32,11 +32,11 @@ using namespace std;
class DynamicHttpCommand
{
public:
- DynamicHttpCommand(string&);
- virtual ~DynamicHttpCommand();
- string getName();
- virtual int acceptData() = 0;
- virtual int send(HttpThreadContext* context, ConnectionPtr lpconnection,
+ DynamicHttpCommand (string&);
+ virtual ~DynamicHttpCommand ();
+ string getName ();
+ virtual int acceptData () = 0;
+ virtual int send (HttpThreadContext* context, ConnectionPtr lpconnection,
string& Uri, int systemrequest = 0,
int
OnlyHeader = 0, int yetmapped = 0) = 0;
private:
diff --git a/myserver/include/protocol/http/dyn_http_command_manager.h
b/myserver/include/protocol/http/dyn_http_command_manager.h
index 44c4fd9..c62ef80 100644
--- a/myserver/include/protocol/http/dyn_http_command_manager.h
+++ b/myserver/include/protocol/http/dyn_http_command_manager.h
@@ -35,22 +35,22 @@ using namespace std;
class DynHttpCommandManager
{
public:
- DynHttpCommandManager();
- virtual ~DynHttpCommandManager();
+ DynHttpCommandManager ();
+ virtual ~DynHttpCommandManager ();
- DynamicHttpCommand* getHttpCommand(string& name);
+ DynamicHttpCommand* getHttpCommand (string& name);
- HashMap<string, DynamicHttpCommand*>::Iterator begin(){return
dynamicHttpCommands.begin();}
- HashMap<string, DynamicHttpCommand*>::Iterator end(){return
dynamicHttpCommands.end();}
+ HashMap<string, DynamicHttpCommand*>::Iterator begin (){return
dynamicHttpCommands.begin ();}
+ HashMap<string, DynamicHttpCommand*>::Iterator end (){return
dynamicHttpCommands.end ();}
void clear ();
- void addHttpCommand(string& name, DynamicHttpCommand* httpCommand);
+ void addHttpCommand (string& name, DynamicHttpCommand* httpCommand);
- void addHttpCommand(char* name, DynamicHttpCommand* httpCommand)
+ void addHttpCommand (char* name, DynamicHttpCommand* httpCommand)
{
- string strName(name);
- addHttpCommand(strName, httpCommand);
+ string strName (name);
+ addHttpCommand (strName, httpCommand);
}
private:
HashMap<string, DynamicHttpCommand*> dynamicHttpCommands;
diff --git a/myserver/include/protocol/http/dyn_http_manager.h
b/myserver/include/protocol/http/dyn_http_manager.h
index 9941ada..f020e6c 100644
--- a/myserver/include/protocol/http/dyn_http_manager.h
+++ b/myserver/include/protocol/http/dyn_http_manager.h
@@ -33,9 +33,9 @@ using namespace std;
class DynamicHttpManager
{
public:
- DynamicHttpManager();
- virtual ~DynamicHttpManager();
- virtual int send(HttpThreadContext*, ConnectionPtr s, const char
*filenamePath,
+ DynamicHttpManager ();
+ virtual ~DynamicHttpManager ();
+ virtual int send (HttpThreadContext*, ConnectionPtr s, const char
*filenamePath,
const char* cgi, int selfExecuted, int onlyHeader = 0) = 0;
};
diff --git a/myserver/include/protocol/http/env/env.h
b/myserver/include/protocol/http/env/env.h
index 0537b63..5774c65 100644
--- a/myserver/include/protocol/http/env/env.h
+++ b/myserver/include/protocol/http/env/env.h
@@ -27,10 +27,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class Env
{
public:
- static void buildEnvironmentString(HttpThreadContext*, char*, int = 1);
+ static void buildEnvironmentString (HttpThreadContext*, char*, int = 1);
private:
- static void buildProcessEnvString(MemBuf& memCgi);
- static void buildHttpHeaderEnvString(MemBuf& memCgi, HttpRequestHeader &
req);
+ static void buildProcessEnvString (MemBuf& memCgi);
+ static void buildHttpHeaderEnvString (MemBuf& memCgi, HttpRequestHeader &
req);
};
#endif
diff --git a/myserver/include/protocol/http/http.h
b/myserver/include/protocol/http/http.h
index 3ff27b9..972adaf 100644
--- a/myserver/include/protocol/http/http.h
+++ b/myserver/include/protocol/http/http.h
@@ -44,17 +44,17 @@ using namespace std;
class HttpStaticData : public MulticastRegistry<string, void*, int>
{
public:
- vector<Multicast<string, void*, int>*>* getHandlers(string& msg)
+ vector<Multicast<string, void*, int>*>* getHandlers (string& msg)
{
- return MulticastRegistry<string, void*, int>::getHandlers(msg);
+ return MulticastRegistry<string, void*, int>::getHandlers (msg);
}
HttpStaticData ();
virtual ~HttpStaticData ();
- void clear()
+ void clear ()
{
- clearMulticastRegistry();
+ clearMulticastRegistry ();
dynManagerList.clear ();
dynCmdManager.clear ();
}
@@ -92,80 +92,80 @@ public:
/*! Nonzero if the digest was already checked. */
int digestChecked;
- HttpUserData();
- ~HttpUserData();
- void reset();
+ HttpUserData ();
+ ~HttpUserData ();
+ void reset ();
};
class Http : public Protocol
{
public:
- int requestAuthorization();
+ int requestAuthorization ();
- int sendHTTPResource(string& filename,
+ int sendHTTPResource (string& filename,
int systemrequest = 0,
int onlyHeader = 0,
int yetMapped = 0);
- int putHTTPRESOURCE(string &filename,
+ int putHTTPRESOURCE (string &filename,
int systemrequest = 0,
int onlyHeader = 0,
int yetMapped = 0);
- int optionsHTTPRESOURCE(string &filename,
+ int optionsHTTPRESOURCE (string &filename,
int yetMapped = 0);
- int traceHTTPRESOURCE(string& filename,
+ int traceHTTPRESOURCE (string& filename,
int yetMapped = 0);
- int deleteHTTPRESOURCE(string &filename,
+ int deleteHTTPRESOURCE (string &filename,
int systemrequest = 0,
int onlyHeader = 0,
int yetMapped = 0);
- bool allowMethod(const char *name);
+ bool allowMethod (const char *name);
- int raiseHTTPError(int ID);
+ int raiseHTTPError (int ID);
int sendHTTPhardError500();
- int sendAuth();
+ int sendAuth ();
- int getPath(string& filenamePath,
+ int getPath (string& filenamePath,
const string& filename,
int systemrequest)
- {return getPath(td, filenamePath, filename.c_str(), systemrequest);}
+ {return getPath (td, filenamePath, filename.c_str (), systemrequest);}
- int getPath(string& filenamePath,
+ int getPath (string& filenamePath,
const char *filename,
int systemrequest)
- {return getPath(td, filenamePath, filename, systemrequest);}
+ {return getPath (td, filenamePath, filename, systemrequest);}
- static int getPath(HttpThreadContext* td,
+ static int getPath (HttpThreadContext* td,
string& filenamePath,
const string& filename,
int systemrequest)
- {return getPath(td, filenamePath, filename.c_str(), systemrequest);}
+ {return getPath (td, filenamePath, filename.c_str (), systemrequest);}
- static int getPath(HttpThreadContext* td,
+ static int getPath (HttpThreadContext* td,
string& filenamePath,
const char *filename,
int systemrequest);
- MimeRecord* getMIME(string& filename);
+ MimeRecord* getMIME (string& filename);
- int logHTTPaccess();
- int sendHTTPRedirect(const char *newURL);
- int sendHTTPNonModified();
- Http();
- virtual ~Http();
- virtual char* registerName(char* out,int len){return registerNameImpl(out,
len);}
+ int logHTTPaccess ();
+ int sendHTTPRedirect (const char *newURL);
+ int sendHTTPNonModified ();
+ Http ();
+ virtual ~Http ();
+ virtual char* registerName (char* out,int len){return registerNameImpl (out,
len);}
- static char* registerNameImpl(char*, int len);
- int controlConnection(ConnectionPtr a,
+ static char* registerNameImpl (char*, int len);
+ int controlConnection (ConnectionPtr a,
char *b1,
char *b2,
int bs1,
@@ -173,18 +173,18 @@ public:
u_long nbtr,
u_long id);
- static int loadProtocolStatic();
- static int unLoadProtocolStatic();
+ static int loadProtocolStatic ();
+ static int unLoadProtocolStatic ();
u_long getTimeout ();
- int preprocessHttpRequest(string& filename, int yetmapped,
+ int preprocessHttpRequest (string& filename, int yetmapped,
int* permissions);
- int getFilePermissions(string& filename, string& directory,
+ int getFilePermissions (string& filename, string& directory,
string& file, string &filenamePath,
int yetmapped, int* permissions);
- static HttpStaticData* getStaticData();
+ static HttpStaticData* getStaticData ();
SecurityToken *getSecurityToken (){return &(td->securityToken);}
@@ -193,9 +193,9 @@ protected:
int processDefaultFile (string& uri, int permissions, int onlyHeader);
struct HttpThreadContext *td;
- void clean();
- void computeDigest(char*, char*);
- u_long checkDigest();
+ void clean ();
+ void computeDigest (char*, char*);
+ u_long checkDigest ();
};
@@ -205,33 +205,33 @@ protected:
class HttpProtocol : public Protocol
{
public:
- HttpProtocol()
+ HttpProtocol ()
{
protocolOptions = 0;
}
- virtual ~HttpProtocol()
+ virtual ~HttpProtocol ()
{
}
- virtual char* registerName(char* out, int len)
+ virtual char* registerName (char* out, int len)
{
- return Http::registerNameImpl(out, len);
+ return Http::registerNameImpl (out, len);
}
- virtual int controlConnection(ConnectionPtr a, char *b1, char *b2,
+ virtual int controlConnection (ConnectionPtr a, char *b1, char *b2,
int bs1, int bs2, u_long nbtr, u_long id)
{
Http http;
int ret = 0;
- ret = http.controlConnection(a, b1, b2, bs1, bs2, nbtr, id);
+ ret = http.controlConnection (a, b1, b2, bs1, bs2, nbtr, id);
return ret;
}
- virtual int loadProtocol()
+ virtual int loadProtocol ()
{
return Http::loadProtocolStatic ();
}
diff --git a/myserver/include/protocol/http/http_data_handler.h
b/myserver/include/protocol/http/http_data_handler.h
index 260eaaf..8866ba2 100644
--- a/myserver/include/protocol/http/http_data_handler.h
+++ b/myserver/include/protocol/http/http_data_handler.h
@@ -35,14 +35,14 @@ public:
virtual int load ();
virtual int unLoad ();
- virtual int send(HttpThreadContext*, const char* exec,
+ virtual int send (HttpThreadContext*, const char* exec,
const char* cmdLine = 0, bool execute = false,
bool onlyHeader = false);
- HttpDataHandler();
- virtual ~HttpDataHandler();
+ HttpDataHandler ();
+ virtual ~HttpDataHandler ();
- static void checkDataChunks(HttpThreadContext*, bool*, bool*);
+ static void checkDataChunks (HttpThreadContext*, bool*, bool*);
static int appendDataToHTTPChannel (HttpThreadContext* td,
char* buffer,
@@ -54,7 +54,7 @@ public:
u_long realBufferSize,
MemoryStream *tmpStream);
- static int appendDataToHTTPChannel(HttpThreadContext* td,
+ static int appendDataToHTTPChannel (HttpThreadContext* td,
char* buffer,
u_long size,
File* appendFile,
diff --git a/myserver/include/protocol/http/http_data_read.h
b/myserver/include/protocol/http/http_data_read.h
index 4b1bbcd..bfcf3a0 100644
--- a/myserver/include/protocol/http/http_data_read.h
+++ b/myserver/include/protocol/http/http_data_read.h
@@ -41,9 +41,9 @@ using namespace std;
class HttpDataRead
{
public:
- static int readPostData(HttpThreadContext* td, int* ret);
+ static int readPostData (HttpThreadContext* td, int* ret);
- static int readContiguousPrimitivePostData(const char* inBuffer,
+ static int readContiguousPrimitivePostData (const char* inBuffer,
u_long *inBufferPos,
u_long inBufferSize,
Socket *inSocket,
@@ -51,7 +51,7 @@ public:
u_long outBufferSize,
u_long* nbr,
u_long timeout);
- static int readChunkedPostData(const char* inBuffer,
+ static int readChunkedPostData (const char* inBuffer,
u_long *inBufferPos,
u_long inBufferSize,
Socket *inSocket,
diff --git a/myserver/include/protocol/http/http_errors.h
b/myserver/include/protocol/http/http_errors.h
index 6f1c0e4..2073c09 100644
--- a/myserver/include/protocol/http/http_errors.h
+++ b/myserver/include/protocol/http/http_errors.h
@@ -28,13 +28,13 @@ using namespace std;
class HttpErrors
{
public:
- static void getErrorPage(int statusCode, string& out);
- static void getErrorMessage(int statusCode, string& out);
- static void load();
- static void unLoad();
+ static void getErrorPage (int statusCode, string& out);
+ static void getErrorMessage (int statusCode, string& out);
+ static void load ();
+ static void unLoad ();
private:
static bool loaded;
- static void putMessage(int, const char*);
+ static void putMessage (int, const char*);
static HashMap<int, const char*> messagesMap;
};
#endif
diff --git a/myserver/include/protocol/http/http_header.h
b/myserver/include/protocol/http/http_header.h
index 2a53ad0..6387643 100644
--- a/myserver/include/protocol/http/http_header.h
+++ b/myserver/include/protocol/http/http_header.h
@@ -26,9 +26,9 @@ using namespace std;
struct HttpHeader
{
- virtual string* getValue(const char* name, string* out) = 0;
- virtual string* setValue(const char* name, const char* in) = 0;
- virtual ~HttpHeader(){}
+ virtual string* getValue (const char* name, string* out) = 0;
+ virtual string* setValue (const char* name, const char* in) = 0;
+ virtual ~HttpHeader (){}
};
#endif
diff --git a/myserver/include/protocol/http/http_request.h
b/myserver/include/protocol/http/http_request.h
index 33ef265..6fee77b 100644
--- a/myserver/include/protocol/http/http_request.h
+++ b/myserver/include/protocol/http/http_request.h
@@ -46,22 +46,22 @@ struct HttpRequestHeader : public HttpHeader
{
string *name;
string *value;
- Entry()
+ Entry ()
{
- name = new string();
- value = new string();
+ name = new string ();
+ value = new string ();
}
- Entry(string& n, string& v)
+ Entry (string& n, string& v)
{
- name = new string();
- value = new string();
+ name = new string ();
+ value = new string ();
- name->assign(n);
- value->assign(v);
+ name->assign (n);
+ value->assign (v);
}
- ~Entry()
+ ~Entry ()
{
delete name;
delete value;
@@ -95,19 +95,19 @@ struct HttpRequestHeader : public HttpHeader
HashMap<string, HttpRequestHeader::Entry*> other;
- virtual string* getValue(const char* name, string* out);
- virtual string* setValue(const char* name, const char* in);
+ virtual string* getValue (const char* name, string* out);
+ virtual string* setValue (const char* name, const char* in);
- HashMap<string, HttpRequestHeader::Entry*>::Iterator begin(){return
other.begin();}
- HashMap<string, HttpRequestHeader::Entry*>::Iterator back(){return
other.back();}
- HashMap<string, HttpRequestHeader::Entry*>::Iterator end(){return
other.end();}
+ HashMap<string, HttpRequestHeader::Entry*>::Iterator begin (){return
other.begin ();}
+ HashMap<string, HttpRequestHeader::Entry*>::Iterator back (){return
other.back ();}
+ HashMap<string, HttpRequestHeader::Entry*>::Iterator end (){return
other.end ();}
- bool isKeepAlive();
+ bool isKeepAlive ();
- HttpRequestHeader();
- ~HttpRequestHeader();
- void free();
+ HttpRequestHeader ();
+ ~HttpRequestHeader ();
+ void free ();
};
diff --git a/myserver/include/protocol/http/http_response.h
b/myserver/include/protocol/http/http_response.h
index a362efd..1281aea 100644
--- a/myserver/include/protocol/http/http_response.h
+++ b/myserver/include/protocol/http/http_response.h
@@ -45,21 +45,21 @@ struct HttpResponseHeader : public HttpHeader
{
string *name;
string *value;
- Entry()
+ Entry ()
{
- name = new string();
- value = new string();
+ name = new string ();
+ value = new string ();
}
- Entry(string& n, string& v)
+ Entry (string& n, string& v)
{
- name = new string();
- value = new string();
+ name = new string ();
+ value = new string ();
- name->assign(n);
- value->assign(v);
+ name->assign (n);
+ value->assign (v);
}
- ~Entry()
+ ~Entry ()
{
delete name;
delete value;
@@ -72,14 +72,14 @@ struct HttpResponseHeader : public HttpHeader
string errorType;
HashMap<string,HttpResponseHeader::Entry*> other;
- HttpResponseHeader();
- ~HttpResponseHeader();
+ HttpResponseHeader ();
+ ~HttpResponseHeader ();
- int getStatusType();
+ int getStatusType ();
- virtual string* getValue(const char* name, string* out);
- virtual string* setValue(const char* name, const char* in);
- void free();
+ virtual string* getValue (const char* name, string* out);
+ virtual string* setValue (const char* name, const char* in);
+ void free ();
};
#endif
diff --git a/myserver/include/protocol/http/http_thread_context.h
b/myserver/include/protocol/http/http_thread_context.h
index c7b26c6..5b6e49c 100644
--- a/myserver/include/protocol/http/http_thread_context.h
+++ b/myserver/include/protocol/http/http_thread_context.h
@@ -91,8 +91,8 @@ struct HttpThreadContext
SecurityToken securityToken;
int permissions;
- const char* getVhostDir();
- const char* getVhostSys();
+ const char* getVhostDir ();
+ const char* getVhostSys ();
const char* getData (const char *name);
};
diff --git a/myserver/include/protocol/https/https.h
b/myserver/include/protocol/https/https.h
index f455e42..aad05c2 100644
--- a/myserver/include/protocol/https/https.h
+++ b/myserver/include/protocol/https/https.h
@@ -24,16 +24,16 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class Https : public Http
{
public:
- static char* registerNameImpl(char* out, int len);
- virtual char* registerName(char*,int len);
- Https();
- virtual ~Https();
+ static char* registerNameImpl (char* out, int len);
+ virtual char* registerName (char*,int len);
+ Https ();
+ virtual ~Https ();
- static int loadProtocolStatic(XmlParser* lang)
+ static int loadProtocolStatic (XmlParser* lang)
{
return 1;
}
- static int unLoadProtocolStatic(XmlParser* lang)
+ static int unLoadProtocolStatic (XmlParser* lang)
{
return 1;
}
@@ -46,40 +46,40 @@ public:
class HttpsProtocol : public Protocol
{
public:
- HttpsProtocol()
+ HttpsProtocol ()
{
protocolOptions = PROTOCOL_USES_SSL;
}
- virtual ~HttpsProtocol()
+ virtual ~HttpsProtocol ()
{
}
- virtual char* registerName(char* out, int len)
+ virtual char* registerName (char* out, int len)
{
- return Https::registerNameImpl(out, len);
+ return Https::registerNameImpl (out, len);
}
- virtual int controlConnection(ConnectionPtr a, char *b1, char *b2,
+ virtual int controlConnection (ConnectionPtr a, char *b1, char *b2,
int bs1, int bs2, u_long nbtr, u_long id)
{
int ret = 0;
Https https;
- ret = https.controlConnection(a, b1, b2, bs1, bs2, nbtr, id);
+ ret = https.controlConnection (a, b1, b2, bs1, bs2, nbtr, id);
return ret;
}
- virtual int loadProtocol(XmlParser* parser)
+ virtual int loadProtocol (XmlParser* parser)
{
- return Https::loadProtocolStatic(parser);
+ return Https::loadProtocolStatic (parser);
}
- virtual int unLoadProtocol(XmlParser* parser)
+ virtual int unLoadProtocol (XmlParser* parser)
{
- return Https::unLoadProtocolStatic(parser);
+ return Https::unLoadProtocolStatic (parser);
}
};
diff --git a/myserver/include/protocol/protocol.h
b/myserver/include/protocol/protocol.h
index 6443aca..2d55654 100644
--- a/myserver/include/protocol/protocol.h
+++ b/myserver/include/protocol/protocol.h
@@ -32,7 +32,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class Protocol
{
public:
- Protocol();
+ Protocol ();
virtual ~Protocol ();
virtual char* registerName (char*,int len);
virtual int controlConnection (ConnectionPtr a, char *b1, char *b2,
diff --git a/myserver/include/protocol/protocol_buffer.h
b/myserver/include/protocol/protocol_buffer.h
index 4012792..d727f83 100644
--- a/myserver/include/protocol/protocol_buffer.h
+++ b/myserver/include/protocol/protocol_buffer.h
@@ -25,9 +25,9 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class ProtocolBuffer
{
public:
- ProtocolBuffer();
- virtual ~ProtocolBuffer();
- virtual bool allowDelete(bool wait);
+ ProtocolBuffer ();
+ virtual ~ProtocolBuffer ();
+ virtual bool allowDelete (bool wait);
};
#endif
diff --git a/myserver/include/protocol/protocols_manager.h
b/myserver/include/protocol/protocols_manager.h
index b64ef40..225c3d2 100644
--- a/myserver/include/protocol/protocols_manager.h
+++ b/myserver/include/protocol/protocols_manager.h
@@ -33,17 +33,17 @@ using namespace std;
class ProtocolsManager
{
public:
- ProtocolsManager();
- ~ProtocolsManager();
+ ProtocolsManager ();
+ ~ProtocolsManager ();
- Protocol* getProtocol(string& name);
+ Protocol* getProtocol (string& name);
- void addProtocol(string& name, Protocol* protocol);
+ void addProtocol (string& name, Protocol* protocol);
- void addProtocol(char* name, Protocol* protocol)
+ void addProtocol (char* name, Protocol* protocol)
{
- string strName(name);
- addProtocol(strName, protocol);
+ string strName (name);
+ addProtocol (strName, protocol);
}
protected:
diff --git a/myserver/include/server/clients_thread.h
b/myserver/include/server/clients_thread.h
index aa3c240..6b009ff 100644
--- a/myserver/include/server/clients_thread.h
+++ b/myserver/include/server/clients_thread.h
@@ -33,7 +33,7 @@ class ClientsThread
{
friend class Server;
- friend DEFINE_THREAD(clients_thread, pParam);
+ friend DEFINE_THREAD (clients_thread, pParam);
public:
enum RETURN_CODE
@@ -66,8 +66,8 @@ public:
void setTimeout (int);
bool isToDestroy ();
void setToDestroy (bool);
- bool isStatic();
- bool isBusy();
+ bool isStatic ();
+ bool isBusy ();
void setStatic (bool);
int run ();
ThreadID getThreadId (){return tid;}
@@ -87,18 +87,18 @@ private:
bool threadIsRunning;
u_long buffersize;
u_long secondaryBufferSize;
- bool isRunning();
- bool isStopped();
+ bool isRunning ();
+ bool isStopped ();
FtpProtocol *ftpParser;
HttpProtocol* httpParser;
HttpsProtocol* httpsParser;
ControlProtocol *controlProtocolParser;
MemBuf buffer;
MemBuf secondaryBuffer;
- int controlConnections();
+ int controlConnections ();
u_long nBytesToRead;
};
-DEFINE_THREAD(clients_thread, pParam);
+DEFINE_THREAD (clients_thread, pParam);
#endif
diff --git a/myserver/include/server/server.h b/myserver/include/server/server.h
index 347117c..18ce38d 100644
--- a/myserver/include/server/server.h
+++ b/myserver/include/server/server.h
@@ -60,9 +60,9 @@ using namespace std;
*Definition for new threads entry-point.
*/
# ifdef WIN32
-unsigned int __stdcall listenServer(void* pParam);
+unsigned int __stdcall listenServer (void* pParam);
# else
-void* listenServer(void* pParam);
+void* listenServer (void* pParam);
# endif
class XmlValidator;
@@ -70,73 +70,73 @@ class XmlValidator;
class Server : public MulticastRegistry<string, void*, int>
{
public:
- ProcessServerManager* getProcessServerManager()
+ ProcessServerManager* getProcessServerManager ()
{
return &processServerManager;
}
- PluginsManager* getPluginsManager(){return &pluginsManager;}
- bool stopServer(){return mustEndServer;}
- HomeDir* getHomeDir();
- static void createInstance();
- static inline Server* getInstance()
+ PluginsManager* getPluginsManager (){return &pluginsManager;}
+ bool stopServer (){return mustEndServer;}
+ HomeDir* getHomeDir ();
+ static void createInstance ();
+ static inline Server* getInstance ()
{
return instance;
}
- int loadLibraries();
-
- CachedFileFactory* getCachedFiles();
- const char* getData(const char* name);
-
- void setGlobalData(const char* name, void* data);
- void* getGlobalData(const char* name);
-
- FiltersFactory* getFiltersFactory();
- int getMaxThreads();
- const char *getUid();
- const char *getGid();
- int countAvailableThreads();
- void checkThreadsNumber();
- int removeThread(u_long ID);
- bool isServerReady();
- ProtocolsManager* getProtocolsManager();
- void disableAutoReboot();
- void enableAutoReboot();
- bool isAutorebootEnabled();
- bool isRebooting(){return rebooting;}
- void rebootOnNextLoop();
- const char* getMainConfFile();
- const char* getVhostConfFile();
- const char* getMIMEConfFile();
- const char* getExternalPath();
- ~Server();
- Protocol* getProtocol(const char *protocolName);
- int addConnection(Socket,MYSERVER_SOCKADDRIN*);
- u_long getNumConnections();
- u_long getNumTotalConnections();
- void getConnections(list<ConnectionPtr>&);
- ConnectionPtr getConnection(int);
- u_long getTimeout();
- const char *getAddresses();
- const char *getPath();
- u_long getNumThreads();
+ int loadLibraries ();
+
+ CachedFileFactory* getCachedFiles ();
+ const char* getData (const char* name);
+
+ void setGlobalData (const char* name, void* data);
+ void* getGlobalData (const char* name);
+
+ FiltersFactory* getFiltersFactory ();
+ int getMaxThreads ();
+ const char *getUid ();
+ const char *getGid ();
+ int countAvailableThreads ();
+ void checkThreadsNumber ();
+ int removeThread (u_long ID);
+ bool isServerReady ();
+ ProtocolsManager* getProtocolsManager ();
+ void disableAutoReboot ();
+ void enableAutoReboot ();
+ bool isAutorebootEnabled ();
+ bool isRebooting (){return rebooting;}
+ void rebootOnNextLoop ();
+ const char* getMainConfFile ();
+ const char* getVhostConfFile ();
+ const char* getMIMEConfFile ();
+ const char* getExternalPath ();
+ ~Server ();
+ Protocol* getProtocol (const char *protocolName);
+ int addConnection (Socket,MYSERVER_SOCKADDRIN*);
+ u_long getNumConnections ();
+ u_long getNumTotalConnections ();
+ void getConnections (list<ConnectionPtr>&);
+ ConnectionPtr getConnection (int);
+ u_long getTimeout ();
+ const char *getAddresses ();
+ const char *getPath ();
+ u_long getNumThreads ();
NodeTree<string>* getNodeTree (string& key)
{
return hashedData.get (key);
}
- const char *getServerName();
- int getMaxLogFileSize();
- int mustUseLogonOption();
- void start(string &, string &, string &, string &);
- void stop();
- void finalCleanup();
- int terminate();
+ const char *getServerName ();
+ int getMaxLogFileSize ();
+ int mustUseLogonOption ();
+ void start (string &, string &, string &, string &);
+ void stop ();
+ void finalCleanup ();
+ int terminate ();
int log (LoggingLevel level, const char *fmt, ...);
int log (char const*, LoggingLevel level = MYSERVER_LOG_MSG_INFO);
int log (string const &str)
- {return log (str.c_str());};
+ {return log (str.c_str ());};
int setLogLocation (string);
u_long getBuffersize ();
u_long getThrottlingRate ();
@@ -172,7 +172,7 @@ private:
MainConfiguration *configurationFileManager;
# ifdef WIN32
- friend int __stdcall control_handler(u_long control_type);
+ friend int __stdcall control_handler (u_long control_type);
# endif
# ifdef NOT_WIN
friend int control_handler (u_long control_type);
@@ -190,13 +190,13 @@ private:
static Server* instance;
/*! Do not allow to create directly objects. */
- Server();
+ Server ();
void readHashedData (xmlNodePtr lcur);
- void mainLoop();
- void loadPlugins();
- void displayBoot();
- int postLoad();
+ void mainLoop ();
+ void loadPlugins ();
+ void displayBoot ();
+ int postLoad ();
void initLogManager ();
CachedFileFactory cachedFiles;
@@ -230,19 +230,19 @@ private:
string *ipAddresses;
char serverName[HOST_NAME_MAX + 1];
string* path;
- int initialize();
- int addThread(bool staticThread = false);
- ConnectionPtr addConnectionToList(Socket* s, MYSERVER_SOCKADDRIN *asock_in,
+ int initialize ();
+ int addThread (bool staticThread = false);
+ ConnectionPtr addConnectionToList (Socket* s, MYSERVER_SOCKADDRIN *asock_in,
char *ipAddr, char *localIpAddr,
u_short port, u_short localPort, int);
u_long maxConnections;
u_long maxConnectionsToAccept;
- void clearAllConnections();
- int freeHashedData();
+ void clearAllConnections ();
+ int freeHashedData ();
u_long connectionTimeout;
u_long maxLogFileSize;
- void logWriteNTimes(string, unsigned);
- bool resetConfigurationPaths(string &, string &, string &, string &);
+ void logWriteNTimes (string, unsigned);
+ bool resetConfigurationPaths (string &, string &, string &, string &);
Mutex* connectionsMutex;
u_long nStaticThreads;
u_long nMaxThreads;
@@ -253,8 +253,8 @@ private:
Mutex* threadsMutex;
list<ClientsThread*> threads;
- int purgeThreads();
- int reboot();
+ int purgeThreads ();
+ int reboot ();
string mainConfigurationFile;
string vhostConfigurationFile;
diff --git a/myserver/src/base/base64/mime_utils.cpp
b/myserver/src/base/base64/mime_utils.cpp
index 709896a..d10977c 100644
--- a/myserver/src/base/base64/mime_utils.cpp
+++ b/myserver/src/base/base64/mime_utils.cpp
@@ -31,25 +31,25 @@ extern "C"
#endif
}
-#define strupos(x, y) (strustr(x, y) != NULL ? strustr(x, y) - x : -1) //char
version
+#define strupos(x, y) (strustr (x, y) != NULL ? strustr (x, y) - x : -1)
//char version
-static char* strustr(char *source, char *s)
+static char* strustr (char *source, char *s)
{
- char *csource = new char[strlen(source) + 1];
- if(csource == 0)
+ char *csource = new char[strlen (source) + 1];
+ if (csource == 0)
return 0;
- char *cs = new char[strlen(s) + 1];
- if(cs == 0)
+ char *cs = new char[strlen (s) + 1];
+ if (cs == 0)
{
delete [] csource;
return 0;
}
- strncpy(csource, source, (strlen(source) + 2));
- strncpy(cs, s, (strlen(s) + 2));
- strupr(csource);
- strupr(cs);
- char *result = strstr(csource, cs);
+ strncpy (csource, source, (strlen (source) + 2));
+ strncpy (cs, s, (strlen (s) + 2));
+ strupr (csource);
+ strupr (cs);
+ char *result = strstr (csource, cs);
if (result != NULL)
{
int pos =static_cast<int>(result - csource);
@@ -179,85 +179,85 @@ const char QpEncodeMap[] =
-char* CBase64Utils::mimeDecodeMailHeaderField(char *s)
+char* CBase64Utils::mimeDecodeMailHeaderField (char *s)
{
if (s == NULL) return s;
- if (s[strlen(s) - 2] == '\r')
+ if (s[strlen (s) - 2] == '\r')
{
- s[strlen(s) - 2] = '\0';
+ s[strlen (s) - 2] = '\0';
}
char *s1 = s;
char *rest = NULL;
char *start = NULL;
while (*s1 == ' ') s1++;
- if (strupos(s1, (char*) "=?") > 0)
+ if (strupos (s1, (char*) "=?") > 0)
{
- int startendpos =static_cast<int>(strupos(s1, (char*)"=?"));
+ int startendpos =static_cast<int>(strupos (s1, (char*)"=?"));
start = new char[startendpos + 1];
- strncpy(start, s, startendpos);
+ strncpy (start, s, startendpos);
start[startendpos] = '\0';
s1 += startendpos;
}
- if (strupos(s1, (char*) "=?") == 0)
+ if (strupos (s1, (char*) "=?") == 0)
{
int alloclen;
char *decodedText=0;
- int plainpos =static_cast<int>(strupos(s1, (char*) "Q?="));
+ int plainpos =static_cast<int>(strupos (s1, (char*) "Q?="));
if (plainpos > 0)
{
plainpos += 3;
char *m = s1 + plainpos;
- plainpos +=static_cast<int>(strupos(m, (char*)"?="));
+ plainpos +=static_cast<int>(strupos (m, (char*)"?="));
}
else
{
- plainpos = static_cast<int>(strupos(s1, (char*) "?="));
+ plainpos = static_cast<int>(strupos (s1, (char*) "?="));
}
if (plainpos > 1)
{
char *mid = s1 + plainpos + 2;
s1[plainpos] = '\0';
- if (strlen(mid) > 0)
+ if (strlen (mid) > 0)
{
- rest = new char[strlen(mid) + 1];
- strncpy(rest, mid,(strlen(mid) + 2));
+ rest = new char[strlen (mid) + 1];
+ strncpy (rest, mid,(strlen (mid) + 2));
}
}
- if (strupos(s1, (char*) "?Q?") > 0)
+ if (strupos (s1, (char*) "?Q?") > 0)
{
CQPUtils qp;
- int pos = static_cast<int>(strupos(s1, (char*) "?Q?"));
+ int pos = static_cast<int>(strupos (s1, (char*) "?Q?"));
s1 += pos;
- if (strlen(s1) < 4) return s;
+ if (strlen (s1) < 4) return s;
s1 += 3;
- decodedText = qp.decode(s1);
+ decodedText = qp.decode (s1);
}
- if (strupos(s1, (char*) "?B?") > 0)
+ if (strupos (s1, (char*) "?B?") > 0)
{
CBase64Utils bu;
int sLen;
- int pos = static_cast<int>(strupos(s1, (char*) "?B?"));
+ int pos = static_cast<int>(strupos (s1, (char*) "?B?"));
s1 += pos;
- if (strlen(s1) < 4) return s;
+ if (strlen (s1) < 4) return s;
s1 += 3;
- sLen = static_cast<int>(strlen(s1));
- decodedText = bu.decode(s1, &sLen);
+ sLen = static_cast<int>(strlen (s1));
+ decodedText = bu.decode (s1, &sLen);
}
- alloclen =static_cast<int>(strlen(decodedText)) + 1;
- if (start != NULL) alloclen +=static_cast<int>(strlen(start));
- if (rest != NULL) alloclen +=static_cast<int>(strlen(rest));
- alloclen *= sizeof(char);
- s = (char*)realloc(s, alloclen);
+ alloclen =static_cast<int>(strlen (decodedText)) + 1;
+ if (start != NULL) alloclen +=static_cast<int>(strlen (start));
+ if (rest != NULL) alloclen +=static_cast<int>(strlen (rest));
+ alloclen *= sizeof (char);
+ s = (char*)realloc (s, alloclen);
s[0] = '\0';
if (start != NULL)
{
- strncat(s, start, strlen(s));
+ strncat (s, start, strlen (s));
}
- strncat(s, decodedText, strlen(s));
+ strncat (s, decodedText, strlen (s));
if (rest != NULL)
{
- strncat(s, rest, strlen(s));
+ strncat (s, rest, strlen (s));
}
delete [] decodedText;
}
@@ -265,23 +265,23 @@ char* CBase64Utils::mimeDecodeMailHeaderField(char *s)
}
-CBase64Utils::CBase64Utils()
+CBase64Utils::CBase64Utils ()
{
ErrorCode = 0;
}
-CBase64Utils::~CBase64Utils()
+CBase64Utils::~CBase64Utils ()
{
}
/*!
*Decode a string using the Base64 codification
*/
-char* CBase64Utils::encode(const char *input, int bufsize)
+char* CBase64Utils::encode (const char *input, int bufsize)
{
int alsize = ((bufsize * 4) / 3);
- char *finalresult = (char*)calloc(alsize + ((alsize / 76) * 2) +
- (10 * sizeof(char)), sizeof(char));
+ char *finalresult = (char*)calloc (alsize + ((alsize / 76) * 2) +
+ (10 * sizeof (char)), sizeof (char));
int count = 0;
int LineLen = 0;
char* fresult = finalresult;
@@ -388,10 +388,10 @@ char* CBase64Utils::encode(const char *input, int bufsize)
/*!
*Decode a Base64 coded string.
*/
-char* CBase64Utils::decode(const char *input, int *bufsize)
+char* CBase64Utils::decode (const char *input, int *bufsize)
{
int std = 0, count = 1, resultlen = 0;
- char *finalresult = (char*)calloc(*bufsize + sizeof(char), sizeof(char));
+ char *finalresult = (char*)calloc (*bufsize + sizeof (char), sizeof (char));
const char *s = input;
char *result = finalresult;
@@ -458,20 +458,20 @@ char* CBase64Utils::decode(const char *input, int
*bufsize)
*bufsize = resultlen;
return finalresult;
}
-CQPUtils::CQPUtils()
+CQPUtils::CQPUtils ()
{
ErrorCode = 0;
}
-CQPUtils::~CQPUtils()
+CQPUtils::~CQPUtils ()
{
}
-char* CQPUtils::decode(char *input)
+char* CQPUtils::decode (char *input)
{
char *s = input;
- char *finalresult = (char*)calloc(strlen(input) + sizeof(char),
- sizeof(char));
+ char *finalresult = (char*)calloc (strlen (input) + sizeof (char),
+ sizeof (char));
char *result = finalresult;
while (*s != '\0')
{
@@ -529,7 +529,7 @@ char* CQPUtils::decode(char *input)
-char* CQPUtils::expandBuffer(char *buffer, int UsedSize, int *BufSize,
+char* CQPUtils::expandBuffer (char *buffer, int UsedSize, int *BufSize,
int Singlechar)
{
int AddVal;
@@ -538,18 +538,18 @@ char* CQPUtils::expandBuffer(char *buffer, int UsedSize,
int *BufSize,
if (UsedSize >= *BufSize - AddVal)
{
*BufSize += BufAdd;
- return (char*)realloc(buffer, *BufSize * sizeof(char));
+ return (char*)realloc (buffer, *BufSize * sizeof (char));
}
return buffer;
}
-char* CQPUtils::encode(char *input)
+char* CQPUtils::encode (char *input)
{
- int BufSize = static_cast<int>(strlen(input) + BufAdd);
+ int BufSize = static_cast<int>(strlen (input) + BufAdd);
int UsedSize = 0;
int LineLen = 0;
- char *finalresult = (char*)calloc(BufSize, sizeof(char));
+ char *finalresult = (char*)calloc (BufSize, sizeof (char));
char *fresult = finalresult;
char *s = input;
while (*s != '\0')
@@ -562,18 +562,18 @@ char* CQPUtils::encode(char *input)
char mids[3];
if (LineLen >= MaxLineLength - 4)
{
- finalresult = expandBuffer(finalresult, UsedSize, &BufSize, 0);
+ finalresult = expandBuffer (finalresult, UsedSize, &BufSize, 0);
*(fresult++) = '=';
*(fresult++) = '\r';
*(fresult++) = '\n';
UsedSize += 3;
LineLen = 0;
}
- finalresult = expandBuffer(finalresult, UsedSize, &BufSize, 0);
+ finalresult = expandBuffer (finalresult, UsedSize, &BufSize, 0);
- snprintf(mids, 3, "%X", mid);
+ snprintf (mids, 3, "%X", mid);
- strupr(mids);
+ strupr (mids);
*(fresult++) = '=';
*(fresult++) = mids[0];
*(fresult++) = mids[1];
@@ -585,14 +585,14 @@ char* CQPUtils::encode(char *input)
{
if (LineLen >= MaxLineLength - 4)
{
- finalresult = expandBuffer(finalresult, UsedSize, &BufSize, 0);
+ finalresult = expandBuffer (finalresult, UsedSize, &BufSize, 0);
*(fresult++) = '=';
*(fresult++) = '\r';
*(fresult++) = '\n';
UsedSize += 3;
LineLen = 0;
}
- finalresult = expandBuffer(finalresult, UsedSize, &BufSize);
+ finalresult = expandBuffer (finalresult, UsedSize, &BufSize);
UsedSize++;
LineLen++;
*(fresult++) = *(s++);
diff --git a/myserver/src/base/bitvec/bitvec.cpp
b/myserver/src/base/bitvec/bitvec.cpp
index c47871c..fd9879c 100644
--- a/myserver/src/base/bitvec/bitvec.cpp
+++ b/myserver/src/base/bitvec/bitvec.cpp
@@ -94,9 +94,9 @@ int BitVec::ffs ()
* Find a bit set to '1'.
*
* The cost of adding N elements sequentially and after unset them, after the
- * index is found by ffs is O(n^2).
+ * index is found by ffs is O (n^2).
*
- * Use the `find' function instead to have a O(n) cost.
+ * Use the `find' function instead to have a O (n) cost.
*
*\return the Index of the first bit.
*\return -1 If there are not free bits.
diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index 27bbb53..984df1b 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -68,7 +68,7 @@ const u_long File::NO_INHERIT = (1<<8);
/*!
*Costructor of the class.
*/
-File::File()
+File::File ()
{
handle = 0;
}
@@ -83,7 +83,7 @@ File::File()
*\param buffersize The length of the buffer in bytes.
*\param nbw How many bytes were written to the file.
*/
-int File::writeToFile(const char* buffer, u_long buffersize, u_long* nbw)
+int File::writeToFile (const char* buffer, u_long buffersize, u_long* nbw)
{
if (buffersize == 0)
{
@@ -185,7 +185,7 @@ int File::openFile (const char* nfilename,u_long opt)
if (handle == INVALID_HANDLE_VALUE)
{
- filename.clear();
+ filename.clear ();
return 1;
}
else
@@ -197,8 +197,8 @@ int File::openFile (const char* nfilename,u_long opt)
if (ret)
{
- close();
- filename.clear();
+ close ();
+ filename.clear ();
return 1;
}
}
@@ -252,7 +252,7 @@ Handle File::getHandle ()
*Return a non null-value on errors.
*\param hl The new base/file/file.handle.
*/
-int File::setHandle(Handle hl)
+int File::setHandle (Handle hl)
{
handle = (FileHandle) hl;
return 0;
@@ -274,16 +274,16 @@ int File::operator =(File f)
*Return Non-zero on errors.
*\param nfilename The new file name.
*/
-int File::setFilename(const char* nfilename)
+int File::setFilename (const char* nfilename)
{
- filename.assign(nfilename);
+ filename.assign (nfilename);
return 0;
}
/*!
*Returns the file path.
*/
-const char *File::getFilename()
+const char *File::getFilename ()
{
return filename.c_str ();
}
@@ -292,12 +292,12 @@ const char *File::getFilename()
*Create a temporary file.
*\param filename The new temporary file name.
*/
-int File::createTemporaryFile(const char* filename)
+int File::createTemporaryFile (const char* filename)
{
- if (FilesUtility::fileExists(filename))
- FilesUtility::deleteFile(filename);
+ if (FilesUtility::fileExists (filename))
+ FilesUtility::deleteFile (filename);
- return openFile(filename, File::READ |
+ return openFile (filename, File::READ |
File::WRITE|
File::FILE_CREATE_ALWAYS |
File::TEMPORARY |
@@ -307,7 +307,7 @@ int File::createTemporaryFile(const char* filename)
/*!
* Close the file.
*/
-int File::close()
+int File::close ()
{
int ret = 0;
if (handle)
@@ -320,7 +320,7 @@ int File::close()
ret |= ::close (handle);
#endif
}
- filename.clear();
+ filename.clear ();
handle = 0;
return ret;
}
@@ -329,7 +329,7 @@ int File::close()
* Returns the file size in bytes.
* Returns -1 on errors.
*/
-u_long File::getFileSize()
+u_long File::getFileSize ()
{
u_long ret;
#ifdef WIN32
@@ -389,9 +389,9 @@ time_t File::getLastModTime ()
/*!
*This function returns the creation time of the file.
*/
-time_t File::getCreationTime()
+time_t File::getCreationTime ()
{
- return FilesUtility::getCreationTime(filename);
+ return FilesUtility::getCreationTime (filename);
}
/*!
diff --git a/myserver/src/base/file/files_utility.cpp
b/myserver/src/base/file/files_utility.cpp
index ec754c3..9d55d90 100644
--- a/myserver/src/base/file/files_utility.cpp
+++ b/myserver/src/base/file/files_utility.cpp
@@ -53,7 +53,7 @@ string FilesUtility::tmpPath;
/*!
* Constructor body.
*/
-FilesUtility::FilesUtility()
+FilesUtility::FilesUtility ()
{
}
@@ -125,7 +125,7 @@ int FilesUtility::getPathRecursionLevel (const char* path)
}
else
{
- while( (*lpath != '\\') && (*lpath != '/') && (*lpath != 0))
+ while ( (*lpath != '\\') && (*lpath != '/') && (*lpath != 0))
lpath++;
rec++;
}
@@ -245,17 +245,17 @@ int FilesUtility::isDirectory (const char *filename)
{
#ifdef WIN32
u_long fa = GetFileAttributes (filename);
- if(fa != INVALID_FILE_ATTRIBUTES)
- return(fa & FILE_ATTRIBUTE_DIRECTORY)?1:0;
+ if (fa != INVALID_FILE_ATTRIBUTES)
+ return (fa & FILE_ATTRIBUTE_DIRECTORY)?1:0;
else
return 0;
#else
struct stat F_Stats;
- int ret = stat(filename, &F_Stats);
- if(ret < 0)
+ int ret = stat (filename, &F_Stats);
+ if (ret < 0)
return 0;
- return (S_ISDIR(F_Stats.st_mode))? 1 : 0;
+ return (S_ISDIR (F_Stats.st_mode))? 1 : 0;
#endif
}
@@ -263,17 +263,17 @@ int FilesUtility::isDirectory (const char *filename)
* Returns a non-null value if the given path is a link.
* \param filename The path to check.
*/
-int FilesUtility::isLink(const char* filename)
+int FilesUtility::isLink (const char* filename)
{
#ifdef WIN32
return 0;
#else
struct stat F_Stats;
- int ret = lstat(filename, &F_Stats);
- if(ret < 0)
+ int ret = lstat (filename, &F_Stats);
+ if (ret < 0)
return 0;
- return (S_ISLNK(F_Stats.st_mode))? 1 : 0;
+ return (S_ISLNK (F_Stats.st_mode))? 1 : 0;
#endif
}
@@ -282,7 +282,7 @@ int FilesUtility::isLink(const char* filename)
* Returns a non-null value if the given path is a valid file.
* \param filename The path to check.
*/
-int FilesUtility::fileExists(const char* filename)
+int FilesUtility::fileExists (const char* filename)
{
#ifdef WIN32
HANDLE hFile = CreateFile (filename, GENERIC_READ, FILE_SHARE_READ,
@@ -295,10 +295,10 @@ int FilesUtility::fileExists(const char* filename)
#else
struct stat fstats;
int ret = stat (filename, &fstats);
- if(ret < 0)
+ if (ret < 0)
return 0;
/*! Return 1 if it is a regular file or a directory. */
- return (S_ISREG (fstats.st_mode) | S_ISDIR(fstats.st_mode))? 1 : 0;
+ return (S_ISREG (fstats.st_mode) | S_ISDIR (fstats.st_mode))? 1 : 0;
#endif
}
@@ -373,7 +373,7 @@ time_t FilesUtility::getLastAccTime (const char *filename)
* \param uid The user id.
* \param gid the group id.
*/
-int FilesUtility::chown(const char* filename, string &uid, string &gid)
+int FilesUtility::chown (const char* filename, string &uid, string &gid)
{
#ifndef WIN32
return ::chown (filename, Process::getUid (uid.c_str ()),
@@ -390,7 +390,7 @@ int FilesUtility::chown(const char* filename, string &uid,
string &gid)
int FilesUtility::getFilenameLength (const char *path, int *filename)
{
int splitpoint, i = 0, j = 0;
- splitpoint = static_cast<int>(strlen(path) - 1);
+ splitpoint = static_cast<int>(strlen (path) - 1);
while ((splitpoint > 0) && (path[splitpoint] != '/'))
splitpoint--;
*filename = splitpoint + 1;
@@ -399,7 +399,7 @@ int FilesUtility::getFilenameLength (const char *path, int
*filename)
/*!
* Get the filename from a path.
- * Be sure that the filename buffer is at least getFilenameLength(...) bytes
+ * Be sure that the filename buffer is at least getFilenameLength (...) bytes
* before call this function.
* \param path The full path to the file.
* \param filename A buffer to fullfill with the file name.
@@ -407,7 +407,7 @@ int FilesUtility::getFilenameLength (const char *path, int
*filename)
void FilesUtility::getFilename (const char *path, char *filename)
{
int splitpoint, i = 0, j = 0;
- splitpoint = static_cast<int>(strlen(path) - 1);
+ splitpoint = static_cast<int>(strlen (path) - 1);
while ((splitpoint > 0) && (path[splitpoint] != '/'))
splitpoint--;
if ((splitpoint == 0) && (path[splitpoint] != '/'))
@@ -435,7 +435,7 @@ void FilesUtility::getFilename (string const &path, string&
filename)
{
u_long splitpoint = path.find_last_of ("\\/");
if (splitpoint != string::npos)
- filename = path.substr(splitpoint+1, path.length()-1);
+ filename = path.substr (splitpoint+1, path.length ()-1);
else
filename.assign ("");
}
@@ -453,13 +453,13 @@ void FilesUtility::splitPathLength (const char *path, int
*dir, int *filename)
int i = 0;
for (i = 0; path[i]; i++)
- if(path[i] == '/' || path[i] == '\\' )
+ if (path[i] == '/' || path[i] == '\\' )
splitpoint = i;
if (dir)
*dir = splitpoint + 2;
- if(filename)
+ if (filename)
*filename = i - splitpoint + 2;
}
@@ -493,7 +493,7 @@ void FilesUtility::splitPath (const char *path, char *dir,
char *filename)
if (filename)
{
- memcpy(filename, path + splitpoint + (splitpoint ? 1 : 0),
+ memcpy (filename, path + splitpoint + (splitpoint ? 1 : 0),
i - splitpoint - (splitpoint ? 1 : 0));
filename[i - splitpoint - (splitpoint ? 1 : 0)] = '\0';
}
@@ -515,7 +515,7 @@ void FilesUtility::splitPath (string const &path, string&
dir, string& filename)
char lastDirChar;
dir = path.substr (0, splitpoint);
- lastDirChar = dir[dir.length() - 1];
+ lastDirChar = dir[dir.length () - 1];
if (lastDirChar != '\\' && lastDirChar != '/')
dir.append ("/");
@@ -525,20 +525,20 @@ void FilesUtility::splitPath (string const &path, string&
dir, string& filename)
else
{
filename = path;
- dir.assign("");
+ dir.assign ("");
}
}
/*!
* Get the file extension passing its path.
- * Save in ext all the bytes afer the last dot(.) in filename.
+ * Save in ext all the bytes afer the last dot (.) in filename.
* \param ext The buffer to fullfill with the file extension.
* \param filename The path to the file.
*/
void FilesUtility::getFileExt (char* ext, const char* filename)
{
int nDot;
- nDot = static_cast<int>(strlen(filename) - 1);
+ nDot = static_cast<int>(strlen (filename) - 1);
while ((nDot > 0) && (filename[nDot] != '.'))
nDot--;
@@ -551,7 +551,7 @@ void FilesUtility::getFileExt (char* ext, const char*
filename)
/*!
* Get the file extension passing its path.
- * Save in ext all the bytes afer the last dot(.) in filename.
+ * Save in ext all the bytes afer the last dot (.) in filename.
* \param ext The buffer to fullfill with the file extension.
* \param filename The path to the file.
*/
@@ -641,7 +641,7 @@ int FilesUtility::completePath (char **fileName, int *size,
int dontRealloc)
buffer = bufferAutoPtr.get ();
strcpy (buffer, *fileName);
- bufferNewLen = getdefaultwdlen() + bufferLen + 1 ;
+ bufferNewLen = getdefaultwdlen () + bufferLen + 1 ;
if (dontRealloc)
{
if (*size < bufferNewLen )
@@ -682,7 +682,7 @@ int FilesUtility::completePath (string &fileName)
buffer = bufferAutoPtr.get ();
- if (GetFullPathName(fileName.c_str (), bufferLen, buffer, 0) == 0)
+ if (GetFullPathName (fileName.c_str (), bufferLen, buffer, 0) == 0)
return -1;
fileName.assign (buffer);
diff --git a/myserver/src/base/files_cache/cached_file.cpp
b/myserver/src/base/files_cache/cached_file.cpp
index 65d529b..c640298 100644
--- a/myserver/src/base/files_cache/cached_file.cpp
+++ b/myserver/src/base/files_cache/cached_file.cpp
@@ -60,7 +60,7 @@ CachedFile::CachedFile (CachedFileBuffer* cfb)
* Inherithed by File.
* \see File#writeToFile.
*/
-int CachedFile::writeToFile(const char* buffer, u_long buffersize, u_long* nbw)
+int CachedFile::writeToFile (const char* buffer, u_long buffersize, u_long*
nbw)
{
return -1;
}
@@ -124,7 +124,7 @@ int CachedFile::operator =(CachedFile f)
int CachedFile::read (char* buffer, u_long buffersize, u_long* nbr)
{
u_long toRead = std::min (buffersize, this->buffer->getFileSize () - fseek);
- const char* src = &(this->buffer->getBuffer()[fseek]);
+ const char* src = &(this->buffer->getBuffer ()[fseek]);
if (nbr)
*nbr = toRead;
@@ -169,7 +169,7 @@ u_long CachedFile::getFileSize ()
*/
int CachedFile::seek (u_long initialByte)
{
- if (initialByte > buffer->getFileSize())
+ if (initialByte > buffer->getFileSize ())
return -1;
fseek = initialByte;
@@ -194,6 +194,6 @@ int CachedFile::write (const char* buffer, u_long len,
u_long *nbw)
int CachedFile::fastCopyToSocket (Socket *dest, u_long firstByte,
MemBuf *buf, u_long *nbw)
{
- return dest->write (&(this->buffer->getBuffer()[firstByte]),
- buffer->getFileSize() - firstByte, nbw);
+ return dest->write (&(this->buffer->getBuffer ()[firstByte]),
+ buffer->getFileSize () - firstByte, nbw);
}
diff --git a/myserver/src/base/files_cache/cached_file_buffer.cpp
b/myserver/src/base/files_cache/cached_file_buffer.cpp
index 9de5337..32f08e6 100644
--- a/myserver/src/base/files_cache/cached_file_buffer.cpp
+++ b/myserver/src/base/files_cache/cached_file_buffer.cpp
@@ -59,7 +59,7 @@ CachedFileBuffer::CachedFileBuffer (const char* filename)
file.openFile (filename, File::OPEN_IF_EXISTS | File::READ);
- fileSize = file.getFileSize();
+ fileSize = file.getFileSize ();
buffer = new char[fileSize];
file.read (buffer, fileSize, &nbw);
@@ -142,7 +142,7 @@ CachedFileBuffer::CachedFileBuffer (File* file)
refCounter = 0;
fileSize = file->getFileSize ();
buffer = new char[fileSize];
- filename.assign (file->getFilename());
+ filename.assign (file->getFilename ());
file->seek (0);
file->read (buffer, fileSize, &nbr);
}
diff --git a/myserver/src/base/files_cache/cached_file_factory.cpp
b/myserver/src/base/files_cache/cached_file_factory.cpp
index ff2ec8c..6159920 100644
--- a/myserver/src/base/files_cache/cached_file_factory.cpp
+++ b/myserver/src/base/files_cache/cached_file_factory.cpp
@@ -185,7 +185,7 @@ File* CachedFileFactory::open (const char* filename)
if (buffer == NULL)
{
u_long fileSize;
- File *file = new File();
+ File *file = new File ();
if (file->openFile (filename, File::OPEN_IF_EXISTS | File::READ))
{
mutex.unlock ();
@@ -207,9 +207,9 @@ File* CachedFileFactory::open (const char* filename)
if (!record)
{
delete record;
- file->close();
+ file->close ();
delete file;
- mutex.unlock();
+ mutex.unlock ();
return 0;
}
diff --git a/myserver/src/base/find_data/find_data.cpp
b/myserver/src/base/find_data/find_data.cpp
index 511b593..6d567b9 100644
--- a/myserver/src/base/find_data/find_data.cpp
+++ b/myserver/src/base/find_data/find_data.cpp
@@ -64,7 +64,7 @@ int FindData::findfirst (const char *filename)
filenameStar.append ("\\*");
ff = _findfirst (filenameStar.c_str (), &fd );
- if(ff!=-1)
+ if (ff!=-1)
{
name = fd.name;
attrib = fd.attrib;
@@ -79,8 +79,8 @@ int FindData::findfirst (const char *filename)
struct dirent * dirInfo;
dirName.assign (filename);
- if (dirName[dirName.length() - 1] == '/')
- dirName.erase (dirName.length() - 1);
+ if (dirName[dirName.length () - 1] == '/')
+ dirName.erase (dirName.length () - 1);
dh = opendir (dirName.c_str ());
diff --git a/myserver/src/base/hash_map/hash_map.cpp
b/myserver/src/base/hash_map/hash_map.cpp
index 4dd1aa4..31b0110 100644
--- a/myserver/src/base/hash_map/hash_map.cpp
+++ b/myserver/src/base/hash_map/hash_map.cpp
@@ -1,6 +1,6 @@
/*
MyServer
-Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
This program 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 3 of the License, or
@@ -25,11 +25,11 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#define elfHash(data, len){\
unsigned int h = 0;\
unsigned int x = 0;\
- for(int i = 0; i < len; i++)\
+ for (int i = 0; i < len; i++)\
{\
h = (h << 4) + data[i];\
x = h & 0xF0000000L;\
- if(x)\
+ if (x)\
{\
h ^= (x >> 24);\
h &= ~x;\
@@ -40,7 +40,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
//HashMap
template <typename KeyType, typename ValueType>
-HashMap<KeyType, ValueType>::HashMap()
+HashMap<KeyType, ValueType>::HashMap ()
{
power=4;
capacity=16;
@@ -51,12 +51,12 @@ HashMap<KeyType, ValueType>::HashMap()
load=0;
offset=1;
- data.resize(16);
- map.resize(16, 0);
+ data.resize (16);
+ map.resize (16, 0);
}
template <typename ValueType>
-HashMap<string, ValueType>::HashMap()
+HashMap<string, ValueType>::HashMap ()
{
power=4;
capacity=16;
@@ -67,12 +67,12 @@ HashMap<string, ValueType>::HashMap()
load=0;
offset=1;
- data.resize(16);
- map.resize(16, 0);
+ data.resize (16);
+ map.resize (16, 0);
}
template <typename ValueType>
-HashMap<char*, ValueType>::HashMap()
+HashMap<char*, ValueType>::HashMap ()
{
power=4;
capacity=16;
@@ -83,12 +83,12 @@ HashMap<char*, ValueType>::HashMap()
load=0;
offset=1;
- data.resize(16);
- map.resize(16, 0);
+ data.resize (16);
+ map.resize (16, 0);
}
template <typename ValueType>
-HashMap<void*, ValueType>::HashMap()
+HashMap<void*, ValueType>::HashMap ()
{
power=4;
capacity=16;
@@ -99,17 +99,17 @@ HashMap<void*, ValueType>::HashMap()
load=0;
offset=1;
- data.resize(16);
- map.resize(16, 0);
+ data.resize (16);
+ map.resize (16, 0);
}
template <typename KeyType, typename ValueType>
-HashMap<KeyType, ValueType>::HashMap(int hashCapacity)
+HashMap<KeyType, ValueType>::HashMap (int hashCapacity)
{
- if(hashCapacity>0x10)
+ if (hashCapacity>0x10)
{
power=5;
- for(hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
+ for (hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
++power;
capacity=0x1<<power;
mask=0xffffffff>>(32-power);
@@ -126,17 +126,17 @@ HashMap<KeyType, ValueType>::HashMap(int hashCapacity)
load=0;
offset=1;
- data.resize(capacity);
- map.resize(capacity, 0);
+ data.resize (capacity);
+ map.resize (capacity, 0);
}
template <typename ValueType>
-HashMap<string, ValueType>::HashMap(int hashCapacity)
+HashMap<string, ValueType>::HashMap (int hashCapacity)
{
- if(hashCapacity>0x10)
+ if (hashCapacity>0x10)
{
power=5;
- for(hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
+ for (hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
++power;
capacity=0x1<<power;
mask=0xffffffff>>(32-power);
@@ -153,17 +153,17 @@ HashMap<string, ValueType>::HashMap(int hashCapacity)
load=0;
offset=1;
- data.resize(capacity);
- map.resize(capacity, 0);
+ data.resize (capacity);
+ map.resize (capacity, 0);
}
template <typename ValueType>
-HashMap<char*, ValueType>::HashMap(int hashCapacity)
+HashMap<char*, ValueType>::HashMap (int hashCapacity)
{
- if(hashCapacity>0x10)
+ if (hashCapacity>0x10)
{
power=5;
- for(hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
+ for (hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
++power;
capacity=0x1<<power;
mask=0xffffffff>>(32-power);
@@ -180,17 +180,17 @@ HashMap<char*, ValueType>::HashMap(int hashCapacity)
load=0;
offset=1;
- data.resize(capacity);
- map.resize(capacity, 0);
+ data.resize (capacity);
+ map.resize (capacity, 0);
}
template <typename ValueType>
-HashMap<void*, ValueType>::HashMap(int hashCapacity)
+HashMap<void*, ValueType>::HashMap (int hashCapacity)
{
- if(hashCapacity>0x10)
+ if (hashCapacity>0x10)
{
power=5;
- for(hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
+ for (hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
++power;
capacity=0x1<<power;
mask=0xffffffff>>(32-power);
@@ -207,14 +207,14 @@ HashMap<void*, ValueType>::HashMap(int hashCapacity)
load=0;
offset=1;
- data.resize(capacity);
- map.resize(capacity, 0);
+ data.resize (capacity);
+ map.resize (capacity, 0);
}
template <typename KeyType, typename ValueType>
-HashMap<KeyType, ValueType>::HashMap(float hashLoadFactor)
+HashMap<KeyType, ValueType>::HashMap (float hashLoadFactor)
{
- if(hashLoadFactor>0)
+ if (hashLoadFactor>0)
{
highLoadFactor=hashLoadFactor;
lowLoadFactor=hashLoadFactor/13*6;
@@ -231,14 +231,14 @@ HashMap<KeyType, ValueType>::HashMap(float hashLoadFactor)
load=0;
offset=1;
- data.resize(16);
- map.resize(16, 0);
+ data.resize (16);
+ map.resize (16, 0);
}
template <typename ValueType>
-HashMap<string, ValueType>::HashMap(float hashLoadFactor)
+HashMap<string, ValueType>::HashMap (float hashLoadFactor)
{
- if(hashLoadFactor>0)
+ if (hashLoadFactor>0)
{
highLoadFactor=hashLoadFactor;
lowLoadFactor=hashLoadFactor/13*6;
@@ -255,14 +255,14 @@ HashMap<string, ValueType>::HashMap(float hashLoadFactor)
load=0;
offset=1;
- data.resize(16);
- map.resize(16, 0);
+ data.resize (16);
+ map.resize (16, 0);
}
template <typename ValueType>
-HashMap<char*, ValueType>::HashMap(float hashLoadFactor)
+HashMap<char*, ValueType>::HashMap (float hashLoadFactor)
{
- if(hashLoadFactor>0)
+ if (hashLoadFactor>0)
{
highLoadFactor=hashLoadFactor;
lowLoadFactor=hashLoadFactor/13*6;
@@ -279,14 +279,14 @@ HashMap<char*, ValueType>::HashMap(float hashLoadFactor)
load=0;
offset=1;
- data.resize(16);
- map.resize(16, 0);
+ data.resize (16);
+ map.resize (16, 0);
}
template <typename ValueType>
-HashMap<void*, ValueType>::HashMap(float hashLoadFactor)
+HashMap<void*, ValueType>::HashMap (float hashLoadFactor)
{
- if(hashLoadFactor>0)
+ if (hashLoadFactor>0)
{
highLoadFactor=hashLoadFactor;
lowLoadFactor=hashLoadFactor/13*6;
@@ -303,17 +303,17 @@ HashMap<void*, ValueType>::HashMap(float hashLoadFactor)
load=0;
offset=1;
- data.resize(16);
- map.resize(16, 0);
+ data.resize (16);
+ map.resize (16, 0);
}
template <typename KeyType, typename ValueType>
-HashMap<KeyType, ValueType>::HashMap(int hashCapacity, float hashLoadFactor)
+HashMap<KeyType, ValueType>::HashMap (int hashCapacity, float hashLoadFactor)
{
- if(hashCapacity>0x10)
+ if (hashCapacity>0x10)
{
power=5;
- for(hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
+ for (hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
++power;
capacity=0x1<<power;
mask=0xffffffff>>(32-power);
@@ -325,7 +325,7 @@ HashMap<KeyType, ValueType>::HashMap(int hashCapacity,
float hashLoadFactor)
mask=0xffffffff>>(32-4);
}
- if(hashLoadFactor>0)
+ if (hashLoadFactor>0)
{
highLoadFactor=hashLoadFactor;
lowLoadFactor=hashLoadFactor/13*6;
@@ -339,17 +339,17 @@ HashMap<KeyType, ValueType>::HashMap(int hashCapacity,
float hashLoadFactor)
load=0;
offset=1;
- data.resize(capacity);
- map.resize(capacity, 0);
+ data.resize (capacity);
+ map.resize (capacity, 0);
}
template <typename ValueType>
-HashMap<string, ValueType>::HashMap(int hashCapacity, float hashLoadFactor)
+HashMap<string, ValueType>::HashMap (int hashCapacity, float hashLoadFactor)
{
- if(hashCapacity>0x10)
+ if (hashCapacity>0x10)
{
power=5;
- for(hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
+ for (hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
++power;
capacity=0x1<<power;
mask=0xffffffff>>(32-power);
@@ -361,7 +361,7 @@ HashMap<string, ValueType>::HashMap(int hashCapacity, float
hashLoadFactor)
mask=0xffffffff>>(32-4);
}
- if(hashLoadFactor>0)
+ if (hashLoadFactor>0)
{
highLoadFactor=hashLoadFactor;
lowLoadFactor=hashLoadFactor/13*6;
@@ -375,17 +375,17 @@ HashMap<string, ValueType>::HashMap(int hashCapacity,
float hashLoadFactor)
load=0;
offset=1;
- data.resize(capacity);
- map.resize(capacity, 0);
+ data.resize (capacity);
+ map.resize (capacity, 0);
}
template <typename ValueType>
-HashMap<char*, ValueType>::HashMap(int hashCapacity, float hashLoadFactor)
+HashMap<char*, ValueType>::HashMap (int hashCapacity, float hashLoadFactor)
{
- if(hashCapacity>0x10)
+ if (hashCapacity>0x10)
{
power=5;
- for(hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
+ for (hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
++power;
capacity=0x1<<power;
mask=0xffffffff>>(32-power);
@@ -397,7 +397,7 @@ HashMap<char*, ValueType>::HashMap(int hashCapacity, float
hashLoadFactor)
mask=0xffffffff>>(32-4);
}
- if(hashLoadFactor>0)
+ if (hashLoadFactor>0)
{
highLoadFactor=hashLoadFactor;
lowLoadFactor=hashLoadFactor/13*6;
@@ -411,17 +411,17 @@ HashMap<char*, ValueType>::HashMap(int hashCapacity,
float hashLoadFactor)
load=0;
offset=1;
- data.resize(capacity);
- map.resize(capacity, 0);
+ data.resize (capacity);
+ map.resize (capacity, 0);
}
template <typename ValueType>
-HashMap<void*, ValueType>::HashMap(int hashCapacity, float hashLoadFactor)
+HashMap<void*, ValueType>::HashMap (int hashCapacity, float hashLoadFactor)
{
- if(hashCapacity>0x10)
+ if (hashCapacity>0x10)
{
power=5;
- for(hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
+ for (hashCapacity>>=5;hashCapacity>0;hashCapacity>>=1)
++power;
capacity=0x1<<power;
mask=0xffffffff>>(32-power);
@@ -433,7 +433,7 @@ HashMap<void*, ValueType>::HashMap(int hashCapacity, float
hashLoadFactor)
mask=0xffffffff>>(32-4);
}
- if(hashLoadFactor>0)
+ if (hashLoadFactor>0)
{
highLoadFactor=hashLoadFactor;
lowLoadFactor=hashLoadFactor/13*6;
@@ -447,658 +447,658 @@ HashMap<void*, ValueType>::HashMap(int hashCapacity,
float hashLoadFactor)
load=0;
offset=1;
- data.resize(capacity);
- map.resize(capacity, 0);
+ data.resize (capacity);
+ map.resize (capacity, 0);
}
template <typename KeyType, typename ValueType>
-inline bool HashMap<KeyType, ValueType>::empty(void) const
+inline bool HashMap<KeyType, ValueType>::empty (void) const
{
- return(!load);
+ return (!load);
}
template <typename ValueType>
-inline bool HashMap<string, ValueType>::empty(void) const
+inline bool HashMap<string, ValueType>::empty (void) const
{
- return(!load);
+ return (!load);
}
template <typename ValueType>
-inline bool HashMap<char*, ValueType>::empty(void) const
+inline bool HashMap<char*, ValueType>::empty (void) const
{
- return(!load);
+ return (!load);
}
template <typename ValueType>
-inline bool HashMap<void*, ValueType>::empty(void) const
+inline bool HashMap<void*, ValueType>::empty (void) const
{
- return(!load);
+ return (!load);
}
template <typename KeyType, typename ValueType>
-void HashMap<KeyType, ValueType>::clear(void)
+void HashMap<KeyType, ValueType>::clear (void)
{
load=0;
++offset;
- if(offset==0x0)
+ if (offset==0x0)
{
offset=1;
- data.clear();
- map.assign(capacity, 0);
+ data.clear ();
+ map.assign (capacity, 0);
}
}
template <typename ValueType>
-void HashMap<string, ValueType>::clear(void)
+void HashMap<string, ValueType>::clear (void)
{
load=0;
++offset;
- if(offset==0x0)
+ if (offset==0x0)
{
offset=1;
- data.clear();
+ data.clear ();
- map.assign(capacity, 0);
+ map.assign (capacity, 0);
}
}
template <typename ValueType>
-void HashMap<char*, ValueType>::clear(void)
+void HashMap<char*, ValueType>::clear (void)
{
load=0;
++offset;
- if(offset==0x0)
+ if (offset==0x0)
{
offset=1;
- data.clear();
- map.assign(capacity, 0);
+ data.clear ();
+ map.assign (capacity, 0);
}
}
template <typename ValueType>
-void HashMap<void*, ValueType>::clear(void)
+void HashMap<void*, ValueType>::clear (void)
{
load=0;
++offset;
- if(offset==0x0)
+ if (offset==0x0)
{
offset=1;
- data.clear();
- map.assign(capacity, 0);
+ data.clear ();
+ map.assign (capacity, 0);
}
}
template <typename KeyType, typename ValueType>
-inline int HashMap<KeyType, ValueType>::size(void) const
+inline int HashMap<KeyType, ValueType>::size (void) const
{
- return(load);
+ return (load);
}
template <typename ValueType>
-inline int HashMap<string, ValueType>::size(void) const
+inline int HashMap<string, ValueType>::size (void) const
{
- return(load);
+ return (load);
}
template <typename ValueType>
-inline int HashMap<char*, ValueType>::size(void) const
+inline int HashMap<char*, ValueType>::size (void) const
{
- return(load);
+ return (load);
}
template <typename ValueType>
-inline int HashMap<void*, ValueType>::size(void) const
+inline int HashMap<void*, ValueType>::size (void) const
{
- return(load);
+ return (load);
}
template <typename KeyType, typename ValueType>
-inline typename HashMap<KeyType, ValueType>::Iterator HashMap<KeyType,
ValueType>::begin(void)
+inline typename HashMap<KeyType, ValueType>::Iterator HashMap<KeyType,
ValueType>::begin (void)
{
tempIterator.vectorPtr=&data;
tempIterator.offset=offset;
- if(load)
+ if (load)
{
int i=0;
- for(;i<capacity;++i)
+ for (;i<capacity;++i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
break;
}
- tempIterator.mapIter=map.begin()+i;
- tempIterator.vectorIter=data.begin()+i;
- tempIterator.listIter=data[i].begin();
+ tempIterator.mapIter=map.begin ()+i;
+ tempIterator.vectorIter=data.begin ()+i;
+ tempIterator.listIter=data[i].begin ();
}else
{
- tempIterator.mapIter=map.end();
- tempIterator.vectorIter=data.end();
- tempIterator.listIter=tempIterator.vectorIter->end();
+ tempIterator.mapIter=map.end ();
+ tempIterator.vectorIter=data.end ();
+ tempIterator.listIter=tempIterator.vectorIter->end ();
}
- return(tempIterator);
+ return (tempIterator);
}
template <typename ValueType>
-inline typename HashMap<string, ValueType>::Iterator HashMap<string,
ValueType>::begin(void)
+inline typename HashMap<string, ValueType>::Iterator HashMap<string,
ValueType>::begin (void)
{
tempIterator.vectorPtr=&data;
tempIterator.offset=offset;
- if(load)
+ if (load)
{
int i=0;
- for(;i<capacity;++i)
+ for (;i<capacity;++i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
break;
}
- tempIterator.mapIter=map.begin()+i;
- tempIterator.vectorIter=data.begin()+i;
- tempIterator.listIter=data[i].begin();
+ tempIterator.mapIter=map.begin ()+i;
+ tempIterator.vectorIter=data.begin ()+i;
+ tempIterator.listIter=data[i].begin ();
}else
{
- tempIterator.mapIter=map.end();
- tempIterator.vectorIter=data.end();
- tempIterator.listIter=tempIterator.vectorIter->end();
+ tempIterator.mapIter=map.end ();
+ tempIterator.vectorIter=data.end ();
+ tempIterator.listIter=tempIterator.vectorIter->end ();
}
- return(tempIterator);
+ return (tempIterator);
}
template <typename ValueType>
-inline typename HashMap<char*, ValueType>::Iterator HashMap<char*,
ValueType>::begin(void)
+inline typename HashMap<char*, ValueType>::Iterator HashMap<char*,
ValueType>::begin (void)
{
tempIterator.vectorPtr=&data;
tempIterator.offset=offset;
- if(load)
+ if (load)
{
int i=0;
- for(;i<capacity;++i)
+ for (;i<capacity;++i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
break;
}
- tempIterator.mapIter=map.begin()+i;
- tempIterator.vectorIter=data.begin()+i;
- tempIterator.listIter=data[i].begin();
+ tempIterator.mapIter=map.begin ()+i;
+ tempIterator.vectorIter=data.begin ()+i;
+ tempIterator.listIter=data[i].begin ();
}else
{
- tempIterator.mapIter=map.end();
- tempIterator.vectorIter=data.end();
- tempIterator.listIter=tempIterator.vectorIter->end();
+ tempIterator.mapIter=map.end ();
+ tempIterator.vectorIter=data.end ();
+ tempIterator.listIter=tempIterator.vectorIter->end ();
}
- return(tempIterator);
+ return (tempIterator);
}
template <typename ValueType>
-inline typename HashMap<void*, ValueType>::Iterator HashMap<void*,
ValueType>::begin(void)
+inline typename HashMap<void*, ValueType>::Iterator HashMap<void*,
ValueType>::begin (void)
{
tempIterator.vectorPtr=&data;
tempIterator.offset=offset;
- if(load)
+ if (load)
{
int i=0;
- for(;i<capacity;++i)
+ for (;i<capacity;++i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
break;
}
- tempIterator.mapIter=map.begin()+i;
- tempIterator.vectorIter=data.begin()+i;
- tempIterator.listIter=data[i].begin();
+ tempIterator.mapIter=map.begin ()+i;
+ tempIterator.vectorIter=data.begin ()+i;
+ tempIterator.listIter=data[i].begin ();
}else
{
- tempIterator.mapIter=map.end();
- tempIterator.vectorIter=data.end();
- tempIterator.listIter=tempIterator.vectorIter->end();
+ tempIterator.mapIter=map.end ();
+ tempIterator.vectorIter=data.end ();
+ tempIterator.listIter=tempIterator.vectorIter->end ();
}
- return(tempIterator);
+ return (tempIterator);
}
template <typename KeyType, typename ValueType>
-inline typename HashMap<KeyType, ValueType>::Iterator HashMap<KeyType,
ValueType>::back(void)
+inline typename HashMap<KeyType, ValueType>::Iterator HashMap<KeyType,
ValueType>::back (void)
{
tempIterator.vectorPtr=&data;
tempIterator.offset=offset;
- if(load)
+ if (load)
{
int i=capacity-1;
- for(;i>=0;--i)
+ for (;i>=0;--i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
break;
}
- tempIterator.mapIter=map.begin()+i;
- tempIterator.vectorIter=data.begin()+i;
- tempIterator.listIter=--data[i].end();
+ tempIterator.mapIter=map.begin ()+i;
+ tempIterator.vectorIter=data.begin ()+i;
+ tempIterator.listIter=--data[i].end ();
}else
{
- tempIterator.mapIter=map.end();
- tempIterator.vectorIter=data.end();
- tempIterator.listIter=tempIterator.vectorIter->end();
+ tempIterator.mapIter=map.end ();
+ tempIterator.vectorIter=data.end ();
+ tempIterator.listIter=tempIterator.vectorIter->end ();
}
- return(tempIterator);
+ return (tempIterator);
}
template <typename ValueType>
-inline typename HashMap<string, ValueType>::Iterator HashMap<string,
ValueType>::back(void)
+inline typename HashMap<string, ValueType>::Iterator HashMap<string,
ValueType>::back (void)
{
tempIterator.vectorPtr=&data;
tempIterator.offset=offset;
- if(load)
+ if (load)
{
int i=capacity-1;
- for(;i>=0;--i)
+ for (;i>=0;--i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
break;
}
- tempIterator.mapIter=map.begin()+i;
- tempIterator.vectorIter=data.begin()+i;
- tempIterator.listIter=--data[i].end();
+ tempIterator.mapIter=map.begin ()+i;
+ tempIterator.vectorIter=data.begin ()+i;
+ tempIterator.listIter=--data[i].end ();
}else
{
- tempIterator.mapIter=map.end();
- tempIterator.vectorIter=data.end();
- tempIterator.listIter=tempIterator.vectorIter->end();
+ tempIterator.mapIter=map.end ();
+ tempIterator.vectorIter=data.end ();
+ tempIterator.listIter=tempIterator.vectorIter->end ();
}
- return(tempIterator);
+ return (tempIterator);
}
template <typename ValueType>
-inline typename HashMap<char*, ValueType>::Iterator HashMap<char*,
ValueType>::back(void)
+inline typename HashMap<char*, ValueType>::Iterator HashMap<char*,
ValueType>::back (void)
{
tempIterator.vectorPtr=&data;
tempIterator.offset=offset;
- if(load)
+ if (load)
{
int i=capacity-1;
- for(;i>=0;--i)
+ for (;i>=0;--i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
break;
}
- tempIterator.mapIter=map.begin()+i;
- tempIterator.vectorIter=data.begin()+i;
- tempIterator.listIter=--data[i].end();
+ tempIterator.mapIter=map.begin ()+i;
+ tempIterator.vectorIter=data.begin ()+i;
+ tempIterator.listIter=--data[i].end ();
}else
{
- tempIterator.mapIter=map.end();
- tempIterator.vectorIter=data.end();
- tempIterator.listIter=tempIterator.vectorIter->end();
+ tempIterator.mapIter=map.end ();
+ tempIterator.vectorIter=data.end ();
+ tempIterator.listIter=tempIterator.vectorIter->end ();
}
- return(tempIterator);
+ return (tempIterator);
}
template <typename ValueType>
-inline typename HashMap<void*, ValueType>::Iterator HashMap<void*,
ValueType>::back(void)
+inline typename HashMap<void*, ValueType>::Iterator HashMap<void*,
ValueType>::back (void)
{
tempIterator.vectorPtr=&data;
tempIterator.offset=offset;
- if(load)
+ if (load)
{
int i=capacity-1;
- for(;i>=0;--i)
+ for (;i>=0;--i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
break;
}
- tempIterator.mapIter=map.begin()+i;
- tempIterator.vectorIter=data.begin()+i;
- tempIterator.listIter=--data[i].end();
+ tempIterator.mapIter=map.begin ()+i;
+ tempIterator.vectorIter=data.begin ()+i;
+ tempIterator.listIter=--data[i].end ();
}else
{
- tempIterator.mapIter=map.end();
- tempIterator.vectorIter=data.end();
- tempIterator.listIter=tempIterator.vectorIter->end();
+ tempIterator.mapIter=map.end ();
+ tempIterator.vectorIter=data.end ();
+ tempIterator.listIter=tempIterator.vectorIter->end ();
}
- return(tempIterator);
+ return (tempIterator);
}
template <typename KeyType, typename ValueType>
-inline typename HashMap<KeyType, ValueType>::Iterator HashMap<KeyType,
ValueType>::end(void)
+inline typename HashMap<KeyType, ValueType>::Iterator HashMap<KeyType,
ValueType>::end (void)
{
tempIterator.offset=offset;
tempIterator.vectorPtr=&data;
- tempIterator.mapIter=map.end();
- tempIterator.vectorIter=data.end();
- tempIterator.listIter=tempIterator.vectorIter->end();
- return(tempIterator);
+ tempIterator.mapIter=map.end ();
+ tempIterator.vectorIter=data.end ();
+ tempIterator.listIter=tempIterator.vectorIter->end ();
+ return (tempIterator);
}
template <typename ValueType>
-inline typename HashMap<string, ValueType>::Iterator HashMap<string,
ValueType>::end(void)
+inline typename HashMap<string, ValueType>::Iterator HashMap<string,
ValueType>::end (void)
{
tempIterator.offset=offset;
tempIterator.vectorPtr=&data;
- tempIterator.mapIter=map.end();
- tempIterator.vectorIter=data.end();
- tempIterator.listIter=tempIterator.vectorIter->end();
- return(tempIterator);
+ tempIterator.mapIter=map.end ();
+ tempIterator.vectorIter=data.end ();
+ tempIterator.listIter=tempIterator.vectorIter->end ();
+ return (tempIterator);
}
template <typename ValueType>
-inline typename HashMap<char*, ValueType>::Iterator HashMap<char*,
ValueType>::end(void)
+inline typename HashMap<char*, ValueType>::Iterator HashMap<char*,
ValueType>::end (void)
{
tempIterator.offset=offset;
tempIterator.vectorPtr=&data;
- tempIterator.mapIter=map.end();
- tempIterator.vectorIter=data.end();
- tempIterator.listIter=tempIterator.vectorIter->end();
- return(tempIterator);
+ tempIterator.mapIter=map.end ();
+ tempIterator.vectorIter=data.end ();
+ tempIterator.listIter=tempIterator.vectorIter->end ();
+ return (tempIterator);
}
template <typename ValueType>
-inline typename HashMap<void*, ValueType>::Iterator HashMap<void*,
ValueType>::end(void)
+inline typename HashMap<void*, ValueType>::Iterator HashMap<void*,
ValueType>::end (void)
{
tempIterator.offset=offset;
tempIterator.vectorPtr=&data;
- tempIterator.mapIter=map.end();
- tempIterator.vectorIter=data.end();
- tempIterator.listIter=tempIterator.vectorIter->end();
- return(tempIterator);
+ tempIterator.mapIter=map.end ();
+ tempIterator.vectorIter=data.end ();
+ tempIterator.listIter=tempIterator.vectorIter->end ();
+ return (tempIterator);
}
template <typename KeyType, typename ValueType>
-ValueType HashMap<KeyType, ValueType>::remove(const Iterator& iter)
+ValueType HashMap<KeyType, ValueType>::remove (const Iterator& iter)
{
--load;
tempShkv.value=iter.listIter->value;
tempShkv.hash=iter.listIter->hash;
- iter.vectorIter->erase(iter.listIter);
- if(iter.vectorIter->empty())
+ iter.vectorIter->erase (iter.listIter);
+ if (iter.vectorIter->empty ())
map[tempShkv.hash & mask]=0;
- return(tempShkv.value);
+ return (tempShkv.value);
}
template <typename ValueType>
-ValueType HashMap<string, ValueType>::remove(const Iterator& iter)
+ValueType HashMap<string, ValueType>::remove (const Iterator& iter)
{
--load;
tempShkv.value=iter.listIter->value;
tempShkv.hash=iter.listIter->hash;
- iter.vectorIter->erase(iter.listIter);
- if(iter.vectorIter->empty())
+ iter.vectorIter->erase (iter.listIter);
+ if (iter.vectorIter->empty ())
map[tempShkv.hash & mask]=0;
- return(tempShkv.value);
+ return (tempShkv.value);
}
template <typename ValueType>
-ValueType HashMap<char*, ValueType>::remove(const Iterator& iter)
+ValueType HashMap<char*, ValueType>::remove (const Iterator& iter)
{
--load;
tempShkv.value=iter.listIter->value;
tempShkv.hash=iter.listIter->hash;
- iter.vectorIter->erase(iter.listIter);
- if(iter.vectorIter->empty())
+ iter.vectorIter->erase (iter.listIter);
+ if (iter.vectorIter->empty ())
map[tempShkv.hash & mask]=0;
- return(tempShkv.value);
+ return (tempShkv.value);
}
template <typename ValueType>
-ValueType HashMap<void*, ValueType>::remove(const Iterator& iter)
+ValueType HashMap<void*, ValueType>::remove (const Iterator& iter)
{
--load;
tempShkv.value=iter.listIter->value;
tempShkv.hash=iter.listIter->hash;
- iter.vectorIter->erase(iter.listIter);
- if(iter.vectorIter->empty())
+ iter.vectorIter->erase (iter.listIter);
+ if (iter.vectorIter->empty ())
map[tempShkv.hash & mask]=0;
- return(tempShkv.value);
+ return (tempShkv.value);
}
template <typename KeyType, typename ValueType>
-bool HashMap<KeyType, ValueType>::containsKey(const KeyType& key)
+bool HashMap<KeyType, ValueType>::containsKey (const KeyType& key)
{
- tempHash=hash((const char*)&key, sizeof(key));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash ((const char*)&key, sizeof (key));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
- return(true);
+ if (dataIter->key==key)
+ return (true);
}
}
- return(false);
+ return (false);
}
template <typename ValueType>
-bool HashMap<string, ValueType>::containsKey(const string& key)
+bool HashMap<string, ValueType>::containsKey (const string& key)
{
- tempHash=hash(key.c_str(), key.size());
- if(map[tempHash & mask]>=offset)
+ tempHash=hash (key.c_str (), key.size ());
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
- return(true);
+ if (dataIter->key==key)
+ return (true);
}
}
- return(false);
+ return (false);
}
template <typename ValueType>
-bool HashMap<char*, ValueType>::containsKey(const char* const key)
+bool HashMap<char*, ValueType>::containsKey (const char* const key)
{
- tempHash=hash(key, strlen(key));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash (key, strlen (key));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(!(strcmp(dataIter->key.c_str(), key)))
- return(true);
+ if (!(strcmp (dataIter->key.c_str (), key)))
+ return (true);
}
}
- return(false);
+ return (false);
}
template <typename ValueType>
-bool HashMap<void*, ValueType>::containsKey(const void* const key)
+bool HashMap<void*, ValueType>::containsKey (const void* const key)
{
- tempHash=hash((const char*)key, sizeof(void*));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash ((const char*)key, sizeof (void*));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
- return(true);
+ if (dataIter->key==key)
+ return (true);
}
}
- return(false);
+ return (false);
}
template <typename KeyType, typename ValueType>
-ValueType HashMap<KeyType, ValueType>::get(const KeyType& key)
+ValueType HashMap<KeyType, ValueType>::get (const KeyType& key)
{
unsigned int tempHash;
typename list < Shkv<KeyType, ValueType> >::iterator dataIter;
- tempHash=hash((const char*)&key, sizeof(key));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash ((const char*)&key, sizeof (key));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
- return(dataIter->value);
+ if (dataIter->key==key)
+ return (dataIter->value);
}
}
- return(0);
+ return (0);
}
template <typename ValueType>
-ValueType HashMap<string, ValueType>::get(const string& key)
+ValueType HashMap<string, ValueType>::get (const string& key)
{
unsigned int tempHash;
typename list < Shkv<string, ValueType> >::iterator dataIter;
- tempHash=hash(key.c_str(), key.size());
- if(map[tempHash & mask]>=offset)
+ tempHash=hash (key.c_str (), key.size ());
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
- return(dataIter->value);
+ if (dataIter->key==key)
+ return (dataIter->value);
}
}
- return(0);
+ return (0);
}
template <typename ValueType>
-ValueType HashMap<char*, ValueType>::get(const char* const key)
+ValueType HashMap<char*, ValueType>::get (const char* const key)
{
unsigned int tempHash;
typename list < Shkv<char*, ValueType> >::iterator dataIter;
- tempHash=hash(key, strlen(key));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash (key, strlen (key));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(!(strcmp(dataIter->key.c_str(), key)))
- return(dataIter->value);
+ if (!(strcmp (dataIter->key.c_str (), key)))
+ return (dataIter->value);
}
}
- return(0);
+ return (0);
}
template <typename ValueType>
-ValueType HashMap<void*, ValueType>::get(const void* const key)
+ValueType HashMap<void*, ValueType>::get (const void* const key)
{
- tempHash=hash((const char*)key, sizeof(void*));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash ((const char*)key, sizeof (void*));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
- return(dataIter->value);
+ if (dataIter->key==key)
+ return (dataIter->value);
}
}
- return(0);
+ return (0);
}
template <typename KeyType, typename ValueType>
-typename HashMap<KeyType, ValueType>::Iterator HashMap<KeyType,
ValueType>::getI(const KeyType& key)
+typename HashMap<KeyType, ValueType>::Iterator HashMap<KeyType,
ValueType>::getI (const KeyType& key)
{
- tempHash=hash((const char*)&key, sizeof(key));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash ((const char*)&key, sizeof (key));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
+ if (dataIter->key==key)
{
tempIterator.vectorPtr=&data;
- tempIterator.vectorIter=data.begin()+(tempHash & mask);
+ tempIterator.vectorIter=data.begin ()+(tempHash & mask);
tempIterator.listIter=dataIter;
- return(tempIterator);
+ return (tempIterator);
}
}
}
- return(end());
+ return (end ());
}
template <typename ValueType>
-typename HashMap<string, ValueType>::Iterator HashMap<string,
ValueType>::getI(const string& key)
+typename HashMap<string, ValueType>::Iterator HashMap<string, ValueType>::getI
(const string& key)
{
- tempHash=hash(key.c_str(), key.size());
- if(map[tempHash & mask]>=offset)
+ tempHash=hash (key.c_str (), key.size ());
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
+ if (dataIter->key==key)
{
tempIterator.vectorPtr=&data;
- tempIterator.vectorIter=data.begin()+(tempHash & mask);
+ tempIterator.vectorIter=data.begin ()+(tempHash & mask);
tempIterator.listIter=dataIter;
- return(tempIterator);
+ return (tempIterator);
}
}
}
- return(end());
+ return (end ());
}
template <typename ValueType>
-typename HashMap<char*, ValueType>::Iterator HashMap<char*,
ValueType>::getI(const char* const key)
+typename HashMap<char*, ValueType>::Iterator HashMap<char*, ValueType>::getI
(const char* const key)
{
- tempHash=hash(key, strlen(key));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash (key, strlen (key));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(!(strcmp(dataIter->key.c_str(), key)))
+ if (!(strcmp (dataIter->key.c_str (), key)))
{
tempIterator.vectorPtr=&data;
- tempIterator.vectorIter=data.begin()+(tempHash & mask);
+ tempIterator.vectorIter=data.begin ()+(tempHash & mask);
tempIterator.listIter=dataIter;
- return(tempIterator);
+ return (tempIterator);
}
}
}
- return(end());
+ return (end ());
}
template <typename ValueType>
-typename HashMap<void*, ValueType>::Iterator HashMap<void*,
ValueType>::getI(const void* const key)
+typename HashMap<void*, ValueType>::Iterator HashMap<void*, ValueType>::getI
(const void* const key)
{
- tempHash=hash((const char*)key, sizeof(void*));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash ((const char*)key, sizeof (void*));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
+ if (dataIter->key==key)
{
tempIterator.vectorPtr=&data;
- tempIterator.vectorIter=data.begin()+(tempHash & mask);
+ tempIterator.vectorIter=data.begin ()+(tempHash & mask);
tempIterator.listIter=dataIter;
- return(tempIterator);
+ return (tempIterator);
}
}
}
- return(end());
+ return (end ());
}
template <typename KeyType, typename ValueType>
-ValueType HashMap<KeyType, ValueType>::put(KeyType& key, const ValueType&
value)
+ValueType HashMap<KeyType, ValueType>::put (KeyType& key, const ValueType&
value)
{
- tempHash=hash((const char*)&key, sizeof(key));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash ((const char*)&key, sizeof (key));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
+ if (dataIter->key==key)
{
tempShkv.value=dataIter->value;
dataIter->value=value;
- return(tempShkv.value);
+ return (tempShkv.value);
}
}
++load;
tempShkv.hash=tempHash;
tempShkv.key=key;
tempShkv.value=value;
- data[tempHash & mask].push_front(tempShkv);
+ data[tempHash & mask].push_front (tempShkv);
}else
{
++load;
@@ -1106,36 +1106,36 @@ ValueType HashMap<KeyType, ValueType>::put(KeyType&
key, const ValueType& value)
tempShkv.hash=tempHash;
tempShkv.key=key;
tempShkv.value=value;
- data[tempHash & mask].clear();
- data[tempHash & mask].push_front(tempShkv);
+ data[tempHash & mask].clear ();
+ data[tempHash & mask].push_front (tempShkv);
}
- if((float)(load/capacity)>highLoadFactor)
- increaseSize(1);
- return(0);
+ if ((float)(load/capacity)>highLoadFactor)
+ increaseSize (1);
+ return (0);
}
template <typename ValueType>
-ValueType HashMap<string, ValueType>::put(string& key, const ValueType& value)
+ValueType HashMap<string, ValueType>::put (string& key, const ValueType& value)
{
- tempHash=hash(key.c_str(), key.size());
- if(map[tempHash & mask]>=offset)
+ tempHash=hash (key.c_str (), key.size ());
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
+ if (dataIter->key==key)
{
tempShkv.value=dataIter->value;
dataIter->value=value;
- return(tempShkv.value);
+ return (tempShkv.value);
}
}
++load;
tempShkv.hash=tempHash;
tempShkv.key=key;
tempShkv.value=value;
- data[tempHash & mask].push_front(tempShkv);
+ data[tempHash & mask].push_front (tempShkv);
}else
{
++load;
@@ -1143,36 +1143,36 @@ ValueType HashMap<string, ValueType>::put(string& key,
const ValueType& value)
tempShkv.hash=tempHash;
tempShkv.key=key;
tempShkv.value=value;
- data[tempHash & mask].clear();
- data[tempHash & mask].push_front(tempShkv);
+ data[tempHash & mask].clear ();
+ data[tempHash & mask].push_front (tempShkv);
}
- if((float)(load/capacity)>highLoadFactor)
- increaseSize(1);
- return(0);
+ if ((float)(load/capacity)>highLoadFactor)
+ increaseSize (1);
+ return (0);
}
template <typename ValueType>
-ValueType HashMap<char*, ValueType>::put(char* const key, const ValueType&
value)
+ValueType HashMap<char*, ValueType>::put (char* const key, const ValueType&
value)
{
- tempHash=hash(key, strlen(key));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash (key, strlen (key));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(!(strcmp(dataIter->key.c_str(), key)))
+ if (!(strcmp (dataIter->key.c_str (), key)))
{
tempShkv.value=dataIter->value;
dataIter->value=value;
- return(tempShkv.value);
+ return (tempShkv.value);
}
}
++load;
tempShkv.hash=tempHash;
tempShkv.key=key;
tempShkv.value=value;
- data[tempHash & mask].push_front(tempShkv);
+ data[tempHash & mask].push_front (tempShkv);
}else
{
++load;
@@ -1180,36 +1180,36 @@ ValueType HashMap<char*, ValueType>::put(char* const
key, const ValueType& value
tempShkv.hash=tempHash;
tempShkv.key=key;
tempShkv.value=value;
- data[tempHash & mask].clear();
- data[tempHash & mask].push_front(tempShkv);
+ data[tempHash & mask].clear ();
+ data[tempHash & mask].push_front (tempShkv);
}
- if((float)(load/capacity)>highLoadFactor)
- increaseSize(1);
- return(0);
+ if ((float)(load/capacity)>highLoadFactor)
+ increaseSize (1);
+ return (0);
}
template <typename ValueType>
-ValueType HashMap<void*, ValueType>::put(void* const key, const ValueType&
value)
+ValueType HashMap<void*, ValueType>::put (void* const key, const ValueType&
value)
{
- tempHash=hash((const char*)key, sizeof(void*));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash ((const char*)key, sizeof (void*));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
+ if (dataIter->key==key)
{
tempShkv.value=dataIter->value;
dataIter->value=value;
- return(tempShkv.value);
+ return (tempShkv.value);
}
}
++load;
tempShkv.hash=tempHash;
tempShkv.key=key;
tempShkv.value=value;
- data[tempHash & mask].push_front(tempShkv);
+ data[tempHash & mask].push_front (tempShkv);
}else
{
++load;
@@ -1217,116 +1217,116 @@ ValueType HashMap<void*, ValueType>::put(void* const
key, const ValueType& value
tempShkv.hash=tempHash;
tempShkv.key=key;
tempShkv.value=value;
- data[tempHash & mask].clear();
- data[tempHash & mask].push_front(tempShkv);
+ data[tempHash & mask].clear ();
+ data[tempHash & mask].push_front (tempShkv);
}
- if((float)(load/capacity)>highLoadFactor)
- increaseSize(1);
- return(0);
+ if ((float)(load/capacity)>highLoadFactor)
+ increaseSize (1);
+ return (0);
}
template <typename KeyType, typename ValueType>
-ValueType HashMap<KeyType, ValueType>::remove(const KeyType& key)
+ValueType HashMap<KeyType, ValueType>::remove (const KeyType& key)
{
- tempHash=hash((const char*)&key, sizeof(key));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash ((const char*)&key, sizeof (key));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
+ if (dataIter->key==key)
{
--load;
tempShkv.value=dataIter->value;
- data[tempHash & mask].erase(dataIter);
- if(data[tempHash & mask].empty())
+ data[tempHash & mask].erase (dataIter);
+ if (data[tempHash & mask].empty ())
map[tempHash & mask]=0;
- if(((float)(load/capacity)<lowLoadFactor) && (capacity>16))
- decreaseSize(1);
- return(tempShkv.value);
+ if (((float)(load/capacity)<lowLoadFactor) && (capacity>16))
+ decreaseSize (1);
+ return (tempShkv.value);
}
}
}
- return(0);
+ return (0);
}
template <typename ValueType>
-ValueType HashMap<string, ValueType>::remove(const string& key)
+ValueType HashMap<string, ValueType>::remove (const string& key)
{
- tempHash=hash(key.c_str(), key.size());
- if(map[tempHash & mask]>=offset)
+ tempHash=hash (key.c_str (), key.size ());
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
+ if (dataIter->key==key)
{
--load;
tempShkv.value=dataIter->value;
- data[tempHash & mask].erase(dataIter);
- if(data[tempHash & mask].empty())
+ data[tempHash & mask].erase (dataIter);
+ if (data[tempHash & mask].empty ())
map[tempHash & mask]=0;
- if(((float)(load/capacity)<lowLoadFactor) && (capacity>16))
- decreaseSize(1);
- return(tempShkv.value);
+ if (((float)(load/capacity)<lowLoadFactor) && (capacity>16))
+ decreaseSize (1);
+ return (tempShkv.value);
}
}
}
- return(0);
+ return (0);
}
template <typename ValueType>
-ValueType HashMap<char*, ValueType>::remove(const char* const key)
+ValueType HashMap<char*, ValueType>::remove (const char* const key)
{
- tempHash=hash(key, strlen(key));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash (key, strlen (key));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(!(strcmp(dataIter->key.c_str(), key)))
+ if (!(strcmp (dataIter->key.c_str (), key)))
{
--load;
tempShkv.value=dataIter->value;
- data[tempHash & mask].erase(dataIter);
- if(data[tempHash & mask].empty())
+ data[tempHash & mask].erase (dataIter);
+ if (data[tempHash & mask].empty ())
map[tempHash & mask]=0;
- if(((float)(load/capacity)<lowLoadFactor) && (capacity>16))
- decreaseSize(1);
- return(tempShkv.value);
+ if (((float)(load/capacity)<lowLoadFactor) && (capacity>16))
+ decreaseSize (1);
+ return (tempShkv.value);
}
}
}
- return(0);
+ return (0);
}
template <typename ValueType>
-ValueType HashMap<void*, ValueType>::remove(const void* const key)
+ValueType HashMap<void*, ValueType>::remove (const void* const key)
{
- tempHash=hash((const char*)key, sizeof(key));
- if(map[tempHash & mask]>=offset)
+ tempHash=hash ((const char*)key, sizeof (key));
+ if (map[tempHash & mask]>=offset)
{
- for(dataIter=data[tempHash & mask].begin();
- dataIter!=data[tempHash & mask].end();
+ for (dataIter=data[tempHash & mask].begin ();
+ dataIter!=data[tempHash & mask].end ();
++dataIter)
{
- if(dataIter->key==key)
+ if (dataIter->key==key)
{
--load;
tempShkv.value=dataIter->value;
- data[tempHash & mask].erase(dataIter);
- if(data[tempHash & mask].empty())
+ data[tempHash & mask].erase (dataIter);
+ if (data[tempHash & mask].empty ())
map[tempHash & mask]=0;
- if(((float)(load/capacity)<lowLoadFactor) && (capacity>16))
- decreaseSize(1);
- return(tempShkv.value);
+ if (((float)(load/capacity)<lowLoadFactor) && (capacity>16))
+ decreaseSize (1);
+ return (tempShkv.value);
}
}
}
- return(0);
+ return (0);
}
template <typename KeyType, typename ValueType>
@@ -1334,29 +1334,29 @@ void HashMap<KeyType, ValueType>::increaseSize (const
int powerOffset)
{
power+=powerOffset;
mask=0xffffffff>>(32-power);
- data.resize(0x1<<power);
- map.resize(0x1<<power, 0);
+ data.resize (0x1<<power);
+ map.resize (0x1<<power, 0);
- for(int i=0;i<capacity;++i)
+ for (int i=0;i<capacity;++i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
{
- for(dataIter=data[i].begin();
- dataIter!=data[i].end();
+ for (dataIter=data[i].begin ();
+ dataIter!=data[i].end ();
)
{
- if((dataIter->hash & mask)!=(unsigned int)i)
+ if ((dataIter->hash & mask)!=(unsigned int)i)
{
map[dataIter->hash & mask]=offset;
- data[dataIter->hash & mask].push_front(*dataIter);
+ data[dataIter->hash & mask].push_front (*dataIter);
tempdataIter=dataIter;
++dataIter;
- data[i].erase(tempdataIter);
+ data[i].erase (tempdataIter);
continue;
}
++dataIter;
}
- if(data[i].empty())
+ if (data[i].empty ())
map[i]=0;
}
}
@@ -1368,29 +1368,29 @@ void HashMap<string, ValueType>::increaseSize (const
int powerOffset)
{
power+=powerOffset;
mask=0xffffffff>>(32-power);
- data.resize(0x1<<power);
- map.resize(0x1<<power, 0);
+ data.resize (0x1<<power);
+ map.resize (0x1<<power, 0);
- for(int i=0;i<capacity;++i)
+ for (int i=0;i<capacity;++i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
{
- for(dataIter=data[i].begin();
- dataIter!=data[i].end();
+ for (dataIter=data[i].begin ();
+ dataIter!=data[i].end ();
)
{
- if((dataIter->hash & mask)!=(unsigned int)i)
+ if ((dataIter->hash & mask)!=(unsigned int)i)
{
map[dataIter->hash & mask]=offset;
- data[dataIter->hash & mask].push_front(*dataIter);
+ data[dataIter->hash & mask].push_front (*dataIter);
tempdataIter=dataIter;
++dataIter;
- data[i].erase(tempdataIter);
+ data[i].erase (tempdataIter);
continue;
}
++dataIter;
}
- if(data[i].empty())
+ if (data[i].empty ())
map[i]=0;
}
}
@@ -1402,29 +1402,29 @@ void HashMap<char*, ValueType>::increaseSize (const int
powerOffset)
{
power += powerOffset;
mask = 0xffffffff >> (32 - power);
- data.resize(0x1 << power);
- map.resize(0x1 << power, 0);
+ data.resize (0x1 << power);
+ map.resize (0x1 << power, 0);
- for(int i = 0; i < capacity; i++)
+ for (int i = 0; i < capacity; i++)
{
- if(map[i] >= offset)
+ if (map[i] >= offset)
{
- for(dataIter = data[i].begin();
- dataIter != data[i].end();
+ for (dataIter = data[i].begin ();
+ dataIter != data[i].end ();
)
{
- if((int)(dataIter->hash & mask) != i)
+ if ((int)(dataIter->hash & mask) != i)
{
map[dataIter->hash & mask]=offset;
- data[dataIter->hash & mask].push_front(*dataIter);
+ data[dataIter->hash & mask].push_front (*dataIter);
tempdataIter=dataIter;
++dataIter;
- data[i].erase(tempdataIter);
+ data[i].erase (tempdataIter);
continue;
}
++dataIter;
}
- if(data[i].empty())
+ if (data[i].empty ())
map[i]=0;
}
}
@@ -1436,29 +1436,29 @@ void HashMap<void*, ValueType>::increaseSize (const int
powerOffset)
{
power+=powerOffset;
mask=0xffffffff>>(32-power);
- data.resize(0x1<<power);
- map.resize(0x1<<power, 0);
+ data.resize (0x1<<power);
+ map.resize (0x1<<power, 0);
- for(int i=0;i<capacity;++i)
+ for (int i=0;i<capacity;++i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
{
- for(dataIter=data[i].begin();
- dataIter!=data[i].end();
+ for (dataIter=data[i].begin ();
+ dataIter!=data[i].end ();
)
{
- if((dataIter->hash & mask)!=i)
+ if ((dataIter->hash & mask)!=i)
{
map[dataIter->hash & mask]=offset;
- data[dataIter->hash & mask].push_front(*dataIter);
+ data[dataIter->hash & mask].push_front (*dataIter);
tempdataIter=dataIter;
++dataIter;
- data[i].erase(tempdataIter);
+ data[i].erase (tempdataIter);
continue;
}
++dataIter;
}
- if(data[i].empty())
+ if (data[i].empty ())
map[i]=0;
}
}
@@ -1472,25 +1472,25 @@ void HashMap<KeyType, ValueType>::decreaseSize (const
int powerOffset)
mask>>=powerOffset;
int i=capacity-1;
- for(capacity>>=powerOffset;i>=capacity;--i)
+ for (capacity>>=powerOffset;i>=capacity;--i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
{
- for(dataIter=data[i].begin();
- dataIter!=data[i].end();
+ for (dataIter=data[i].begin ();
+ dataIter!=data[i].end ();
++dataIter)
{
- if(map[dataIter->hash & mask]<offset)
+ if (map[dataIter->hash & mask]<offset)
{
map[dataIter->hash & mask]=offset;
- data[dataIter->hash & mask].clear();
+ data[dataIter->hash & mask].clear ();
}
- data[dataIter->hash & mask].push_front(*dataIter);
+ data[dataIter->hash & mask].push_front (*dataIter);
}
}
}
- data.resize(capacity);
- map.resize(capacity);
+ data.resize (capacity);
+ map.resize (capacity);
}
template <typename ValueType>
@@ -1500,25 +1500,25 @@ void HashMap<string, ValueType>::decreaseSize (const
int powerOffset)
mask>>=powerOffset;
int i=capacity-1;
- for(capacity>>=powerOffset;i>=capacity;--i)
+ for (capacity>>=powerOffset;i>=capacity;--i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
{
- for(dataIter=data[i].begin();
- dataIter!=data[i].end();
+ for (dataIter=data[i].begin ();
+ dataIter!=data[i].end ();
++dataIter)
{
- if(map[dataIter->hash & mask]<offset)
+ if (map[dataIter->hash & mask]<offset)
{
map[dataIter->hash & mask]=offset;
- data[dataIter->hash & mask].clear();
+ data[dataIter->hash & mask].clear ();
}
- data[dataIter->hash & mask].push_front(*dataIter);
+ data[dataIter->hash & mask].push_front (*dataIter);
}
}
}
- data.resize(capacity);
- map.resize(capacity);
+ data.resize (capacity);
+ map.resize (capacity);
}
template <typename ValueType>
@@ -1528,25 +1528,25 @@ void HashMap<char*, ValueType>::decreaseSize (const int
powerOffset)
mask>>=powerOffset;
int i=capacity-1;
- for(capacity>>=powerOffset;i>=capacity;--i)
+ for (capacity>>=powerOffset;i>=capacity;--i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
{
- for(dataIter=data[i].begin();
- dataIter!=data[i].end();
+ for (dataIter=data[i].begin ();
+ dataIter!=data[i].end ();
++dataIter)
{
- if(map[dataIter->hash & mask]<offset)
+ if (map[dataIter->hash & mask]<offset)
{
map[dataIter->hash & mask]=offset;
- data[dataIter->hash & mask].clear();
+ data[dataIter->hash & mask].clear ();
}
- data[dataIter->hash & mask].push_front(*dataIter);
+ data[dataIter->hash & mask].push_front (*dataIter);
}
}
}
- data.resize(capacity);
- map.resize(capacity);
+ data.resize (capacity);
+ map.resize (capacity);
}
template <typename ValueType>
@@ -1556,54 +1556,54 @@ void HashMap<void*, ValueType>::decreaseSize (const int
powerOffset)
mask>>=powerOffset;
int i=capacity-1;
- for(capacity>>=powerOffset;i>=capacity;--i)
+ for (capacity>>=powerOffset;i>=capacity;--i)
{
- if(map[i]>=offset)
+ if (map[i]>=offset)
{
- for(dataIter=data[i].begin();
- dataIter!=data[i].end();
+ for (dataIter=data[i].begin ();
+ dataIter!=data[i].end ();
++dataIter)
{
- if(map[dataIter->hash & mask]<offset)
+ if (map[dataIter->hash & mask]<offset)
{
map[dataIter->hash & mask]=offset;
- data[dataIter->hash & mask].clear();
+ data[dataIter->hash & mask].clear ();
}
- data[dataIter->hash & mask].push_front(*dataIter);
+ data[dataIter->hash & mask].push_front (*dataIter);
}
}
}
- data.resize(capacity);
- map.resize(capacity);
+ data.resize (capacity);
+ map.resize (capacity);
}
template <typename KeyType, typename ValueType>
unsigned int HashMap<KeyType, ValueType>::hash (const char *data, int len)
{
- elfHash(data, len);
+ elfHash (data, len);
}
template <typename ValueType>
unsigned int HashMap<string, ValueType>::hash (const char *data, int len)
{
- elfHash(data, len);
+ elfHash (data, len);
}
template <typename ValueType>
unsigned int HashMap<char*, ValueType>::hash (const char *data, int len)
{
- elfHash(data, len);
+ elfHash (data, len);
}
template <typename ValueType>
unsigned int HashMap<void*, ValueType>::hash (const char *data, int len)
{
- elfHash(data, len);
+ elfHash (data, len);
}
//Iterator
template <typename KeyType, typename ValueType>
-MyIterator<KeyType, ValueType>::MyIterator()
+MyIterator<KeyType, ValueType>::MyIterator ()
{
}
@@ -1611,43 +1611,43 @@ MyIterator<KeyType, ValueType>::MyIterator()
template <typename KeyType, typename ValueType>
inline bool MyIterator<KeyType, ValueType>::operator==(const MyIterator& op2)
const
{
- return(listIter==op2.listIter);
+ return (listIter==op2.listIter);
}
template <typename KeyType, typename ValueType>
inline bool MyIterator<KeyType, ValueType>::operator!=(const MyIterator& op2)
const
{
- return(listIter!=op2.listIter);
+ return (listIter!=op2.listIter);
}
template <typename KeyType, typename ValueType>
inline ValueType& MyIterator<KeyType, ValueType>::operator*() const
{
- return(listIter->value);
+ return (listIter->value);
}
template <typename KeyType, typename ValueType>
inline MyIterator<KeyType, ValueType>& MyIterator<KeyType,
ValueType>::operator++()
{
++listIter;
- if(listIter==vectorIter->end())
+ if (listIter==vectorIter->end ())
{
++mapIter;
++vectorIter;
- while(vectorIter!=vectorPtr->end())
+ while (vectorIter!=vectorPtr->end ())
{
- if(*mapIter>=offset)
+ if (*mapIter>=offset)
{
- listIter=vectorIter->begin();
- return(*this);
+ listIter=vectorIter->begin ();
+ return (*this);
}
++mapIter;
++vectorIter;
}
- listIter=vectorIter->end();
+ listIter=vectorIter->end ();
}
- return(*this);
+ return (*this);
}
template <typename KeyType, typename ValueType>
@@ -1655,79 +1655,79 @@ inline MyIterator<KeyType, ValueType>
MyIterator<KeyType, ValueType>::operator++
{
MyIterator tempIterator=*this;
++listIter;
- if(listIter==vectorIter->end())
+ if (listIter==vectorIter->end ())
{
++mapIter;
++vectorIter;
- while(vectorIter!=vectorPtr->end())
+ while (vectorIter!=vectorPtr->end ())
{
- if(*mapIter>=offset)
+ if (*mapIter>=offset)
{
- listIter=vectorIter->begin();
- return(tempIterator);
+ listIter=vectorIter->begin ();
+ return (tempIterator);
}
++mapIter;
++vectorIter;
}
- listIter=vectorIter->end();
+ listIter=vectorIter->end ();
}
- return(tempIterator);
+ return (tempIterator);
}
template <typename KeyType, typename ValueType>
inline MyIterator<KeyType, ValueType>& MyIterator<KeyType,
ValueType>::operator--()
{
- if(listIter==vectorIter->begin())
+ if (listIter==vectorIter->begin ())
{
- while(vectorIter!=vectorPtr->begin())
+ while (vectorIter!=vectorPtr->begin ())
{
--mapIter;
--vectorIter;
- if(*mapIter>=offset)
+ if (*mapIter>=offset)
{
- listIter=vectorIter->end();
+ listIter=vectorIter->end ();
--listIter;
- return(*this);
+ return (*this);
}
}
- //vectorIter=vectorPtr->end();
- listIter=vectorIter->begin();
- return(*this);
+ //vectorIter=vectorPtr->end ();
+ listIter=vectorIter->begin ();
+ return (*this);
}
--listIter;
- return(*this);
+ return (*this);
}
template <typename KeyType, typename ValueType>
inline MyIterator<KeyType, ValueType> MyIterator<KeyType,
ValueType>::operator--(int)
{
MyIterator tempIterator=*this;
- if(listIter==vectorIter->begin())
+ if (listIter==vectorIter->begin ())
{
- while(vectorIter!=vectorPtr->begin())
+ while (vectorIter!=vectorPtr->begin ())
{
--mapIter;
--vectorIter;
- if(*mapIter>=offset)
+ if (*mapIter>=offset)
{
- listIter=vectorIter->end();
+ listIter=vectorIter->end ();
--listIter;
- return(tempIterator);
+ return (tempIterator);
}
}
- //vectorIter=vectorPtr->end();
- listIter=vectorIter->begin();
- return(tempIterator);
+ //vectorIter=vectorPtr->end ();
+ listIter=vectorIter->begin ();
+ return (tempIterator);
}
--listIter;
- return(tempIterator);
+ return (tempIterator);
}
template <typename KeyType, typename ValueType>
-inline KeyType MyIterator<KeyType, ValueType>::getKey() const
+inline KeyType MyIterator<KeyType, ValueType>::getKey () const
{
- return(listIter->key);
+ return (listIter->key);
}
diff --git a/myserver/src/base/home_dir/home_dir.cpp
b/myserver/src/base/home_dir/home_dir.cpp
index 6798ec3..2014fb5 100644
--- a/myserver/src/base/home_dir/home_dir.cpp
+++ b/myserver/src/base/home_dir/home_dir.cpp
@@ -85,7 +85,7 @@ HomeDir::~HomeDir ()
/*!
*Clear the used memory.
*/
-void HomeDir::clear()
+void HomeDir::clear ()
{
#ifdef WIN32
data.assign ("");
@@ -127,11 +127,11 @@ int HomeDir::loadImpl ()
char *buf;
buf = new char[len];
- if (GetProfilesDirectory(buf, &len) == FALSE)
+ if (GetProfilesDirectory (buf, &len) == FALSE)
{
delete [] buf;
buf = new char[len];
- if (GetProfilesDirectory(buf, &len) == FALSE)
+ if (GetProfilesDirectory (buf, &len) == FALSE)
{
delete [] buf;
return 1;
diff --git a/myserver/src/base/md5/md5.cpp b/myserver/src/base/md5/md5.cpp
index a16b75a..25106f7 100644
--- a/myserver/src/base/md5/md5.cpp
+++ b/myserver/src/base/md5/md5.cpp
@@ -1,6 +1,6 @@
/*
MyServer
- Copyright (C) 2005-2008 Free Software Foundation, Inc.
+ Copyright (C) 2005-2009 Free Software Foundation, Inc.
This program 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 3 of the License, or
@@ -34,13 +34,13 @@
* needed on buffers full of bytes, and then call MD5Final, which
* will fill a supplied 16-byte array with the digest.
*/
-#include <string.h> /*! for memcpy() */
+#include <string.h> /*! for memcpy () */
#include <include/base/md5/md5.h>
#ifdef WORDS_BIGENDIAN
void
-byteSwap(unsigned int *buf, unsigned int words)
+byteSwap (unsigned int *buf, unsigned int words)
{
unsigned char *p = (unsigned char *)buf;
@@ -59,7 +59,7 @@ byteSwap(unsigned int *buf, unsigned int words)
*Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
*initialization constants.
*/
-void Md5::init()
+void Md5::init ()
{
buf[0] = 0x67452301;
buf[1] = 0xefcdab89;
@@ -74,7 +74,7 @@ void Md5::init()
*Update context to reflect the concatenation of another buffer full
*of bytes.
*/
-void Md5::update(unsigned char const *buf, unsigned long len)
+void Md5::update (unsigned char const *buf, unsigned long len)
{
unsigned int t;
@@ -87,35 +87,35 @@ void Md5::update(unsigned char const *buf, unsigned long
len)
t = 64 - (t & 0x3f); /* Space available in in (at least 1) */
if (t > len)
{
- memcpy((unsigned char *)in + 64 - t, buf, len);
+ memcpy ((unsigned char *)in + 64 - t, buf, len);
return;
}
/* First chunk is an odd size */
- memcpy((unsigned char *)in + 64 - t, buf, t);
- byteSwap(in, 16);
- transform( this->buf, in);
+ memcpy ((unsigned char *)in + 64 - t, buf, t);
+ byteSwap (in, 16);
+ transform ( this->buf, in);
buf += t;
len -= t;
/* Process data in 64-byte chunks */
while (len >= 64)
{
- memcpy(in, buf, 64);
- byteSwap(in, 16);
- transform(this->buf, in);
+ memcpy (in, buf, 64);
+ byteSwap (in, 16);
+ transform (this->buf, in);
buf += 64;
len -= 64;
}
/* Handle any remaining bytes of data. */
- memcpy(in, buf, len);
+ memcpy (in, buf, len);
}
/*!
*Final wrapup - pad to 64-byte boundary with the bit pattern
*1 0* (64-bit count of bits processed, MSB-first)
*/
-void Md5::final(unsigned char digest[16])
+void Md5::final (unsigned char digest[16])
{
long count = bytes[0] & 0x3f; /* Number of bytes mod 64. */
unsigned char *p = (unsigned char *)in + count;
@@ -127,31 +127,31 @@ void Md5::final(unsigned char digest[16])
count = 56 - 1 - count;
if (count < 0) { /* Padding forces an extra block */
- memset(p, 0, count + 8);
- byteSwap(in, 16);
- transform( buf, in);
+ memset (p, 0, count + 8);
+ byteSwap (in, 16);
+ transform ( buf, in);
p = (unsigned char *)in;
count = 56;
}
- memset(p, 0, count);
- byteSwap(in, 14);
+ memset (p, 0, count);
+ byteSwap (in, 14);
/* Append length in bits and transform */
in[14] = bytes[0] << 3;
in[15] = bytes[1] << 3 | bytes[0] >> 29;
- transform(buf, in);
+ transform (buf, in);
- byteSwap(buf, 4);
+ byteSwap (buf, 4);
- memcpy(digest, buf, 16);
+ memcpy (digest, buf, 16);
- for(i = 0; i < 4; i++)
+ for (i = 0; i < 4; i++)
buf[i] = 0;
- for(i = 0; i < 2; i++)
+ for (i = 0; i < 2; i++)
bytes[i] = 0;
- for(i = 0; i < 16; i++)
+ for (i = 0; i < 16; i++)
in[i] = 0;
}
@@ -168,14 +168,14 @@ void Md5::final(unsigned char digest[16])
/* This is the central step in the MD5 algorithm. */
# define MD5STEP(f,w,x,y,z,in,s) \
- (w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
+ (w += f (x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
/*!
*The core of the MD5 algorithm, this alters an existing MD5 hash to
*reflect the addition of 16 longwords of new data. update blocks
*the data and converts bytes longo longwords for this routine.
*/
-void Md5::transform(unsigned int buf[4], unsigned int const in[16])
+void Md5::transform (unsigned int buf[4], unsigned int const in[16])
{
register unsigned int a, b, c, d;
@@ -184,73 +184,73 @@ void Md5::transform(unsigned int buf[4], unsigned int
const in[16])
c = buf[2];
d = buf[3];
- MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
- MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
- MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
- MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
- MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
- MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
- MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
- MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
- MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
- MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
- MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
- MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
- MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
- MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
- MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
- MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
- MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
- MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
- MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
- MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
- MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
- MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
- MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
- MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
- MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
- MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
- MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
- MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
- MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
- MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
- MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
- MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-
- MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
- MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
- MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
- MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
- MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
- MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
- MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
- MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
- MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
- MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
- MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
- MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
- MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
- MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
- MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
- MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-
- MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
- MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
- MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
- MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
- MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
- MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
- MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
- MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
- MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
- MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
- MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
- MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
- MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
- MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
- MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
- MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+ MD5STEP (F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+ MD5STEP (F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+ MD5STEP (F1, c, d, a, b, in[2] + 0x242070db, 17);
+ MD5STEP (F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+ MD5STEP (F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+ MD5STEP (F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+ MD5STEP (F1, c, d, a, b, in[6] + 0xa8304613, 17);
+ MD5STEP (F1, b, c, d, a, in[7] + 0xfd469501, 22);
+ MD5STEP (F1, a, b, c, d, in[8] + 0x698098d8, 7);
+ MD5STEP (F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+ MD5STEP (F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+ MD5STEP (F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+ MD5STEP (F1, a, b, c, d, in[12] + 0x6b901122, 7);
+ MD5STEP (F1, d, a, b, c, in[13] + 0xfd987193, 12);
+ MD5STEP (F1, c, d, a, b, in[14] + 0xa679438e, 17);
+ MD5STEP (F1, b, c, d, a, in[15] + 0x49b40821, 22);
+
+ MD5STEP (F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+ MD5STEP (F2, d, a, b, c, in[6] + 0xc040b340, 9);
+ MD5STEP (F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+ MD5STEP (F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+ MD5STEP (F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+ MD5STEP (F2, d, a, b, c, in[10] + 0x02441453, 9);
+ MD5STEP (F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+ MD5STEP (F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+ MD5STEP (F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+ MD5STEP (F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+ MD5STEP (F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+ MD5STEP (F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+ MD5STEP (F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+ MD5STEP (F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+ MD5STEP (F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+ MD5STEP (F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+
+ MD5STEP (F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+ MD5STEP (F3, d, a, b, c, in[8] + 0x8771f681, 11);
+ MD5STEP (F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+ MD5STEP (F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+ MD5STEP (F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+ MD5STEP (F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+ MD5STEP (F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+ MD5STEP (F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+ MD5STEP (F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+ MD5STEP (F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+ MD5STEP (F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+ MD5STEP (F3, b, c, d, a, in[6] + 0x04881d05, 23);
+ MD5STEP (F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+ MD5STEP (F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+ MD5STEP (F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+ MD5STEP (F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+
+ MD5STEP (F4, a, b, c, d, in[0] + 0xf4292244, 6);
+ MD5STEP (F4, d, a, b, c, in[7] + 0x432aff97, 10);
+ MD5STEP (F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+ MD5STEP (F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+ MD5STEP (F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+ MD5STEP (F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+ MD5STEP (F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+ MD5STEP (F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+ MD5STEP (F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+ MD5STEP (F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+ MD5STEP (F4, c, d, a, b, in[6] + 0xa3014314, 15);
+ MD5STEP (F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+ MD5STEP (F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+ MD5STEP (F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+ MD5STEP (F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+ MD5STEP (F4, b, c, d, a, in[9] + 0xeb86d391, 21);
buf[0] += a;
buf[1] += b;
@@ -263,7 +263,7 @@ void Md5::transform(unsigned int buf[4], unsigned int const
in[16])
*/
Md5::Md5()
{
- init();
+ init ();
}
/*!
@@ -275,7 +275,7 @@ Md5::~Md5()
/*!
*Write the final hash to the buffer.
*/
-char* Md5::end(char *buf)
+char* Md5::end (char *buf)
{
long i;
unsigned char digest[16];
@@ -283,7 +283,7 @@ char* Md5::end(char *buf)
if (!buf)
return 0;
- final(digest);
+ final (digest);
for ( i = 0; i < 16; i++)
{
buf[(i << 1)] = hex[digest[i] >> 4];
diff --git a/myserver/src/base/mem_buff/mem_buff.cpp
b/myserver/src/base/mem_buff/mem_buff.cpp
index e7a89f5..302bc4c 100644
--- a/myserver/src/base/mem_buff/mem_buff.cpp
+++ b/myserver/src/base/mem_buff/mem_buff.cpp
@@ -99,7 +99,7 @@ u_int MemBuf::crc32Table[256] =
};
/*! Default constructor */
-MemBuf::MemBuf()
+MemBuf::MemBuf ()
{
m_buffer = NULL;
m_nSize = 0;
@@ -114,19 +114,19 @@ Copy constructor
pAdr : pointer to the buffer to copy
size : size of pAdr
*/
-MemBuf::MemBuf(const void* pAdr, u_int size)
+MemBuf::MemBuf (const void* pAdr, u_int size)
{
m_buffer = NULL;
m_nSize = 0;
m_nRealSize = 0;
m_nSizeLimit = 0;
m_nBlockLength = 1024;
- setBuffer(pAdr, size);
+ setBuffer (pAdr, size);
m_bCanDelete = 1;
}
/*! Direct copy constructor (should only be used by the operators to avoid
reallocations) */
-MemBuf::MemBuf(const MemBuf& srcBuf)
+MemBuf::MemBuf (const MemBuf& srcBuf)
{
m_buffer = srcBuf.m_buffer;
m_nSize = srcBuf.m_nSize;
@@ -137,32 +137,32 @@ MemBuf::MemBuf(const MemBuf& srcBuf)
}
/*! Copy constructor */
-MemBuf::MemBuf(MemBuf &srcBuf, int)
+MemBuf::MemBuf (MemBuf &srcBuf, int)
{
m_buffer = NULL;
m_nSize = 0;
m_nRealSize = 0;
m_nBlockLength = 1024;
m_nSizeLimit = 0;
- setBuffer(srcBuf.m_buffer, srcBuf.m_nSize);
+ setBuffer (srcBuf.m_buffer, srcBuf.m_nSize);
m_bCanDelete = 1;
}
/*! find a specific character in the internal buffer from a specific location
*/
-u_int MemBuf::find(char c, u_int start)
+u_int MemBuf::find (char c, u_int start)
{
#ifdef ASSERT
- ASSERT(m_buffer != NULL);
+ ASSERT (m_buffer != NULL);
#endif
if (start >= m_nSize)
return (u_int) -1;
- void* pFound = memchr(m_buffer + start, c, m_nSize - start);
+ void* pFound = memchr (m_buffer + start, c, m_nSize - start);
return (pFound == NULL) ? (u_int) -1 : ((char*) pFound - m_buffer);
}
/*! find a specific buffer in the internal buffer from a specific location */
-u_int MemBuf::find(const void* pAdr, u_int size, u_int start)
+u_int MemBuf::find (const void* pAdr, u_int size, u_int start)
{
if (start >= m_nSize)
return (u_int)-1;
@@ -172,14 +172,14 @@ u_int MemBuf::find(const void* pAdr, u_int size, u_int
start)
const char* pPrev = m_buffer + start;
u_int size_buf = m_nSize - start;
const char* pEnd = m_buffer + m_nSize + 1;
- while ((pLast = (char*) memchr(pPrev, first, size_buf)) != NULL)
+ while ((pLast = (char*) memchr (pPrev, first, size_buf)) != NULL)
{
size_buf -= (u_int)(pLast - pPrev);
pPrev = pLast + 1;
if (pLast + size >= pEnd)
return (u_int)-1;
- if (memcmp(pLast, pAdr, size) == 0)
+ if (memcmp (pLast, pAdr, size) == 0)
return (u_int)(pLast - m_buffer);
}
@@ -188,7 +188,7 @@ u_int MemBuf::find(const void* pAdr, u_int size, u_int
start)
/*! replace a character by another */
-void MemBuf::replace(char what, char by)
+void MemBuf::replace (char what, char by)
{
const char* pEnd = m_buffer + m_nSize;
char *buf_c = m_buffer;
@@ -204,7 +204,7 @@ Add a buffer at the end of the internal buffer.
If the internal buffer isn't large enough, a reallocation is done until
m_nSizeLimit is reached
If m_nSizeLimit is equal to 0, reallocation are always done.
*/
-void MemBuf::addBuffer(const void* pAdr, u_int size)
+void MemBuf::addBuffer (const void* pAdr, u_int size)
{
if (size == 0)
return;
@@ -213,9 +213,9 @@ void MemBuf::addBuffer(const void* pAdr, u_int size)
if (nNewSize > m_nRealSize)
{
if (nNewSize - m_nRealSize < m_nBlockLength)
- setLength(m_nRealSize + m_nBlockLength);
+ setLength (m_nRealSize + m_nBlockLength);
else
- setLength(nNewSize);
+ setLength (nNewSize);
}
const u_int nAllowedSize = m_nRealSize - m_nSize;
if (nAllowedSize == 0)
@@ -223,12 +223,12 @@ void MemBuf::addBuffer(const void* pAdr, u_int size)
if (size > nAllowedSize)
{
size = nAllowedSize;
- memcpy(m_buffer + m_nSize, pAdr, size);
+ memcpy (m_buffer + m_nSize, pAdr, size);
m_nSize = m_nRealSize;
}
else
{
- memcpy(m_buffer + m_nSize, pAdr, size);
+ memcpy (m_buffer + m_nSize, pAdr, size);
m_nSize = nNewSize;
}
#else
@@ -239,36 +239,36 @@ void MemBuf::addBuffer(const void* pAdr, u_int size)
fs = m_nSizeLimit;
}
- char* temp = mem_alloc(fs);
- memcpy(temp, m_buffer, m_nSize);
- memcpy(temp + m_nRealSize, pAdr, size);
- mem_free(m_buffer);
+ char* temp = mem_alloc (fs);
+ memcpy (temp, m_buffer, m_nSize);
+ memcpy (temp + m_nRealSize, pAdr, size);
+ mem_free (m_buffer);
m_buffer = temp;
m_nRealSize = fs;
#endif
return;
}
-int MemBuf::setBuffer(const void* pAdr, u_int size)
+int MemBuf::setBuffer (const void* pAdr, u_int size)
{
#ifdef DONT_MATCH_LENGTH
if (size <= m_nRealSize)
{
- memcpy(m_buffer, pAdr, size);
+ memcpy (m_buffer, pAdr, size);
m_nSize = size;
}
else
{
if (m_nSizeLimit != 0 && size > m_nSizeLimit)
size = m_nSizeLimit;
- allocBuffer(size);
- memcpy(m_buffer, pAdr, size);
+ allocBuffer (size);
+ memcpy (m_buffer, pAdr, size);
m_nSize = m_nRealSize = size;
}
#else
- ASSERT(size != 0);
- allocBuffer(size);
- memcpy(m_buffer, pAdr, size);
+ ASSERT (size != 0);
+ allocBuffer (size);
+ memcpy (m_buffer, pAdr, size);
#endif
return 1;
}
@@ -280,11 +280,11 @@ This can be useful to use variables from the stack.
Ex.:
unsigned char stackBuffer[10];
MemBuf buffer;
-buffer.setExternalBuffer(stackBuffer, 10); // here, you'll use the memory from
stackBuffer
+buffer.setExternalBuffer (stackBuffer, 10); // here, you'll use the memory
from stackBuffer
*/
-void MemBuf::setExternalBuffer(const void* pAdr, u_int size)
+void MemBuf::setExternalBuffer (const void* pAdr, u_int size)
{
- free();
+ free ();
m_bCanDelete = false;
m_buffer = (char*) pAdr;
m_nRealSize = size;
@@ -292,9 +292,9 @@ void MemBuf::setExternalBuffer(const void* pAdr, u_int size)
}
/*! Return the internal buffer by setting previously a specific length */
-char* MemBuf::getBuffersetLength(u_int newSize)
+char* MemBuf::getBuffersetLength (u_int newSize)
{
- setLength(newSize);
+ setLength (newSize);
return (char*)m_buffer;
}
@@ -302,7 +302,7 @@ char* MemBuf::getBuffersetLength(u_int newSize)
Copy a part of the internal buffer in "result".
Here, "result" is completly removed and replaced by this part.
*/
-int MemBuf::getPart(u_int nStart, u_int nEnd, MemBuf& result)
+int MemBuf::getPart (u_int nStart, u_int nEnd, MemBuf& result)
{
if (nEnd > m_nSize)
nEnd = m_nSize;
@@ -312,12 +312,12 @@ int MemBuf::getPart(u_int nStart, u_int nEnd, MemBuf&
result)
#ifdef DONT_MATCH_LENGTH
result.m_nSize = 0;
#else
- result.free();
+ result.free ();
#endif
return 1;
}
- result.setBuffer(m_buffer + nStart, nEnd - nStart);
+ result.setBuffer (m_buffer + nStart, nEnd - nStart);
return 1;
}
@@ -325,7 +325,7 @@ int MemBuf::getPart(u_int nStart, u_int nEnd, MemBuf&
result)
Copy a part of the internal buffer in "result".
Here, "result" is completly removed and replaced by this part.
*/
-int MemBuf::getPartAsString(u_int nStart, u_int nEnd, MemBuf& result)
+int MemBuf::getPartAsString (u_int nStart, u_int nEnd, MemBuf& result)
{
if (nEnd > m_nRealSize)
nEnd = m_nRealSize;
@@ -336,14 +336,14 @@ int MemBuf::getPartAsString(u_int nStart, u_int nEnd,
MemBuf& result)
result.m_nSize = 0;
result[0] = '\0';
#else
- result.free();
+ result.free ();
#endif
return 1;
}
const u_int lg = nEnd - nStart;
- char* buf = (char*) result.getBuffersetLength(lg + 1);
- memcpy(buf, m_buffer + nStart, lg);
+ char* buf = (char*) result.getBuffersetLength (lg + 1);
+ memcpy (buf, m_buffer + nStart, lg);
buf[lg] = '\0';
return 1;
@@ -354,7 +354,7 @@ Set the length of the internal buffer.
If the length is smallest than the existing one, no reallocation is done.
if it's biggest, a reallocation is done until m_nSizeLimit is reached.
*/
-void MemBuf::setLength(u_int newSize)
+void MemBuf::setLength (u_int newSize)
{
#ifndef DONT_MATCH_LENGTH
if (newSize == 0)
@@ -369,11 +369,11 @@ void MemBuf::setLength(u_int newSize)
#ifdef DONT_MATCH_LENGTH
m_nSize = newSize;
#else
- ASSERT(m_buffer != NULL);
- char* temp = mem_alloc(newSize);
- memcpy(temp, m_buffer, newSize);
+ ASSERT (m_buffer != NULL);
+ char* temp = mem_alloc (newSize);
+ memcpy (temp, m_buffer, newSize);
if (m_bCanDelete)
- mem_free(m_buffer);
+ mem_free (m_buffer);
m_buffer = temp;
m_nRealSize = m_nSize = newSize;
#endif
@@ -391,14 +391,14 @@ void MemBuf::setLength(u_int newSize)
if (m_buffer == NULL || m_nRealSize == 0)
{
- allocBuffer(newSize);
+ allocBuffer (newSize);
return;
}
- char* temp = mem_alloc(newSize);
- memcpy(temp, m_buffer, m_nRealSize);
+ char* temp = mem_alloc (newSize);
+ memcpy (temp, m_buffer, m_nRealSize);
if (m_bCanDelete)
- mem_free(m_buffer);
+ mem_free (m_buffer);
m_buffer = temp;
m_nRealSize = newSize;
#ifndef DONT_MATCH_LENGTH
@@ -411,10 +411,10 @@ void MemBuf::setLength(u_int newSize)
// hex <-> Data conversion functions
/*! Write to the MemBuf the hex representation of pAdr */
-void MemBuf::hex(const void* pAdr, u_int nSize)
+void MemBuf::hex (const void* pAdr, u_int nSize)
{
const u_int nFinalSize = nSize * 2;
- setLength(nFinalSize + 1);
+ setLength (nFinalSize + 1);
const char* hex_chars = "0123456789abcdef";
for (u_int i = 0; i < nSize; i++)
{
@@ -426,7 +426,7 @@ void MemBuf::hex(const void* pAdr, u_int nSize)
}
/*! Return the decimal number of an hexadecimal character */
-unsigned char MemBuf::hexCharToNumber(unsigned char c)
+unsigned char MemBuf::hexCharToNumber (unsigned char c)
{
if (c >= '0' && c <= '9')
return c - '0';
@@ -438,17 +438,17 @@ unsigned char MemBuf::hexCharToNumber(unsigned char c)
}
/*! Return a MemBuf with the decoded hexadicmal string pointed at pAdr */
-MemBuf MemBuf::hexToData(const void* pAdr, u_int nSize)
+MemBuf MemBuf::hexToData (const void* pAdr, u_int nSize)
{
if ((nSize & 1) == 1) // nSize impair
- return MemBuf("", 1);
+ return MemBuf ("", 1);
MemBuf memFinal;
memFinal.m_bCanDelete = false;
- memFinal.setLength(nSize >> 1);
+ memFinal.setLength (nSize >> 1);
const char* pTmp = (const char*) pAdr;
const char* pEnd = pTmp + nSize;
for ( ; pTmp < pEnd; pTmp += 2)
- memFinal << (unsigned char) ((hexCharToNumber(*pTmp) << 4) +
hexCharToNumber(*(pTmp + 1)));
+ memFinal << (unsigned char) ((hexCharToNumber (*pTmp) << 4) +
hexCharToNumber (*(pTmp + 1)));
return memFinal;
}
@@ -456,19 +456,19 @@ MemBuf MemBuf::hexToData(const void* pAdr, u_int nSize)
void MemBuf::hashMD5(const void* pAdr, u_int nSize)
{
Md5 md5;
- setLength(16);
+ setLength (16);
- md5.init();
- md5.update((unsigned char*) pAdr, nSize);
- md5.final((unsigned char*) getBuffer());
+ md5.init ();
+ md5.update ((unsigned char*) pAdr, nSize);
+ md5.final ((unsigned char*) getBuffer ());
m_nSize = 16;
}
/*! CRC hashing function */
-void MemBuf::hashCRC(const void* pAdr, u_int nSize)
+void MemBuf::hashCRC (const void* pAdr, u_int nSize)
{
- setLength(4);
- u_int* nCrc32 = (u_int*) getBuffer();
+ setLength (4);
+ u_int* nCrc32 = (u_int*) getBuffer ();
*nCrc32 = 0xFFFFFFFF;
for (u_int i = 0; i < nSize; i++)
{
@@ -482,18 +482,18 @@ void MemBuf::hashCRC(const void* pAdr, u_int nSize)
// Int <-> Str conversion functions
/*! Return a MemBuf with the string representation of "i" */
-void MemBuf::xIntToStr(u_int i, int bNegative)
+void MemBuf::xIntToStr (u_int i, int bNegative)
{
if (i == 0) // log10(0) won't work !!
{
- setBuffer("0", 2);
+ setBuffer ("0", 2);
m_nSize = 1;
return;
}
#ifdef DONT_MATCH_LENGTH
- setLength(12);
+ setLength (12);
#else
- setLength((u_int) log10(i) + 3);
+ setLength ((u_int) log10(i) + 3);
#endif
do
{
@@ -523,13 +523,13 @@ void MemBuf::xIntToStr(u_int i, int bNegative)
}
/*! Return a MemBuf with the string representation of "i" using an external
buffer. */
-void MemBuf::xIntToStr(u_int i, int bNegative, char* pBufToUse, u_int nBufSize)
+void MemBuf::xIntToStr (u_int i, int bNegative, char* pBufToUse, u_int
nBufSize)
{
m_nSizeLimit = nBufSize;
- setExternalBuffer(pBufToUse, nBufSize);
+ setExternalBuffer (pBufToUse, nBufSize);
if (i == 0) // log10(0) won't work !!
{
- setBuffer("0", 2);
+ setBuffer ("0", 2);
m_nSize = 1;
return;
}
@@ -562,9 +562,9 @@ void MemBuf::xIntToStr(u_int i, int bNegative, char*
pBufToUse, u_int nBufSize)
}
/* Convert a string into an unsigned number */
-u_int MemBuf::strToUint(const char* pAdr)
+u_int MemBuf::strToUint (const char* pAdr)
{
- int nSize = (int)strlen(pAdr);
+ int nSize = (int)strlen (pAdr);
if (nSize > 10) // a (signed/unsigned) 32-bit number as a maximun of 10 digit
nSize = 10;
u_int nRes = 0;
@@ -578,31 +578,31 @@ u_int MemBuf::strToUint(const char* pAdr)
}
/* Convert a string into a signed number */
-int MemBuf::strToInt(const char* pAdr)
+int MemBuf::strToInt (const char* pAdr)
{
if (*pAdr == '-')
- return (int) (-(int) (strToUint(++pAdr)));
- return (int) strToUint(pAdr);
+ return (int) (-(int) (strToUint (++pAdr)));
+ return (int) strToUint (pAdr);
}
/*! Destructor */
-MemBuf::~MemBuf()
+MemBuf::~MemBuf ()
{
- if(m_buffer != NULL && m_bCanDelete)
- mem_free(m_buffer);
+ if (m_buffer != NULL && m_bCanDelete)
+ mem_free (m_buffer);
}
-void MemBuf::addBuffer(MemBuf *nmb)
+void MemBuf::addBuffer (MemBuf *nmb)
{
- addBuffer(nmb->m_buffer, nmb->m_nSize);
+ addBuffer (nmb->m_buffer, nmb->m_nSize);
}
/*! free used memory */
-int MemBuf::free()
+int MemBuf::free ()
{
- if(m_buffer != NULL && m_bCanDelete)
+ if (m_buffer != NULL && m_bCanDelete)
{
- mem_free(m_buffer);
+ mem_free (m_buffer);
m_buffer = NULL;
m_nSize = m_nRealSize = 0;
return 0;
@@ -612,39 +612,39 @@ int MemBuf::free()
/*!
*Get the real allocated size.
*/
-u_int MemBuf::getRealLength()
+u_int MemBuf::getRealLength ()
{
return m_nRealSize;
}
-u_int MemBuf::find(MemBuf *smb, u_int start)
+u_int MemBuf::find (MemBuf *smb, u_int start)
{
- return find(smb->m_buffer, smb->m_nSize, start);
+ return find (smb->m_buffer, smb->m_nSize, start);
}
-char& MemBuf::getAt(u_int nIndex)
+char& MemBuf::getAt (u_int nIndex)
{
#ifdef ASSERT
- ASSERT(m_buffer != NULL);
- ASSERT(nIndex <= m_nSize);
+ ASSERT (m_buffer != NULL);
+ ASSERT (nIndex <= m_nSize);
#endif
return *(m_buffer + nIndex);
}
char& MemBuf::operator[](u_int nIndex)
{
- return getAt(nIndex);
+ return getAt (nIndex);
}
-u_int MemBuf::getLength()
+u_int MemBuf::getLength ()
{
return m_nSize;
}
-int MemBuf::isValid()
+int MemBuf::isValid ()
{
return ((m_nSize != 0) || (m_buffer != NULL))?1:0;
}
-char* MemBuf::getBuffer()
+char* MemBuf::getBuffer ()
{
return ( char*) m_buffer;
}
@@ -655,132 +655,132 @@ MemBuf::operator const void*()
}
MemBuf MemBuf::operator+ (MemBuf& src)
{
- MemBuf temp(*this);
- temp.addBuffer(&src);
+ MemBuf temp (*this);
+ temp.addBuffer (&src);
return temp;
}
MemBuf MemBuf::operator+ (const char* src)
{
- MemBuf temp(*this);
- temp.addBuffer((const void*) src, (u_int)strlen(src));
+ MemBuf temp (*this);
+ temp.addBuffer ((const void*) src, (u_int)strlen (src));
return temp;
}
const MemBuf& MemBuf::operator+= (MemBuf& add)
{
- addBuffer(&add);
+ addBuffer (&add);
return *this;
}
const MemBuf& MemBuf::operator+= (const char* pStr)
{
- addBuffer(pStr, (u_int)strlen(pStr));
+ addBuffer (pStr, (u_int)strlen (pStr));
return *this;
}
const MemBuf& MemBuf::operator+= (char c)
{
- addBuffer(&c, 1);
+ addBuffer (&c, 1);
return *this;
}
MemBuf& MemBuf::operator<< (const char* pSrc)
{
- addBuffer(pSrc, (u_int)strlen(pSrc));
+ addBuffer (pSrc, (u_int)strlen (pSrc));
return *this;
}
MemBuf& MemBuf::operator<< (int i)
{
- addBuffer(&i, 4);
+ addBuffer (&i, 4);
return *this;
}
MemBuf& MemBuf::operator<< (unsigned int i)
{
- addBuffer(&i, 4);
+ addBuffer (&i, 4);
return *this;
}
MemBuf& MemBuf::operator<< (long i)
{
- addBuffer(&i, 4);
+ addBuffer (&i, 4);
return *this;
}
MemBuf& MemBuf::operator<< (unsigned long i)
{
- addBuffer(&i, 4);
+ addBuffer (&i, 4);
return *this;
}
MemBuf& MemBuf::operator<< (char c)
{
- addBuffer(&c, 1);
+ addBuffer (&c, 1);
return *this;
}
MemBuf& MemBuf::operator<< (unsigned char c)
{
- addBuffer(&c, 1);
+ addBuffer (&c, 1);
return *this;
}
MemBuf& MemBuf::operator<< (const MemBuf &src)
{
- addBuffer(src.m_buffer, src.m_nSize);
+ addBuffer (src.m_buffer, src.m_nSize);
return *this;
}
MemBuf& MemBuf::operator<< (const string &src)
{
- addBuffer((const void*) src.c_str(), src.length());
+ addBuffer ((const void*) src.c_str (), src.length ());
return *this;
}
MemBuf& MemBuf::operator=(const MemBuf& src)
{
- setBuffer(src.m_buffer, src.m_nRealSize);
+ setBuffer (src.m_buffer, src.m_nRealSize);
return *this;
}
MemBuf& MemBuf::operator=(const char* src)
{
- setBuffer((const void*) src, (u_int)strlen(src) + 1);
+ setBuffer ((const void*) src, (u_int)strlen (src) + 1);
return* this;
}
-void MemBuf::uintToStr(u_int i)
+void MemBuf::uintToStr (u_int i)
{
- xIntToStr(i, 0);
+ xIntToStr (i, 0);
}
-void MemBuf::uintToStr(u_int i, char* pBufToUse, u_int nBufSize)
+void MemBuf::uintToStr (u_int i, char* pBufToUse, u_int nBufSize)
{
- xIntToStr(i, 0, pBufToUse, nBufSize);
+ xIntToStr (i, 0, pBufToUse, nBufSize);
}
-void MemBuf::intToStr(int i)
+void MemBuf::intToStr (int i)
{
if (i < 0)
- xIntToStr( (u_int)(-i), 1);
+ xIntToStr ( (u_int)(-i), 1);
else
- xIntToStr( (u_int) i, 0);
+ xIntToStr ( (u_int) i, 0);
}
-void MemBuf::intToStr(int i, char* pBufToUse, u_int nBufSize)
+void MemBuf::intToStr (int i, char* pBufToUse, u_int nBufSize)
{
if (i < 0)
- xIntToStr((u_int)(-i), 1, pBufToUse, nBufSize);
+ xIntToStr ((u_int)(-i), 1, pBufToUse, nBufSize);
else
- xIntToStr((u_int) i, 0, pBufToUse, nBufSize);
+ xIntToStr ((u_int) i, 0, pBufToUse, nBufSize);
}
-void MemBuf::hex(MemBuf& membuf)
+void MemBuf::hex (MemBuf& membuf)
{
- hex(membuf.m_buffer, membuf.m_nSize);
+ hex (membuf.m_buffer, membuf.m_nSize);
}
void MemBuf::hashMD5(MemBuf& membuf)
{
hashMD5(membuf.m_buffer, membuf.m_nSize);
}
-void MemBuf::hashCRC(MemBuf& membuf)
+void MemBuf::hashCRC (MemBuf& membuf)
{
- hashCRC(membuf.m_buffer, membuf.m_nSize);
+ hashCRC (membuf.m_buffer, membuf.m_nSize);
}
-void MemBuf::allocBuffer(u_int size)
+void MemBuf::allocBuffer (u_int size)
{
- if(size > m_nRealSize || m_buffer == NULL)
+ if (size > m_nRealSize || m_buffer == NULL)
{
- free();
- m_buffer = mem_alloc(size);
+ free ();
+ m_buffer = mem_alloc (size);
m_nRealSize = size;
}
}
diff --git a/myserver/src/base/multicast/multicast.cpp
b/myserver/src/base/multicast/multicast.cpp
index 6f93dae..d3b8c56 100644
--- a/myserver/src/base/multicast/multicast.cpp
+++ b/myserver/src/base/multicast/multicast.cpp
@@ -22,15 +22,15 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
*Register the handler for the specified message type.
*/
template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
-void MulticastRegistry<MSG_TYPE, ARG_TYPE, RET_TYPE>::addMulticast(MSG_TYPE
msg, Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>* handler)
+void MulticastRegistry<MSG_TYPE, ARG_TYPE, RET_TYPE>::addMulticast (MSG_TYPE
msg, Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>* handler)
{
- vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*> *msgHandlers =
handlers.get(msg);
- if(!msgHandlers)
+ vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*> *msgHandlers = handlers.get
(msg);
+ if (!msgHandlers)
{
msgHandlers = new vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*>();
- handlers.put(msg, msgHandlers);
+ handlers.put (msg, msgHandlers);
}
- msgHandlers->push_back(handler);
+ msgHandlers->push_back (handler);
}
@@ -38,19 +38,19 @@ void MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>::addMulticast(MSG_TYPE msg,
*Remove the handler from the vector for a message type.
*/
template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
-void MulticastRegistry<MSG_TYPE, ARG_TYPE, RET_TYPE>::removeMulticast(MSG_TYPE
msg, Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>* handler)
+void MulticastRegistry<MSG_TYPE, ARG_TYPE, RET_TYPE>::removeMulticast
(MSG_TYPE msg, Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>* handler)
{
- vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*> *msgHandlers =
handlers.get(msg);
+ vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*> *msgHandlers = handlers.get
(msg);
typename vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE> * >::iterator it;
- if(!msgHandlers)
+ if (!msgHandlers)
{
return;
}
- for(it = msgHandlers->begin(); it != msgHandlers->end(); it++)
- if(*it == handler)
+ for (it = msgHandlers->begin (); it != msgHandlers->end (); it++)
+ if (*it == handler)
{
- msgHandlers->erase(it);
+ msgHandlers->erase (it);
break;
}
}
@@ -59,10 +59,10 @@ void MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>::removeMulticast(MSG_TYPE m
*Remove all the handlers for a specified message.
*/
template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
-void MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>::removeMulticasts(MSG_TYPE msg)
+void MulticastRegistry<MSG_TYPE, ARG_TYPE, RET_TYPE>::removeMulticasts
(MSG_TYPE msg)
{
- vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*> *msgHandlers =
handlers.remove(msg);
- if(msgHandlers)
+ vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*> *msgHandlers =
handlers.remove (msg);
+ if (msgHandlers)
{
delete msgHandlers;
}
@@ -72,17 +72,17 @@ void MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>::removeMulticasts(MSG_TYPE
*Notify the message to all the registered handlers passing an argument.
*/
template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
-void MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>::notifyMulticast(MSG_TYPE& msg, ARG_TYPE arg)
+void MulticastRegistry<MSG_TYPE, ARG_TYPE, RET_TYPE>::notifyMulticast
(MSG_TYPE& msg, ARG_TYPE arg)
{
- vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*> *msgHandlers =
handlers.get(msg);
+ vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*> *msgHandlers = handlers.get
(msg);
- if(!msgHandlers)
+ if (!msgHandlers)
return;
- for(size_t i = 0; i < msgHandlers->size(); i++)
+ for (size_t i = 0; i < msgHandlers->size (); i++)
{
Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>* multicast = (*msgHandlers)[i];
- multicast->updateMulticast(this, msg, arg);
+ multicast->updateMulticast (this, msg, arg);
}
}
@@ -91,30 +91,30 @@ void MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>::notifyMulticast(MSG_TYPE&
*Get the vector of handlers for a specified message.
*/
template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
-vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*>* MulticastRegistry<MSG_TYPE,
ARG_TYPE, RET_TYPE>::getHandlers(MSG_TYPE& msg)
+vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*>* MulticastRegistry<MSG_TYPE,
ARG_TYPE, RET_TYPE>::getHandlers (MSG_TYPE& msg)
{
- return handlers.get(msg);
+ return handlers.get (msg);
}
/*!
*Clear the registry.
*/
template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
-void MulticastRegistry<MSG_TYPE, ARG_TYPE, RET_TYPE>::clearMulticastRegistry()
+void MulticastRegistry<MSG_TYPE, ARG_TYPE, RET_TYPE>::clearMulticastRegistry ()
{
/* Dirty code, but compile and works. */
HashMap<void*, void*>* ptrHandlers = (HashMap<void*, void*>*) &handlers;
- HashMap<void*, void*>::Iterator it = ptrHandlers->begin();
- HashMap<void*, void*>::Iterator end = ptrHandlers->end();
+ HashMap<void*, void*>::Iterator it = ptrHandlers->begin ();
+ HashMap<void*, void*>::Iterator end = ptrHandlers->end ();
vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*>* v;
- while(it != end)
+ while (it != end)
{
v = (vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*>*) *it;
delete v;
it++;
}
- handlers.clear();
+ handlers.clear ();
}
diff --git a/myserver/src/base/pipe/pipe.cpp b/myserver/src/base/pipe/pipe.cpp
index 05522c3..8e17a81 100644
--- a/myserver/src/base/pipe/pipe.cpp
+++ b/myserver/src/base/pipe/pipe.cpp
@@ -54,13 +54,13 @@ int Pipe::read (char* buffer, u_long len, u_long *nbr)
{
*nbr = 0;
#ifndef WIN32
- int ret = ::read(handles[0], buffer, len);
- if(ret == -1)
+ int ret = ::read (handles[0], buffer, len);
+ if (ret == -1)
{
terminated = true;
return 1;
}
- else if(!ret)
+ else if (!ret)
{
terminated = true;
return 0;
@@ -71,10 +71,10 @@ int Pipe::read (char* buffer, u_long len, u_long *nbr)
}
return 0;
#else
- if( !ReadFile(readHandle, buffer, len, nbr, NULL) || !nbr)
+ if ( !ReadFile (readHandle, buffer, len, nbr, NULL) || !nbr)
{
*nbr = 0;
- if(GetLastError() != ERROR_BROKEN_PIPE)
+ if (GetLastError () != ERROR_BROKEN_PIPE)
return 1;
else
{
@@ -107,7 +107,7 @@ int Pipe::create (bool readPipe)
#else
HANDLE tmp;
SECURITY_ATTRIBUTES sa;
- sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+ sa.nLength = sizeof (SECURITY_ATTRIBUTES);
sa.bInheritHandle = TRUE;
sa.lpSecurityDescriptor = NULL;
if (!CreatePipe (&readHandle, &writeHandle, &sa, 0))
@@ -249,8 +249,8 @@ void Pipe::closeRead ()
::close (handles[0]);
handles[0] = 0;
#else
- if(readHandle)
- CloseHandle(readHandle);
+ if (readHandle)
+ CloseHandle (readHandle);
readHandle = 0;
#endif
}
diff --git a/myserver/src/base/process/fork_server.cpp
b/myserver/src/base/process/fork_server.cpp
index 9c88288..fd2a388 100644
--- a/myserver/src/base/process/fork_server.cpp
+++ b/myserver/src/base/process/fork_server.cpp
@@ -259,7 +259,7 @@ int ForkServer::forkServerLoop (UnixSocket *serverSocket)
}
/* Don't let the fork server come back from this function
in _any_ case. */
- catch(...)
+ catch (...)
{
serverSocket->close ();
socket.close ();
@@ -363,7 +363,7 @@ void ForkServer::killServer ()
int ForkServer::startForkServer ()
{
#ifndef WIN32
- FilesUtility::temporaryFileName(0, socketPath);
+ FilesUtility::temporaryFileName (0, socketPath);
socket.socket ();
socket.bind (socketPath.c_str ());
@@ -398,11 +398,11 @@ int ForkServer::startForkServer ()
int ForkServer::generateListenerSocket (Socket &socket, u_short *port)
{
int optvalReuseAddr = 1;
- int len = sizeof(sockaddr_in);
+ int len = sizeof (sockaddr_in);
socket.socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (socket.getHandle() == (Handle)INVALID_SOCKET)
+ if (socket.getHandle () == (Handle)INVALID_SOCKET)
return -1;
MYSERVER_SOCKADDR_STORAGE sockaddr = { 0 };
@@ -418,7 +418,7 @@ int ForkServer::generateListenerSocket (Socket &socket,
u_short *port)
*port = ntohs (((sockaddr_in*)(&sockaddr))->sin_port);
- if(socket.setsockopt (SOL_SOCKET, SO_REUSEADDR, (const char
*)&optvalReuseAddr,
+ if (socket.setsockopt (SOL_SOCKET, SO_REUSEADDR, (const char
*)&optvalReuseAddr,
sizeof (optvalReuseAddr)) < 0)
return -1;
diff --git a/myserver/src/base/process/process.cpp
b/myserver/src/base/process/process.cpp
index 4291c88..c798794 100644
--- a/myserver/src/base/process/process.cpp
+++ b/myserver/src/base/process/process.cpp
@@ -96,7 +96,7 @@ int Process::generateArgList (const char **args, size_t size,
const char *proc,
start = i++;
while (additionalArgs[++i] != '"' && i < len);
if (i == len)
- exit(1);
+ exit (1);
if (count < size)
{
@@ -116,7 +116,7 @@ int Process::generateArgList (const char **args, size_t
size, const char *proc,
args[count++] = &(additionalArgs[start]);
additionalArgs[i] = '\0';
- while((arg[i] == ' ') && (i < len))
+ while ((arg[i] == ' ') && (i < len))
i++;
start = i + 1;
@@ -163,7 +163,7 @@ int Process::generateEnvString (const char **envp, size_t
size, char *envString)
if (envString != NULL)
{
- while(*(envString + i) != '\0')
+ while (*(envString + i) != '\0')
{
envp[index] = envString + i;
index++;
@@ -196,8 +196,8 @@ int Process::exec (StartProcInfo* spi, bool waitEnd)
STARTUPINFO si;
PROCESS_INFORMATION pi;
const char *cwd;
- ZeroMemory( &si, sizeof(si));
- si.cb = sizeof(si);
+ ZeroMemory ( &si, sizeof (si));
+ si.cb = sizeof (si);
si.hStdInput = (HANDLE)spi->stdIn;
si.hStdOutput = (HANDLE)spi->stdOut;
si.hStdError = (HANDLE)spi->stdError;
@@ -206,10 +206,10 @@ int Process::exec (StartProcInfo* spi, bool waitEnd)
si.dwFlags |= STARTF_USESTDHANDLES;
si.wShowWindow = SW_HIDE;
- cwd = spi->cwd.length() ? (char*)spi->cwd.c_str() : 0;
- ZeroMemory( &pi, sizeof(pi) );
+ cwd = spi->cwd.length () ? (char*)spi->cwd.c_str () : 0;
+ ZeroMemory ( &pi, sizeof (pi) );
- BOOL ret = CreateProcess(NULL, (char*)spi->cmdLine.c_str(), NULL, NULL,
TRUE,0,
+ BOOL ret = CreateProcess (NULL, (char*)spi->cmdLine.c_str (), NULL, NULL,
TRUE,0,
spi->envString, cwd, &si, &pi);
if (!ret)
@@ -262,7 +262,7 @@ int Process::exec (StartProcInfo* spi, bool waitEnd)
exit (1);
if (spi->cwd.length ()
- && chdir (spi->cwd.c_str()) == -1)
+ && chdir (spi->cwd.c_str ()) == -1)
exit (1);
if ((long)spi->stdOut == -1)
@@ -271,7 +271,7 @@ int Process::exec (StartProcInfo* spi, bool waitEnd)
if ((long)spi->stdError == -1)
spi->stdError = (FileHandle)open ("/dev/null", O_WRONLY);
- close(0);
+ close (0);
if (spi->stdIn != -1)
{
diff --git a/myserver/src/base/process/process_server_manager.cpp
b/myserver/src/base/process/process_server_manager.cpp
index cad6f48..74e8c19 100644
--- a/myserver/src/base/process/process_server_manager.cpp
+++ b/myserver/src/base/process/process_server_manager.cpp
@@ -24,9 +24,9 @@ using namespace std;
/*!
*Default constructor.
*/
-ProcessServerManager::ProcessServerManager()
+ProcessServerManager::ProcessServerManager ()
{
- mutex.init();
+ mutex.init ();
nServers = 0;
maxServers = 25;
}
@@ -34,9 +34,9 @@ ProcessServerManager::ProcessServerManager()
/*!
*Default destructor.
*/
-ProcessServerManager::~ProcessServerManager()
+ProcessServerManager::~ProcessServerManager ()
{
- mutex.destroy();
+ mutex.destroy ();
}
/*!
@@ -46,7 +46,7 @@ void ProcessServerManager::load ()
{
string key ("server.process_servers");
- NodeTree<string> *node = ::Server::getInstance()->getNodeTree (key);
+ NodeTree<string> *node = ::Server::getInstance ()->getNodeTree (key);
if (node == NULL)
return;
@@ -62,7 +62,7 @@ void ProcessServerManager::load ()
list<NodeTree<string>*> *children = node->getChildren ();
- for(list<NodeTree<string>*>::iterator it = children->begin ();
+ for (list<NodeTree<string>*>::iterator it = children->begin ();
it != children->end ();
it++)
{
@@ -102,7 +102,7 @@ void ProcessServerManager::load ()
if (n->getAttr (chrootKey))
chroot = n->getAttr (chrootKey)->c_str ();
- if (!local.compare("YES") || !local.compare("yes"))
+ if (!local.compare ("YES") || !local.compare ("yes"))
localBool = true;
else
localBool = false;
@@ -111,15 +111,15 @@ void ProcessServerManager::load ()
{
u_short portN = 0;
- if(port.size ())
- portN = atoi (port.c_str());
+ if (port.size ())
+ portN = atoi (port.c_str ());
if (localBool)
- runAndAddServer (domain.c_str(), name.c_str(), chroot, uid, gid,
portN);
+ runAndAddServer (domain.c_str (), name.c_str (), chroot, uid, gid,
portN);
else
{
if (portN)
- addRemoteServer (domain.c_str(), name.c_str(), host.c_str(),
portN);
+ addRemoteServer (domain.c_str (), name.c_str (), host.c_str
(), portN);
else
::Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
_("Error: incomplete remote PROCESS_SERVER block, %s:%s needs a
port"),
@@ -138,12 +138,12 @@ void ProcessServerManager::load ()
*\param name The domain name.
*/
ProcessServerManager::ServerDomain*
-ProcessServerManager::getDomain(const char* name)
+ProcessServerManager::getDomain (const char* name)
{
ServerDomain* ret;
- mutex.lock();
- ret = domains.get(name);
- mutex.unlock();
+ mutex.lock ();
+ ret = domains.get (name);
+ mutex.unlock ();
return ret;
}
@@ -156,17 +156,17 @@ ProcessServerManager::createDomain (const char* name)
{
ServerDomain* ret;
- mutex.lock();
+ mutex.lock ();
- ret = domains.get(name);
- if(!ret)
+ ret = domains.get (name);
+ if (!ret)
{
- string str(name);
- ret = new ServerDomain();
- domains.put(str, ret);
+ string str (name);
+ ret = new ServerDomain ();
+ domains.put (str, ret);
}
- mutex.unlock();
+ mutex.unlock ();
return ret;
}
@@ -174,18 +174,18 @@ ProcessServerManager::createDomain (const char* name)
/*!
*Clear the used memory.
*/
-void ProcessServerManager::clear()
+void ProcessServerManager::clear ()
{
HashMap<string, ServerDomain*>::Iterator it;
- mutex.lock();
+ mutex.lock ();
- it = domains.begin();
+ it = domains.begin ();
- for (;it != domains.end(); it++)
+ for (;it != domains.end (); it++)
{
ServerDomain *sd = *it;
- HashMap<string, vector<Server*>*>::Iterator server = sd->servers.begin();
+ HashMap<string, vector<Server*>*>::Iterator server = sd->servers.begin
();
for (; server != sd->servers.end (); server++)
{
@@ -195,21 +195,21 @@ void ProcessServerManager::clear()
{
Server *s = *it;
- if(s->isLocal)
+ if (s->isLocal)
nServers--;
if (sd->clear)
- sd->clear(s);
+ sd->clear (s);
- s->terminate();
+ s->terminate ();
delete s;
}
delete (*server);
}
delete (*it);
}
- domains.clear();
- mutex.unlock();
+ domains.clear ();
+ mutex.unlock ();
}
/*!
@@ -219,22 +219,22 @@ void ProcessServerManager::clear()
*\param seed Random seed to use for choosing a server.
*/
ProcessServerManager::Server*
-ProcessServerManager::getServer(const char* domain, const char* name, int seed)
+ProcessServerManager::getServer (const char* domain, const char* name, int
seed)
{
ServerDomain* sd;
Server* s = NULL;
- mutex.lock();
- sd = domains.get(domain);
+ mutex.lock ();
+ sd = domains.get (domain);
- if(sd)
+ if (sd)
{
vector<Server*> *slist = sd->servers.get (name);
if (slist)
s = slist->at (seed % slist->size ());
}
- if(s && s->isLocal && !s->process.isProcessAlive())
+ if (s && s->isLocal && !s->process.isProcessAlive ())
{
s->socket.close ();
s->process.terminateProcess ();
@@ -243,7 +243,7 @@ ProcessServerManager::getServer(const char* domain, const
char* name, int seed)
s->port = 0;
- if (runServer (s, s->path.c_str(), s->port))
+ if (runServer (s, s->path.c_str (), s->port))
{
sd->servers.remove (name);
delete s;
@@ -261,14 +261,14 @@ ProcessServerManager::getServer(const char* domain, const
char* name, int seed)
*\param domain The server's domain.
*\param name The server's name.
*/
-void ProcessServerManager::addServer(ProcessServerManager::Server* server,
+void ProcessServerManager::addServer (ProcessServerManager::Server* server,
const char* domain, const char* name)
{
ServerDomain *sd = createDomain (domain);
Server *old;
string strName (name);
- mutex.lock();
+ mutex.lock ();
vector<Server*>* slist = sd->servers.get (strName);
if (slist == NULL)
@@ -279,7 +279,7 @@ void
ProcessServerManager::addServer(ProcessServerManager::Server* server,
slist->push_back (server);
- mutex.unlock();
+ mutex.unlock ();
}
/*!
@@ -312,7 +312,7 @@ void ProcessServerManager::removeDomain (const char* domain)
ServerDomain *sd;
HashMap<string, Server*>::Iterator server;
- mutex.lock();
+ mutex.lock ();
sd = getDomain (domain);
@@ -328,11 +328,11 @@ void ProcessServerManager::removeDomain (const char*
domain)
{
Server *s = *it;
- if(s->isLocal)
+ if (s->isLocal)
nServers--;
if (sd->clear)
- sd->clear(s);
+ sd->clear (s);
s->terminate ();
delete s;
@@ -342,7 +342,7 @@ void ProcessServerManager::removeDomain (const char* domain)
delete sd;
}
- mutex.unlock();
+ mutex.unlock ();
}
/*!
@@ -376,7 +376,7 @@ ProcessServerManager::runAndAddServer (const char *domain,
const char *path,
delete server;
return 0;
}
- addServer(server, domain, path);
+ addServer (server, domain, path);
return server;
}
@@ -397,7 +397,7 @@ int ProcessServerManager::runServer
(ProcessServerManager::Server* server,
MYSERVER_SOCKADDRIN serverSockAddrIn;
int addrLen = sizeof (serverSockAddrIn);
- server->host.assign("localhost");
+ server->host.assign ("localhost");
server->isLocal = true;
if (nServers >= maxServers)
@@ -430,11 +430,11 @@ int ProcessServerManager::runServer
(ProcessServerManager::Server* server,
if (i < len)
{
- string tmpString(path);
+ string tmpString (path);
int begin = tmpString[0] == '"' ? 1 : 0;
int end = tmpString[i] == '"' ? i + 1 : i ;
tmpCgiPath.assign (tmpString.substr (begin, end));
- moreArg.assign (tmpString.substr(i, len));
+ moreArg.assign (tmpString.substr (i, len));
}
else
{
@@ -447,10 +447,10 @@ int ProcessServerManager::runServer
(ProcessServerManager::Server* server,
spi.envString = 0;
spi.stdOut = spi.stdError = (FileHandle) -1;
- spi.cmd.assign(tmpCgiPath);
- spi.arg.assign(moreArg);
- spi.cmdLine.assign(path);
- server->path.assign(path);
+ spi.cmd.assign (tmpCgiPath);
+ spi.arg.assign (moreArg);
+ spi.cmdLine.assign (path);
+ server->path.assign (path);
if (chroot)
spi.chroot.assign (chroot);
@@ -477,25 +477,25 @@ int ProcessServerManager::runServer
(ProcessServerManager::Server* server,
server->socket.socket (AF_INET, SOCK_STREAM, 0);
- if(server->socket.getHandle () == (Handle)INVALID_SOCKET)
+ if (server->socket.getHandle () == (Handle)INVALID_SOCKET)
return 1;
((sockaddr_in *)(&serverSockAddrIn))->sin_family = AF_INET;
((sockaddr_in *)(&serverSockAddrIn))->sin_addr.s_addr =
- htonl(INADDR_LOOPBACK);
+ htonl (INADDR_LOOPBACK);
((sockaddr_in *)(&serverSockAddrIn))->sin_port =
- htons(server->port);
+ htons (server->port);
if ( server->socket.bind (&serverSockAddrIn,
- sizeof(sockaddr_in)) ||
- server->socket.listen(SOMAXCONN) )
+ sizeof (sockaddr_in)) ||
+ server->socket.listen (SOMAXCONN) )
{
server->socket.close ();
return 1;
}
- server->DESCRIPTOR.fileHandle = (unsigned long) server->socket.getHandle();
+ server->DESCRIPTOR.fileHandle = (unsigned long) server->socket.getHandle ();
spi.stdIn = (FileHandle)server->DESCRIPTOR.fileHandle;
if (server->socket.getsockname (&serverSockAddrIn, &addrLen))
@@ -504,7 +504,7 @@ int ProcessServerManager::runServer
(ProcessServerManager::Server* server,
server->port = ntohs (((sockaddr_in *)&serverSockAddrIn)->sin_port);
server->process.exec (&spi);
- server->socket.close();
+ server->socket.close ();
return 0;
}
@@ -514,25 +514,25 @@ int ProcessServerManager::runServer
(ProcessServerManager::Server* server,
*\param sock The socket to connect.
*\param server The server to connect to.
*/
-int ProcessServerManager::connect(Socket* sock,
+int ProcessServerManager::connect (Socket* sock,
ProcessServerManager::Server* server )
{
MYSERVER_SOCKADDRIN serverSock = { 0 };
- socklen_t nLength = sizeof(MYSERVER_SOCKADDRIN);
+ socklen_t nLength = sizeof (MYSERVER_SOCKADDRIN);
- if (server->socket.getHandle())
+ if (server->socket.getHandle ())
server->socket.getsockname ((MYSERVER_SOCKADDR*)&serverSock,
(int*)&nLength);
- if(!serverSock.ss_family || serverSock.ss_family == AF_INET ||
!server->isLocal)
+ if (!serverSock.ss_family || serverSock.ss_family == AF_INET ||
!server->isLocal)
{
/*! Try to create the socket. */
- if(sock->socket(AF_INET, SOCK_STREAM, 0) == -1)
+ if (sock->socket (AF_INET, SOCK_STREAM, 0) == -1)
return -1;
/*! If the socket was created try to connect. */
- if(sock->connect(server->host.c_str(), server->port) == -1)
+ if (sock->connect (server->host.c_str (), server->port) == -1)
{
- sock->close();
+ sock->close ();
return -1;
}
@@ -541,17 +541,17 @@ int ProcessServerManager::connect(Socket* sock,
else if ( serverSock.ss_family == AF_INET6 )
{
/*! Try to create the socket. */
- if(sock->socket(AF_INET6, SOCK_STREAM, 0) == -1)
+ if (sock->socket (AF_INET6, SOCK_STREAM, 0) == -1)
return -1;
/*! If the socket was created try to connect. */
- if(sock->connect(server->host, server->port) == -1)
+ if (sock->connect (server->host, server->port) == -1)
{
- sock->close();
+ sock->close ();
return -1;
}
}
#endif // HAVE_IPV6
- sock->setNonBlocking(1);
+ sock->setNonBlocking (1);
return 0;
}
diff --git a/myserver/src/base/safetime/safetime.cpp
b/myserver/src/base/safetime/safetime.cpp
index b5519f9..e7089d8 100644
--- a/myserver/src/base/safetime/safetime.cpp
+++ b/myserver/src/base/safetime/safetime.cpp
@@ -38,11 +38,11 @@ static Mutex mutex;
/*!
*Initialize the localtime function.
*/
-void myserver_safetime_init()
+void myserver_safetime_init ()
{
#ifndef WIN32
# if !HAVE_LOCALTIME_R
- mutex.init();
+ mutex.init ();
# endif
#endif
}
@@ -50,11 +50,11 @@ void myserver_safetime_init()
/*!
*Clean all the data used by the localtime function.
*/
-void myserver_safetime_destroy()
+void myserver_safetime_destroy ()
{
#ifndef WIN32
# if !HAVE_LOCALTIME_R
- mutex.destroy();
+ mutex.destroy ();
# endif
#endif
}
@@ -62,19 +62,19 @@ void myserver_safetime_destroy()
/*!
*Thread-safe wrap function for localtime.
*/
-struct tm *myserver_localtime(const time_t *timep, tm* res)
+struct tm *myserver_localtime (const time_t *timep, tm* res)
{
#ifdef WIN32
/* The localtime function under WIN32 is thread-safe. */
- memcpy(res, localtime(timep), sizeof(tm));
+ memcpy (res, localtime (timep), sizeof (tm));
return res;
#elif HAVE_LOCALTIME_R
- return localtime_r(timep, res);
+ return localtime_r (timep, res);
#else
- mutex.lock();
- memcpy(res, localtime(timep), sizeof(tm));
- mutex.unlock();
+ mutex.lock ();
+ memcpy (res, localtime (timep), sizeof (tm));
+ mutex.unlock ();
return res;
#endif
@@ -83,20 +83,20 @@ struct tm *myserver_localtime(const time_t *timep, tm* res)
/*!
*Thread-safe wrap function for gmtime.
*/
-struct tm *myserver_gmtime(const time_t *timep, tm* res)
+struct tm *myserver_gmtime (const time_t *timep, tm* res)
{
#ifdef WIN32
/* The gmtime function under WIN32 is thread-safe. */
- memcpy(res, gmtime(timep), sizeof(tm));
+ memcpy (res, gmtime (timep), sizeof (tm));
return res;
#elif HAVE_LOCALTIME_R
- return gmtime_r(timep, res);
+ return gmtime_r (timep, res);
#else
- mutex.lock();
- memcpy(res, gmtime(timep), sizeof(tm));
- mutex.unlock();
+ mutex.lock ();
+ memcpy (res, gmtime (timep), sizeof (tm));
+ mutex.unlock ();
return res;
#endif
diff --git a/myserver/src/base/socket/socket.cpp
b/myserver/src/base/socket/socket.cpp
index ba9c5d7..057aef6 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -43,7 +43,7 @@ bool Socket::denyBlockingOperations = false;
/*!
*Source code to wrap the socket library to MyServer project.
*/
-int Socket::startupSocketLib()
+int Socket::startupSocketLib ()
{
#ifdef WIN32
/*
@@ -55,7 +55,7 @@ int Socket::startupSocketLib()
{
WSADATA wsaData;
done = true;
- return WSAStartup(MAKEWORD( 1, 1), &wsaData);
+ return WSAStartup (MAKEWORD ( 1, 1), &wsaData);
}
#endif
return 0;
@@ -64,7 +64,7 @@ int Socket::startupSocketLib()
/*!
*Returns the socket handle
*/
-Handle Socket::getHandle()
+Handle Socket::getHandle ()
{
return (Handle) socketHandle;
}
@@ -72,7 +72,7 @@ Handle Socket::getHandle()
/*!
*Set the handle for the socket
*/
-void Socket::setHandle(SocketHandle h)
+void Socket::setHandle (SocketHandle h)
{
socketHandle = h;
}
@@ -100,12 +100,12 @@ int Socket::operator=(Socket s)
*Create the socket.
*\return 0 on error.
*/
-int Socket::socket(int af, int type, int protocol)
+int Socket::socket (int af, int type, int protocol)
{
#ifdef WIN32
- socketHandle = (SOCKET)::socket(af, type, protocol);
+ socketHandle = (SOCKET)::socket (af, type, protocol);
#else
- socketHandle = (FileHandle)::socket(af, type, protocol);
+ socketHandle = (FileHandle)::socket (af, type, protocol);
#endif
return (int)socketHandle;
}
@@ -113,7 +113,7 @@ int Socket::socket(int af, int type, int protocol)
/*!
*Set the base/socket/socket.handle.
*/
-Socket::Socket(SocketHandle handle)
+Socket::Socket (SocketHandle handle)
{
throttlingRate = 0;
setHandle (handle);
@@ -123,7 +123,7 @@ Socket::Socket(SocketHandle handle)
/*!
*Set the base/socket/socket.handle.
*/
-Socket::Socket(Socket* socket)
+Socket::Socket (Socket* socket)
{
socketHandle = socket->socketHandle;
serverSocket = socket->serverSocket;
@@ -132,19 +132,19 @@ Socket::Socket(Socket* socket)
}
/*!
- *Return the throttling rate(bytes/second) used by the socket. A return value
+ *Return the throttling rate (bytes/second) used by the socket. A return value
*of zero means that no throttling is used.
*/
-u_long Socket::getThrottling()
+u_long Socket::getThrottling ()
{
return throttlingRate;
}
/*!
- *Set the throttling rate(bytes/second) for the socket.
+ *Set the throttling rate (bytes/second) for the socket.
*Use a zero rate to disable throttling.
*/
-void Socket::setThrottling(u_long tr)
+void Socket::setThrottling (u_long tr)
{
throttlingRate = tr;
}
@@ -152,61 +152,61 @@ void Socket::setThrottling(u_long tr)
/*!
*Constructor of the class.
*/
-Socket::Socket()
+Socket::Socket ()
{
/*! Reset everything. */
throttlingRate = 0;
serverSocket = 0;
- setHandle(0);
+ setHandle (0);
}
/*!
*Bind the port to the socket.
*/
-int Socket::bind(MYSERVER_SOCKADDR* sa,int namelen)
+int Socket::bind (MYSERVER_SOCKADDR* sa,int namelen)
{
if ( sa == NULL )
return -1;
- if ((sa->ss_family == AF_INET && namelen != sizeof(sockaddr_in))
+ if ((sa->ss_family == AF_INET && namelen != sizeof (sockaddr_in))
#if HAVE_IPV6
- || (sa->ss_family == AF_INET6 && namelen != sizeof(sockaddr_in6))
+ || (sa->ss_family == AF_INET6 && namelen != sizeof (sockaddr_in6))
#endif
)
return -1;
#ifdef WIN32
- return ::bind((SOCKET)socketHandle,(const struct sockaddr*)sa,namelen);
+ return ::bind ((SOCKET)socketHandle,(const struct sockaddr*)sa,namelen);
#else
- return ::bind((int)socketHandle,(const struct sockaddr*)sa,namelen);
+ return ::bind ((int)socketHandle,(const struct sockaddr*)sa,namelen);
#endif
}
/*!
*Listen for other connections.
*/
-int Socket::listen(int max)
+int Socket::listen (int max)
{
#ifdef WIN32
- return ::listen(socketHandle, max);
+ return ::listen (socketHandle, max);
#else
- return ::listen((int)socketHandle, max);
+ return ::listen ((int)socketHandle, max);
#endif
}
/*!
*Accept a new connection.
*/
-Socket Socket::accept(MYSERVER_SOCKADDR* sa, socklen_t* sockaddrlen)
+Socket Socket::accept (MYSERVER_SOCKADDR* sa, socklen_t* sockaddrlen)
{
Socket s;
socklen_t connectSize;
connectSize = (socklen_t) *sockaddrlen;
- SocketHandle acceptHandle = ::accept((int)socketHandle, (struct sockaddr
*)sa,
+ SocketHandle acceptHandle = ::accept ((int)socketHandle, (struct sockaddr
*)sa,
(socklen_t*)&connectSize);
- s.setHandle(acceptHandle);
+ s.setHandle (acceptHandle);
return s;
}
@@ -214,21 +214,21 @@ Socket Socket::accept(MYSERVER_SOCKADDR* sa, socklen_t*
sockaddrlen)
/*!
*Close the socket.
*/
-int Socket::close()
+int Socket::close ()
{
#ifdef WIN32
- if(socketHandle)
+ if (socketHandle)
{
- int ret = ::closesocket(socketHandle);
+ int ret = ::closesocket (socketHandle);
socketHandle = 0;
return ret;
}
else
return 0;
#else
- if(socketHandle)
+ if (socketHandle)
{
- int ret = ::close((int)socketHandle);
+ int ret = ::close ((int)socketHandle);
socketHandle = 0;
return ret;
}
@@ -240,12 +240,12 @@ int Socket::close()
/*!
*Returns an host by its address.
*/
-MYSERVER_HOSTENT *Socket::gethostbyaddr(char* addr,int len,int type)
+MYSERVER_HOSTENT *Socket::gethostbyaddr (char* addr,int len,int type)
{
#ifdef WIN32
- HOSTENT *he = ::gethostbyaddr(addr,len,type);
+ HOSTENT *he = ::gethostbyaddr (addr,len,type);
#else
- struct hostent * he = ::gethostbyaddr(addr,len,type);
+ struct hostent * he = ::gethostbyaddr (addr,len,type);
#endif
return he;
}
@@ -253,51 +253,51 @@ MYSERVER_HOSTENT *Socket::gethostbyaddr(char* addr,int
len,int type)
/*!
*Returns an host by its name
*/
-MYSERVER_HOSTENT *Socket::gethostbyname(const char *hostname)
+MYSERVER_HOSTENT *Socket::gethostbyname (const char *hostname)
{
- return (MYSERVER_HOSTENT *)::gethostbyname(hostname);
+ return (MYSERVER_HOSTENT *)::gethostbyname (hostname);
}
/*!
*Shutdown the socket.
*/
-int Socket::shutdown(int how)
+int Socket::shutdown (int how)
{
#ifdef WIN32
- return ::shutdown(socketHandle,how);
+ return ::shutdown (socketHandle,how);
#else
- return ::shutdown((int)socketHandle,how);
+ return ::shutdown ((int)socketHandle,how);
#endif
}
/*!
*Set socket options.
*/
-int Socket::setsockopt(int level, int optname,
+int Socket::setsockopt (int level, int optname,
const char *optval, int optlen)
{
- return ::setsockopt(socketHandle, level, optname, optval, optlen);
+ return ::setsockopt (socketHandle, level, optname, optval, optlen);
}
/*!
*Fill the out string with a list of the local IPs. Returns 0 on success.
*/
-int Socket::getLocalIPsList(string &out)
+int Socket::getLocalIPsList (string &out)
{
char serverName[HOST_NAME_MAX + 1];
- memset(serverName, 0, HOST_NAME_MAX + 1);
+ memset (serverName, 0, HOST_NAME_MAX + 1);
- Socket::gethostname(serverName, HOST_NAME_MAX);
+ Socket::gethostname (serverName, HOST_NAME_MAX);
#if ( HAVE_IPV6 )
addrinfo aiHints = { 0 }, *pHostInfo = NULL, *pCrtHostInfo = NULL;
/* only interested in socket types the that server will listen to. */
aiHints.ai_socktype = SOCK_STREAM;
- if ( getaddrinfo(serverName, NULL, &aiHints, &pHostInfo) == 0 &&
+ if ( getaddrinfo (serverName, NULL, &aiHints, &pHostInfo) == 0 &&
pHostInfo != NULL )
{
sockaddr_storage *pCurrentSockAddr = NULL;
char straddr[NI_MAXHOST] = "";
- memset(straddr, 0, NI_MAXHOST);
+ memset (straddr, 0, NI_MAXHOST);
ostringstream stream;
for ( pCrtHostInfo = pHostInfo; pCrtHostInfo != NULL;
pCrtHostInfo = pCrtHostInfo->ai_next )
@@ -307,46 +307,46 @@ int Socket::getLocalIPsList(string &out)
if ( pCurrentSockAddr == NULL )
continue;
- if ( !getnameinfo(reinterpret_cast<sockaddr *>(pCurrentSockAddr),
- sizeof(sockaddr_storage), straddr, NI_MAXHOST,
+ if ( !getnameinfo (reinterpret_cast<sockaddr *>(pCurrentSockAddr),
+ sizeof (sockaddr_storage), straddr, NI_MAXHOST,
NULL, 0, NI_NUMERICHOST) )
{
- stream << ( !stream.str().empty() ? ", " : "" ) << straddr;
+ stream << ( !stream.str ().empty () ? ", " : "" ) << straddr;
}
else
return -1;
}
- out.assign(stream.str());
- freeaddrinfo(pHostInfo);
+ out.assign (stream.str ());
+ freeaddrinfo (pHostInfo);
}
return 0;
#else// !HAVE_IPV6
MYSERVER_HOSTENT *localhe;
in_addr ia;
- localhe = Socket::gethostbyname(serverName);
+ localhe = Socket::gethostbyname (serverName);
- if(localhe)
+ if (localhe)
{
ostringstream stream;
int i;
/*! Print all the interfaces IPs. */
- for(i= 0; (localhe->h_addr_list[i]); i++)
+ for (i= 0; (localhe->h_addr_list[i]); i++)
{
# ifdef WIN32
ia.S_un.S_addr = *((u_long FAR*) (localhe->h_addr_list[i]));
# else
ia.s_addr = *((u_long *) (localhe->h_addr_list[i]));
# endif
- stream << ( (i != 0) ? ", " : "") << inet_ntoa(ia);
+ stream << ( (i != 0) ? ", " : "") << inet_ntoa (ia);
}
- out.assign(stream.str());
+ out.assign (stream.str ());
return 0;
}
else
{
- out.assign("127.0.0.1");
+ out.assign ("127.0.0.1");
return 0;
}
#endif//HAVE_IPV6
@@ -356,7 +356,7 @@ int Socket::getLocalIPsList(string &out)
/*!
*Set this to true to stop any operation that can block sockets.
*/
-void Socket::stopBlockingOperations(bool value)
+void Socket::stopBlockingOperations (bool value)
{
denyBlockingOperations = value;
}
@@ -366,17 +366,17 @@ void Socket::stopBlockingOperations(bool value)
*Return -1 on error.
*This routine is accessible only from the Socket class.
*/
-int Socket::rawSend(const char* buffer, int len, int flags)
+int Socket::rawSend (const char* buffer, int len, int flags)
{
#ifdef WIN32
int ret;
- SetLastError(0);
- while(!denyBlockingOperations)
+ SetLastError (0);
+ while (!denyBlockingOperations)
{
- ret = ::send(socketHandle, buffer, len, flags);
- if((ret == SOCKET_ERROR) && (GetLastError() == WSAEWOULDBLOCK))
+ ret = ::send (socketHandle, buffer, len, flags);
+ if ((ret == SOCKET_ERROR) && (GetLastError () == WSAEWOULDBLOCK))
{
- Thread::wait(10);
+ Thread::wait (10);
}
else
break;
@@ -384,7 +384,7 @@ int Socket::rawSend(const char* buffer, int len, int flags)
}
return ret;
#else
- return ::send((int)socketHandle, buffer, len, flags);
+ return ::send ((int)socketHandle, buffer, len, flags);
#endif
}
@@ -394,35 +394,35 @@ int Socket::rawSend(const char* buffer, int len, int
flags)
*Returns the number of bytes sent on success.
*If a throttling rate is specified, send will use it.
*/
-int Socket::send(const char* buffer, int len, int flags)
+int Socket::send (const char* buffer, int len, int flags)
{
u_long toSend = (u_long) len;
int ret;
/*! If no throttling is specified, send only one big data chunk. */
- if(throttlingRate == 0)
+ if (throttlingRate == 0)
{
- ret = rawSend(buffer, len, flags);
+ ret = rawSend (buffer, len, flags);
return ret;
}
else
{
- while(!denyBlockingOperations)
+ while (!denyBlockingOperations)
{
/*! When we can send data again? */
- u_long time = getTicks() + (1000 * 1024 / throttlingRate) ;
+ u_long time = getTicks () + (1000 * 1024 / throttlingRate) ;
/*! If a throttling rate is specified, send chunks of 1024 bytes. */
- ret = rawSend(buffer + (len - toSend), toSend < 1024 ?
+ ret = rawSend (buffer + (len - toSend), toSend < 1024 ?
toSend : 1024, flags);
/*! On errors returns directly -1. */
- if(ret < 0)
+ if (ret < 0)
return -1;
toSend -= (u_long)ret;
/*!
*If there are other bytes to send wait before cycle again.
*/
- if(toSend)
+ if (toSend)
{
- Thread::wait(getTicks () - time);
+ Thread::wait (getTicks () - time);
}
else
break;
@@ -436,13 +436,13 @@ int Socket::send(const char* buffer, int len, int flags)
/*!
*Function used to control the socket.
*/
-int Socket::ioctlsocket(long cmd,unsigned long* argp)
+int Socket::ioctlsocket (long cmd,unsigned long* argp)
{
#ifdef WIN32
- return ::ioctlsocket(socketHandle, cmd, argp);
+ return ::ioctlsocket (socketHandle, cmd, argp);
#else
int int_argp = 0;
- int ret = ::ioctl((int)socketHandle, cmd, &int_argp);
+ int ret = ::ioctl ((int)socketHandle, cmd, &int_argp);
*argp = int_argp;
return ret;
#endif
@@ -452,14 +452,14 @@ int Socket::ioctlsocket(long cmd,unsigned long* argp)
*Connect to the specified host:port.
*Returns zero on success.
*/
-int Socket::connect(const char* host, u_short port)
+int Socket::connect (const char* host, u_short port)
{
if ( host == NULL )
return -1;
#if ( HAVE_IPV6 )
MYSERVER_SOCKADDRIN thisSock = { 0 };
- int nLength = sizeof(MYSERVER_SOCKADDRIN);
+ int nLength = sizeof (MYSERVER_SOCKADDRIN);
int nSockLen = 0;
bool bSocketConnected = false;
int nGetaddrinfoRet = 0;
@@ -474,20 +474,20 @@ int Socket::connect(const char* host, u_short port)
*have this host, than create socket.
*/
- //getsockname(&thisSock, &nLength);
- if ( getsockname(&thisSock, &nLength) == 0 )
+ //getsockname (&thisSock, &nLength);
+ if ( getsockname (&thisSock, &nLength) == 0 )
{
aiHints.ai_family = thisSock.ss_family;
aiHints.ai_socktype = SOCK_STREAM;
}
- memset(szPort, 0, sizeof(char)*10);
- snprintf(szPort, 10, "%d", port);
+ memset (szPort, 0, sizeof (char)*10);
+ snprintf (szPort, 10, "%d", port);
if (aiHints.ai_family != 0)
- nGetaddrinfoRet = getaddrinfo(host, NULL, &aiHints, &pHostInfo);
+ nGetaddrinfoRet = getaddrinfo (host, NULL, &aiHints, &pHostInfo);
else
- nGetaddrinfoRet = getaddrinfo(host, NULL, NULL, &pHostInfo);
+ nGetaddrinfoRet = getaddrinfo (host, NULL, NULL, &pHostInfo);
if (nGetaddrinfoRet != 0 || pHostInfo == NULL )
return -1;
@@ -506,19 +506,19 @@ int Socket::connect(const char* host, u_short port)
//so try to create one now based on 'pCurrentSockAddr'
if ( pCurrentSockAddr->ss_family == AF_INET )
{
- if(Socket::socket(AF_INET, SOCK_STREAM, 0) == -1)
+ if (Socket::socket (AF_INET, SOCK_STREAM, 0) == -1)
continue;
}
else if ( pCurrentSockAddr->ss_family == AF_INET6 )
{
- if(Socket::socket(AF_INET6, SOCK_STREAM, 0) == -1)
+ if (Socket::socket (AF_INET6, SOCK_STREAM, 0) == -1)
continue;
}
- if ( getsockname(&thisSock, &nLength) != 0 )
+ if ( getsockname (&thisSock, &nLength) != 0 )
return -1;
}
- memset(&connectionSockAddrIn, 0, sizeof(connectionSockAddrIn));
+ memset (&connectionSockAddrIn, 0, sizeof (connectionSockAddrIn));
connectionSockAddrIn.ss_family = pCurrentSockAddr->ss_family;
if ( connectionSockAddrIn.ss_family != AF_INET &&
@@ -527,24 +527,24 @@ int Socket::connect(const char* host, u_short port)
if ( connectionSockAddrIn.ss_family == AF_INET )
{
- nSockLen = sizeof(sockaddr_in);
- memcpy((sockaddr_in *)&connectionSockAddrIn,
+ nSockLen = sizeof (sockaddr_in);
+ memcpy ((sockaddr_in *)&connectionSockAddrIn,
(sockaddr_in *)pCurrentSockAddr, nSockLen);
- ((sockaddr_in *)(&connectionSockAddrIn))->sin_port = htons(port);
+ ((sockaddr_in *)(&connectionSockAddrIn))->sin_port = htons (port);
}
else// if ( connectionSockAddrIn.ss_family == AF_INET6 )
{
- nSockLen = sizeof(sockaddr_in6);
- memcpy((sockaddr_in6 *)&connectionSockAddrIn,
+ nSockLen = sizeof (sockaddr_in6);
+ memcpy ((sockaddr_in6 *)&connectionSockAddrIn,
(sockaddr_in6 *)pCurrentSockAddr, nSockLen);
- ((sockaddr_in6 *)&connectionSockAddrIn)->sin6_port = htons(port);
+ ((sockaddr_in6 *)&connectionSockAddrIn)->sin6_port = htons (port);
}
- if(Socket::connect((MYSERVER_SOCKADDR*)(&connectionSockAddrIn),
+ if (Socket::connect ((MYSERVER_SOCKADDR*)(&connectionSockAddrIn),
nSockLen) == -1)
{
- Socket::close();
+ Socket::close ();
}
else
{
@@ -552,32 +552,32 @@ int Socket::connect(const char* host, u_short port)
break;
}
}
- freeaddrinfo(pHostInfo);
+ freeaddrinfo (pHostInfo);
if ( !bSocketConnected )
return -1;
#else
- MYSERVER_HOSTENT *hp = Socket::gethostbyname(host);
+ MYSERVER_HOSTENT *hp = Socket::gethostbyname (host);
struct sockaddr_in sockAddr;
int sockLen;
- if(hp == 0)
+ if (hp == 0)
return -1;
/*! If the socket is not created, create it before use. */
- if(socketHandle == 0)
+ if (socketHandle == 0)
{
- if(Socket::socket(AF_INET, SOCK_STREAM, 0) == -1)
+ if (Socket::socket (AF_INET, SOCK_STREAM, 0) == -1)
{
return -1;
}
}
- sockLen = sizeof(sockAddr);
- memset(&sockAddr, 0, sizeof(sockAddr));
+ sockLen = sizeof (sockAddr);
+ memset (&sockAddr, 0, sizeof (sockAddr));
sockAddr.sin_family = AF_INET;
- memcpy(&sockAddr.sin_addr, hp->h_addr, hp->h_length);
- sockAddr.sin_port = htons(port);
- if(Socket::connect((MYSERVER_SOCKADDR*)&sockAddr, sockLen) == -1)
+ memcpy (&sockAddr.sin_addr, hp->h_addr, hp->h_length);
+ sockAddr.sin_port = htons (port);
+ if (Socket::connect ((MYSERVER_SOCKADDR*)&sockAddr, sockLen) == -1)
{
- Socket::close();
+ Socket::close ();
return -1;
}
#endif
@@ -593,27 +593,27 @@ int Socket::connect (MYSERVER_SOCKADDR* sa, int na)
if ( sa == NULL )
return -1;
- if ( (sa->ss_family == AF_INET && na != sizeof(sockaddr_in))
+ if ( (sa->ss_family == AF_INET && na != sizeof (sockaddr_in))
#if HAVE_IPV6
- || (sa->ss_family == AF_INET6 && na != sizeof(sockaddr_in6))
+ || (sa->ss_family == AF_INET6 && na != sizeof (sockaddr_in6))
#endif
)
return -1;
#ifdef WIN32
- return ::connect((SOCKET)socketHandle,(const sockaddr *)sa, na);
+ return ::connect ((SOCKET)socketHandle,(const sockaddr *)sa, na);
#else
- return ::connect((int)socketHandle,(const sockaddr *)sa,na);
+ return ::connect ((int)socketHandle,(const sockaddr *)sa,na);
#endif
}
/*!
*Receive data from the socket.
*/
-int Socket::recv(char* buffer, int len, int flags, u_long timeout)
+int Socket::recv (char* buffer, int len, int flags, u_long timeout)
{
if (dataOnRead (timeout / 1000, timeout % 1000))
- return recv(buffer, len, flags);
+ return recv (buffer, len, flags);
return 0;
}
@@ -622,14 +622,14 @@ int Socket::recv(char* buffer, int len, int flags, u_long
timeout)
*Receive data from the socket.
*Returns -1 on errors.
*/
-int Socket::recv(char* buffer,int len,int flags)
+int Socket::recv (char* buffer,int len,int flags)
{
int err = 0;
#ifdef WIN32
- err = ::recv(socketHandle, buffer, len, flags);
+ err = ::recv (socketHandle, buffer, len, flags);
- if ( err == SOCKET_ERROR && GetLastError() == WSAEWOULDBLOCK &&
isNonBlocking)
+ if ( err == SOCKET_ERROR && GetLastError () == WSAEWOULDBLOCK &&
isNonBlocking)
return 0;
if (err == SOCKET_ERROR)
@@ -637,12 +637,12 @@ int Socket::recv(char* buffer,int len,int flags)
else
return err;
#else
- err = ::recv((int)socketHandle, buffer, len, flags);
+ err = ::recv ((int)socketHandle, buffer, len, flags);
if ( err < 0 && errno == EAGAIN && isNonBlocking)
return 0;
- if(err == 0)
+ if (err == 0)
err = -1;
return err;
@@ -653,15 +653,15 @@ int Socket::recv(char* buffer,int len,int flags)
/*!
*Returns the number of bytes waiting to be read.
*/
-u_long Socket::bytesToRead()
+u_long Socket::bytesToRead ()
{
u_long nBytesToRead = 0;
#ifdef FIONREAD
- ioctlsocket(FIONREAD,&nBytesToRead);
+ ioctlsocket (FIONREAD,&nBytesToRead);
#else
# ifdef I_NREAD
- ::ioctlsocket( I_NREAD, &nBytesToRead ) ;
+ ::ioctlsocket ( I_NREAD, &nBytesToRead ) ;
# endif
#endif
return nBytesToRead;
@@ -675,26 +675,26 @@ u_long Socket::bytesToRead()
*A blocking socket will wait until the operation can be performed.
*\param nonBlocking Nonzero to configure the socket non blocking.
*/
-int Socket::setNonBlocking(int nonBlocking)
+int Socket::setNonBlocking (int nonBlocking)
{
int ret = -1;
#ifdef WIN32
u_long nonblock = nonBlocking ? 1 : 0;
- ret = ioctlsocket( FIONBIO, &nonblock);
+ ret = ioctlsocket ( FIONBIO, &nonblock);
#else
int flags;
- flags = fcntl((int)socketHandle, F_GETFL, 0);
+ flags = fcntl ((int)socketHandle, F_GETFL, 0);
if (flags < 0)
return -1;
- if(nonBlocking)
+ if (nonBlocking)
flags |= O_NONBLOCK;
else
flags &= ~O_NONBLOCK;
- ret = fcntl((int)socketHandle, F_SETFL, flags);
+ ret = fcntl ((int)socketHandle, F_SETFL, flags);
#endif
isNonBlocking = nonBlocking ? true : false;
@@ -704,21 +704,21 @@ int Socket::setNonBlocking(int nonBlocking)
/*!
*Returns the hostname.
*/
-int Socket::gethostname(char *name, int namelen)
+int Socket::gethostname (char *name, int namelen)
{
- return ::gethostname(name,namelen);
+ return ::gethostname (name,namelen);
}
/*!
*Returns the sockname.
*/
-int Socket::getsockname(MYSERVER_SOCKADDR *ad, int *namelen)
+int Socket::getsockname (MYSERVER_SOCKADDR *ad, int *namelen)
{
#ifdef WIN32
- return ::getsockname(socketHandle,(sockaddr *)ad,namelen);
+ return ::getsockname (socketHandle,(sockaddr *)ad,namelen);
#else
socklen_t len =(socklen_t) *namelen;
- int ret = ::getsockname((int)socketHandle, (struct sockaddr *)ad, &len);
+ int ret = ::getsockname ((int)socketHandle, (struct sockaddr *)ad, &len);
*namelen = (int)len;
return ret;
#endif
@@ -727,14 +727,14 @@ int Socket::getsockname(MYSERVER_SOCKADDR *ad, int
*namelen)
/*!
*Set the socket used by the server.
*/
-void Socket::setServerSocket(Socket* sock)
+void Socket::setServerSocket (Socket* sock)
{
serverSocket = sock;
}
/*!
*Returns the server socket.
*/
-Socket* Socket::getServerSocket()
+Socket* Socket::getServerSocket ()
{
return serverSocket;
}
@@ -743,7 +743,7 @@ Socket* Socket::getServerSocket()
*Check if there is data ready to be read.
*Returns 1 if there is data to read, 0 if not.
*/
-int Socket::dataOnRead(int sec, int usec)
+int Socket::dataOnRead (int sec, int usec)
{
struct timeval tv;
fd_set readfds;
@@ -751,18 +751,18 @@ int Socket::dataOnRead(int sec, int usec)
tv.tv_sec = sec;
tv.tv_usec = usec;
- FD_ZERO(&readfds);
+ FD_ZERO (&readfds);
#ifdef WIN32
- FD_SET((SOCKET)socketHandle, &readfds);
+ FD_SET ((SOCKET)socketHandle, &readfds);
#else
- FD_SET(socketHandle, &readfds);
+ FD_SET (socketHandle, &readfds);
#endif
- ret = ::select(socketHandle + 1, &readfds, NULL, NULL, &tv);
+ ret = ::select (socketHandle + 1, &readfds, NULL, NULL, &tv);
- if(ret == -1 || ret == 0)
+ if (ret == -1 || ret == 0)
return 0;
- if (FD_ISSET(socketHandle, &readfds))
+ if (FD_ISSET (socketHandle, &readfds))
return 1;
return 0;
@@ -772,11 +772,11 @@ int Socket::dataOnRead(int sec, int usec)
*Inherited from Stream.
*Return zero on success, or -1 error. Also sets nbr to -1 if error.
*/
-int Socket::read(char* buffer, u_long len, u_long *nbr)
+int Socket::read (char* buffer, u_long len, u_long *nbr)
{
- *nbr = static_cast<u_long>(recv(buffer, len, 0));
+ *nbr = static_cast<u_long>(recv (buffer, len, 0));
- if(*nbr == static_cast<u_long>(-1))
+ if (*nbr == static_cast<u_long>(-1))
return -1;
return 0;
@@ -786,9 +786,9 @@ int Socket::read(char* buffer, u_long len, u_long *nbr)
*Inherited from Stream.
*Return zero on success, or -1 on error. Also sets nbw to -1 if error.
*/
-int Socket::write(const char* buffer, u_long len, u_long *nbw)
+int Socket::write (const char* buffer, u_long len, u_long *nbw)
{
- *nbw = static_cast<u_long>(send(buffer, len, 0));
+ *nbw = static_cast<u_long>(send (buffer, len, 0));
if ( *nbw == static_cast<u_long>(-1) )
return -1;
diff --git a/myserver/src/base/socket/ssl_socket.cpp
b/myserver/src/base/socket/ssl_socket.cpp
index c244236..a396b45 100644
--- a/myserver/src/base/socket/ssl_socket.cpp
+++ b/myserver/src/base/socket/ssl_socket.cpp
@@ -41,7 +41,7 @@ using namespace std;
/*!
*Constructor of the class.
*/
-SslSocket::SslSocket(Socket* socket) : Socket(socket)
+SslSocket::SslSocket (Socket* socket) : Socket (socket)
{
this->socket = socket;
sslConnection = 0;
@@ -51,35 +51,35 @@ SslSocket::SslSocket(Socket* socket) : Socket(socket)
externalContext = false;
}
-SslSocket::~SslSocket()
+SslSocket::~SslSocket ()
{
- freeSSL();
+ freeSSL ();
}
/*!
*Close the socket.
*/
-int SslSocket::close()
+int SslSocket::close ()
{
- freeSSL();
+ freeSSL ();
- return Socket::close();
+ return Socket::close ();
}
/*!
*Shutdown the socket.
*/
-int SslSocket::shutdown(int how)
+int SslSocket::shutdown (int how)
{
- if(sslConnection)
+ if (sslConnection)
{
- SSL_shutdown(sslConnection);
+ SSL_shutdown (sslConnection);
}
#ifdef WIN32
- return ::shutdown(socketHandle, how);
+ return ::shutdown (socketHandle, how);
#else
- return ::shutdown((int)socketHandle, how);
+ return ::shutdown ((int)socketHandle, how);
#endif
}
@@ -88,16 +88,16 @@ int SslSocket::shutdown(int how)
*Return -1 on error.
*This routine is accessible only from the Socket class.
*/
-int SslSocket::rawSend(const char* buffer, int len, int flags)
+int SslSocket::rawSend (const char* buffer, int len, int flags)
{
int err;
do
{
- err = SSL_write(sslConnection,buffer,len);
- }while((err <= 0) &&
- (SSL_get_error(sslConnection,err) == SSL_ERROR_WANT_WRITE
- || SSL_get_error(sslConnection,err) == SSL_ERROR_WANT_READ));
- if(err <= 0)
+ err = SSL_write (sslConnection,buffer,len);
+ }while ((err <= 0) &&
+ (SSL_get_error (sslConnection,err) == SSL_ERROR_WANT_WRITE
+ || SSL_get_error (sslConnection,err) == SSL_ERROR_WANT_READ));
+ if (err <= 0)
return -1;
else
return err;
@@ -106,42 +106,42 @@ int SslSocket::rawSend(const char* buffer, int len, int
flags)
/*!
*Connect the socket.
*/
-int SslSocket::connect(MYSERVER_SOCKADDR* sa, int na)
+int SslSocket::connect (MYSERVER_SOCKADDR* sa, int na)
{
if ( sa == NULL || (sa->ss_family != AF_INET && sa->ss_family != AF_INET6) )
return 1;
- if ( (sa->ss_family == AF_INET && na != sizeof(sockaddr_in))
+ if ( (sa->ss_family == AF_INET && na != sizeof (sockaddr_in))
#if HAVE_IPV6
- || (sa->ss_family == AF_INET6 && na != sizeof(sockaddr_in6))
+ || (sa->ss_family == AF_INET6 && na != sizeof (sockaddr_in6))
#endif
)
return 1;
- sslMethod = SSLv23_client_method();
+ sslMethod = SSLv23_client_method ();
/*! Create the local context. */
- sslContext = SSL_CTX_new(sslMethod);
- if(sslContext == 0)
+ sslContext = SSL_CTX_new (sslMethod);
+ if (sslContext == 0)
return -1;
/*! Do the TCP connection. */
- if(::connect((int)socketHandle,(const sockaddr *)sa, na))
+ if (::connect ((int)socketHandle,(const sockaddr *)sa, na))
{
- SSL_CTX_free(sslContext);
+ SSL_CTX_free (sslContext);
sslContext = 0;
return -1;
}
- sslConnection = SSL_new(sslContext);
- if(sslConnection == 0)
+ sslConnection = SSL_new (sslContext);
+ if (sslConnection == 0)
{
- SSL_CTX_free(sslContext);
+ SSL_CTX_free (sslContext);
sslContext = 0;
return -1;
}
- SSL_set_fd(sslConnection, (int)socketHandle);
- if(SSL_connect(sslConnection) < 0)
+ SSL_set_fd (sslConnection, (int)socketHandle);
+ if (SSL_connect (sslConnection) < 0)
{
- SSL_CTX_free(sslContext);
- close();
+ SSL_CTX_free (sslContext);
+ close ();
sslContext = 0;
return -1;
}
@@ -152,7 +152,7 @@ int SslSocket::connect(MYSERVER_SOCKADDR* sa, int na)
/*!
*Set the SSL context.
*/
-int SslSocket::setSSLContext(SSL_CTX* context)
+int SslSocket::setSSLContext (SSL_CTX* context)
{
sslContext = context;
externalContext = true;
@@ -163,18 +163,18 @@ int SslSocket::setSSLContext(SSL_CTX* context)
/*!
*Free the SSL connection.
*/
-int SslSocket::freeSSL()
+int SslSocket::freeSSL ()
{
/*! free up the SSL context. */
- if(sslConnection)
+ if (sslConnection)
{
- SSL_free(sslConnection);
+ SSL_free (sslConnection);
sslConnection = 0;
}
- if(sslContext && !externalContext)
+ if (sslContext && !externalContext)
{
- SSL_CTX_free(sslContext);
+ SSL_CTX_free (sslContext);
sslContext = 0;
}
return 1;
@@ -184,7 +184,7 @@ int SslSocket::freeSSL()
/*!
*Returns the SSL connection.
*/
-SSL* SslSocket::getSSLConnection()
+SSL* SslSocket::getSSLConnection ()
{
return sslConnection;
}
@@ -193,25 +193,25 @@ SSL* SslSocket::getSSLConnection()
*SSL handshake procedure.
*Return nonzero on errors.
*/
-int SslSocket::sslAccept()
+int SslSocket::sslAccept ()
{
int sslAccept;
- if(sslContext == 0)
+ if (sslContext == 0)
return -1;
- if(sslConnection)
- freeSSL();
- sslConnection = SSL_new(sslContext);
- if(sslConnection == 0)
+ if (sslConnection)
+ freeSSL ();
+ sslConnection = SSL_new (sslContext);
+ if (sslConnection == 0)
{
- freeSSL();
+ freeSSL ();
return -1;
}
- if(SSL_set_fd(sslConnection,socketHandle) == 0)
+ if (SSL_set_fd (sslConnection,socketHandle) == 0)
{
- shutdown(2);
- freeSSL();
- close();
+ shutdown (2);
+ freeSSL ();
+ close ();
return -1;
}
@@ -221,11 +221,11 @@ int SslSocket::sslAccept()
}while (sslAccept != 1 &&
SSL_get_error (sslConnection, sslAccept) == SSL_ERROR_WANT_READ);
- if(sslAccept != 1 )
+ if (sslAccept != 1 )
{
- shutdown(2);
- freeSSL();
- close();
+ shutdown (2);
+ freeSSL ();
+ close ();
return -1;
}
@@ -239,7 +239,7 @@ int SslSocket::sslAccept()
*Receive data from the socket.
*Returns -1 on errors.
*/
-int SslSocket::recv(char* buffer, int len, int flags)
+int SslSocket::recv (char* buffer, int len, int flags)
{
int err = 0;
@@ -272,7 +272,7 @@ int SslSocket::recv(char* buffer, int len, int flags)
/*!
*Returns the number of bytes waiting to be read.
*/
-u_long SslSocket::bytesToRead()
+u_long SslSocket::bytesToRead ()
{
u_long nBytesToRead = 0;
@@ -289,7 +289,7 @@ u_long SslSocket::bytesToRead()
*/
int SslSocket::dataOnRead (int sec, int usec)
{
- if(bytesToRead ())
+ if (bytesToRead ())
return 1;
return Socket::dataOnRead (sec, usec);
diff --git a/myserver/src/base/socket_pair/socket_pair.cpp
b/myserver/src/base/socket_pair/socket_pair.cpp
index d0938b4..7df3a59 100644
--- a/myserver/src/base/socket_pair/socket_pair.cpp
+++ b/myserver/src/base/socket_pair/socket_pair.cpp
@@ -81,7 +81,7 @@ int SocketPair::create ()
struct sockaddr_in addr;
SOCKET listener;
int e;
- int addrlen = sizeof(addr);
+ int addrlen = sizeof (addr);
DWORD flags = 0;
if (handles == 0)
@@ -93,19 +93,19 @@ int SocketPair::create ()
if (listener == INVALID_SOCKET)
return -1;
- memset(&addr, 0, sizeof (addr));
+ memset (&addr, 0, sizeof (addr));
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = htonl (0x7f000001);
addr.sin_port = 0;
- e = ::bind(listener, (const struct sockaddr*) &addr, sizeof(addr));
+ e = ::bind (listener, (const struct sockaddr*) &addr, sizeof (addr));
if (e == SOCKET_ERROR)
{
closesocket (listener);
return -1;
}
- e = ::getsockname(listener, (struct sockaddr*) &addr, &addrlen);
+ e = ::getsockname (listener, (struct sockaddr*) &addr, &addrlen);
if (e == SOCKET_ERROR)
{
closesocket (listener);
@@ -118,7 +118,7 @@ int SocketPair::create ()
break;
if ((handles[0] = ::socket (AF_INET, type, 0)) == INVALID_SOCKET)
break;
- if (::connect(handles[0], (const struct sockaddr*) &addr, sizeof (addr))
== SOCKET_ERROR)
+ if (::connect (handles[0], (const struct sockaddr*) &addr, sizeof
(addr)) == SOCKET_ERROR)
break;
if ((handles[1] = ::accept (listener, NULL, NULL)) == INVALID_SOCKET)
break;
diff --git a/myserver/src/base/ssl/ssl.cpp b/myserver/src/base/ssl/ssl.cpp
index 8781e26..cbf5ad9 100644
--- a/myserver/src/base/ssl/ssl.cpp
+++ b/myserver/src/base/ssl/ssl.cpp
@@ -77,10 +77,10 @@ int SslContext::initialize ()
/*
* The specified file doesn't exist.
*/
- if (FilesUtility::fileExists(privateKeyFile) == 0)
+ if (FilesUtility::fileExists (privateKeyFile) == 0)
return -1;
- if (SSL_CTX_use_PrivateKey_file(context, privateKeyFile.c_str(),
+ if (SSL_CTX_use_PrivateKey_file (context, privateKeyFile.c_str (),
SSL_FILETYPE_PEM) != 1)
return -1;
diff --git a/myserver/src/base/string/stringutils.cpp
b/myserver/src/base/string/stringutils.cpp
index 83618ff..5d91319 100644
--- a/myserver/src/base/string/stringutils.cpp
+++ b/myserver/src/base/string/stringutils.cpp
@@ -45,8 +45,8 @@ extern "C"
const char *getRFC822GMTTime (string& out,int len)
{
time_t ltime;
- time( <ime );
- return getRFC822GMTTime(ltime, out, len);
+ time ( <ime );
+ return getRFC822GMTTime (ltime, out, len);
}
/*!
@@ -120,7 +120,7 @@ const char *getRFC822GMTTime (const time_t ltime, char*
out, int /*!len*/)
out[ind++]= asct[6];
out[ind++] = ' ';
- sprintf(&out[ind], "%i", gmTime->tm_year);
+ sprintf (&out[ind], "%i", gmTime->tm_year);
ind += 4;
out[ind++] = ' ';
@@ -163,7 +163,7 @@ time_t getTime (const char* str)
lb[i] = str[c++];
}
i = lb[0] + lb[1] + lb[3];
- switch(i)
+ switch (i)
{
case 310:
t.tm_wday = 0; //Sun
@@ -200,7 +200,7 @@ time_t getTime (const char* str)
else
lb[i] = str[c++];
}
- t.tm_mday = atoi(lb);
+ t.tm_mday = atoi (lb);
for (i = 0; i < 30; i++)
{
@@ -214,7 +214,7 @@ time_t getTime (const char* str)
lb[i] = str[c++];
}
i = lb[0] + lb[1] + lb[3];
- switch(i)
+ switch (i)
{
case 281:
t.tm_wday = 0; //Jan
@@ -265,7 +265,7 @@ time_t getTime (const char* str)
else
lb[i] = str[c++];
}
- t.tm_year = atoi(lb) - 1900;
+ t.tm_year = atoi (lb) - 1900;
for (i = 0; i < 30; i++)
{
@@ -278,7 +278,7 @@ time_t getTime (const char* str)
else
lb[i] = str[c++];
}
- t.tm_hour = atoi(lb);
+ t.tm_hour = atoi (lb);
for (i = 0; i < 30; i++)
{
@@ -291,7 +291,7 @@ time_t getTime (const char* str)
else
lb[i] = str[c++];
}
- t.tm_min = atoi(lb);
+ t.tm_min = atoi (lb);
for (i = 0; i < 30; i++)
{
@@ -304,13 +304,13 @@ time_t getTime (const char* str)
else
lb[i] = str[c++];
}
- t.tm_sec = atoi(lb);
+ t.tm_sec = atoi (lb);
t.tm_yday = 0;
t.tm_wday = 0;
t.tm_isdst = -1;
- return mktime(&t);
+ return mktime (&t);
}
/*!
@@ -389,7 +389,7 @@ const char* getLocalLogFormatDate (char* out, int len)
const char* getGMTLogFormatDate (char* out, int len)
{
time_t ltime;
- time(<ime);
+ time (<ime);
return getGMTLogFormatDate (ltime, out, len);
}
@@ -429,7 +429,7 @@ const char* getLocalLogFormatDate (string& out, int len)
/*!
* Get the GMT time string.
*/
-const char* getGMTLogFormatDate(string& out, int len)
+const char* getGMTLogFormatDate (string& out, int len)
{
char buff[32];
getGMTLogFormatDate (buff, len);
@@ -584,7 +584,7 @@ string trim (string const &s, string const &t)
*from the head and tail of the first string.
*Ex: char str[16]="Hellow World!!!";
* char trim[7]="e!HlwW";
- * StrTrim(str,trim);
+ * StrTrim (str,trim);
*result: str="ow World"
*'w', 'W' and the last 'l' aren't removed because they aren't
*attached to the head or tail of the string
@@ -657,7 +657,7 @@ void gotoNextLine (char** cmd)
/*!
*Translates HTTP escape sequences.
*/
-void translateEscapeString(char *str)
+void translateEscapeString (char *str)
{
int i, j;
i = 0;
@@ -666,7 +666,7 @@ void translateEscapeString(char *str)
{
if ((str[i] == '%') && (str[i + 1] != 0) && (str[i + 2] != 0))
{
- str[j] =(char) (16 * hexVal(str[i + 1]) + hexVal(str[i + 2]));
+ str[j] =(char) (16 * hexVal (str[i + 1]) + hexVal (str[i + 2]));
i = i + 3;
}
else
@@ -682,17 +682,17 @@ void translateEscapeString(char *str)
/*!
*Translates HTTP escape sequences.
*/
-void translateEscapeString(string& str)
+void translateEscapeString (string& str)
{
int i, j, len;
i = 0;
j = 0;
- len = str.length();
+ len = str.length ();
while (len--)
{
if ((str[i] == '%') && (str[i + 1] != 0) && (str[i + 2] != 0))
{
- str[j] =(char) (16 * hexVal(str[i + 1]) + hexVal(str[i + 2]));
+ str[j] =(char) (16 * hexVal (str[i + 1]) + hexVal (str[i + 2]));
i = i + 3;
}
else
@@ -708,7 +708,7 @@ void translateEscapeString(string& str)
/*!
*This function converts a hexadecimal number to a decimal number.
*/
-int hexVal(char ch)
+int hexVal (char ch)
{
if (ch >= '0' && ch <= '9')
return ch - '0';
@@ -729,7 +729,7 @@ int hexVal(char ch)
/*!
*Convert from an hex string to an int
*/
-int hexToInt(const char *str)
+int hexToInt (const char *str)
{
register u_long u;
register const char *cp;
@@ -740,7 +740,7 @@ int hexToInt(const char *str)
while (*cp != '\0')
{
- if (!isxdigit((int)*cp))
+ if (!isxdigit ((int)*cp))
return 0;
if (u >= 0x10000000)
@@ -760,7 +760,7 @@ int hexToInt(const char *str)
/*!
*Get the offset from string start of a character.
*/
-int getCharInString(const char* str, const char* characters, int max)
+int getCharInString (const char* str, const char* characters, int max)
{
int i, j;
@@ -865,11 +865,11 @@ int stringcmp (string const &a, const char* b)
}
#ifndef WIN32
-char* strupr(char * s)
+char* strupr (char * s)
{
- unsigned int len = strlen(s);
+ unsigned int len = strlen (s);
for (register unsigned int i = 0; i < len; i++)
- s[i] = toupper(s[i]);
+ s[i] = toupper (s[i]);
return s;
}
#endif
diff --git a/myserver/src/base/sync/event.cpp b/myserver/src/base/sync/event.cpp
index 3033038..884c59d 100644
--- a/myserver/src/base/sync/event.cpp
+++ b/myserver/src/base/sync/event.cpp
@@ -48,10 +48,10 @@ extern "C" {
*Constructor for the event class.
*\param broadcast If true a signal will be sent to all the waiting threads.
*/
-Event::Event(bool broadcast)
+Event::Event (bool broadcast)
{
initialized = false;
- init(broadcast);
+ init (broadcast);
}
/*!
@@ -59,21 +59,21 @@ Event::Event(bool broadcast)
*\param broadcast If true a signal will be sent to all the waiting threads.
*\return nonzero on errors.
*/
-int Event::init(bool broadcast)
+int Event::init (bool broadcast)
{
int ret = 0;
- if(initialized)
+ if (initialized)
{
- destroy();
+ destroy ();
initialized = false;
}
this->broadcast = broadcast;
#ifdef HAVE_PTHREAD
- ret = pthread_mutex_init(&mutex,(pthread_mutexattr_t*) NULL);
- if(!ret)
- ret = pthread_cond_init(&event, NULL);
+ ret = pthread_mutex_init (&mutex,(pthread_mutexattr_t*) NULL);
+ if (!ret)
+ ret = pthread_cond_init (&event, NULL);
#else
- event = CreateEvent(NULL, broadcast ? FALSE : TRUE, FALSE, NULL);
+ event = CreateEvent (NULL, broadcast ? FALSE : TRUE, FALSE, NULL);
ret = !event;
#endif
initialized = true;
@@ -85,41 +85,41 @@ int Event::init(bool broadcast)
*\param id The calling thread id.
*\param timeout Timeout value in milliseconds.
*/
-int Event::wait(u_long id, u_long timeout)
+int Event::wait (u_long id, u_long timeout)
{
- if(!initialized)
+ if (!initialized)
return -1;
#ifdef HAVE_PTHREAD
int ret;
- if(timeout)
+ if (timeout)
{
struct timespec ts;
struct timeval tp;
- gettimeofday(&tp, NULL);
+ gettimeofday (&tp, NULL);
ts.tv_sec = tp.tv_sec + tp.tv_usec / 1000000 + timeout / 1000;
ts.tv_nsec = (tp.tv_usec * 1000 + timeout * 1000000) % 1000000000;
- pthread_mutex_lock(&mutex);
- ret = pthread_cond_timedwait(&event, &mutex, &ts);
- pthread_mutex_unlock(&mutex);
+ pthread_mutex_lock (&mutex);
+ ret = pthread_cond_timedwait (&event, &mutex, &ts);
+ pthread_mutex_unlock (&mutex);
}
else
{
- pthread_mutex_lock(&mutex);
- ret = pthread_cond_wait(&event, &mutex);
- pthread_mutex_unlock(&mutex);
+ pthread_mutex_lock (&mutex);
+ ret = pthread_cond_wait (&event, &mutex);
+ pthread_mutex_unlock (&mutex);
}
- if(ret == ETIMEDOUT)
+ if (ret == ETIMEDOUT)
ret = 1;
return ret;
#else
- DWORD32 ret = WaitForSingleObject(event, timeout ? timeout : INFINITE);
- if(ret == WAIT_TIMEOUT)
+ DWORD32 ret = WaitForSingleObject (event, timeout ? timeout : INFINITE);
+ if (ret == WAIT_TIMEOUT)
return 1;
- else if(ret == WAIT_OBJECT_0)
+ else if (ret == WAIT_OBJECT_0)
return 0;
return -1;
@@ -134,29 +134,29 @@ int Event::wait(u_long id, u_long timeout)
*threads otherwise only one thread will be signaled.
*\param id The calling thread id.
*/
-int Event::signal(u_long id)
+int Event::signal (u_long id)
{
- if(!initialized)
+ if (!initialized)
return -1;
#ifdef HAVE_PTHREAD
- if(broadcast)
+ if (broadcast)
{
- pthread_mutex_lock(&mutex);
- pthread_cond_broadcast(&event);
- pthread_mutex_unlock(&mutex);
+ pthread_mutex_lock (&mutex);
+ pthread_cond_broadcast (&event);
+ pthread_mutex_unlock (&mutex);
}
else
{
- pthread_mutex_lock(&mutex);
- pthread_cond_signal(&event);
- pthread_mutex_unlock(&mutex);
+ pthread_mutex_lock (&mutex);
+ pthread_cond_signal (&event);
+ pthread_mutex_unlock (&mutex);
}
#else
- SetEvent(event);
+ SetEvent (event);
/* Reset the event for later reusability. */
- ResetEvent(event);
+ ResetEvent (event);
#endif
return 0;
@@ -166,22 +166,22 @@ int Event::signal(u_long id)
/*!
*Clean all the used resources.
*/
-int Event::destroy()
+int Event::destroy ()
{
#ifdef HAVE_PTHREAD
- if(initialized)
+ if (initialized)
{
- pthread_mutex_lock(&mutex);
+ pthread_mutex_lock (&mutex);
initialized = false;
- pthread_cond_broadcast(&event);
- pthread_mutex_unlock(&mutex);
+ pthread_cond_broadcast (&event);
+ pthread_mutex_unlock (&mutex);
- pthread_cond_destroy(&event);
- pthread_mutex_destroy(&mutex);
+ pthread_cond_destroy (&event);
+ pthread_mutex_destroy (&mutex);
}
#else
- if(initialized)
- CloseHandle(event);
+ if (initialized)
+ CloseHandle (event);
#endif
initialized = false;
return 0;
@@ -190,7 +190,7 @@ int Event::destroy()
/*!
*Destroy the object.
*/
-Event::~Event()
+Event::~Event ()
{
- destroy();
+ destroy ();
}
diff --git a/myserver/src/base/sync/mutex.cpp b/myserver/src/base/sync/mutex.cpp
index 82b00c8..95cddf3 100644
--- a/myserver/src/base/sync/mutex.cpp
+++ b/myserver/src/base/sync/mutex.cpp
@@ -46,20 +46,20 @@ extern "C" {
/*!
*Constructor for the mutex class.
*/
-Mutex::Mutex()
+Mutex::Mutex ()
{
initialized = 0;
- init();
+ init ();
}
/*!
*Initialize a mutex.
*/
-int Mutex::init()
+int Mutex::init ()
{
int ret = 0;
- if(initialized)
+ if (initialized)
{
- destroy();
+ destroy ();
initialized = 0;
}
#ifdef HAVE_PTHREAD
@@ -67,15 +67,15 @@ int Mutex::init()
# if 0
pthread_mutexattr_t mta;
- pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_NORMAL);
- ret = pthread_mutex_init(&mutex, &mta);
+ pthread_mutexattr_settype (&mta, PTHREAD_MUTEX_NORMAL);
+ ret = pthread_mutex_init (&mutex, &mta);
# else
- ret = pthread_mutex_init(&mutex,(pthread_mutexattr_t*) NULL);
+ ret = pthread_mutex_init (&mutex,(pthread_mutexattr_t*) NULL);
# endif
#else
- mutex = CreateMutex(0, 0, 0);
+ mutex = CreateMutex (0, 0, 0);
ret = !mutex;
#endif
initialized = 1;
@@ -85,14 +85,14 @@ int Mutex::init()
/*!
*Destroy a mutex.
*/
-int Mutex::destroy()
+int Mutex::destroy ()
{
#ifdef HAVE_PTHREAD
- if(initialized)
- pthread_mutex_destroy(&mutex);
+ if (initialized)
+ pthread_mutex_destroy (&mutex);
#else
- if(initialized)
- CloseHandle(mutex);
+ if (initialized)
+ CloseHandle (mutex);
#endif
initialized = 0;
return 0;
@@ -101,20 +101,20 @@ int Mutex::destroy()
/*!
*Lock the mutex.
*/
-int Mutex::lock(u_long /*id*/)
+int Mutex::lock (u_long /*id*/)
{
#ifdef HAVE_PTHREAD
# ifdef PTHREAD_ALTERNATE_LOCK
- pthread_mutex_lock(&mutex);
+ pthread_mutex_lock (&mutex);
# else
- while(pthread_mutex_trylock(&mutex) == EBUSY)
+ while (pthread_mutex_trylock (&mutex) == EBUSY)
{
- Thread::wait(1);
+ Thread::wait (1);
}
# endif
#else
- WaitForSingleObject(mutex, INFINITE);
+ WaitForSingleObject (mutex, INFINITE);
#endif
locked = true;
return 0;
@@ -125,7 +125,7 @@ int Mutex::lock(u_long /*id*/)
*
*\return Return true if the mutex is currently locked.
*/
-bool Mutex::isLocked()
+bool Mutex::isLocked ()
{
return locked;
}
@@ -133,13 +133,13 @@ bool Mutex::isLocked()
/*!
*Unlock the mutex access.
*/
-int Mutex::unlock(u_long/*! id*/)
+int Mutex::unlock (u_long/*! id*/)
{
#ifdef HAVE_PTHREAD
int err;
- err = pthread_mutex_unlock(&mutex);
+ err = pthread_mutex_unlock (&mutex);
#else
- ReleaseMutex(mutex);
+ ReleaseMutex (mutex);
#endif
locked = false;
return 0;
@@ -148,15 +148,15 @@ int Mutex::unlock(u_long/*! id*/)
/*!
*Destroy the object.
*/
-Mutex::~Mutex()
+Mutex::~Mutex ()
{
- destroy();
+ destroy ();
}
/*!
*Get the handle for the mutex.
*/
-MutexHandle Mutex::getHandle()
+MutexHandle Mutex::getHandle ()
{
return mutex;
}
diff --git a/myserver/src/base/sync/read_write_lock.cpp
b/myserver/src/base/sync/read_write_lock.cpp
index a3ea5fe..6890e9d 100644
--- a/myserver/src/base/sync/read_write_lock.cpp
+++ b/myserver/src/base/sync/read_write_lock.cpp
@@ -24,7 +24,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
*Initialize the read write lock.
*\param maxReaders The max number of readers.
*/
-ReadWriteLock::ReadWriteLock(int maxReaders) : semaphore(maxReaders)
+ReadWriteLock::ReadWriteLock (int maxReaders) : semaphore (maxReaders)
{
ReadWriteLock::maxReaders = maxReaders;
}
@@ -32,42 +32,42 @@ ReadWriteLock::ReadWriteLock(int maxReaders) :
semaphore(maxReaders)
/*!
*Free the used resources.
*/
-ReadWriteLock::~ReadWriteLock()
+ReadWriteLock::~ReadWriteLock ()
{
- semaphore.destroy();
+ semaphore.destroy ();
}
/*!
*Reader access.
*/
-void ReadWriteLock::readLock()
+void ReadWriteLock::readLock ()
{
- semaphore.lock(1);
+ semaphore.lock (1);
}
/*!
*Reader terminate access.
*/
-void ReadWriteLock::readUnlock()
+void ReadWriteLock::readUnlock ()
{
- semaphore.unlock(1);
+ semaphore.unlock (1);
}
/*!
*Writer access.
*/
-void ReadWriteLock::writeLock()
+void ReadWriteLock::writeLock ()
{
- for(int i = 0; i < maxReaders; i++)
- semaphore.lock();
+ for (int i = 0; i < maxReaders; i++)
+ semaphore.lock ();
}
/*!
*Writer terminate access.
*/
-void ReadWriteLock::writeUnlock()
+void ReadWriteLock::writeUnlock ()
{
- for(int i = 0; i < maxReaders; i++)
- semaphore.unlock();
+ for (int i = 0; i < maxReaders; i++)
+ semaphore.unlock ();
}
diff --git a/myserver/src/base/sync/recursive_mutex.cpp
b/myserver/src/base/sync/recursive_mutex.cpp
index 680be0b..93633c8 100644
--- a/myserver/src/base/sync/recursive_mutex.cpp
+++ b/myserver/src/base/sync/recursive_mutex.cpp
@@ -45,30 +45,30 @@ extern "C" {
/*!
*Constructor for the recursive mutex class.
*/
-RecursiveMutex::RecursiveMutex() : Mutex()
+RecursiveMutex::RecursiveMutex () : Mutex ()
{
initialized = 0;
- init();
+ init ();
}
/*!
*Initialize a recursive mutex.
*/
-int RecursiveMutex::init()
+int RecursiveMutex::init ()
{
int ret = 0;
- if(initialized)
+ if (initialized)
{
- destroy();
+ destroy ();
initialized = 0;
}
#ifdef HAVE_PTHREAD
pthread_mutexattr_t mta;
- pthread_mutexattr_init(&mta);
- pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_RECURSIVE);
- ret = pthread_mutex_init(&mutex, &mta);
+ pthread_mutexattr_init (&mta);
+ pthread_mutexattr_settype (&mta, PTHREAD_MUTEX_RECURSIVE);
+ ret = pthread_mutex_init (&mutex, &mta);
#else
- return Mutex::init();
+ return Mutex::init ();
#endif
initialized = 1;
@@ -78,7 +78,7 @@ int RecursiveMutex::init()
/*!
*Destroy the object.
*/
-RecursiveMutex::~RecursiveMutex()
+RecursiveMutex::~RecursiveMutex ()
{
- destroy();
+ destroy ();
}
diff --git a/myserver/src/base/sync/semaphore.cpp
b/myserver/src/base/sync/semaphore.cpp
index 980570e..629051a 100644
--- a/myserver/src/base/sync/semaphore.cpp
+++ b/myserver/src/base/sync/semaphore.cpp
@@ -50,27 +50,27 @@ extern "C" {
/*!
*Constructor for the semaphore class.
*/
-Semaphore::Semaphore(int n)
+Semaphore::Semaphore (int n)
{
initialized = 0;
- init(n);
+ init (n);
}
/*!
*Initialize the semaphore.
*/
-int Semaphore::init(int n)
+int Semaphore::init (int n)
{
int ret = 0;
- if(initialized)
+ if (initialized)
{
- destroy();
+ destroy ();
initialized = 0;
}
#ifdef HAVE_PTHREAD
- ret = sem_init(&semaphore, 0, n);
+ ret = sem_init (&semaphore, 0, n);
#else
- semaphore = CreateSemaphore(0, n, LONG_MAX, 0);
+ semaphore = CreateSemaphore (0, n, LONG_MAX, 0);
ret = !semaphore;
#endif
initialized = 1;
@@ -80,14 +80,14 @@ int Semaphore::init(int n)
/*!
*Destroy the semaphore.
*/
-int Semaphore::destroy()
+int Semaphore::destroy ()
{
#ifdef HAVE_PTHREAD
- if(initialized)
- sem_destroy(&semaphore);
+ if (initialized)
+ sem_destroy (&semaphore);
#else
- if(initialized)
- CloseHandle(semaphore);
+ if (initialized)
+ CloseHandle (semaphore);
#endif
initialized = 0;
return 0;
@@ -96,21 +96,21 @@ int Semaphore::destroy()
/*!
*Lock the semaphore (p).
*/
-int Semaphore::lock(u_long /*id*/)
+int Semaphore::lock (u_long /*id*/)
{
int err = 0;
#ifdef HAVE_PTHREAD
# ifdef PTHREAD_ALTERNATE_LOCK
- err = sem_wait(&semaphore);
+ err = sem_wait (&semaphore);
# else
timespec ts = {3, 0};
- while(sem_timedwait(&semaphore, &ts) && errno == ETIMEDOUT)
- Thread::wait(1);
+ while (sem_timedwait (&semaphore, &ts) && errno == ETIMEDOUT)
+ Thread::wait (1);
# endif
#else
- err = (WaitForSingleObject(semaphore, INFINITE) == WAIT_FAILED) ? 1 : 0;
+ err = (WaitForSingleObject (semaphore, INFINITE) == WAIT_FAILED) ? 1 : 0;
#endif
return err;
}
@@ -118,13 +118,13 @@ int Semaphore::lock(u_long /*id*/)
/*!
*Unlock the semaphore access (n).
*/
-int Semaphore::unlock(u_long/*! id*/)
+int Semaphore::unlock (u_long/*! id*/)
{
int err;
#ifdef HAVE_PTHREAD
- err = sem_post(&semaphore);
+ err = sem_post (&semaphore);
#else
- err = (ReleaseSemaphore(semaphore, 1, NULL) == FALSE) ? 1 : 0;
+ err = (ReleaseSemaphore (semaphore, 1, NULL) == FALSE) ? 1 : 0;
#endif
return err;
}
@@ -132,7 +132,7 @@ int Semaphore::unlock(u_long/*! id*/)
/*!
*Destroy the object.
*/
-Semaphore::~Semaphore()
+Semaphore::~Semaphore ()
{
- destroy();
+ destroy ();
}
diff --git a/myserver/src/base/unix_socket/unix_socket.cpp
b/myserver/src/base/unix_socket/unix_socket.cpp
index 8cd55ca..948d5c3 100644
--- a/myserver/src/base/unix_socket/unix_socket.cpp
+++ b/myserver/src/base/unix_socket/unix_socket.cpp
@@ -30,7 +30,7 @@ UnixSocket::UnixSocket ()
*\param path Path to the file bound by the socket.
*\return 0 on success.
*/
-int UnixSocket::bind(const char* path)
+int UnixSocket::bind (const char* path)
{
if (path == NULL)
return -1;
diff --git a/myserver/src/base/utility.cpp b/myserver/src/base/utility.cpp
index f28f896..58f141a 100644
--- a/myserver/src/base/utility.cpp
+++ b/myserver/src/base/utility.cpp
@@ -61,14 +61,14 @@ u_long getCPUCount ()
u_long ret = 1;
#ifdef WIN32
SYSTEM_INFO si;
- GetSystemInfo(&si);
+ GetSystemInfo (&si);
ret = si.dwNumberOfProcessors;
#endif
#ifdef _SC_NPROCESSORS_CONF
- ret = (u_long)sysconf(_SC_NPROCESSORS_CONF);
+ ret = (u_long)sysconf (_SC_NPROCESSORS_CONF);
/*! Use only a processor if some error happens. */
- if(ret == (u_long)-1)
+ if (ret == (u_long)-1)
ret = 1;
#endif
@@ -80,9 +80,9 @@ u_long getCPUCount ()
size_t len;
mib[0] = CTL_HW;
mib[1] = HW_NCPU;
- len = sizeof(nproc);
- err = sysctl(mib, 2, &nproc, &len, NULL, 0);
- if(err == 0)
+ len = sizeof (nproc);
+ err = sysctl (mib, 2, &nproc, &len, NULL, 0);
+ if (err == 0)
ret = nproc;
else
ret = 1;
@@ -101,20 +101,20 @@ int setcwdBuffer ()
#ifdef WIN32
/* Under windows there is MAX_PATH, we will use it. */
currentPath = new char [MAX_PATH];
- if(currentPath == 0)
+ if (currentPath == 0)
return (-1);
- char* ret =(char*) _getcwd(currentPath,MAX_PATH);
- if(ret == 0)
+ char* ret =(char*) _getcwd (currentPath,MAX_PATH);
+ if (ret == 0)
return -1;
ret = 0;
- for(u_long i = 0; i<(u_long)strlen(currentPath); i++)
- if(currentPath[i] == '\\')
+ for (u_long i = 0; i<(u_long)strlen (currentPath); i++)
+ if (currentPath[i] == '\\')
currentPath[i] = '/';
- if(currentPath[strlen(currentPath)] == '/')
- currentPath[strlen(currentPath)] = '\0';
+ if (currentPath[strlen (currentPath)] == '/')
+ currentPath[strlen (currentPath)] = '\0';
return 0;
#endif
@@ -130,22 +130,22 @@ int setcwdBuffer ()
do
{
/*! Allocation problem is up. */
- if(currentPath == 0)
+ if (currentPath == 0)
return -1;
ret = getcwd (currentPath, size);
/* Realloc the buffer if it cannot contain the current directory. */
- if(ret == 0)
+ if (ret == 0)
{
size *= 2;
delete [] currentPath;
currentPath = new char[size];
}
}
- while((ret == 0) && (errno == ERANGE));
+ while ((ret == 0) && (errno == ERANGE));
- if(currentPath[strlen(currentPath)] == '/')
- currentPath[strlen(currentPath)] = '\0';
+ if (currentPath[strlen (currentPath)] == '/')
+ currentPath[strlen (currentPath)] = '\0';
return 0;
#endif
}
@@ -169,7 +169,7 @@ int getdefaultwd (string& out)
/*!
* Free the cwd buffer.
*/
-int freecwdBuffer()
+int freecwdBuffer ()
{
delete [] currentPath;
return 0;
@@ -194,9 +194,9 @@ char *getdefaultwd (char *path, int len)
{
/* If len is equal to zero we assume no limit. */
if (len)
- myserver_strlcpy(path, currentPath, len);
+ myserver_strlcpy (path, currentPath, len);
else
- strcpy(path, currentPath);
+ strcpy (path, currentPath);
}
return currentPath;
}
@@ -208,11 +208,11 @@ char *getdefaultwd (char *path, int len)
int setcwd (const char *dir)
{
#ifdef WIN32
- return _chdir(dir);
+ return _chdir (dir);
#endif
#ifndef WIN32
- return chdir(dir);
+ return chdir (dir);
#endif
}
@@ -297,7 +297,7 @@ int readFileHandle (SocketHandle s, Handle* fd)
mh.msg_controllen = sizeof (cmh[0]) * 2;
iov.iov_base = tbuf;
iov.iov_len = 4;
- cmh[0].cmsg_len = sizeof (cmh[0]) + sizeof(int);
+ cmh[0].cmsg_len = sizeof (cmh[0]) + sizeof (int);
ret = recvmsg (s, &mh, 0);
if (ret < 0)
@@ -336,7 +336,7 @@ int writeFileHandle (SocketHandle s, Handle fd)
iov.iov_len = 4;
cmh[0].cmsg_level = SOL_SOCKET;
cmh[0].cmsg_type = SCM_RIGHTS;
- cmh[0].cmsg_len = sizeof(cmh[0]) + sizeof(int);
+ cmh[0].cmsg_len = sizeof (cmh[0]) + sizeof (int);
*(int *)&cmh[1] = fd;
return sendmsg (s, &mh, 0);
#endif
diff --git a/myserver/src/base/xml/xml_parser.cpp
b/myserver/src/base/xml/xml_parser.cpp
index 94b0463..fcee23f 100644
--- a/myserver/src/base/xml/xml_parser.cpp
+++ b/myserver/src/base/xml/xml_parser.cpp
@@ -51,7 +51,7 @@ static int MemBufCloseCallback (void *context)
/**
* Initializes the libxml2 library
- * Calls xmlInitParser()
+ * Calls xmlInitParser ()
* @return Returns true
*/
bool XmlParser::startXML ()
@@ -87,7 +87,7 @@ int XmlParser::open (const char* filename, bool useXpath)
return -1;
if (doc!= NULL)
- close();
+ close ();
doc = xmlParseFile (filename);
@@ -338,7 +338,7 @@ int XmlParser::close ()
}
if (useXpath && xpathCtx)
- xmlXPathFreeContext(xpathCtx);
+ xmlXPathFreeContext (xpathCtx);
doc = NULL;
cur = NULL;
@@ -356,7 +356,7 @@ int XmlParser::close ()
* \param nbytes Amount of bytes
* \return Returns 0 on success, non 0 on failures
*/
-int XmlParser::save(const char *filename,int *nbytes)
+int XmlParser::save (const char *filename,int *nbytes)
{
int err = xmlSaveFile (filename,doc);
@@ -404,7 +404,7 @@ int XmlParser::saveMemBuf (MemBuf & memory,int *nbytes)
void XmlParser::newfile (const char * root)
{
if (doc != NULL)
- close();
+ close ();
doc = xmlNewDoc ((const xmlChar*)"1.0");
cur = xmlNewDocNode (doc, NULL, (const xmlChar*)root, NULL);
diff --git a/myserver/src/conf/main/main_configuration.cpp
b/myserver/src/conf/main/main_configuration.cpp
index 98dc366..b8a44b6 100644
--- a/myserver/src/conf/main/main_configuration.cpp
+++ b/myserver/src/conf/main/main_configuration.cpp
@@ -30,6 +30,6 @@ MainConfiguration::~MainConfiguration ()
char *MainConfiguration::getValue (string const &field)
{
- return getValue (field.c_str());
+ return getValue (field.c_str ());
};
diff --git a/myserver/src/conf/mime/mime_manager.cpp
b/myserver/src/conf/mime/mime_manager.cpp
index 2432b2b..365844f 100644
--- a/myserver/src/conf/mime/mime_manager.cpp
+++ b/myserver/src/conf/mime/mime_manager.cpp
@@ -78,7 +78,7 @@ MimeRecord::MimeRecord (MimeRecord& m)
filters.clear ();
- for( ; i != m.filters.end (); i++)
+ for ( ; i != m.filters.end (); i++)
{
filters.push_back (*i);
}
@@ -87,7 +87,7 @@ MimeRecord::MimeRecord (MimeRecord& m)
extensions.clear ();
- for( ; i != m.extensions.end (); i++)
+ for ( ; i != m.extensions.end (); i++)
{
filters.push_back (*i);
}
@@ -135,7 +135,7 @@ NodeTree<string>* MimeRecord::getNodeTree (string &name)
/*!
* Get the value stored in the hash dictionary for the `name' key.
*/
-const char* MimeRecord::getData(string &name)
+const char* MimeRecord::getData (string &name)
{
NodeTree<string> *str = hashedData.get (name);
if (str)
@@ -180,7 +180,7 @@ MimeRecord *MimeManager::readRecord (xmlNodePtr node)
for ( ;lcur; lcur = lcur->next)
{
- if (lcur->name && !xmlStrcmp(lcur->name, (const xmlChar *)"EXTENSION"))
+ if (lcur->name && !xmlStrcmp (lcur->name, (const xmlChar *)"EXTENSION"))
{
for (attrs = lcur->properties; attrs; attrs = attrs->next)
{
@@ -193,7 +193,7 @@ MimeRecord *MimeManager::readRecord (xmlNodePtr node)
}
}
- if (lcur->name && !xmlStrcmp(lcur->name, (const xmlChar *)"DEFINE"))
+ if (lcur->name && !xmlStrcmp (lcur->name, (const xmlChar *)"DEFINE"))
{
const char *name = NULL;
const char *value = NULL;
@@ -214,12 +214,12 @@ MimeRecord *MimeManager::readRecord (xmlNodePtr node)
string key (name);
string val (value);
NodeTree<string> *nt = new NodeTree<string> (val);
- rc->hashedData.put(key, nt);
+ rc->hashedData.put (key, nt);
}
}
- if (lcur->name && !xmlStrcmp(lcur->name, (const xmlChar *)"PATH"))
+ if (lcur->name && !xmlStrcmp (lcur->name, (const xmlChar *)"PATH"))
{
for (attrs = lcur->properties; attrs; attrs = attrs->next)
{
@@ -239,7 +239,7 @@ MimeRecord *MimeManager::readRecord (xmlNodePtr node)
}
}
- if (lcur->name && !xmlStrcmp(lcur->name, (const xmlChar *)"FILTER"))
+ if (lcur->name && !xmlStrcmp (lcur->name, (const xmlChar *)"FILTER"))
{
for (attrs = lcur->properties; attrs; attrs = attrs->next)
{
@@ -262,7 +262,7 @@ u_long MimeManager::loadXML (const char *fn)
XmlParser parser;
u_long ret = 0;
- if(parser.open (fn))
+ if (parser.open (fn))
{
return -1;
}
@@ -312,7 +312,7 @@ u_long MimeManager::loadXML (XmlParser* parser)
*/
MimeManager::~MimeManager ()
{
- clean();
+ clean ();
}
/*!
@@ -320,7 +320,7 @@ MimeManager::~MimeManager ()
*/
void MimeManager::clean ()
{
- if(loaded)
+ if (loaded)
{
loaded = false;
filename.assign ("");
@@ -352,7 +352,7 @@ int MimeManager::addRecord (MimeRecord *mr)
string &ext = *it;
#ifdef MIME_LOWER_CASE
- transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
+ transform (ext.begin (), ext.end (), ext.begin (), ::tolower);
#endif
extIndex.put (ext, position);
}
diff --git a/myserver/src/conf/security/auth_domain.cpp
b/myserver/src/conf/security/auth_domain.cpp
index bef57b7..65bec0d 100644
--- a/myserver/src/conf/security/auth_domain.cpp
+++ b/myserver/src/conf/security/auth_domain.cpp
@@ -26,7 +26,7 @@ AuthDomain::AuthDomain (SecurityToken *st)
securityToken = st;
}
-AuthDomain::~AuthDomain()
+AuthDomain::~AuthDomain ()
{
}
diff --git a/myserver/src/conf/security/auth_method.cpp
b/myserver/src/conf/security/auth_method.cpp
index a5a84b9..5819187 100644
--- a/myserver/src/conf/security/auth_method.cpp
+++ b/myserver/src/conf/security/auth_method.cpp
@@ -24,7 +24,7 @@ AuthMethod::AuthMethod ()
}
-AuthMethod::~AuthMethod()
+AuthMethod::~AuthMethod ()
{
}
diff --git a/myserver/src/conf/security/auth_method_factory.cpp
b/myserver/src/conf/security/auth_method_factory.cpp
index 5c1ef66..3511a31 100644
--- a/myserver/src/conf/security/auth_method_factory.cpp
+++ b/myserver/src/conf/security/auth_method_factory.cpp
@@ -38,7 +38,7 @@ AuthMethodFactory::~AuthMethodFactory ()
/*!
*Return an AuthMethod given its name.
*/
-AuthMethod* AuthMethodFactory::getAuthMethod(string &name)
+AuthMethod* AuthMethodFactory::getAuthMethod (string &name)
{
return authMethods.get (name);
}
@@ -49,7 +49,7 @@ AuthMethod* AuthMethodFactory::getAuthMethod(string &name)
*\param authMethod The authMethod to add.
*\return The old authMethod registered with [name], in any.
*/
-AuthMethod* AuthMethodFactory::addAuthMethod(string &name, AuthMethod*
authMethod)
+AuthMethod* AuthMethodFactory::addAuthMethod (string &name, AuthMethod*
authMethod)
{
return authMethods.put (name, authMethod);
diff --git a/myserver/src/conf/security/security_cache.cpp
b/myserver/src/conf/security/security_cache.cpp
index f7871a5..09fcf5d 100644
--- a/myserver/src/conf/security/security_cache.cpp
+++ b/myserver/src/conf/security/security_cache.cpp
@@ -41,7 +41,7 @@ SecurityCache::SecurityCache ()
*/
SecurityCache::~SecurityCache ()
{
- free();
+ free ();
}
/*!
@@ -49,14 +49,14 @@ SecurityCache::~SecurityCache ()
*/
void SecurityCache::free ()
{
- HashMap<string, XmlParser*>::Iterator it = dictionary.begin();
+ HashMap<string, XmlParser*>::Iterator it = dictionary.begin ();
for (;it != dictionary.end (); it++)
{
delete (*it);
}
- dictionary.clear();
+ dictionary.clear ();
}
/*!
@@ -70,10 +70,10 @@ void SecurityCache::setMaxNodes (int newLimit)
newLimit = 1;
/*! Remove all the additional nodes from the dictionary. */
- while(newLimit < dictionary.size())
+ while (newLimit < dictionary.size ())
{
- XmlParser* toremove = dictionary.remove(dictionary.begin());
- if(toremove)
+ XmlParser* toremove = dictionary.remove (dictionary.begin ());
+ if (toremove)
delete toremove;
}
limit = newLimit;
@@ -94,35 +94,35 @@ int SecurityCache::getSecurityFile (const string& dir,
{
int found = 0;
string secFile;
- string file(dir);
+ string file (dir);
- int i = file.length() - 1;
+ int i = file.length () - 1;
- while(i && dir[i] == '/')
- file.erase(i--, 1);
+ while (i && dir[i] == '/')
+ file.erase (i--, 1);
- secFile.assign(dir);
- secFile.append("/");
- secFile.append(secFileName);
+ secFile.assign (dir);
+ secFile.append ("/");
+ secFile.append (secFileName);
/* The security file exists in the directory. */
- if(FilesUtility::fileExists(secFile))
+ if (FilesUtility::fileExists (secFile))
{
- out.assign(secFile);
+ out.assign (secFile);
return 0;
}
/* Go upper in the tree till we find a security file. */
- for(;;)
+ for (;;)
{
- if(found || !file.length())
+ if (found || !file.length ())
break;
- for(i = file.length() - 1; i; i--)
- if(file[i] == '/')
+ for (i = file.length () - 1; i; i--)
+ if (file[i] == '/')
{
- file.erase(i, file.length() - i);
+ file.erase (i, file.length () - i);
break;
}
@@ -130,22 +130,22 @@ int SecurityCache::getSecurityFile (const string& dir,
*Top of the tree, check if the security file is present in the
*system directory. Return an error if it is not.
*/
- if(i == 0)
+ if (i == 0)
{
- out.assign(sys);
- out.append("/");
- out.append(secFileName);
- return !FilesUtility::fileExists(out);
+ out.assign (sys);
+ out.append ("/");
+ out.append (secFileName);
+ return !FilesUtility::fileExists (out);
}
- secFile.assign(file);
- secFile.append("/");
- secFile.append(secFileName);
+ secFile.assign (file);
+ secFile.append ("/");
+ secFile.append (secFileName);
- found = FilesUtility::fileExists(secFile);
+ found = FilesUtility::fileExists (secFile);
}
- out.assign(secFile);
+ out.assign (secFile);
return 0;
}
@@ -153,7 +153,7 @@ int SecurityCache::getSecurityFile (const string& dir,
/*!
*Get the actual limit of open nodes.
*/
-int SecurityCache::getMaxNodes()
+int SecurityCache::getMaxNodes ()
{
return limit;
}
@@ -208,7 +208,7 @@ XmlParser* SecurityCache::getParser (const string &dir,
parserFile.close ();
}
- if(parser->open (file.c_str (), useXpath) == -1)
+ if (parser->open (file.c_str (), useXpath) == -1)
{
dictionary.remove (file.c_str ());
return NULL;
diff --git a/myserver/src/conf/security/validator.cpp
b/myserver/src/conf/security/validator.cpp
index d21b926..e9c0aaf 100644
--- a/myserver/src/conf/security/validator.cpp
+++ b/myserver/src/conf/security/validator.cpp
@@ -133,7 +133,7 @@ string *Validator::getValue (HashMap<string,
SecurityDomain*> *hashedDomains, st
}
else
{
- domain.assign("");
+ domain.assign ("");
var = name;
}
diff --git a/myserver/src/conf/security/validator_factory.cpp
b/myserver/src/conf/security/validator_factory.cpp
index 3377a43..6ff6e39 100644
--- a/myserver/src/conf/security/validator_factory.cpp
+++ b/myserver/src/conf/security/validator_factory.cpp
@@ -41,7 +41,7 @@ ValidatorFactory::~ValidatorFactory ()
/*!
*Return a validator given its name.
*/
-Validator* ValidatorFactory::getValidator(string &name)
+Validator* ValidatorFactory::getValidator (string &name)
{
return validators.get (name);
}
@@ -52,7 +52,7 @@ Validator* ValidatorFactory::getValidator(string &name)
*\param validator The validator to add.
*\return The old validator registered with [name], in any.
*/
-Validator* ValidatorFactory::addValidator(string &name, Validator* validator)
+Validator* ValidatorFactory::addValidator (string &name, Validator* validator)
{
return validators.put (name, validator);
}
diff --git a/myserver/src/conf/security/xml_validator.cpp
b/myserver/src/conf/security/xml_validator.cpp
index a5fe690..8cd63ce 100644
--- a/myserver/src/conf/security/xml_validator.cpp
+++ b/myserver/src/conf/security/xml_validator.cpp
@@ -155,22 +155,22 @@ int XmlValidator::getPermissions (xmlAttr* attrs,
xmlChar** user, xmlChar** pass
else if (!xmlStrcmp (attrs->name, (const xmlChar *)"READ") &&
attrs->children && attrs->children->content &&
- !xmlStrcmp(attrs->children->content, (const xmlChar *) "YES"))
+ !xmlStrcmp (attrs->children->content, (const xmlChar *) "YES"))
permissions |= MYSERVER_PERMISSION_READ;
else if (!xmlStrcmp (attrs->name, (const xmlChar *)"WRITE") &&
attrs->children && attrs->children->content &&
- !xmlStrcmp(attrs->children->content, (const xmlChar *) "YES"))
+ !xmlStrcmp (attrs->children->content, (const xmlChar *) "YES"))
permissions |= MYSERVER_PERMISSION_WRITE;
else if (!xmlStrcmp (attrs->name, (const xmlChar *)"EXECUTE") &&
attrs->children && attrs->children->content &&
- !xmlStrcmp(attrs->children->content, (const xmlChar *) "YES"))
+ !xmlStrcmp (attrs->children->content, (const xmlChar *) "YES"))
permissions |= MYSERVER_PERMISSION_EXECUTE;
else if (!xmlStrcmp (attrs->name, (const xmlChar *)"BROWSE") &&
attrs->children && attrs->children->content &&
- !xmlStrcmp(attrs->children->content, (const xmlChar *) "YES"))
+ !xmlStrcmp (attrs->children->content, (const xmlChar *) "YES"))
permissions |= MYSERVER_PERMISSION_BROWSE;
attrs = attrs->next;
@@ -357,11 +357,11 @@ void XmlValidator::doDefine (xmlNodePtr node,
SecurityToken *st, HashMap<string,
while (attrs)
{
- if(!xmlStrcmp (attrs->name, (const xmlChar *)"name") &&
+ if (!xmlStrcmp (attrs->name, (const xmlChar *)"name") &&
attrs->children && attrs->children->content)
name.assign ((const char*)attrs->children->content);
- if(!xmlStrcmp (attrs->name, (const xmlChar *)"value") &&
+ if (!xmlStrcmp (attrs->name, (const xmlChar *)"value") &&
attrs->children && attrs->children->content)
value = attrs->children->content;
diff --git a/myserver/src/conf/vhost/ip.cpp b/myserver/src/conf/vhost/ip.cpp
index a72867f..8513d0e 100644
--- a/myserver/src/conf/vhost/ip.cpp
+++ b/myserver/src/conf/vhost/ip.cpp
@@ -21,15 +21,15 @@
/*!
* comment here
*/
-IpRange *IpRange::RangeFactory(const std::string &ipRange)
+IpRange *IpRange::RangeFactory (const std::string &ipRange)
{
- Ipv4Range *pV4 = new Ipv4Range();
- if ( pV4->SetRange(ipRange) )
+ Ipv4Range *pV4 = new Ipv4Range ();
+ if ( pV4->SetRange (ipRange) )
return pV4;
/* when will be implemented
- Ipv6Range *pV6 = new Ipv6Range();
- if ( pV6->SetRange(ipRange) )
+ Ipv6Range *pV6 = new Ipv6Range ();
+ if ( pV6->SetRange (ipRange) )
return pV6;
*/
@@ -40,42 +40,42 @@ IpRange *IpRange::RangeFactory(const std::string &ipRange)
/*!
* Ipv4Range c-tor
*/
-Ipv4Range::Ipv4Range()
+Ipv4Range::Ipv4Range ()
{
- Init();
+ Init ();
}
/*!
* Ipv4Range c-tor
*/
-Ipv4Range::Ipv4Range(const std::string &sRange)
+Ipv4Range::Ipv4Range (const std::string &sRange)
{
- SetRange(sRange);
+ SetRange (sRange);
}
/*!
- * range given as x.x.x.x-y.y.y.y or x.x.x.x(/y)
+ * range given as x.x.x.x-y.y.y.y or x.x.x.x (/y)
*/
-bool Ipv4Range::SetRange(const std::string &sRange)
+bool Ipv4Range::SetRange (const std::string &sRange)
{
- if ( !Init() )
+ if ( !Init () )
return false;
- if ( sRange.empty() )
+ if ( sRange.empty () )
return true;//just init
- std::string::size_type nPos = sRange.find('-');
+ std::string::size_type nPos = sRange.find ('-');
if ( nPos != std::string::npos )// x.x.x.x-y.y.y.y form
{
- std::string start(sRange.substr(0, nPos));
- std::string end(sRange.substr(nPos + 1));
- return SetRange(start, end);
+ std::string start (sRange.substr (0, nPos));
+ std::string end (sRange.substr (nPos + 1));
+ return SetRange (start, end);
}
- else// x.x.x.x(/y) form
+ else// x.x.x.x (/y) form
{
- std::istringstream istream(sRange);
+ std::istringstream istream (sRange);
char nSep = 0;
unsigned char nAddr[4];
int nTemp = 0;
- for ( int i = 0; i < 4 && !istream.eof(); i++ )
+ for ( int i = 0; i < 4 && !istream.eof (); i++ )
{
istream >> nTemp;
nAddr[i] = nTemp;
@@ -86,7 +86,7 @@ bool Ipv4Range::SetRange(const std::string &sRange)
if ( nSep == '/' )
istream >> nTemp;
- if ( !istream.eof() )
+ if ( !istream.eof () )
return false;
for ( int i = 0, nByte = 0; i < nTemp && nByte < 4; i++ )
@@ -107,15 +107,15 @@ bool Ipv4Range::SetRange(const std::string &sRange)
return true;
}
-bool Ipv4Range::SetRange(const std::string &sStartHost, const std::string
&sEndHost)
+bool Ipv4Range::SetRange (const std::string &sStartHost, const std::string
&sEndHost)
{
- if ( !Init() )
+ if ( !Init () )
return false;
- std::istringstream start(sStartHost), end(sEndHost);
+ std::istringstream start (sStartHost), end (sEndHost);
char nSep = 0;
int nTemp = 0;
- for ( int i = 0; i < 4 && !start.eof() && !end.eof(); i++ )
+ for ( int i = 0; i < 4 && !start.eof () && !end.eof (); i++ )
{
start >> nTemp;
m_nStart[i] = nTemp;
@@ -124,10 +124,10 @@ bool Ipv4Range::SetRange(const std::string &sStartHost,
const std::string &sEndH
m_nEnd[i] = nTemp;
end >> nSep;
}
- if ( !start.eof() || !end.eof() )
+ if ( !start.eof () || !end.eof () )
return false;
- // get mask lenght(max common addr part)
+ // get mask lenght (max common addr part)
char bs = 0;
for ( bs = 0; bs < 32; bs++ )
{
@@ -147,7 +147,7 @@ bool Ipv4Range::SetRange(const std::string &sStartHost,
const std::string &sEndH
* Ipv4Range initializer
* return false on error
*/
-bool Ipv4Range::Init()
+bool Ipv4Range::Init ()
{
for ( int i = 0; i < 4; i++ )
{
@@ -161,14 +161,14 @@ bool Ipv4Range::Init()
/*!
*d-tor
*/
-Ipv4Range::~Ipv4Range()
+Ipv4Range::~Ipv4Range ()
{
}
/*!
*checks if addr from param belongs the same network address
*/
-bool Ipv4Range::InRange(const unsigned char addr[4])
+bool Ipv4Range::InRange (const unsigned char addr[4])
{
unsigned char hostMask[4];
for ( int i = 0; i < 4; i++ )
@@ -195,13 +195,13 @@ bool Ipv4Range::InRange(const unsigned char addr[4])
return true;//equal to start or end
}
-bool Ipv4Range::InRange(const std::string &ip)
+bool Ipv4Range::InRange (const std::string &ip)
{
unsigned char addr[4];
- std::istringstream stream(ip);
+ std::istringstream stream (ip);
char nSep = 0;
int nTemp = 0;
- for ( int i = 0; i < 4 && !stream.eof(); i++ )
+ for ( int i = 0; i < 4 && !stream.eof (); i++ )
{
stream >> nTemp;
addr[i] = nTemp;
@@ -210,13 +210,13 @@ bool Ipv4Range::InRange(const std::string &ip)
stream >> nSep;
}
- return InRange(addr);
+ return InRange (addr);
}
-bool Ipv4Range::InRange(const IpRange *pRange)
+bool Ipv4Range::InRange (const IpRange *pRange)
{
if ( pRange == NULL )
return false;
const Ipv4Range *pLocal = static_cast<const Ipv4Range *>(pRange);
- return InRange(pLocal->GetStart()) && InRange(pLocal->GetEnd());
+ return InRange (pLocal->GetStart ()) && InRange (pLocal->GetEnd ());
}
diff --git a/myserver/src/conf/vhost/vhost.cpp
b/myserver/src/conf/vhost/vhost.cpp
index 2444164..202135a 100644
--- a/myserver/src/conf/vhost/vhost.cpp
+++ b/myserver/src/conf/vhost/vhost.cpp
@@ -83,7 +83,7 @@ Vhost::~Vhost ()
}
refMutex.destroy ();
- mimeManager.clean();
+ mimeManager.clean ();
logManager->remove (this);
}
@@ -91,7 +91,7 @@ Vhost::~Vhost ()
* Clear the data dictionary.
* Returns zero on success.
*/
-int Vhost::freeHashedData()
+int Vhost::freeHashedData ()
{
try
{
@@ -103,9 +103,9 @@ int Vhost::freeHashedData()
}
hashedDataTrees.clear ();
- hashedData.clear();
+ hashedData.clear ();
}
- catch(...)
+ catch (...)
{
return 1;
}
@@ -268,13 +268,13 @@ int Vhost::areAllHostAllowed ()
/*!
* Check if all the IPs are allowed to the connection.
*/
-int Vhost::areAllIPAllowed()
+int Vhost::areAllIPAllowed ()
{
return ipListDeny.empty () && ipListAllow.empty () ? 1 : 0;
}
/*!
- * Check if the network is allowed to the connection(control the network
+ * Check if the network is allowed to the connection (control the network
* by the local IP).
* \param ip The IP to check.
*/
@@ -326,7 +326,7 @@ void Vhost::addHost (const char *host, int isRegex)
char* ascii = 0;
uint32_t* ucs4 = stringprep_utf8_to_ucs4 (host, -1, &len);
- if(!ucs4)
+ if (!ucs4)
{
delete hl;
return;
@@ -412,9 +412,9 @@ NULL_REFERENCECB Vhost::getNullRefCB ()
*/
void Vhost::addRef ()
{
- refMutex.lock(0);
+ refMutex.lock (0);
refCount++;
- refMutex.unlock(0);
+ refMutex.unlock (0);
}
/*!
@@ -422,15 +422,15 @@ void Vhost::addRef ()
*/
void Vhost::removeRef ()
{
- refMutex.lock(0);
+ refMutex.lock (0);
refCount--;
/*!
* If the reference count reaches zero and a callback
* function is defined call it.
*/
if (refCount == 0 && nullReferenceCb)
- nullReferenceCb(this);
- refMutex.unlock(0);
+ nullReferenceCb (this);
+ refMutex.unlock (0);
}
/*!
@@ -456,9 +456,9 @@ void Vhost::setRef (int n)
*/
const char* Vhost::getData (const char* name)
{
- NodeTree<string> *s = hashedData.get(name);
+ NodeTree<string> *s = hashedData.get (name);
- return s ? s->getValue ()->c_str() : 0;
+ return s ? s->getValue ()->c_str () : 0;
}
/*!
diff --git a/myserver/src/conf/vhost/vhost_manager.cpp
b/myserver/src/conf/vhost/vhost_manager.cpp
index 4793e32..f5a0a38 100644
--- a/myserver/src/conf/vhost/vhost_manager.cpp
+++ b/myserver/src/conf/vhost/vhost_manager.cpp
@@ -26,14 +26,14 @@
*VhostManager add function.
*\param vh The virtual host to add.
*/
-int VhostManager::addVHost(Vhost* vh)
+int VhostManager::addVHost (Vhost* vh)
{
list<Vhost*>::iterator it;
- mutex.lock();
+ mutex.lock ();
/* Be sure there is a listening thread on the specified port. */
- listenThreads->addListeningThread(vh->getPort());
+ listenThreads->addListeningThread (vh->getPort ());
if (extSource)
{
@@ -48,15 +48,15 @@ int VhostManager::addVHost(Vhost* vh)
{
if (!vh->getProtocolName ())
{
- vh->setProtocolName("http");
- Server::getInstance()->log (MYSERVER_LOG_MSG_WARNING,
+ vh->setProtocolName ("http");
+ Server::getInstance ()->log (MYSERVER_LOG_MSG_WARNING,
_("Protocol not defined for vhost: %s, using HTTP by
default"),
vh->getName ());
}
string protocol (vh->getProtocolName ());
- if (Server::getInstance ()->getProtocolsManager()->getProtocol (protocol)
+ if (Server::getInstance ()->getProtocolsManager ()->getProtocol
(protocol)
== NULL)
- Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
_("The protocol \"%s\" is used but not
loaded"),
protocol.c_str ());
@@ -64,9 +64,9 @@ int VhostManager::addVHost(Vhost* vh)
mutex.unlock ();
return 0;
}
- catch(...)
+ catch (...)
{
- mutex.unlock();
+ mutex.unlock ();
return -1;
};
}
@@ -78,50 +78,50 @@ int VhostManager::addVHost(Vhost* vh)
*\param ip IP address for the virtual host.
*\param port The port used by the client to connect to the server.
*/
-Vhost* VhostManager::getVHost(const char* host, const char* ip, u_short port)
+Vhost* VhostManager::getVHost (const char* host, const char* ip, u_short port)
{
list<Vhost*>::iterator it;
- mutex.lock();
+ mutex.lock ();
try
{
- if(extSource)
+ if (extSource)
{
- Vhost* ret = extSource->getVHost(host, ip, port);
- mutex.unlock();
+ Vhost* ret = extSource->getVHost (host, ip, port);
+ mutex.unlock ();
return ret;
}
- it = hostList.begin();
+ it = hostList.begin ();
/*Do a linear search here. We have to use the first full-matching
*virtual host.
*/
- for(; it != hostList.end(); it++)
+ for (; it != hostList.end (); it++)
{
Vhost* vh = *it;
/* Control if the host port is the correct one. */
- if(vh->getPort() != port)
+ if (vh->getPort () != port)
continue;
/* If ip is defined check that it is allowed to connect to the host.
*/
- if(ip && !vh->isIPAllowed(ip))
+ if (ip && !vh->isIPAllowed (ip))
continue;
/* If host is defined check if it is allowed to connect to the host.
*/
- if(host && !vh->isHostAllowed(host))
+ if (host && !vh->isHostAllowed (host))
continue;
/* We find a valid host. */
- mutex.unlock();
+ mutex.unlock ();
/* Add a reference. */
- vh->addRef();
+ vh->addRef ();
return vh;
}
- mutex.unlock();
+ mutex.unlock ();
return 0;
}
- catch(...)
+ catch (...)
{
- mutex.unlock();
+ mutex.unlock ();
return 0;
};
}
@@ -131,38 +131,38 @@ Vhost* VhostManager::getVHost(const char* host, const
char* ip, u_short port)
*\param lt A ListenThreads object to use to create new threads.
*\param lm The log manager to use.
*/
-VhostManager::VhostManager(ListenThreads* lt, LogManager* lm)
+VhostManager::VhostManager (ListenThreads* lt, LogManager* lm)
{
listenThreads = lt;
- hostList.clear();
+ hostList.clear ();
extSource = 0;
- mutex.init();
+ mutex.init ();
logManager = lm;
}
/*!
*Clean the virtual hosts.
*/
-void VhostManager::clean()
+void VhostManager::clean ()
{
list<Vhost*>::iterator it;
- mutex.lock();
+ mutex.lock ();
- it = hostList.begin();
+ it = hostList.begin ();
try
{
- for(;it != hostList.end(); it++)
+ for (;it != hostList.end (); it++)
delete *it;
- hostList.clear();
+ hostList.clear ();
- mutex.unlock();
+ mutex.unlock ();
}
- catch(...)
+ catch (...)
{
- mutex.unlock();
+ mutex.unlock ();
return;
};
}
@@ -170,16 +170,16 @@ void VhostManager::clean()
/*!
*vhostmanager destructor.
*/
-VhostManager::~VhostManager()
+VhostManager::~VhostManager ()
{
- clean();
- mutex.destroy();
+ clean ();
+ mutex.destroy ();
}
/*!
*Returns the entire virtual hosts list.
*/
-list<Vhost*>* VhostManager::getVHostList()
+list<Vhost*>* VhostManager::getVHostList ()
{
return &(this->hostList);
}
@@ -189,30 +189,30 @@ list<Vhost*>* VhostManager::getVHostList()
*/
void VhostManager::changeLocationsOwner ()
{
- if(Server::getInstance ()->getUid () ||
+ if (Server::getInstance ()->getUid () ||
Server::getInstance ()->getGid ())
{
- string uid (Server::getInstance()->getUid ());
- string gid (Server::getInstance()->getGid ());
+ string uid (Server::getInstance ()->getUid ());
+ string gid (Server::getInstance ()->getGid ());
/*
*Change the log files owner if a different user or group
*identifier is specified.
*/
- for(list<Vhost*>::iterator it = hostList.begin (); it != hostList.end
(); it++)
+ for (list<Vhost*>::iterator it = hostList.begin (); it != hostList.end
(); it++)
{
int err;
Vhost* vh = *it;
/* Chown the log files. */
err = logManager->chown (vh, "ACCESSLOG", uid, gid);
- if(err)
- Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
+ if (err)
+ Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
_("Error while changing accesses log locations owner"));
err = logManager->chown (vh, "WARNINGLOG", uid, gid);
- if(err)
- Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
+ if (err)
+ Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
_("Error while changing log locations owner"));
}
}
@@ -222,9 +222,9 @@ void VhostManager::changeLocationsOwner ()
/*!
*Returns the number of hosts in the list
*/
-int VhostManager::getHostsNumber()
+int VhostManager::getHostsNumber ()
{
- return hostList.size();
+ return hostList.size ();
}
@@ -291,7 +291,7 @@ VhostManager::loadXMLlogData (string name, Vhost* vh,
xmlNode* lcur)
err = vh->openAccessLog (location, filters, cycle);
vh->setAccessLogOpt (opt.c_str ());
if (err)
- Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
_("Error opening %s"),
location.c_str ());
}
else if (!name.compare ("WARNINGLOG"))
@@ -299,11 +299,11 @@ VhostManager::loadXMLlogData (string name, Vhost* vh,
xmlNode* lcur)
err = vh->openWarningLog (location, filters, cycle);
vh->setWarningLogOpt (opt.c_str ());
if (err)
- Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
_("Error opening %s"),
location.c_str ());
}
else
- Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
_(" Unrecognized log type"));
}
}
@@ -314,18 +314,18 @@ VhostManager::loadXMLlogData (string name, Vhost* vh,
xmlNode* lcur)
*Returns non-null on errors.
*\param filename The XML file to open.
*/
-int VhostManager::loadXMLConfigurationFile(const char *filename)
+int VhostManager::loadXMLConfigurationFile (const char *filename)
{
XmlParser parser;
xmlDocPtr doc;
xmlNodePtr node;
- if(parser.open(filename))
+ if (parser.open (filename))
{
- Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
_("Error opening %s"), filename);
return -1;
}
- doc = parser.getDoc();
+ doc = parser.getDoc ();
node = doc->children->children;
for (;node;node = node->next )
@@ -338,9 +338,9 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
vh = new Vhost (logManager);
if (vh == 0)
{
- parser.close();
- clean();
- Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
+ parser.close ();
+ clean ();
+ Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
_("internal error"), filename);
return -1;
}
@@ -360,7 +360,7 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
{
if (!xmlStrcmp (attrs->name, (const xmlChar *)"isRegex")
&& attrs->children && attrs->children->content
- && (!xmlStrcmp(attrs->children->content,
+ && (!xmlStrcmp (attrs->children->content,
(const xmlChar *)"YES")))
useRegex = 1;
}
@@ -373,7 +373,7 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
}
else if (!xmlStrcmp (lcur->name, (const xmlChar *)"LOCATION"))
{
- string loc (vh->getDocumentRoot());
+ string loc (vh->getDocumentRoot ());
loc.append ("/");
for (xmlAttr *attrs = lcur->properties; attrs; attrs =
attrs->next)
{
@@ -390,8 +390,8 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
}
else if (!xmlStrcmp (lcur->name, (const xmlChar *)"SSL_CERTIFICATE"))
{
- string certificate((char*)lcur->children->content);
- sslContext->setCertificateFile(certificate);
+ string certificate ((char*)lcur->children->content);
+ sslContext->setCertificateFile (certificate);
}
else if (!xmlStrcmp (lcur->name, (const xmlChar
*)"CONNECTIONS_PRIORITY"))
{
@@ -415,10 +415,10 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
while (attrs)
{
- if (!xmlStrcmp(attrs->name, (const xmlChar *)"isRegex"))
+ if (!xmlStrcmp (attrs->name, (const xmlChar *)"isRegex"))
{
if (attrs->children && attrs->children->content &&
- (!xmlStrcmp(attrs->children->content,
+ (!xmlStrcmp (attrs->children->content,
(const xmlChar *)"YES")))
useRegex = 1;
}
@@ -430,7 +430,7 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
{
int val = atoi ((char*)lcur->children->content);
if (val > (1 << 16) || strlen ((const
char*)lcur->children->content) > 6)
- Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
_("Specified invalid port %s"),
lcur->children->content);
vh->setPort ((u_short)val);
}
@@ -460,16 +460,16 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
else
vh->setDocumentRoot ("");
}
- else if (!xmlStrcmp(lcur->name, (const xmlChar *)"SYSROOT"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *)"SYSROOT"))
{
if (lcur->children && lcur->children->content)
{
char* lastChar = (char*)lcur->children->content;
- while(*(lastChar+1) != '\0')
+ while (*(lastChar+1) != '\0')
lastChar++;
- if(*lastChar == '\\' || *lastChar == '/')
+ if (*lastChar == '\\' || *lastChar == '/')
*lastChar = '\0';
vh->setSystemRoot ((const char*)lcur->children->content);
@@ -488,7 +488,7 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
else if (!xmlStrcmp (lcur->name, (const xmlChar *)"MIME_FILE"))
{
if (lcur->children)
- vh->getMIME()->loadXML ((char*)lcur->children->content);
+ vh->getMIME ()->loadXML ((char*)lcur->children->content);
}
else if (!xmlStrcmp (lcur->name, (const xmlChar *)"THROTTLING_RATE"))
{
@@ -496,11 +496,11 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
}
lcur = lcur->next;
- }// while(lcur)
+ }// while (lcur)
if (vh->openLogFiles ())
{
- Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
_("Error opening log files"));
delete vh;
vh = 0;
@@ -509,7 +509,7 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
if (vh->initializeSSL () < 0)
{
- Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
_("Error initializing SSL for
%s"),
vh->getName ());
delete vh;
@@ -519,7 +519,7 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
if (addVHost (vh))
{
- Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
_("Internal error"));
delete vh;
vh = 0;
@@ -538,36 +538,36 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
*Zero based list.
*\param n The virtual host id.
*/
-Vhost* VhostManager::getVHostByNumber(int n)
+Vhost* VhostManager::getVHostByNumber (int n)
{
Vhost* ret = 0;
- mutex.lock();
+ mutex.lock ();
try
{
- list<Vhost*>::iterator i = hostList.begin();
- if(extSource)
+ list<Vhost*>::iterator i = hostList.begin ();
+ if (extSource)
{
- ret=extSource->getVHostByNumber(n);
- mutex.unlock();
+ ret=extSource->getVHostByNumber (n);
+ mutex.unlock ();
return ret;
}
- for( ; i != hostList.end(); i++)
+ for ( ; i != hostList.end (); i++)
{
- if(!(n--))
+ if (!(n--))
{
ret = *i;
- ret->addRef();
+ ret->addRef ();
break;
}
}
- mutex.unlock();
+ mutex.unlock ();
return ret;
}
- catch(...)
+ catch (...)
{
- mutex.unlock();
+ mutex.unlock ();
return ret;
};
}
@@ -577,28 +577,28 @@ Vhost* VhostManager::getVHostByNumber(int n)
*First position is zero.
*\param n The virtual host identifier in the list.
*/
-int VhostManager::removeVHost(int n)
+int VhostManager::removeVHost (int n)
{
- mutex.lock();
+ mutex.lock ();
try
{
- list<Vhost*>::iterator i = hostList.begin();
+ list<Vhost*>::iterator i = hostList.begin ();
- for( ;i != hostList.end(); i++)
+ for ( ;i != hostList.end (); i++)
{
- if(!(n--))
+ if (!(n--))
{
delete *i;
- mutex.unlock();
+ mutex.unlock ();
return 1;
}
}
- mutex.unlock();
+ mutex.unlock ();
return 0;
}
- catch(...)
+ catch (...)
{
- mutex.unlock();
+ mutex.unlock ();
return 0;
};
}
@@ -607,17 +607,17 @@ int VhostManager::removeVHost(int n)
*Set an external source for the virtual hosts.
*\param nExtSource The new external source.
*/
-void VhostManager::setExternalSource(VhostSource* nExtSource)
+void VhostManager::setExternalSource (VhostSource* nExtSource)
{
- mutex.lock();
+ mutex.lock ();
extSource = nExtSource;
- mutex.unlock();
+ mutex.unlock ();
}
/*!
*Construct the object.
*/
-VhostSource::VhostSource()
+VhostSource::VhostSource ()
{
}
@@ -625,7 +625,7 @@ VhostSource::VhostSource()
/*!
*Destroy the object.
*/
-VhostSource::~VhostSource()
+VhostSource::~VhostSource ()
{
}
@@ -633,7 +633,7 @@ VhostSource::~VhostSource()
/*!
*Load the object.
*/
-int VhostSource::load()
+int VhostSource::load ()
{
return 0;
}
@@ -641,7 +641,7 @@ int VhostSource::load()
/*!
*Save the object.
*/
-int VhostSource::save()
+int VhostSource::save ()
{
return 0;
}
@@ -649,7 +649,7 @@ int VhostSource::save()
/*!
*Free the object.
*/
-int VhostSource::free()
+int VhostSource::free ()
{
return 0;
}
@@ -657,7 +657,7 @@ int VhostSource::free()
/*!
*Add a virtual host to the source.
*/
-int VhostSource::addVHost(Vhost*)
+int VhostSource::addVHost (Vhost*)
{
return 0;
}
@@ -665,7 +665,7 @@ int VhostSource::addVHost(Vhost*)
/*!
*Get a virtual host.
*/
-Vhost* VhostSource::getVHost(const char*, const char*, u_short)
+Vhost* VhostSource::getVHost (const char*, const char*, u_short)
{
return 0;
}
@@ -673,7 +673,7 @@ Vhost* VhostSource::getVHost(const char*, const char*,
u_short)
/*!
*Get a virtual host by its number.
*/
-Vhost* VhostSource::getVHostByNumber(int n)
+Vhost* VhostSource::getVHostByNumber (int n)
{
return 0;
}
diff --git a/myserver/src/conf/xml_conf.cpp b/myserver/src/conf/xml_conf.cpp
index 5b7a962..ee8979f 100644
--- a/myserver/src/conf/xml_conf.cpp
+++ b/myserver/src/conf/xml_conf.cpp
@@ -45,7 +45,7 @@ void XmlConf::readNode (xmlNodePtr lcur,
HashMap<string, NodeTree<string>*> *hashedData)
{
xmlAttr *attrs;
- for(; lcur; lcur = lcur->next)
+ for (; lcur; lcur = lcur->next)
if (lcur->name && !xmlStrcmp (lcur->name, (const xmlChar *)"DEFINE"))
{
NodeTree<string> *node = new NodeTree<string> ();
@@ -68,14 +68,14 @@ void XmlConf::readNode (xmlNodePtr lcur,
}
}
- string *v = value ? new string((const char*)value) : NULL;
+ string *v = value ? new string ((const char*)value) : NULL;
node->setValue (v);
- if(name)
+ if (name)
{
- string key((const char*)name);
- hashedData->put(key, node);
+ string key ((const char*)name);
+ hashedData->put (key, node);
}
if (root)
diff --git a/myserver/src/connection/connection.cpp
b/myserver/src/connection/connection.cpp
index db4987b..6ebc8fb 100644
--- a/myserver/src/connection/connection.cpp
+++ b/myserver/src/connection/connection.cpp
@@ -66,7 +66,7 @@ void Connection::destroy ()
if (password)
delete password;
- if(ipAddr)
+ if (ipAddr)
delete ipAddr;
if (localIpAddr)
@@ -75,7 +75,7 @@ void Connection::destroy ()
if (connectionBuffer)
delete connectionBuffer;
- if(protocolBuffer)
+ if (protocolBuffer)
delete protocolBuffer;
/*! Remove the reference for the vhost. */
@@ -162,7 +162,7 @@ void Connection::setPort (u_short newPort)
*/
const char* Connection::getLogin ()
{
- return login->c_str();
+ return login->c_str ();
}
/*!
@@ -203,7 +203,7 @@ void Connection::incnTries ()
*/
const char* Connection::getIpAddr ()
{
- return ipAddr->c_str();
+ return ipAddr->c_str ();
}
/*!
@@ -304,7 +304,7 @@ void Connection::setForceControl (int fp)
*/
const char* Connection::getPassword ()
{
- return password->c_str();
+ return password->c_str ();
}
/*!
@@ -313,7 +313,7 @@ const char* Connection::getPassword ()
*/
void Connection::setPassword (const char* p)
{
- password->assign(p);
+ password->assign (p);
}
/*!
diff --git a/myserver/src/connections_scheduler/connections_scheduler.cpp
b/myserver/src/connections_scheduler/connections_scheduler.cpp
index 6a5c05d..db9f4a8 100644
--- a/myserver/src/connections_scheduler/connections_scheduler.cpp
+++ b/myserver/src/connections_scheduler/connections_scheduler.cpp
@@ -18,7 +18,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include <include/connections_scheduler/connections_scheduler.h>
#include <include/server/server.h>
-static DEFINE_THREAD(dispatcher, p)
+static DEFINE_THREAD (dispatcher, p)
{
ConnectionsScheduler::DispatcherArg *da =
(ConnectionsScheduler::DispatcherArg*)p;
@@ -68,9 +68,9 @@ void ConnectionsScheduler::newData (short event, SocketHandle
handle)
{
ConnectionPtr connection = NULL;
- connectionsMutex.lock();
+ connectionsMutex.lock ();
connection = connections.get (handle);
- connectionsMutex.unlock();
+ connectionsMutex.unlock ();
if (connection == NULL || server == NULL)
@@ -80,7 +80,7 @@ void ConnectionsScheduler::newData (short event, SocketHandle
handle)
addReadyConnection (connection);
else if (event == EV_TIMEOUT)
{
- if (!connection->allowDelete())
+ if (!connection->allowDelete ())
return;
server->notifyDeleteConnection (connection);
@@ -97,7 +97,7 @@ static void eventLoopHandler (int fd, short event, void *arg)
{
Socket sock (da->socketPair.getFirstHandle ());
- while (da->socketPair.bytesToRead())
+ while (da->socketPair.bytesToRead ())
{
char cmd;
da->socketPair.read (&cmd, 1, &nbr);
@@ -114,9 +114,9 @@ static void eventLoopHandler (int fd, short event, void
*arg)
ConnectionPtr c;
timeval tv = {10, 0};
- da->socketPair.read ((char*)&handle, sizeof(SocketHandle), &nbr);
- da->socketPair.read ((char*)&c, sizeof(ConnectionPtr), &nbr);
- da->socketPair.read ((char*)&tv, sizeof(timeval), &nbr);
+ da->socketPair.read ((char*)&handle, sizeof (SocketHandle), &nbr);
+ da->socketPair.read ((char*)&c, sizeof (ConnectionPtr), &nbr);
+ da->socketPair.read ((char*)&tv, sizeof (timeval), &nbr);
event_once ((int) handle, EV_READ | EV_TIMEOUT, newDataHandler, da,
&tv);
}
@@ -160,10 +160,10 @@ static void listenerHandler (int fd, short event, void
*arg)
*/
void ConnectionsScheduler::listener (ConnectionsScheduler::ListenerArg *la)
{
- ConnectionsScheduler::ListenerArg *arg = new
ConnectionsScheduler::ListenerArg(la);
+ ConnectionsScheduler::ListenerArg *arg = new
ConnectionsScheduler::ListenerArg (la);
static timeval tv = {3, 0};
- event_set(&(arg->ev), (int) la->serverSocket->getHandle(), EV_READ |
EV_TIMEOUT,
+ event_set (&(arg->ev), (int) la->serverSocket->getHandle (), EV_READ |
EV_TIMEOUT,
listenerHandler, arg);
arg->terminate = &dispatcherArg.terminate;
@@ -171,16 +171,16 @@ void ConnectionsScheduler::listener
(ConnectionsScheduler::ListenerArg *la)
arg->server = server;
arg->eventsMutex = &eventsMutex;
- listeners.push_front(arg);
+ listeners.push_front (arg);
- event_add(&(arg->ev), &tv);
+ event_add (&(arg->ev), &tv);
u_long nbw;
Socket sock (dispatcherArg.socketPair.getSecondHandle ());
- eventsSocketMutex.lock();
- sock.write("l", 1, &nbw);
- eventsSocketMutex.unlock();
+ eventsSocketMutex.lock ();
+ sock.write ("l", 1, &nbw);
+ eventsSocketMutex.unlock ();
}
/*!
@@ -188,10 +188,10 @@ void ConnectionsScheduler::listener
(ConnectionsScheduler::ListenerArg *la)
*/
void ConnectionsScheduler::removeListener (ConnectionsScheduler::ListenerArg*
la)
{
- eventsMutex.lock();
- event_del(&(la->ev));
- listeners.remove(la);
- eventsMutex.unlock();
+ eventsMutex.lock ();
+ event_del (&(la->ev));
+ listeners.remove (la);
+ eventsMutex.unlock ();
}
/*!
@@ -199,11 +199,11 @@ void ConnectionsScheduler::removeListener
(ConnectionsScheduler::ListenerArg* la
*/
ConnectionsScheduler::ConnectionsScheduler (Server* server)
{
- readyMutex.init();
- eventsMutex.init();
- connectionsMutex.init();
- eventsSocketMutex.init();
- readySemaphore = new Semaphore(0);
+ readyMutex.init ();
+ eventsMutex.init ();
+ connectionsMutex.init ();
+ eventsSocketMutex.init ();
+ readySemaphore = new Semaphore (0);
currentPriority = 0;
currentPriorityDone = 0;
nTotalConnections = 0;
@@ -301,10 +301,10 @@ void ConnectionsScheduler::initialize ()
*/
ConnectionsScheduler::~ConnectionsScheduler ()
{
- readyMutex.destroy();
- eventsMutex.destroy();
- eventsSocketMutex.destroy();
- connectionsMutex.destroy();
+ readyMutex.destroy ();
+ eventsMutex.destroy ();
+ eventsSocketMutex.destroy ();
+ connectionsMutex.destroy ();
delete readySemaphore;
delete [] ready;
}
@@ -376,7 +376,7 @@ void ConnectionsScheduler::addWaitingConnectionImpl
(ConnectionPtr c, int lock)
static timeval tv = {10, 0};
SocketHandle handle = c->socket ? (SocketHandle) c->socket->getHandle () :
NULL;
- if(server)
+ if (server)
tv.tv_sec = server->getTimeout () / 1000;
else
tv.tv_sec = 30;
@@ -400,9 +400,9 @@ void ConnectionsScheduler::addWaitingConnectionImpl
(ConnectionPtr c, int lock)
eventsSocketMutex.lock ();
sock.write ("c", 1, &nbw);
- sock.write ((char*)&handle, sizeof(SocketHandle), &nbw);
- sock.write ((char*)&c, sizeof(ConnectionPtr), &nbw);
- sock.write ((char*)&tv, sizeof(timeval), &nbw);
+ sock.write ((char*)&handle, sizeof (SocketHandle), &nbw);
+ sock.write ((char*)&c, sizeof (ConnectionPtr), &nbw);
+ sock.write ((char*)&tv, sizeof (timeval), &nbw);
eventsSocketMutex.unlock ();
}
else
@@ -430,7 +430,7 @@ ConnectionPtr ConnectionsScheduler::getConnection ()
for (int i = 0; i < PRIORITY_CLASSES; i++)
{
if (currentPriorityDone > currentPriority ||
- !ready[currentPriority].size())
+ !ready[currentPriority].size ())
{
currentPriority = (currentPriority + 1) % PRIORITY_CLASSES;
currentPriorityDone = 0;
@@ -512,7 +512,7 @@ void ConnectionsScheduler::getConnections
(list<ConnectionPtr> &out)
connectionsMutex.lock ();
HashMap<SocketHandle, ConnectionPtr>::Iterator it = connections.begin ();
- for(; it != connections.end (); it++)
+ for (; it != connections.end (); it++)
out.push_back (*it);
connectionsMutex.unlock ();
@@ -546,7 +546,7 @@ void ConnectionsScheduler::terminateConnections ()
try
{
- connectionsMutex.lock();
+ connectionsMutex.lock ();
HashMap<SocketHandle, ConnectionPtr>::Iterator it = connections.begin ();
for (; it != connections.end (); it++)
@@ -569,7 +569,7 @@ void ConnectionsScheduler::terminateConnections ()
readyMutex.lock ();
for (i = 0; i < PRIORITY_CLASSES; i++)
- while (ready[i].size())
+ while (ready[i].size ())
ready[i].pop ();
readyMutex.unlock ();
@@ -587,8 +587,8 @@ int ConnectionsScheduler::accept
(ConnectionsSchedulerVisitor* visitor, void* ar
{
for (HashMap<SocketHandle, ConnectionPtr>::Iterator it =
- connections.begin (); it != connections.end() && !ret; it++)
- visitor->visitConnection(*it, args);
+ connections.begin (); it != connections.end () && !ret; it++)
+ visitor->visitConnection (*it, args);
}
catch (...)
{
diff --git a/myserver/src/connections_scheduler/listen_threads.cpp
b/myserver/src/connections_scheduler/listen_threads.cpp
index c6cb761..ee796a0 100644
--- a/myserver/src/connections_scheduler/listen_threads.cpp
+++ b/myserver/src/connections_scheduler/listen_threads.cpp
@@ -48,7 +48,7 @@ using namespace std;
/*!
* C'tor.
*/
-ListenThreads::ListenThreads(ConnectionsScheduler* scheduler, Server* server)
+ListenThreads::ListenThreads (ConnectionsScheduler* scheduler, Server* server)
{
fastRebooting = false;
committingFastReboot = false;
@@ -60,7 +60,7 @@ ListenThreads::ListenThreads(ConnectionsScheduler* scheduler,
Server* server)
* This function is used to create a socket server and a thread listener
* for a port.
*/
-int ListenThreads::createServerAndListener(u_short port)
+int ListenThreads::createServerAndListener (u_short port)
{
int optvalReuseAddr = 1;
string listenPortMsg;
@@ -75,7 +75,7 @@ int ListenThreads::createServerAndListener(u_short port)
* Create the server sockets:
* one server socket for IPv4 and another one for IPv6
*/
- Socket *serverSocketIPv4 = new Socket();
+ Socket *serverSocketIPv4 = new Socket ();
Socket *serverSocketIPv6 = NULL;
SocketInformation* si = new SocketInformation;
@@ -89,7 +89,7 @@ int ListenThreads::createServerAndListener(u_short port)
if (serverSocketIPv4 != NULL)
{
serverSocketIPv4->socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (serverSocketIPv4->getHandle() == (Handle)INVALID_SOCKET)
+ if (serverSocketIPv4->getHandle () == (Handle)INVALID_SOCKET)
{
server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
@@ -108,7 +108,7 @@ int ListenThreads::createServerAndListener(u_short port)
#ifndef WIN32
if (serverSocketIPv4->setsockopt (SOL_SOCKET, SO_REUSEADDR,
(const char *)&optvalReuseAddr,
- sizeof(optvalReuseAddr)) < 0)
+ sizeof (optvalReuseAddr)) < 0)
{
server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
@@ -123,7 +123,7 @@ int ListenThreads::createServerAndListener(u_short port)
_("Binding the port"));
if (!serverSocketIPv4->bind (&sockServerSocketIPv4,
- sizeof(sockaddr_in)))
+ sizeof (sockaddr_in)))
server->log (MYSERVER_LOG_MSG_INFO, _("Port was bound"));
else
{
@@ -138,7 +138,7 @@ int ListenThreads::createServerAndListener(u_short port)
}
#if HAVE_IPV6
- serverSocketIPv6 = new Socket();
+ serverSocketIPv6 = new Socket ();
if (serverSocketIPv6 != NULL)
{
@@ -156,11 +156,11 @@ int ListenThreads::createServerAndListener(u_short port)
((sockaddr_in6*)(&sockServerSocketIPv6))->sin6_family = AF_INET6;
((sockaddr_in6*)(&sockServerSocketIPv6))->sin6_addr =
in6addr_any;
((sockaddr_in6*)(&sockServerSocketIPv6))->sin6_port =
- htons((u_short)port);
+ htons ((u_short)port);
# ifndef WIN32
if (serverSocketIPv6->setsockopt (SOL_SOCKET, SO_REUSEADDR,
(const char *)&optvalReuseAddr,
- sizeof(optvalReuseAddr)) < 0)
+ sizeof (optvalReuseAddr)) < 0)
{
server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
@@ -168,9 +168,9 @@ int ListenThreads::createServerAndListener(u_short port)
serverSocketIPv6 = NULL;
}
- if(serverSocketIPv6->setsockopt (IPPROTO_IPV6, IPV6_V6ONLY,
+ if (serverSocketIPv6->setsockopt (IPPROTO_IPV6, IPV6_V6ONLY,
(const char *)&optvalReuseAddr,
- sizeof(optvalReuseAddr)) < 0)
+ sizeof (optvalReuseAddr)) < 0)
{
server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
@@ -184,7 +184,7 @@ int ListenThreads::createServerAndListener(u_short port)
_("Binding the port"));
if (!serverSocketIPv6->bind (&sockServerSocketIPv6,
- sizeof(sockaddr_in6)))
+ sizeof (sockaddr_in6)))
server->log (MYSERVER_LOG_MSG_INFO,
_("Port was bound"));
else
@@ -239,12 +239,12 @@ int ListenThreads::createServerAndListener(u_short port)
return 0;
}
- catch(bad_alloc &ba)
+ catch (bad_alloc &ba)
{
server->log (MYSERVER_LOG_MSG_ERROR, _("Bad alloc: %s"),
ba.what ());
}
- catch(exception &e)
+ catch (exception &e)
{
server->log (MYSERVER_LOG_MSG_ERROR, _("Error: %s"),
e.what ());
@@ -319,7 +319,7 @@ void ListenThreads::commitFastReboot ()
it != usedPorts.end (); it++)
presentPorts.insert ((*it)->port);
- for(list<u_short>::iterator it = frPortsToAdd.begin ();
+ for (list<u_short>::iterator it = frPortsToAdd.begin ();
it != frPortsToAdd.end (); it++)
newPorts.insert (*it);
@@ -414,7 +414,7 @@ int ListenThreads::terminate ()
}
else
{
- for (HashMap<u_short, SocketInformation*>::Iterator i =
usedPorts.begin();
+ for (HashMap<u_short, SocketInformation*>::Iterator i = usedPorts.begin
();
i != usedPorts.end (); i++)
sockets.push_front (*i);
it = sockets.begin ();
diff --git a/myserver/src/filter/filter.cpp b/myserver/src/filter/filter.cpp
index 692934b..59bfffa 100644
--- a/myserver/src/filter/filter.cpp
+++ b/myserver/src/filter/filter.cpp
@@ -30,7 +30,7 @@ using namespace std;
*\param len The buffer length in bytes.
*\param nbr A pointer to receive the number of read bytes.
*/
-int Filter::read(char* buffer, u_long len, u_long *nbr)
+int Filter::read (char* buffer, u_long len, u_long *nbr)
{
*nbr=0;
return 0;
@@ -42,7 +42,7 @@ int Filter::read(char* buffer, u_long len, u_long *nbr)
*\param len Number of bytes to use.
*\param nbw A pointer to receive the number of written bytes.
*/
-int Filter::write(const char* buffer, u_long len, u_long* nbw)
+int Filter::write (const char* buffer, u_long len, u_long* nbw)
{
*nbw = 0;
return 0;
@@ -54,7 +54,7 @@ int Filter::write(const char* buffer, u_long len, u_long* nbw)
*\param len The buffer length in bytes.
*\param nbr A pointer to receive the number of read bytes.
*/
-int Filter::getHeader(char* buffer, u_long len, u_long* nbr)
+int Filter::getHeader (char* buffer, u_long len, u_long* nbr)
{
*nbr = 0;
return 0;
@@ -66,7 +66,7 @@ int Filter::getHeader(char* buffer, u_long len, u_long* nbr)
*\param len The buffer length in bytes.
*\param nbr A pointer to receive the number of read bytes.
*/
-int Filter::getFooter(char* buffer, u_long len, u_long* nbr)
+int Filter::getFooter (char* buffer, u_long len, u_long* nbr)
{
*nbr = 0;
return 0;
@@ -75,7 +75,7 @@ int Filter::getFooter(char* buffer, u_long len, u_long* nbr)
/*!
*Default constructor.
*/
-Filter::Filter()
+Filter::Filter ()
{
protocol = 0;
protocolData = 0;
@@ -86,7 +86,7 @@ Filter::Filter()
/*!
*Default destructor.
*/
-Filter::~Filter()
+Filter::~Filter ()
{
}
@@ -95,7 +95,7 @@ Filter::~Filter()
*Set the stream where apply the filter.
*\param parentStream The stream to use as parent.
*/
-void Filter::setParent(Stream* parentStream)
+void Filter::setParent (Stream* parentStream)
{
parent = parentStream;
}
@@ -104,7 +104,7 @@ void Filter::setParent(Stream* parentStream)
*Flush everything to the stream. Returns -1 on errors.
*\param nbw A pointer to receive the number of read bytes.
*/
-int Filter::flush(u_long *nbw)
+int Filter::flush (u_long *nbw)
{
*nbw = 0;
return 0;
@@ -113,7 +113,7 @@ int Filter::flush(u_long *nbw)
/*!
*Get the stream used by the filter.
*/
-Stream* Filter::getParent()
+Stream* Filter::getParent ()
{
return parent;
}
@@ -121,7 +121,7 @@ Stream* Filter::getParent()
/*!
*Returns a nonzero value if the filter modify the input/output data.
*/
-int Filter::modifyData()
+int Filter::modifyData ()
{
return 0;
}
@@ -132,10 +132,10 @@ int Filter::modifyData()
*\param name The buffer where write the filter name.
*\param len The buffer length.
*/
-const char* Filter::getName(char* name, u_long len)
+const char* Filter::getName (char* name, u_long len)
{
/* No name by default. */
- if(name)
+ if (name)
{
name[0] = '\0';
}
diff --git a/myserver/src/filter/filters_chain.cpp
b/myserver/src/filter/filters_chain.cpp
index 4c2d36a..1aa3fa2 100644
--- a/myserver/src/filter/filters_chain.cpp
+++ b/myserver/src/filter/filters_chain.cpp
@@ -28,27 +28,27 @@ using namespace std;
/*!
*Read data from the chain. Returns 0 on success.
*/
-int FiltersChain::read(char* buffer, u_long len, u_long* nbr)
+int FiltersChain::read (char* buffer, u_long len, u_long* nbr)
{
- if(stream == 0)
+ if (stream == 0)
return -1;
- if(firstFilter)
- return firstFilter->read(buffer, len, nbr);
+ if (firstFilter)
+ return firstFilter->read (buffer, len, nbr);
- return stream->read(buffer, len, nbr);
+ return stream->read (buffer, len, nbr);
}
/*!
*Set the stream where apply the filters.
*/
-void FiltersChain::setStream(Stream* s)
+void FiltersChain::setStream (Stream* s)
{
- list<Filter*>::iterator i=filters.begin();
+ list<Filter*>::iterator i=filters.begin ();
- for( ; i!=filters.end(); i++ )
- if((*i)->getParent()==stream)
+ for ( ; i!=filters.end (); i++ )
+ if ((*i)->getParent ()==stream)
{
- (*i)->setParent(s);
+ (*i)->setParent (s);
}
stream=s;
}
@@ -56,7 +56,7 @@ void FiltersChain::setStream(Stream* s)
/*!
*Get the stream usedby the chain.
*/
-Stream* FiltersChain::getStream()
+Stream* FiltersChain::getStream ()
{
return stream;
}
@@ -64,20 +64,20 @@ Stream* FiltersChain::getStream()
/*!
*Write data using the chain. Returns 0 on success.
*/
-int FiltersChain::write(const char* buffer, u_long len, u_long* nbw)
+int FiltersChain::write (const char* buffer, u_long len, u_long* nbw)
{
- if(stream == 0)
+ if (stream == 0)
return -1;
- if(firstFilter)
- return firstFilter->write(buffer, len, nbw);
+ if (firstFilter)
+ return firstFilter->write (buffer, len, nbw);
- return stream->write(buffer, len, nbw);
+ return stream->write (buffer, len, nbw);
}
/*!
*Initialize the chain object.
*/
-FiltersChain::FiltersChain()
+FiltersChain::FiltersChain ()
{
acceptDuplicates = 1;
stream = NULL;
@@ -89,7 +89,7 @@ FiltersChain::FiltersChain()
/*!
*Set if the chain can cointain duplicates of the same filter on different
levels.
*/
-void FiltersChain::setAcceptDuplicates(int v)
+void FiltersChain::setAcceptDuplicates (int v)
{
acceptDuplicates = v;
}
@@ -97,7 +97,7 @@ void FiltersChain::setAcceptDuplicates(int v)
/*!
*Return if the chain can have the same filter in multiple places.
*/
-int FiltersChain::getAcceptDuplicates()
+int FiltersChain::getAcceptDuplicates ()
{
return acceptDuplicates;
}
@@ -105,7 +105,7 @@ int FiltersChain::getAcceptDuplicates()
/*!
*Destroy the chain.
*/
-FiltersChain::~FiltersChain()
+FiltersChain::~FiltersChain ()
{
}
@@ -115,35 +115,35 @@ FiltersChain::~FiltersChain()
*Returns 0 on success.
*the number of bytes written to initialize the filter.
*/
-int FiltersChain::addFilter(Filter* f, u_long *nbw, int sendData)
+int FiltersChain::addFilter (Filter* f, u_long *nbw, int sendData)
{
u_long ret = 0;
char buffer[512];
u_long nbw2;
u_long nbwFirstFilter;
- if(!firstFilter)
+ if (!firstFilter)
{
- f->setParent(stream);
+ f->setParent (stream);
}
else
{
- f->setParent(firstFilter);
+ f->setParent (firstFilter);
}
/*! If the chain doesn't support duplicates check if the filter is already
present.*/
- if(!acceptDuplicates)
+ if (!acceptDuplicates)
{
- if(isFilterPresent(f))
+ if (isFilterPresent (f))
return 0;
}
- if(sendData)
+ if (sendData)
{
- /*! Write the filter/filter.header(if any) using the upper chain. */
- if(!f->getHeader(buffer, 512, &nbw2))
+ /*! Write the filter/filter.header (if any) using the upper chain. */
+ if (!f->getHeader (buffer, 512, &nbw2))
{
- if(nbw2 && f->getParent()->write(buffer, nbw2, &nbwFirstFilter))
+ if (nbw2 && f->getParent ()->write (buffer, nbw2, &nbwFirstFilter))
ret = 1;
*nbw = nbwFirstFilter;
}
@@ -159,11 +159,11 @@ int FiltersChain::addFilter(Filter* f, u_long *nbw, int
sendData)
*/
firstFilter = f;
- f->setProtocol(protocol);
- f->setProtocolData(protocolData);
+ f->setProtocol (protocol);
+ f->setProtocolData (protocolData);
/*! Add the filters in the list in the same order they are used. */
- filters.push_front(f);
+ filters.push_front (f);
return ret;
}
@@ -172,20 +172,20 @@ int FiltersChain::addFilter(Filter* f, u_long *nbw, int
sendData)
*Additional footer data for filters is added at the end.
*Returns 0 on success.
*/
-int FiltersChain::flush(u_long* nbw)
+int FiltersChain::flush (u_long* nbw)
{
u_long written = 0;
char buffer[512];
list<Filter*>::iterator i;
*nbw = 0;
- if(firstFilter != NULL)
+ if (firstFilter != NULL)
{
- if(firstFilter->flush(nbw))
+ if (firstFilter->flush (nbw))
return 1;
}
- else if(stream)
+ else if (stream)
{
- if(stream->flush(nbw))
+ if (stream->flush (nbw))
return 1;
}
written = *nbw;
@@ -194,9 +194,9 @@ int FiltersChain::flush(u_long* nbw)
/*!
*Position on the last element.
*/
- i = filters.end();
+ i = filters.end ();
- while(i != filters.begin())
+ while (i != filters.begin ())
{
Filter* f;
u_long tmpNbw = 0;
@@ -204,9 +204,9 @@ int FiltersChain::flush(u_long* nbw)
--i;
f = *i;
- if(f->getFooter(buffer, 512, &tmpNbw))
+ if (f->getFooter (buffer, 512, &tmpNbw))
return -1;
- f->getParent()->write(buffer, tmpNbw, nbw);
+ f->getParent ()->write (buffer, tmpNbw, nbw);
written += (*nbw);
}
@@ -218,12 +218,12 @@ int FiltersChain::flush(u_long* nbw)
/*!
*Check if a filter is present in the chain.
*/
-int FiltersChain::isFilterPresent(Filter* f)
+int FiltersChain::isFilterPresent (Filter* f)
{
- list<Filter*>::iterator i = filters.begin();
+ list<Filter*>::iterator i = filters.begin ();
- for( ; i != filters.end(); ++i )
- if(*i == f)
+ for ( ; i != filters.end (); ++i )
+ if (*i == f)
return 1;
return 0;
@@ -232,12 +232,12 @@ int FiltersChain::isFilterPresent(Filter* f)
/*!
*Check if a filter is present in the chain by its name.
*/
-int FiltersChain::isFilterPresent(const char* name)
+int FiltersChain::isFilterPresent (const char* name)
{
- list<Filter*>::iterator i = filters.begin();
+ list<Filter*>::iterator i = filters.begin ();
- for( ; i != filters.end(); ++i )
- if(!strcmpi((*i)->getName(0, 0), name))
+ for ( ; i != filters.end (); ++i )
+ if (!strcmpi ((*i)->getName (0, 0), name))
return 1;
return 0;
}
@@ -245,17 +245,17 @@ int FiltersChain::isFilterPresent(const char* name)
/*!
*Remove the first occurrence of the specified filter from the chain.
*/
-int FiltersChain::removeFilter(Filter* f)
+int FiltersChain::removeFilter (Filter* f)
{
- list<Filter*>::iterator i = filters.begin();
- list<Filter*>::iterator prev = filters.end();
- for( ; i != filters.end(); ++i )
+ list<Filter*>::iterator i = filters.begin ();
+ list<Filter*>::iterator prev = filters.end ();
+ for ( ; i != filters.end (); ++i )
{
- if(*i == f)
+ if (*i == f)
{
- if(prev != filters.end())
+ if (prev != filters.end ())
{
- (*prev)->setParent((*i)->getParent());
+ (*prev)->setParent ((*i)->getParent ());
}
else
{
@@ -263,20 +263,20 @@ int FiltersChain::removeFilter(Filter* f)
*It is the first filter according to the linked list.
*Do not use the getParent function here as it can be a Stream.
*/
- if(i == filters.end())
+ if (i == filters.end ())
firstFilter = NULL;
else
{
list<Filter*>::iterator tmpIt = i;
tmpIt++;
- if(tmpIt == filters.end())
+ if (tmpIt == filters.end ())
firstFilter = NULL;
else
firstFilter = *(tmpIt);
}
}
- filters.erase(i);
+ filters.erase (i);
break;
}
prev = i;
@@ -288,7 +288,7 @@ int FiltersChain::removeFilter(Filter* f)
/*!
*Returns a nonzero value if the chain is empty.
*/
-int FiltersChain::isEmpty()
+int FiltersChain::isEmpty ()
{
return !firstFilter;
}
@@ -296,26 +296,26 @@ int FiltersChain::isEmpty()
/*!
*Destroy filters objects. This destroys all the filters objects in the list.
*/
-void FiltersChain::clearAllFilters()
+void FiltersChain::clearAllFilters ()
{
- list<Filter*>::iterator i=filters.begin();
- for( ; i!=filters.end();i++)
+ list<Filter*>::iterator i=filters.begin ();
+ for ( ; i!=filters.end ();i++)
{
delete (*i);
}
- filters.clear();
+ filters.clear ();
firstFilter=0;
}
/*!
*Returns a nonzero value if the chain contains any modifier filter.
*/
-int FiltersChain::hasModifiersFilters()
+int FiltersChain::hasModifiersFilters ()
{
- list <Filter*>::iterator i=filters.begin();
- for( ;i!=filters.end(); ++i)
+ list <Filter*>::iterator i=filters.begin ();
+ for ( ;i!=filters.end (); ++i)
{
- if((*i)->modifyData())
+ if ((*i)->modifyData ())
return 1;
}
return 0;
@@ -324,7 +324,7 @@ int FiltersChain::hasModifiersFilters()
/*!
*Get the first filter of the chain.
*/
-Filter* FiltersChain::getFirstFilter()
+Filter* FiltersChain::getFirstFilter ()
{
return firstFilter;
}
@@ -334,22 +334,22 @@ Filter* FiltersChain::getFirstFilter()
*Fullfill the out string with a comma separated list of the filters
*present in the chain.
*/
-void FiltersChain::getName(string& out)
+void FiltersChain::getName (string& out)
{
- list<Filter*>::iterator i = filters.begin();
- out.clear();
+ list<Filter*>::iterator i = filters.begin ();
+ out.clear ();
- for(;;)
+ for (;;)
{
- if(i != filters.end() && (*i)->modifyData())
+ if (i != filters.end () && (*i)->modifyData ())
{
- const char* name = (*i)->getName(0, 0);
- if(name)
- out.append(name);
+ const char* name = (*i)->getName (0, 0);
+ if (name)
+ out.append (name);
}
i++;
- if(i != filters.end() && (*i)->modifyData())
- out.append(",");
+ if (i != filters.end () && (*i)->modifyData ())
+ out.append (",");
else
break;
}
diff --git a/myserver/src/filter/filters_factory.cpp
b/myserver/src/filter/filters_factory.cpp
index cb73fd7..48fc18a 100644
--- a/myserver/src/filter/filters_factory.cpp
+++ b/myserver/src/filter/filters_factory.cpp
@@ -28,15 +28,15 @@ using namespace std;
/*!
*Initialize the object.
*/
-FiltersFactory::FiltersFactory()
+FiltersFactory::FiltersFactory ()
{
- staticFilters.clear();
+ staticFilters.clear ();
}
/*!
*Destroy the object.
*/
-FiltersFactory::~FiltersFactory()
+FiltersFactory::~FiltersFactory ()
{
}
@@ -45,10 +45,10 @@ FiltersFactory::~FiltersFactory()
*Insert a filter by name and factory object. Returns 0 if the entry
*was added correctly.
*/
-int FiltersFactory::insert(const char* name, FiltersSource* ptr)
+int FiltersFactory::insert (const char* name, FiltersSource* ptr)
{
- string nameStr(name);
- dynamicFilters.put(nameStr, ptr);
+ string nameStr (name);
+ dynamicFilters.put (nameStr, ptr);
return 0;
}
@@ -56,10 +56,10 @@ int FiltersFactory::insert(const char* name, FiltersSource*
ptr)
*Insert a filter by name and factory routine. Returns 0 if the entry
*was added correctly.
*/
-int FiltersFactory::insert(const char* name, FILTERCREATE fnc)
+int FiltersFactory::insert (const char* name, FILTERCREATE fnc)
{
- string nameStr(name);
- staticFilters.put(nameStr, fnc);
+ string nameStr (name);
+ staticFilters.put (nameStr, fnc);
return 0;
}
@@ -69,19 +69,19 @@ int FiltersFactory::insert(const char* name, FILTERCREATE
fnc)
*Returns the new created object on success.
*Returns 0 on errors.
*/
-Filter *FiltersFactory::getFilter(const char* name)
+Filter *FiltersFactory::getFilter (const char* name)
{
- FILTERCREATE staticFactory = staticFilters.get(name);
+ FILTERCREATE staticFactory = staticFilters.get (name);
FiltersSource* dynamicFactory;
/*! If the filter exists create a new object and return it. */
- if(staticFactory)
- return staticFactory(name);
+ if (staticFactory)
+ return staticFactory (name);
- dynamicFactory = dynamicFilters.get(name);
+ dynamicFactory = dynamicFilters.get (name);
- if(dynamicFactory)
- return dynamicFactory->createFilter(name);
+ if (dynamicFactory)
+ return dynamicFactory->createFilter (name);
return 0;
}
@@ -93,15 +93,15 @@ Filter *FiltersFactory::getFilter(const char* name)
*will not modify the data.
*On errors returns 0.
*/
-FiltersChain* FiltersFactory::chain(list<string> &l, Stream* out, u_long *nbw,
+FiltersChain* FiltersFactory::chain (list<string> &l, Stream* out, u_long *nbw,
int onlyNotModifiers)
{
- FiltersChain *ret = new FiltersChain();
- if(!ret)
+ FiltersChain *ret = new FiltersChain ();
+ if (!ret)
return 0;
- if(chain(ret, l, out, nbw, onlyNotModifiers))
+ if (chain (ret, l, out, nbw, onlyNotModifiers))
{
- ret->clearAllFilters();
+ ret->clearAllFilters ();
delete ret;
return 0;
}
@@ -114,28 +114,28 @@ FiltersChain* FiltersFactory::chain(list<string> &l,
Stream* out, u_long *nbw,
*will not modify the data.
*On errors returns nonzero.
*/
-int FiltersFactory::chain(FiltersChain* c, list<string> &l, Stream* out,
+int FiltersFactory::chain (FiltersChain* c, list<string> &l, Stream* out,
u_long *nbw, int onlyNotModifiers)
{
- list<string>::iterator i =l.begin();
+ list<string>::iterator i =l.begin ();
- if(!c)
+ if (!c)
return 1;
- c->setStream(out);
+ c->setStream (out);
*nbw=0;
- for( ; i != l.end(); i++)
+ for ( ; i != l.end (); i++)
{
u_long tmp;
- Filter *n = getFilter((*i).c_str());
- if( !n || ( onlyNotModifiers && n->modifyData() ) )
+ Filter *n = getFilter ((*i).c_str ());
+ if ( !n || ( onlyNotModifiers && n->modifyData () ) )
{
- c->clearAllFilters();
+ c->clearAllFilters ();
return 1;
}
- c->addFilter(n, &tmp);
+ c->addFilter (n, &tmp);
*nbw += tmp;
}
@@ -145,8 +145,8 @@ int FiltersFactory::chain(FiltersChain* c, list<string> &l,
Stream* out,
/*!
*Free the object.
*/
-void FiltersFactory::free()
+void FiltersFactory::free ()
{
- staticFilters.clear();
- dynamicFilters.clear();
+ staticFilters.clear ();
+ dynamicFilters.clear ();
}
diff --git a/myserver/src/filter/gzip/gzip.cpp
b/myserver/src/filter/gzip/gzip.cpp
index ec524c8..42befcd 100644
--- a/myserver/src/filter/gzip/gzip.cpp
+++ b/myserver/src/filter/gzip/gzip.cpp
@@ -47,13 +47,13 @@ u_long Gzip::initialize ()
#ifdef HAVE_ZLIB
long level = Z_DEFAULT_COMPRESSION;
- if(protocol && protocolData)
+ if (protocol && protocolData)
{
- if(!strstr(protocol->registerName(0,0), "HTTP"))
+ if (!strstr (protocol->registerName (0,0), "HTTP"))
{
HttpRequestHeader::Entry* e =
((HttpThreadContext*)protocolData)->request.other.get ("Accept-Encoding");
if (e)
- active &= (e->value->find("gzip") != string::npos);
+ active &= (e->value->find ("gzip") != string::npos);
else
active = false;
}
@@ -105,7 +105,7 @@ u_long Gzip::compress (const char* in, u_long sizeIn,
data.stream.avail_in = sizeIn;
data.stream.next_out = (Bytef*) out;
data.stream.avail_out = sizeOut;
- ret = deflate(&(data.stream), Z_FULL_FLUSH);
+ ret = deflate (&(data.stream), Z_FULL_FLUSH);
data.data_size += data.stream.total_out - old_total_out;
data.crc = crc32(data.crc, (const Bytef *) in, sizeIn);
@@ -322,7 +322,7 @@ int Gzip::write (const char* buffer, u_long len, u_long
*nbw)
u_long size=std::min (len, 512UL);
u_long ret=compress (buffer, size, tmpBuffer, 1024);
- if(ret && parent->write(tmpBuffer, ret, &nbw_parent) == -1)
+ if (ret && parent->write (tmpBuffer, ret, &nbw_parent) == -1)
return -1;
written += ret;
diff --git a/myserver/src/filter/gzip/gzip_decompress.cpp
b/myserver/src/filter/gzip/gzip_decompress.cpp
index 004766b..0d1c579 100644
--- a/myserver/src/filter/gzip/gzip_decompress.cpp
+++ b/myserver/src/filter/gzip/gzip_decompress.cpp
@@ -72,7 +72,7 @@ u_long GzipDecompress::decompress (const char* in, u_long
sizeIn,
data.stream.next_out = (Bytef*) out;
data.stream.avail_out = sizeOut;
- ret = inflate(&(data.stream), Z_FULL_FLUSH);
+ ret = inflate (&(data.stream), Z_FULL_FLUSH);
data.data_size += data.stream.total_out - old_total_out;
return data.stream.total_out - old_total_out;
@@ -93,7 +93,7 @@ u_long GzipDecompress::free ()
if (data.initialized == 0)
return 0;
data.initialized = 0;
- ret = inflateEnd(&(data.stream));
+ ret = inflateEnd (&(data.stream));
#endif
return ret;
}
@@ -128,7 +128,7 @@ int GzipDecompress::getFooter (char* buffer, u_long len,
u_long* nbw)
/*!
* The GzipDecompress filter modifies the data.
*/
-int GzipDecompress::modifyData()
+int GzipDecompress::modifyData ()
{
return 1;
}
@@ -149,7 +149,7 @@ u_long GzipDecompress::flush (char *out, u_long sizeOut)
data.stream.avail_in = 0;
data.stream.next_out = (Bytef*) out;
data.stream.avail_out = destLen;
- inflate(&(data.stream), Z_FINISH);
+ inflate (&(data.stream), Z_FINISH);
data.data_size += data.stream.total_out - old_total_out;
return data.stream.total_out - old_total_out;
@@ -170,9 +170,9 @@ GzipDecompress::GzipDecompress ()
/*!
* Destructor for the class.
*/
-GzipDecompress::~GzipDecompress()
+GzipDecompress::~GzipDecompress ()
{
- free();
+ free ();
}
/*!
@@ -180,7 +180,7 @@ GzipDecompress::~GzipDecompress()
* \param str Buffer where write.
* \param size Buffer length.
*/
-u_long GzipDecompress::getFooter(char *str, int /*size*/)
+u_long GzipDecompress::getFooter (char *str, int /*size*/)
{
#ifdef HAVE_ZLIB
return GZIP_FOOTER_LENGTH;
@@ -215,7 +215,7 @@ int GzipDecompress::read (char* buffer, u_long len, u_long
*nbr)
char *tmp_buff;
int ret;
u_long nbr_parent;
- if(!parent)
+ if (!parent)
return -1;
tmp_buff = new char[len/2];
if (!tmp_buff)
@@ -282,7 +282,7 @@ int GzipDecompress::flush (u_long *nbw)
{
char buffer[512];
- if(!active)
+ if (!active)
return 0;
*nbw = flush (buffer, 512);
@@ -320,7 +320,7 @@ const char* GzipDecompress::getName (char* name, u_long len)
{
/*! No name by default. */
if (name)
- myserver_strlcpy(name, "gzip", len);
+ myserver_strlcpy (name, "gzip", len);
return "gzip";
}
@@ -328,7 +328,7 @@ const char* GzipDecompress::getName (char* name, u_long len)
/*!
* Get the GZIP header size.
*/
-u_long GzipDecompress::headerSize()
+u_long GzipDecompress::headerSize ()
{
return GZIP_HEADER_LENGTH;
}
@@ -336,7 +336,7 @@ u_long GzipDecompress::headerSize()
/*!
* Get the GZIP footer size.
*/
-u_long GzipDecompress::footerSize()
+u_long GzipDecompress::footerSize ()
{
return GZIP_FOOTER_LENGTH;
}
diff --git a/myserver/src/filter/memory_stream.cpp
b/myserver/src/filter/memory_stream.cpp
index fb64242..49d7e57 100644
--- a/myserver/src/filter/memory_stream.cpp
+++ b/myserver/src/filter/memory_stream.cpp
@@ -27,13 +27,13 @@ using namespace std;
/*!
*Inherited from Stream.
*/
-int MemoryStream::read(char* buffer, u_long len, u_long *nbr)
+int MemoryStream::read (char* buffer, u_long len, u_long *nbr)
{
char *b;
- *nbr = std::min(len, static_cast<u_long>(data->getLength() - readSeek));
- b = data->getBuffer() + readSeek;
+ *nbr = std::min (len, static_cast<u_long>(data->getLength () - readSeek));
+ b = data->getBuffer () + readSeek;
- memcpy(buffer, b, *nbr);
+ memcpy (buffer, b, *nbr);
readSeek += (*nbr);
@@ -43,10 +43,10 @@ int MemoryStream::read(char* buffer, u_long len, u_long
*nbr)
/*!
*Read directly on the stream.
*/
-int MemoryStream::read(Stream* s, u_long len, u_long *nbr)
+int MemoryStream::read (Stream* s, u_long len, u_long *nbr)
{
- u_long towrite = *nbr = std::min(len, static_cast<u_long>(data->getLength()
- readSeek));
- int ret = s->write(data->getBuffer()+readSeek, towrite, nbr);
+ u_long towrite = *nbr = std::min (len, static_cast<u_long>(data->getLength
() - readSeek));
+ int ret = s->write (data->getBuffer ()+readSeek, towrite, nbr);
readSeek += towrite;
return ret;
}
@@ -54,9 +54,9 @@ int MemoryStream::read(Stream* s, u_long len, u_long *nbr)
/*!
*Inherited from Stream.
*/
-int MemoryStream::write(const char* buffer, u_long len, u_long *nbw)
+int MemoryStream::write (const char* buffer, u_long len, u_long *nbw)
{
- data->addBuffer(buffer, len);
+ data->addBuffer (buffer, len);
*nbw = len;
return 0;
}
@@ -64,7 +64,7 @@ int MemoryStream::write(const char* buffer, u_long len,
u_long *nbw)
/*!
*Inherited from Stream.
*/
-int MemoryStream::flush(u_long* nbw)
+int MemoryStream::flush (u_long* nbw)
{
*nbw = 0;
return 0;
@@ -73,48 +73,48 @@ int MemoryStream::flush(u_long* nbw)
/*!
*Use an external buffer to store data.
*/
-MemoryStream::MemoryStream(MemBuf* out)
+MemoryStream::MemoryStream (MemBuf* out)
{
readSeek = 0;
internalData = 0;
data = out;
- data->setLength(0);
+ data->setLength (0);
}
/*!
*Return how many bytes can be read.
*/
-int MemoryStream::availableToRead()
+int MemoryStream::availableToRead ()
{
- return data->getLength()-readSeek;
+ return data->getLength ()-readSeek;
}
/*!
*Construct the object.
*/
-MemoryStream::MemoryStream()
+MemoryStream::MemoryStream ()
{
internalData = 1;
readSeek = 0;
- data = new MemBuf();
- data->setLength(0);
+ data = new MemBuf ();
+ data->setLength (0);
}
/*!
*Inherited from Stream.
*/
-MemoryStream::~MemoryStream()
+MemoryStream::~MemoryStream ()
{
- if(internalData)
+ if (internalData)
delete data;
}
/*!
*Recycle the buffer.
*/
-int MemoryStream::refresh()
+int MemoryStream::refresh ()
{
readSeek = 0;
- data->setLength(0);
+ data->setLength (0);
return 0;
}
diff --git a/myserver/src/http_handler/cgi/cgi.cpp
b/myserver/src/http_handler/cgi/cgi.cpp
index 16fbe10..501f6ee 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -82,12 +82,12 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
int i;
if (!(td->permissions & MYSERVER_PERMISSION_EXECUTE))
- return td->http->sendAuth();
+ return td->http->sendAuth ();
td->scriptPath.assign (scriptpath);
if (!FilesUtility::fileExists (scriptpath))
- return td->http->raiseHTTPError(404);
+ return td->http->raiseHTTPError (404);
int subString = cgipath[0] == '"';
/* Do not modify the text between " and ". */
@@ -132,12 +132,12 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
if (execute)
{
const char *args = 0;
- if(td->request.uriOpts.length())
- args = td->request.uriOpts.c_str();
- else if (td->pathInfo.length())
+ if (td->request.uriOpts.length ())
+ args = td->request.uriOpts.c_str ();
+ else if (td->pathInfo.length ())
args = &td->pathInfo[1];
- if (cgipath && strlen(cgipath))
+ if (cgipath && strlen (cgipath))
cmdLine << tmpCgiPath << " " << moreArg << " "
<< td->scriptFile << (args ? args : "" ) ;
else
@@ -147,7 +147,7 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
&& td->scriptFile[1] == 'p' && td->scriptFile[2] == 'h'
&& td->scriptFile[3] == '-' ;
- if (cgipath && strlen(cgipath))
+ if (cgipath && strlen (cgipath))
{
spi.cmd.assign (tmpCgiPath);
spi.arg.append (" ");
@@ -177,7 +177,7 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
{
if (!FilesUtility::fileExists (tmpCgiPath.c_str ()))
{
- if (tmpCgiPath.length() > 0)
+ if (tmpCgiPath.length () > 0)
td->connection->host->warningsLogWrite (_("Cgi: cannot find the %s
file")),
tmpCgiPath.c_str ();
else
@@ -201,7 +201,7 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
spi.cmd.append ("/");
spi.cmd.append (td->cgiFile);
- if (td->cgiFile.length() > 4 && td->cgiFile[0] == 'n'
+ if (td->cgiFile.length () > 4 && td->cgiFile[0] == 'n'
&& td->cgiFile[1] == 'p' && td->cgiFile[2] == 'h'
&& td->cgiFile[3] == '-' )
nph = true;
@@ -212,7 +212,7 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
/*
*Open the stdout file for the new CGI process.
*/
- if (stdOutFile.create())
+ if (stdOutFile.create ())
{
td->connection->host->warningsLogWrite (_("Cgi: internal error"));
chain.clearAllFilters ();
@@ -220,7 +220,7 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
}
/* Open the stdin file for the new CGI process. */
- if (stdInFile.openFile(td->inputDataPath,
+ if (stdInFile.openFile (td->inputDataPath,
File::READ | File::FILE_OPEN_ALWAYS))
{
td->connection->host->warningsLogWrite (_("Cgi: internal error"));
@@ -254,8 +254,8 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
spi.stdError = (FileHandle) stdOutFile.getWriteHandle ();
spi.stdIn = (FileHandle) stdInFile.getHandle ();
- spi.stdOut = (FileHandle) stdOutFile.getWriteHandle();
- spi.envString = td->secondaryBuffer->getBuffer();
+ spi.stdOut = (FileHandle) stdOutFile.getWriteHandle ();
+ spi.envString = td->secondaryBuffer->getBuffer ();
if (spi.stdError == (FileHandle) -1 ||
spi.stdIn == (FileHandle) -1 ||
@@ -286,10 +286,10 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
else
ret = cgiProc.exec (&spi);
- if( ret == -1)
+ if ( ret == -1)
{
- stdInFile.close();
- stdOutFile.close();
+ stdInFile.close ();
+ stdOutFile.close ();
td->connection->host->warningsLogWrite (_("Cgi: internal error"));
chain.clearAllFilters ();
return td->http->raiseHTTPError (500);
@@ -305,7 +305,7 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
cgiProc.terminateProcess ();
chain.clearAllFilters ();
- cgiProc.terminateProcess();
+ cgiProc.terminateProcess ();
/* Delete the file only if it was created by the CGI module. */
if (!td->inputData.getHandle ())
@@ -343,14 +343,14 @@ int Cgi::sendData (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chain,
return 1;
/* Create the output filters chain. */
- if (td->mime && Server::getInstance()->getFiltersFactory()->chain(&chain,
+ if (td->mime && Server::getInstance ()->getFiltersFactory ()->chain (&chain,
td->mime->filters,
td->connection->socket,
&nbw,
1))
{
td->connection->host->warningsLogWrite (_("Cgi: internal error"));
- return td->http->raiseHTTPError(500);
+ return td->http->raiseHTTPError (500);
}
if (td->response.getStatusType () == HttpResponseHeader::SUCCESSFUL)
@@ -360,7 +360,7 @@ int Cgi::sendData (HttpThreadContext* td, Pipe &stdOutFile,
FiltersChain& chain,
{
nBytesRead = 0;
int aliveProcess = 0;
- u_long ticks = getTicks() - procStartTime;
+ u_long ticks = getTicks () - procStartTime;
u_long timeout = td->http->getTimeout ();
if (ticks >= timeout ||
stdOutFile.waitForData ((timeout - ticks) / 1000, (timeout - ticks)
% 1000) == 0)
@@ -382,7 +382,7 @@ int Cgi::sendData (HttpThreadContext* td, Pipe &stdOutFile,
FiltersChain& chain,
if (nBytesRead &&
HttpDataHandler::appendDataToHTTPChannel (td,
-
td->secondaryBuffer->getBuffer(),
+
td->secondaryBuffer->getBuffer (),
nBytesRead,
&(td->outputData),
&chain,
@@ -394,7 +394,7 @@ int Cgi::sendData (HttpThreadContext* td, Pipe &stdOutFile,
FiltersChain& chain,
}
/* Send the last null chunk if needed. */
- if(useChunks && chain.getStream ()->write ("0\r\n\r\n", 5, &nbw2))
+ if (useChunks && chain.getStream ()->write ("0\r\n\r\n", 5, &nbw2))
return 0;
}
@@ -426,7 +426,7 @@ int Cgi::sendHeader (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chai
nBytesRead = 0;
/* Do not try to read using a small buffer as this has some
bad influence on the performances. */
- if (td->secondaryBuffer->getRealLength() - headerOffset - 1 < 512)
+ if (td->secondaryBuffer->getRealLength () - headerOffset - 1 < 512)
break;
term = stdOutFile.pipeTerminated ();
@@ -438,11 +438,11 @@ int Cgi::sendHeader (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chai
break;
}
- if (stdOutFile.read (td->secondaryBuffer->getBuffer() + headerOffset,
- td->secondaryBuffer->getRealLength() - headerOffset -
1,
+ if (stdOutFile.read (td->secondaryBuffer->getBuffer () + headerOffset,
+ td->secondaryBuffer->getRealLength () - headerOffset
- 1,
&nBytesRead))
{
- *ret = td->http->raiseHTTPError(500);
+ *ret = td->http->raiseHTTPError (500);
return 1;
}
@@ -458,17 +458,17 @@ int Cgi::sendHeader (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chai
if (headerOffset > td->secondaryBufferSize - 5)
(td->secondaryBuffer->getBuffer ())[headerOffset] = '\0';
- if(headerOffset == 0)
+ if (headerOffset == 0)
{
- *ret = td->http->raiseHTTPError(500);
+ *ret = td->http->raiseHTTPError (500);
return 1;
}
- for (u_long i = std::max(0, (int)headerOffset - (int)nBytesRead - 10);
+ for (u_long i = std::max (0, (int)headerOffset - (int)nBytesRead - 10);
i < headerOffset; i++)
{
- char *buff = td->secondaryBuffer->getBuffer();
- if( (buff[i] == '\r') && (buff[i+1] == '\n')
+ char *buff = td->secondaryBuffer->getBuffer ();
+ if ( (buff[i] == '\r') && (buff[i+1] == '\n')
&& (buff[i+2] == '\r') && (buff[i+3] == '\n') )
{
/*
@@ -500,7 +500,7 @@ int Cgi::sendHeader (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chai
/* Send the header. */
if (headerSize)
- HttpHeaders::buildHTTPResponseHeaderStruct
(td->secondaryBuffer->getBuffer(),
+ HttpHeaders::buildHTTPResponseHeaderStruct
(td->secondaryBuffer->getBuffer (),
&td->response,
&(td->nBytesToRead));
/*
diff --git a/myserver/src/http_handler/fastcgi/fastcgi.cpp
b/myserver/src/http_handler/fastcgi/fastcgi.cpp
index 59b929b..f9eb4ea 100644
--- a/myserver/src/http_handler/fastcgi/fastcgi.cpp
+++ b/myserver/src/http_handler/fastcgi/fastcgi.cpp
@@ -39,7 +39,7 @@ using namespace std;
int FastCgi::initialized = 0;
/*! Use a default timeout of 15 seconds. */
-int FastCgi::timeout = MYSERVER_SEC(15);
+int FastCgi::timeout = MYSERVER_SEC (15);
/*! Process server manager. */
ProcessServerManager *FastCgi::processServerManager = 0;
@@ -57,7 +57,7 @@ struct FourChar
/*!
*Entry-Point to manage a FastCGI request.
*/
-int FastCgi::send(HttpThreadContext* td, const char* scriptpath,
+int FastCgi::send (HttpThreadContext* td, const char* scriptpath,
const char *cgipath, bool execute, bool onlyHeader)
{
FcgiContext con;
@@ -82,34 +82,34 @@ int FastCgi::send(HttpThreadContext* td, const char*
scriptpath,
con.td = td;
con.headerSent = false;
- td->scriptPath.assign(scriptpath);
+ td->scriptPath.assign (scriptpath);
if (!(td->permissions & MYSERVER_PERMISSION_EXECUTE))
- return td->http->sendAuth();
+ return td->http->sendAuth ();
{
string tmp;
- tmp.assign(cgipath);
- FilesUtility::splitPath(tmp, td->cgiRoot, td->cgiFile);
- tmp.assign(scriptpath);
- FilesUtility::splitPath(tmp, td->scriptDir, td->scriptFile);
+ tmp.assign (cgipath);
+ FilesUtility::splitPath (tmp, td->cgiRoot, td->cgiFile);
+ tmp.assign (scriptpath);
+ FilesUtility::splitPath (tmp, td->scriptDir, td->scriptFile);
}
- chain.setProtocol(td->http);
- chain.setProtocolData(td);
- chain.setStream(td->connection->socket);
+ chain.setProtocol (td->http);
+ chain.setProtocolData (td);
+ chain.setStream (td->connection->socket);
- if(td->mime && Server::getInstance()->getFiltersFactory()->chain(&chain,
+ if (td->mime && Server::getInstance ()->getFiltersFactory ()->chain (&chain,
td->mime->filters,
td->connection->socket,
&nbw,
1))
{
td->connection->host->warningsLogWrite (_("FastCGI: internal error"));
- chain.clearAllFilters();
- return td->http->raiseHTTPError(500);
+ chain.clearAllFilters ();
+ return td->http->raiseHTTPError (500);
}
td->buffer->setLength (0);
@@ -120,13 +120,13 @@ int FastCgi::send(HttpThreadContext* td, const char*
scriptpath,
/*! Do not modify the text between " and ". */
int i;
int subString = cgipath[0] == '"';
- int len = strlen(cgipath);
+ int len = strlen (cgipath);
string tmpCgiPath;
- for(i = 1; i < len; i++)
+ for (i = 1; i < len; i++)
{
- if(!subString && cgipath[i]==' ')
+ if (!subString && cgipath[i]==' ')
break;
- if(cgipath[i] == '"' && cgipath[i - 1] != '\\')
+ if (cgipath[i] == '"' && cgipath[i - 1] != '\\')
subString = !subString;
}
/*!
@@ -135,38 +135,38 @@ int FastCgi::send(HttpThreadContext* td, const char*
scriptpath,
*If the cgipath is enclosed between " and " do not consider them
*when splitting directory and file name.
*/
- if(len)
+ if (len)
{
- if(i < len)
+ if (i < len)
{
- string tmpString(cgipath);
+ string tmpString (cgipath);
int begin = tmpString[0]=='"' ? 1: 0;
int end = tmpString[i] == '"' ? i - 1: i;
- tmpCgiPath.assign(tmpString.substr(begin, end - begin));
- moreArg.assign(tmpString.substr(i, len - 1));
+ tmpCgiPath.assign (tmpString.substr (begin, end - begin));
+ moreArg.assign (tmpString.substr (i, len - 1));
}
else
{
int begin = (cgipath[0] == '"') ? 1 : 0;
int end = (cgipath[len] == '"') ? len - 1 : len;
- tmpCgiPath.assign(&cgipath[begin], end - begin);
- moreArg.assign("");
+ tmpCgiPath.assign (&cgipath[begin], end - begin);
+ moreArg.assign ("");
}
- FilesUtility::splitPath(tmpCgiPath, td->cgiRoot, td->cgiFile);
+ FilesUtility::splitPath (tmpCgiPath, td->cgiRoot, td->cgiFile);
}
- tmpCgiPath.assign(scriptpath);
- FilesUtility::splitPath(tmpCgiPath, td->scriptDir, td->scriptFile);
+ tmpCgiPath.assign (scriptpath);
+ FilesUtility::splitPath (tmpCgiPath, td->scriptDir, td->scriptFile);
}
- if(execute)
+ if (execute)
{
- if(cgipath && strlen(cgipath))
+ if (cgipath && strlen (cgipath))
{
#ifdef WIN32
{
int x;
- string cgipathString(cgipath);
- int len = strlen(cgipath);
+ string cgipathString (cgipath);
+ int len = strlen (cgipath);
int subString = cgipath[0] == '"';
cmdLine << "\"" << td->cgiRoot << "/" << td->cgiFile << "\" "
@@ -175,7 +175,7 @@ int FastCgi::send(HttpThreadContext* td, const char*
scriptpath,
#else
cmdLine << cgipath << " " << td->filenamePath;
#endif
- }/*if(execute). */
+ }/*if (execute). */
else
{
cmdLine << scriptpath;
@@ -191,32 +191,32 @@ int FastCgi::send(HttpThreadContext* td, const char*
scriptpath,
#endif
}
- td->inputData.close();
- if(td->inputData.openFile(td->inputDataPath, File::READ |
+ td->inputData.close ();
+ if (td->inputData.openFile (td->inputDataPath, File::READ |
File::FILE_OPEN_ALWAYS |
File::NO_INHERIT))
{
- td->buffer->setLength(0);
+ td->buffer->setLength (0);
td->connection->host->warningsLogWrite (_("FastCGI: internal error"));
- chain.clearAllFilters();
- return td->http->raiseHTTPError(500);
+ chain.clearAllFilters ();
+ return td->http->raiseHTTPError (500);
}
- server = connect (&con, cmdLine.str().c_str());
+ server = connect (&con, cmdLine.str ().c_str ());
if (server == 0)
{
td->buffer->setLength (0);
td->connection->host->warningsLogWrite (_("FastCGI: cannot connect to the
%s process"),
cmdLine.str ().c_str ());
- chain.clearAllFilters();
- return td->http->raiseHTTPError(500);
+ chain.clearAllFilters ();
+ return td->http->raiseHTTPError (500);
}
id = td->id + 1;
if (fastCgiRequest (&con, id))
- return td->http->raiseHTTPError(500);
+ return td->http->raiseHTTPError (500);
/*! Now read the output. This flag is used by the external loop. */
exit = 0;
@@ -224,10 +224,10 @@ int FastCgi::send(HttpThreadContext* td, const char*
scriptpath,
/*! Return 1 if keep the connection. A nonzero value also mean no errors. */
ret = 1;
- initialTicks = getTicks();
+ initialTicks = getTicks ();
- td->buffer->setLength(0);
- checkDataChunks(td, &con.keepalive, &con.useChunks);
+ td->buffer->setLength (0);
+ checkDataChunks (td, &con.keepalive, &con.useChunks);
do
{
@@ -237,7 +237,7 @@ int FastCgi::send(HttpThreadContext* td, const char*
scriptpath,
{
exit = 1;
ret = 1;
- td->http->raiseHTTPError(500);
+ td->http->raiseHTTPError (500);
break;
}
@@ -249,7 +249,7 @@ int FastCgi::send(HttpThreadContext* td, const char*
scriptpath,
*/
dim = (header.contentLengthB1 << 8) | header.contentLengthB0;
- if(dim == 0)
+ if (dim == 0)
{
exit = 1;
ret = 1;
@@ -258,11 +258,11 @@ int FastCgi::send(HttpThreadContext* td, const char*
scriptpath,
{
bool headerCompleted = false;
- switch(header.type)
+ switch (header.type)
{
case FCGISTDERR:
- con.sock.close();
- td->http->raiseHTTPError(501);
+ con.sock.close ();
+ td->http->raiseHTTPError (501);
exit = 1;
ret = 0;
break;
@@ -295,13 +295,13 @@ int FastCgi::send(HttpThreadContext* td, const char*
scriptpath,
}
}
- if(header.paddingLength)
+ if (header.paddingLength)
{
u_long toPad = header.paddingLength;
while (toPad)
{
- nbr = con.sock.recv(td->buffer->getBuffer(),
- std::min(toPad,
(u_long)td->buffer->getRealLength()), 0,
+ nbr = con.sock.recv (td->buffer->getBuffer (),
+ std::min (toPad, (u_long)td->buffer->getRealLength
()), 0,
static_cast<u_long>(timeout));
if (nbr == (u_long)-1)
{
@@ -315,12 +315,12 @@ int FastCgi::send(HttpThreadContext* td, const char*
scriptpath,
}while (!exit);
/* Send the last null chunk if needed. */
- if(con.useChunks &&
+ if (con.useChunks &&
(td->response.getStatusType () == HttpResponseHeader::SUCCESSFUL))
- chain.getStream ()->write("0\r\n\r\n", 5, &nbw);
+ chain.getStream ()->write ("0\r\n\r\n", 5, &nbw);
- chain.clearAllFilters();
- con.sock.close();
+ chain.clearAllFilters ();
+ con.sock.close ();
return ret;
}
@@ -329,15 +329,15 @@ int FastCgi::send(HttpThreadContext* td, const char*
scriptpath,
*Send the buffer content over the FastCGI connection
*Return non-zero on errors.
*/
-int FastCgi::sendFcgiBody(FcgiContext* con, char* buffer, int len, int type,
+int FastCgi::sendFcgiBody (FcgiContext* con, char* buffer, int len, int type,
int id)
{
FcgiHeader header;
- generateFcgiHeader( header, type, id, len );
+ generateFcgiHeader ( header, type, id, len );
- if(con->sock.send((char*)&header, sizeof(header), 0) == -1)
+ if (con->sock.send ((char*)&header, sizeof (header), 0) == -1)
return -1;
- if(con->sock.send((char*)buffer, len, 0) == -1)
+ if (con->sock.send ((char*)buffer, len, 0) == -1)
return -1;
return 0;
}
@@ -346,14 +346,14 @@ int FastCgi::sendFcgiBody(FcgiContext* con, char* buffer,
int len, int type,
*Trasform from a standard environment string to the FastCGI environment
*string.
*/
-int FastCgi::buildFASTCGIEnvironmentString(HttpThreadContext*, char* src,
+int FastCgi::buildFASTCGIEnvironmentString (HttpThreadContext*, char* src,
char* dest)
{
char *ptr = dest;
char *sptr = src;
char varName[100];
char varValue[2500];
- for(;;)
+ for (;;)
{
int max = 100;
u_long i;
@@ -364,26 +364,26 @@ int
FastCgi::buildFASTCGIEnvironmentString(HttpThreadContext*, char* src,
varName[0] = '\0';
varValue[0] = '\0';
- while(*sptr == '\0')
+ while (*sptr == '\0')
sptr++;
- while((--max) && *sptr != '=')
+ while ((--max) && *sptr != '=')
{
varName[varNameLen.i++] = *sptr++;
varName[varNameLen.i] = '\0';
}
- if(max == 0)
+ if (max == 0)
return -1;
sptr++;
max = 2500;
- while((--max) && *sptr != '\0')
+ while ((--max) && *sptr != '\0')
{
varValue[varValueLen.i++] = *sptr++;
varValue[varValueLen.i] = '\0';
}
- if(max == 0)
+ if (max == 0)
return -1;
- if(varNameLen.i > 127)
+ if (varNameLen.i > 127)
{
unsigned char fb = varValueLen.c[3] | 0x80;
*ptr++ = fb;
@@ -396,7 +396,7 @@ int
FastCgi::buildFASTCGIEnvironmentString(HttpThreadContext*, char* src,
*ptr++ = varNameLen.c[0];
}
- if(varValueLen.i > 127)
+ if (varValueLen.i > 127)
{
unsigned char fb = varValueLen.c[3] | 0x80;
*ptr++ = fb;
@@ -408,11 +408,11 @@ int
FastCgi::buildFASTCGIEnvironmentString(HttpThreadContext*, char* src,
{
*ptr++ = varValueLen.c[0];
}
- for(i = 0; i < varNameLen.i; i++)
+ for (i = 0; i < varNameLen.i; i++)
*ptr++ = varName[i];
- for(i = 0; i < varValueLen.i; i++)
+ for (i = 0; i < varValueLen.i; i++)
*ptr++ = varValue[i];
- if(*(++sptr) == '\0')
+ if (*(++sptr) == '\0')
break;
}
return static_cast<int>(ptr - dest);
@@ -421,7 +421,7 @@ int
FastCgi::buildFASTCGIEnvironmentString(HttpThreadContext*, char* src,
/*!
*Fill the FcgiHeader structure.
*/
-void FastCgi::generateFcgiHeader( FcgiHeader &header, int iType,
+void FastCgi::generateFcgiHeader ( FcgiHeader &header, int iType,
int iRequestId, int iContentLength )
{
header.version = FCGIVERSION;
@@ -437,7 +437,7 @@ void FastCgi::generateFcgiHeader( FcgiHeader &header, int
iType,
/*!
*Constructor for the FASTCGI class
*/
-FastCgi::FastCgi()
+FastCgi::FastCgi ()
{
initialized = 0;
}
@@ -445,20 +445,20 @@ FastCgi::FastCgi()
/*!
*Initialize the FastCGI protocol implementation
*/
-int FastCgi::load()
+int FastCgi::load ()
{
- if(initialized)
+ if (initialized)
return 1;
initialized = 1;
- processServerManager = Server::getInstance()->getProcessServerManager();
- processServerManager->createDomain(SERVERS_DOMAIN);
+ processServerManager = Server::getInstance ()->getProcessServerManager ();
+ processServerManager->createDomain (SERVERS_DOMAIN);
return 0;
}
/*!
*Clean the memory and the processes occuped by the FastCGI servers
*/
-int FastCgi::unLoad()
+int FastCgi::unLoad ()
{
initialized = 0;
return 0;
@@ -468,26 +468,26 @@ int FastCgi::unLoad()
*Return the the running server specified by path.
*If the server is not running returns 0.
*/
-FastCgiServer* FastCgi::isFcgiServerRunning(const char* path)
+FastCgiServer* FastCgi::isFcgiServerRunning (const char* path)
{
- return processServerManager->getServer(SERVERS_DOMAIN, path);
+ return processServerManager->getServer (SERVERS_DOMAIN, path);
}
/*!
*Get a connection to the FastCGI server.
*/
-FastCgiServer* FastCgi::connect(FcgiContext* con, const char* path)
+FastCgiServer* FastCgi::connect (FcgiContext* con, const char* path)
{
- FastCgiServer* server = runFcgiServer(con, path);
+ FastCgiServer* server = runFcgiServer (con, path);
/*!
*If we find a valid server try the connection to it.
*/
- if(server)
+ if (server)
{
- int ret = processServerManager->connect(&(con->sock), server);
+ int ret = processServerManager->connect (&(con->sock), server);
- if(ret == -1)
+ if (ret == -1)
return 0;
}
return server;
@@ -498,49 +498,49 @@ FastCgiServer* FastCgi::connect(FcgiContext* con, const
char* path)
*If the path starts with a @ character, the path is handled as a
*remote server.
*/
-FastCgiServer* FastCgi::runFcgiServer(FcgiContext* context,
+FastCgiServer* FastCgi::runFcgiServer (FcgiContext* context,
const char* path)
{
/* This method needs a better home (and maybe better code).
* Compute a simple hash from the IP address. */
- const char *ip = context->td->connection->getIpAddr();
+ const char *ip = context->td->connection->getIpAddr ();
int seed = 13;
for (const char *c = ip; *c; c++)
seed = *c * 21 + seed;
- FastCgiServer* server = processServerManager->getServer(SERVERS_DOMAIN,
+ FastCgiServer* server = processServerManager->getServer (SERVERS_DOMAIN,
path,
seed);
- if(server)
+ if (server)
return server;
/* If the path starts with @ then the server is remote. */
- if(path[0] == '@')
+ if (path[0] == '@')
{
int i = 1;
char host[128];
char port[6];
- while(path[i] && path[i] != ':')
+ while (path[i] && path[i] != ':')
i++;
- myserver_strlcpy(host, &path[1], min(128, i));
+ myserver_strlcpy (host, &path[1], min (128, i));
- myserver_strlcpy(port, &path[i + 1], 6);
+ myserver_strlcpy (port, &path[i + 1], 6);
- return processServerManager->addRemoteServer(SERVERS_DOMAIN, path,
- host, atoi(port));
+ return processServerManager->addRemoteServer (SERVERS_DOMAIN, path,
+ host, atoi (port));
}
- return processServerManager->runAndAddServer(SERVERS_DOMAIN, path);
+ return processServerManager->runAndAddServer (SERVERS_DOMAIN, path);
}
/*!
*Return the timeout value.
*/
-int FastCgi::getTimeout()
+int FastCgi::getTimeout ()
{
return timeout;
}
@@ -548,7 +548,7 @@ int FastCgi::getTimeout()
/*!
*Set a new timeout.
*/
-void FastCgi::setTimeout(int ntimeout)
+void FastCgi::setTimeout (int ntimeout)
{
timeout = ntimeout;
}
@@ -568,12 +568,12 @@ int FastCgi::fastCgiRequest (FcgiContext* con, int id)
FcgiHeader header;
int sizeEnvString;
- Env::buildEnvironmentString(td, td->buffer->getBuffer());
- sizeEnvString = buildFASTCGIEnvironmentString(td,td->buffer->getBuffer(),
-
td->secondaryBuffer->getBuffer());
- if(sizeEnvString == -1)
+ Env::buildEnvironmentString (td, td->buffer->getBuffer ());
+ sizeEnvString = buildFASTCGIEnvironmentString (td,td->buffer->getBuffer (),
+ td->secondaryBuffer->getBuffer
());
+ if (sizeEnvString == -1)
{
- td->buffer->setLength(0);
+ td->buffer->setLength (0);
td->connection->host->warningsLogWrite (_("FastCGI: internal error"));
return 1;
}
@@ -582,36 +582,36 @@ int FastCgi::fastCgiRequest (FcgiContext* con, int id)
tBody.roleB1 = ( FCGIRESPONDER >> 8 ) & 0xff;
tBody.roleB0 = ( FCGIRESPONDER ) & 0xff;
tBody.flags = 0;
- memset( tBody.reserved, 0, sizeof( tBody.reserved ) );
+ memset ( tBody.reserved, 0, sizeof ( tBody.reserved ) );
- if(sendFcgiBody(con, (char*)&tBody, sizeof(tBody), FCGIBEGIN_REQUEST, id))
+ if (sendFcgiBody (con, (char*)&tBody, sizeof (tBody), FCGIBEGIN_REQUEST, id))
{
- td->buffer->setLength(0);
+ td->buffer->setLength (0);
td->connection->host->warningsLogWrite (_("FastCGI: internal error"));
return 1;
}
- if(sendFcgiBody(con, td->secondaryBuffer->getBuffer(), sizeEnvString,
+ if (sendFcgiBody (con, td->secondaryBuffer->getBuffer (), sizeEnvString,
FCGIPARAMS, id))
{
- td->buffer->setLength(0);
+ td->buffer->setLength (0);
td->connection->host->warningsLogWrite (_("FastCGI: internal error"));
return 1;
}
- if(sendFcgiBody(con, 0, 0, FCGIPARAMS, id))
+ if (sendFcgiBody (con, 0, 0, FCGIPARAMS, id))
{
- td->buffer->setLength(0);
+ td->buffer->setLength (0);
td->connection->host->warningsLogWrite (_("FastCGI: internal error"));
return 1;
}
- if(atoi(td->request.contentLength.c_str()))
+ if (atoi (td->request.contentLength.c_str ()))
{
- td->buffer->setLength(0);
+ td->buffer->setLength (0);
- if(td->inputData.seek (0))
+ if (td->inputData.seek (0))
{
td->connection->host->warningsLogWrite (_("FastCGI: internal error"));
return 1;
@@ -620,24 +620,24 @@ int FastCgi::fastCgiRequest (FcgiContext* con, int id)
/*! Send the STDIN data. */
do
{
- if(td->inputData.read(td->buffer->getBuffer(),
+ if (td->inputData.read (td->buffer->getBuffer (),
maxStdinChunk, &nbr))
{
- td->buffer->setLength(0);
+ td->buffer->setLength (0);
td->connection->host->warningsLogWrite (_("FastCGI: internal error"));
return 1;
}
- if(!nbr)
+ if (!nbr)
break;
generateFcgiHeader (header, FCGISTDIN, id, nbr);
- if (con->sock.send ((char*)&header, sizeof(header), 0) == -1)
+ if (con->sock.send ((char*)&header, sizeof (header), 0) == -1)
return 1;
if (con->sock.send (td->buffer->getBuffer (), nbr, 0) == -1)
{
- td->buffer->setLength(0);
+ td->buffer->setLength (0);
td->connection->host->warningsLogWrite (_("FastCGI: internal
error"));
return 1;
}
@@ -648,7 +648,7 @@ int FastCgi::fastCgiRequest (FcgiContext* con, int id)
/*! Final stdin chunk. */
if (sendFcgiBody (con, 0, 0, FCGISTDIN, id))
{
- td->buffer->setLength(0);
+ td->buffer->setLength (0);
td->connection->host->warningsLogWrite (_("FastCGI: internal error"));
return 1;
}
@@ -708,7 +708,7 @@ int FastCgi::sendData (FcgiContext* con, u_long dim, u_long
timeout, FiltersChai
if (onlyHeader || con->td->response.getStatusType () !=
HttpResponseHeader::SUCCESSFUL)
return 0;
- if(HttpDataHandler::appendDataToHTTPChannel(con->td,
+ if (HttpDataHandler::appendDataToHTTPChannel (con->td,
con->td->buffer->getBuffer (),
con->td->buffer->getLength (),
&(con->td->outputData),
@@ -735,9 +735,9 @@ int FastCgi::handleHeader (FcgiContext* con, FiltersChain*
chain, bool* response
u_long size = con->td->buffer->getLength ();
u_long headerSize = 0;
- for(u_long i = 0; i < size - 3; i++)
+ for (u_long i = 0; i < size - 3; i++)
{
- if((buffer[i] == '\r') && (buffer[i + 1] == '\n') &&
+ if ((buffer[i] == '\r') && (buffer[i + 1] == '\n') &&
(buffer[i + 2] == '\r') && (buffer[i + 3] == '\n'))
{
headerSize = i + 4;
@@ -745,11 +745,11 @@ int FastCgi::handleHeader (FcgiContext* con,
FiltersChain* chain, bool* response
}
}
- HttpHeaders::buildHTTPResponseHeaderStruct(con->td->buffer->getBuffer(),
+ HttpHeaders::buildHTTPResponseHeaderStruct (con->td->buffer->getBuffer (),
&con->td->response,
&(con->td->nBytesToRead));
- if(!con->td->appendOutputs)
+ if (!con->td->appendOutputs)
{
string *location = con->td->response.getValue ("Location", NULL);
if (location)
@@ -759,10 +759,10 @@ int FastCgi::handleHeader (FcgiContext* con,
FiltersChain* chain, bool* response
return 0;
}
- u_long hdrLen =
HttpHeaders::buildHTTPResponseHeader(con->td->secondaryBuffer->getBuffer(),
+ u_long hdrLen = HttpHeaders::buildHTTPResponseHeader
(con->td->secondaryBuffer->getBuffer (),
&con->td->response);
- if(con->td->connection->socket->send(con->td->secondaryBuffer->getBuffer(),
+ if (con->td->connection->socket->send (con->td->secondaryBuffer->getBuffer
(),
hdrLen,
0) == SOCKET_ERROR )
{
@@ -778,8 +778,8 @@ int FastCgi::handleHeader (FcgiContext* con, FiltersChain*
chain, bool* response
if (con->td->response.getStatusType () == HttpResponseHeader::SUCCESSFUL &&
size - headerSize)
{
- if(HttpDataHandler::appendDataToHTTPChannel(con->td,
- con->td->buffer->getBuffer() +
headerSize,
+ if (HttpDataHandler::appendDataToHTTPChannel (con->td,
+ con->td->buffer->getBuffer ()
+ headerSize,
size - headerSize,
&(con->td->outputData),
chain,
@@ -820,7 +820,7 @@ int FastCgi::readHeader (FcgiContext *con, FcgiHeader*
header, u_long started, u
return 1;
}
- nbr = con->sock.recv (buffer + readData, sizeof(FcgiHeader) - readData, 0,
+ nbr = con->sock.recv (buffer + readData, sizeof (FcgiHeader) - readData, 0,
timeout - (ticks - started));
if (nbr == static_cast<u_long>(-1) || nbr == 0)
@@ -834,7 +834,7 @@ int FastCgi::readHeader (FcgiContext *con, FcgiHeader*
header, u_long started, u
if (readData > sizeof (FcgiHeader))
{
td->connection->host->warningsLogWrite (_("FastCGI: internal error"));
- sendFcgiBody(con, 0, 0, FCGIABORT_REQUEST, id);
+ sendFcgiBody (con, 0, 0, FCGIABORT_REQUEST, id);
return 1;
}
}
diff --git a/myserver/src/http_handler/http_dir/http_dir.cpp
b/myserver/src/http_handler/http_dir/http_dir.cpp
index 57df24d..b71e105 100644
--- a/myserver/src/http_handler/http_dir/http_dir.cpp
+++ b/myserver/src/http_handler/http_dir/http_dir.cpp
@@ -153,12 +153,12 @@ void HttpDir::getFormattedSize (u_long bytes, string &
out)
break;
}
- if((result - floor(result)) < 0.01)
- osstr << std::fixed << setprecision(0) << result << " " << symbols[i];
+ if ((result - floor (result)) < 0.01)
+ osstr << std::fixed << setprecision (0) << result << " " << symbols[i];
else
- osstr << std::fixed << setprecision(2) << result << " " << symbols[i];
+ osstr << std::fixed << setprecision (2) << result << " " << symbols[i];
- out = osstr.str();
+ out = osstr.str ();
}
/*!
@@ -252,7 +252,7 @@ void HttpDir::generateElement (MemBuf &out,
break;
case 't':
- getRFC822GMTTime(file.time_write, fileTime, 32);
+ getRFC822GMTTime (file.time_write, fileTime, 32);
out << "<td>";
out << fileTime ;
out << "</td>\r\n";
@@ -260,14 +260,14 @@ void HttpDir::generateElement (MemBuf &out,
case 's':
out << "<td>";
- if(file.attrib & FILE_ATTRIBUTE_DIRECTORY)
+ if (file.attrib & FILE_ATTRIBUTE_DIRECTORY)
{
out << "[directory]";
}
else
{
string tmp;
- getFormattedSize(file.size, tmp);
+ getFormattedSize (file.size, tmp);
out << tmp;
}
out << "</td>";
@@ -288,7 +288,7 @@ void HttpDir::generateElement (MemBuf &out,
* \param execute not used.
* \param onlyHeader Specify if send only the HTTP header.
*/
-int HttpDir::send(HttpThreadContext* td,
+int HttpDir::send (HttpThreadContext* td,
const char* directory, const char* cgi,
bool execute, bool onlyHeader)
{
@@ -314,39 +314,39 @@ int HttpDir::send(HttpThreadContext* td,
MYSERVER_SERVER_CONF, "%f%t%s");
- HttpRequestHeader::Entry *host = td->request.other.get("Host");
+ HttpRequestHeader::Entry *host = td->request.other.get ("Host");
- chain.setProtocol(td->http);
- chain.setProtocolData(td);
- chain.setStream(td->connection->socket);
+ chain.setProtocol (td->http);
+ chain.setProtocolData (td);
+ chain.setStream (td->connection->socket);
if ( !(td->permissions & MYSERVER_PERMISSION_BROWSE))
return td->http->sendAuth ();
- if(td->mime && Server::getInstance()->getFiltersFactory()->chain(&chain,
+ if (td->mime && Server::getInstance ()->getFiltersFactory ()->chain (&chain,
td->mime->filters,
td->connection->socket, &nbw, 1))
{
td->connection->host->warningsLogWrite (_("HttpDir: internal error"));
- chain.clearAllFilters();
- return td->http->raiseHTTPError(500);
+ chain.clearAllFilters ();
+ return td->http->raiseHTTPError (500);
}
- lastSlash = td->request.uri.rfind('/') + 1;
+ lastSlash = td->request.uri.rfind ('/') + 1;
- checkDataChunks(td, &keepalive, &useChunks);
+ checkDataChunks (td, &keepalive, &useChunks);
td->response.setValue ("ContentType", "text/html");
- if(!td->appendOutputs)
+ if (!td->appendOutputs)
{
- HttpHeaders::buildHTTPResponseHeader(td->buffer->getBuffer(),
+ HttpHeaders::buildHTTPResponseHeader (td->buffer->getBuffer (),
&(td->response));
- if(td->connection->socket->send(td->buffer->getBuffer(),
- (u_long)strlen(td->buffer->getBuffer()), 0)
+ if (td->connection->socket->send (td->buffer->getBuffer (),
+ (u_long)strlen (td->buffer->getBuffer ()), 0)
== SOCKET_ERROR)
{
/* Remove the connection. */
@@ -354,24 +354,24 @@ int HttpDir::send(HttpThreadContext* td,
}
}
- if(onlyHeader)
+ if (onlyHeader)
return 1;
- sortIndex = td->request.uriOpts.find("sort=");
+ sortIndex = td->request.uriOpts.find ("sort=");
- if(sortIndex != string::npos && sortIndex + 5 < td->request.uriOpts.length())
+ if (sortIndex != string::npos && sortIndex + 5 < td->request.uriOpts.length
())
{
- sortType = td->request.uriOpts.at(sortIndex + 5);
+ sortType = td->request.uriOpts.at (sortIndex + 5);
}
- if(sortIndex != string::npos && sortIndex + 6 < td->request.uriOpts.length())
+ if (sortIndex != string::npos && sortIndex + 6 < td->request.uriOpts.length
())
{
- sortReverse = td->request.uriOpts.at(sortIndex + 6) == 'I';
+ sortReverse = td->request.uriOpts.at (sortIndex + 6) == 'I';
}
/* Make sortType always lowercase. */
- switch(sortType)
+ switch (sortType)
{
case 's':
case 'S':
@@ -382,27 +382,27 @@ int HttpDir::send(HttpThreadContext* td,
sortType = 't';
break;
default:
- sort (files.begin(), files.end(), compareFileStructByName);
+ sort (files.begin (), files.end (), compareFileStructByName);
}
browseDirCSSpath = td->securityToken.getData ("http.dir.css",
MYSERVER_SECURITY_CONF |
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
NULL);
- td->secondaryBuffer->setLength(0);
+ td->secondaryBuffer->setLength (0);
*td->secondaryBuffer << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"\r\n"
"\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\";>\r\n"
"<html xmlns=\"http://www.w3.org/1999/xhtml\"; xml:lang=\"en\">"
"\r\n<head>\r\n<title>" ;
- *td->secondaryBuffer << td->request.uri.c_str() ;
+ *td->secondaryBuffer << td->request.uri.c_str () ;
*td->secondaryBuffer << "</title>\r\n";
/*
*If it is defined a CSS file for the graphic layout of
*the browse directory insert it in the page.
*/
- if(browseDirCSSpath)
+ if (browseDirCSSpath)
{
*td->secondaryBuffer << "<link rel=\"stylesheet\" href=\""
<< browseDirCSSpath
@@ -411,79 +411,79 @@ int HttpDir::send(HttpThreadContext* td,
*td->secondaryBuffer << "</head>\r\n";
- ret = appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
- td->secondaryBuffer->getLength(),
+ ret = appendDataToHTTPChannel (td, td->secondaryBuffer->getBuffer (),
+ td->secondaryBuffer->getLength (),
&(td->outputData), &chain,
td->appendOutputs, useChunks);
- if(ret)
+ if (ret)
{
/* Return an internal server error. */
- td->outputData.close();
- chain.clearAllFilters();
- return td->http->raiseHTTPError(500);
+ td->outputData.close ();
+ chain.clearAllFilters ();
+ return td->http->raiseHTTPError (500);
}
- sentData = td->secondaryBuffer->getLength();
+ sentData = td->secondaryBuffer->getLength ();
filename = directory;
- td->secondaryBuffer->setLength(0);
+ td->secondaryBuffer->setLength (0);
*td->secondaryBuffer << "<body>\r\n<h1>Contents of directory ";
*td->secondaryBuffer << &td->request.uri[lastSlash] ;
*td->secondaryBuffer << "</h1>\r\n<hr />\r\n";
- ret = appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
- td->secondaryBuffer->getLength(),
+ ret = appendDataToHTTPChannel (td, td->secondaryBuffer->getBuffer (),
+ td->secondaryBuffer->getLength (),
&(td->outputData), &chain,
td->appendOutputs, useChunks);
- if(ret)
+ if (ret)
{
- td->outputData.close();
+ td->outputData.close ();
/* Return an internal server error. */
- return td->http->raiseHTTPError(500);
+ return td->http->raiseHTTPError (500);
}
- sentData += td->secondaryBuffer->getLength();
+ sentData += td->secondaryBuffer->getLength ();
- ret = fd.findfirst(filename.c_str());
+ ret = fd.findfirst (filename.c_str ());
- if(ret == -1)
+ if (ret == -1)
{
- chain.clearAllFilters();
- return td->http->raiseHTTPError(404);
+ chain.clearAllFilters ();
+ return td->http->raiseHTTPError (404);
}
/*
* With the current code we build the HTML TABLE to indicize the
* files in the directory.
*/
- td->secondaryBuffer->setLength(0);
+ td->secondaryBuffer->setLength (0);
*td->secondaryBuffer << "<table width=\"100%\">\r\n" ;
generateHeader (*td->secondaryBuffer, sortType, sortReverse, formatString);
- ret = appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
- td->secondaryBuffer->getLength(),
+ ret = appendDataToHTTPChannel (td, td->secondaryBuffer->getBuffer (),
+ td->secondaryBuffer->getLength (),
&(td->outputData), &chain,
td->appendOutputs, useChunks);
- if(ret)
+ if (ret)
{
- td->outputData.close();
- chain.clearAllFilters();
+ td->outputData.close ();
+ chain.clearAllFilters ();
/* Return an internal server error. */
- return td->http->raiseHTTPError(500);
+ return td->http->raiseHTTPError (500);
}
- sentData += td->secondaryBuffer->getLength();
+ sentData += td->secondaryBuffer->getLength ();
- td->secondaryBuffer->setLength(0);
+ td->secondaryBuffer->setLength (0);
- if(FilesUtility::getPathRecursionLevel(td->request.uri) >= 1)
+ if (FilesUtility::getPathRecursionLevel (td->request.uri) >= 1)
{
const char* cur = formatString;
string file;
- file.assign(td->request.uri);
- file.append("/../");
+ file.assign (td->request.uri);
+ file.append ("/../");
*td->secondaryBuffer << "<tr>\r\n";
@@ -508,55 +508,55 @@ int HttpDir::send(HttpThreadContext* td,
*td->secondaryBuffer << "</tr>\r\n";
- ret = appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
- td->secondaryBuffer->getLength(),
+ ret = appendDataToHTTPChannel (td, td->secondaryBuffer->getBuffer (),
+ td->secondaryBuffer->getLength (),
&(td->outputData), &chain,
td->appendOutputs, useChunks);
- if(ret)
+ if (ret)
{
- fd.findclose();
- td->outputData.close();
- chain.clearAllFilters();
+ fd.findclose ();
+ td->outputData.close ();
+ chain.clearAllFilters ();
/* Return an internal server error. */
- return td->http->raiseHTTPError(500);
+ return td->http->raiseHTTPError (500);
}
- sentData += td->secondaryBuffer->getLength();
+ sentData += td->secondaryBuffer->getLength ();
}
/* Put all files in a vector. */
do
{
- if(fd.name[0] == '.')
+ if (fd.name[0] == '.')
continue;
FileStruct file;
- file.name.assign(fd.name);
+ file.name.assign (fd.name);
file.time_write = fd.time_write;
file.attrib = fd.attrib;
file.size = fd.size;
- files.push_back(file);
+ files.push_back (file);
}
- while(!fd.findnext());
+ while (!fd.findnext ());
- fd.findclose();
+ fd.findclose ();
/* Sort the vector. */
- switch(sortType)
+ switch (sortType)
{
case 's':
- sort (files.begin(), files.end(), compareFileStructBySize);
+ sort (files.begin (), files.end (), compareFileStructBySize);
break;
case 't':
- sort (files.begin(), files.end(), compareFileStructByTime);
+ sort (files.begin (), files.end (), compareFileStructByTime);
break;
case 'f':
- sort (files.begin(), files.end(), compareFileStructByName);
+ sort (files.begin (), files.end (), compareFileStructByName);
}
- if(sortReverse)
- reverse (files.begin(), files.end());
+ if (sortReverse)
+ reverse (files.begin (), files.end ());
- if(!td->request.uriEndsWithSlash)
+ if (!td->request.uriEndsWithSlash)
{
linkPrefix.assign (&td->request.uri[lastSlash]);
linkPrefix.append ("/");
@@ -566,80 +566,80 @@ int HttpDir::send(HttpThreadContext* td,
/* Build the files table and send it. */
- for(vector<FileStruct>::iterator it = files.begin();
- it != files.end(); it++)
+ for (vector<FileStruct>::iterator it = files.begin ();
+ it != files.end (); it++)
{
FileStruct& file = *it;
- td->secondaryBuffer->setLength(0);
+ td->secondaryBuffer->setLength (0);
generateElement (*td->secondaryBuffer, file, linkPrefix, formatString);
- ret = appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
- td->secondaryBuffer->getLength(),
+ ret = appendDataToHTTPChannel (td, td->secondaryBuffer->getBuffer (),
+ td->secondaryBuffer->getLength (),
&(td->outputData), &chain,
td->appendOutputs, useChunks);
- if(ret)
+ if (ret)
{
- td->outputData.close();
- chain.clearAllFilters();
+ td->outputData.close ();
+ chain.clearAllFilters ();
/* Return an internal server error. */
- return td->http->raiseHTTPError(500);
+ return td->http->raiseHTTPError (500);
}
- sentData += td->secondaryBuffer->getLength();
+ sentData += td->secondaryBuffer->getLength ();
}
- td->secondaryBuffer->setLength(0);
+ td->secondaryBuffer->setLength (0);
*td->secondaryBuffer << "</table>\r\n<hr />\r\n<address>"
<< MYSERVER_VERSION;
- if(host && host->value->length())
+ if (host && host->value->length ())
{
ostringstream portBuff;
- size_t portSeparator = host->value->find(':');
+ size_t portSeparator = host->value->find (':');
*td->secondaryBuffer << " on ";
- if(portSeparator != string::npos)
- *td->secondaryBuffer << host->value->substr(0, portSeparator).c_str() ;
+ if (portSeparator != string::npos)
+ *td->secondaryBuffer << host->value->substr (0, portSeparator).c_str () ;
else
- *td->secondaryBuffer << host->value->c_str() ;
+ *td->secondaryBuffer << host->value->c_str () ;
*td->secondaryBuffer << " Port ";
- portBuff << td->connection->getLocalPort();
- *td->secondaryBuffer << portBuff.str();
+ portBuff << td->connection->getLocalPort ();
+ *td->secondaryBuffer << portBuff.str ();
}
*td->secondaryBuffer << "</address>\r\n</body>\r\n</html>\r\n";
- ret = appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
- td->secondaryBuffer->getLength(),
+ ret = appendDataToHTTPChannel (td, td->secondaryBuffer->getBuffer (),
+ td->secondaryBuffer->getLength (),
&(td->outputData), &chain,
td->appendOutputs, useChunks);
- if(ret)
+ if (ret)
{
- td->outputData.close();
+ td->outputData.close ();
/* Return an internal server error. */
- return td->http->raiseHTTPError(500);
+ return td->http->raiseHTTPError (500);
}
- sentData += td->secondaryBuffer->getLength();
+ sentData += td->secondaryBuffer->getLength ();
*td->secondaryBuffer << end_str;
/* Changes the \ character in the / character. */
- bufferloop = td->secondaryBuffer->getBuffer();
- while(*bufferloop++)
- if(*bufferloop == '\\')
+ bufferloop = td->secondaryBuffer->getBuffer ();
+ while (*bufferloop++)
+ if (*bufferloop == '\\')
*bufferloop = '/';
- if(!td->appendOutputs && useChunks)
+ if (!td->appendOutputs && useChunks)
{
- if(chain.getStream ()->write ("0\r\n\r\n", 5, &nbw))
+ if (chain.getStream ()->write ("0\r\n\r\n", 5, &nbw))
return 1;
}
/* For logging activity. */
td->sentData += sentData;
- chain.clearAllFilters();
+ chain.clearAllFilters ();
return 1;
}
@@ -649,17 +649,17 @@ int HttpDir::send(HttpThreadContext* td,
* \param in String to convert.
* \param out HTML converted string.
*/
-void HttpDir::formatHtml(string& in, string& out)
+void HttpDir::formatHtml (string& in, string& out)
{
string::size_type pos = 0;
- out.assign(in);
+ out.assign (in);
/*
* Replace characters in the ranges 32-65 91-96 123-126 160-255
* with "&#CODE;".
*/
- for(pos = 0; out[pos] != '\0'; pos++)
+ for (pos = 0; out[pos] != '\0'; pos++)
{
- if(((u_char)out[pos] >= 32 &&
+ if (((u_char)out[pos] >= 32 &&
(u_char)out[pos] <= 65) ||
((u_char)out[pos] >= 91 &&
(u_char)out[pos] <= 96) ||
@@ -670,8 +670,8 @@ void HttpDir::formatHtml(string& in, string& out)
{
ostringstream os;
os << "&#" << (int)((unsigned char)out[pos]) << ";";
- out.replace(pos, 1, os.str());
- pos += os.str().length() - 1;
+ out.replace (pos, 1, os.str ());
+ pos += os.str ().length () - 1;
}
}
}
diff --git a/myserver/src/http_handler/http_file/http_file.cpp
b/myserver/src/http_handler/http_file/http_file.cpp
index 7e4a576..cc57ee9 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -51,37 +51,37 @@ int HttpFile::putFile (HttpThreadContext* td,
try
{
- HttpHeaders::buildDefaultHTTPResponseHeader(&td->response);
+ HttpHeaders::buildDefaultHTTPResponseHeader (&td->response);
- if(td->request.isKeepAlive())
+ if (td->request.isKeepAlive ())
{
td->response.setValue ("Connection", "keep-alive");
keepalive = 1;
}
- if(!(td->permissions & MYSERVER_PERMISSION_WRITE))
- return td->http->sendAuth();
+ if (!(td->permissions & MYSERVER_PERMISSION_WRITE))
+ return td->http->sendAuth ();
- if(FilesUtility::fileExists (td->filenamePath.c_str()))
+ if (FilesUtility::fileExists (td->filenamePath.c_str ()))
{
File file;
- if (file.openFile (td->filenamePath.c_str(), File::OPEN_IF_EXISTS |
+ if (file.openFile (td->filenamePath.c_str (), File::OPEN_IF_EXISTS |
File::WRITE))
return td->http->raiseHTTPError (500);
file.seek (firstByte);
- for(;;)
+ for (;;)
{
u_long nbr = 0, nbw = 0;
- if(td->inputData.read (td->buffer->getBuffer(),
- td->buffer->getRealLength(), &nbr))
+ if (td->inputData.read (td->buffer->getBuffer (),
+ td->buffer->getRealLength (), &nbr))
{
file.close ();
- return td->http->raiseHTTPError(500);
+ return td->http->raiseHTTPError (500);
}
- if(nbr)
+ if (nbr)
{
if (file.writeToFile (td->buffer->getBuffer (), nbr, &nbw))
{
@@ -107,12 +107,12 @@ int HttpFile::putFile (HttpThreadContext* td,
{
/* The file doesn't exist. */
File file;
- if(file.openFile(td->filenamePath.c_str(),
+ if (file.openFile (td->filenamePath.c_str (),
File::FILE_CREATE_ALWAYS |
File::WRITE))
{
/* Internal server error. */
- return td->http->raiseHTTPError(500);
+ return td->http->raiseHTTPError (500);
}
for (;;)
@@ -124,7 +124,7 @@ int HttpFile::putFile (HttpThreadContext* td,
file.close ();
return td->http->raiseHTTPError (500);
}
- if(nbr)
+ if (nbr)
{
if (file.writeToFile (td->buffer->getBuffer (), nbr, &nbw))
{
@@ -134,7 +134,7 @@ int HttpFile::putFile (HttpThreadContext* td,
}
else
break;
- if( nbw != nbr )
+ if ( nbw != nbr )
{
file.close ();
return td->http->raiseHTTPError (500);
@@ -177,7 +177,7 @@ int HttpFile::deleteFile (HttpThreadContext* td,
else
return td->http->raiseHTTPError (204);
}
- catch(...)
+ catch (...)
{
return td->http->raiseHTTPError (500);
};
@@ -195,7 +195,7 @@ void HttpFile::generateEtag (string & etag, u_long mtime,
u_long fsize)
{
#define ROL(x, y) ((x << y) | (x >> (32 - y)))
/* Do a bit rotation to have less significative bits in the middle. */
- u_long x = ROL(mtime, 16) | fsize;
+ u_long x = ROL (mtime, 16) | fsize;
char buf[16];
sprintf (buf, "%u", x);
@@ -253,12 +253,12 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
return td->http->sendAuth ();
if (!FilesUtility::fileExists (filenamePath))
- return td->http->raiseHTTPError(404);
+ return td->http->raiseHTTPError (404);
- lastMT = FilesUtility::getLastModTime (td->filenamePath.c_str());
+ lastMT = FilesUtility::getLastModTime (td->filenamePath.c_str ());
if (lastMT == -1)
- return td->http->raiseHTTPError(500);
+ return td->http->raiseHTTPError (500);
getRFC822GMTTime (lastMT, tmpTime, 32);
td->response.setValue ("Last-Modified", tmpTime.c_str ());
@@ -354,7 +354,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
{
HttpRequestHeader::Entry* e = td->request.other.get
("Accept-Encoding");
if (e)
- useGzip &= (e->value->find("gzip") != string::npos);
+ useGzip &= (e->value->find ("gzip") != string::npos);
else
useGzip = false;
}
@@ -383,7 +383,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
{
e = new HttpResponseHeader::Entry ();
e->name->assign ("Content-Range");
- e->value->assign (buffer.str());
+ e->value->assign (buffer.str ());
td->response.other.put (*(e->name), e);
}
@@ -392,7 +392,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
e->value->assign ("chunked");
else
{
- e = new HttpResponseHeader::Entry();
+ e = new HttpResponseHeader::Entry ();
e->name->assign ("Transfer-Encoding");
e->value->assign ("chunked");
td->response.other.put (*(e->name), e);
@@ -416,14 +416,14 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
chain.clearAllFilters ();
return 0;
}
- memStream.refresh();
+ memStream.refresh ();
dataSent += nbw;
}
if (useGzip && !chain.isFilterPresent ("gzip"))
{
Filter* gzipFilter =
- Server::getInstance()->getFiltersFactory()->getFilter ("gzip");
+ Server::getInstance ()->getFiltersFactory ()->getFilter ("gzip");
u_long nbw;
if (!gzipFilter)
{
@@ -478,7 +478,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
{
HttpResponseHeader::Entry *e;
e = td->response.other.get ("Transfer-Encoding");
- if(e)
+ if (e)
e->value->assign ("chunked");
else
{
@@ -491,7 +491,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
}
}
- u_long hdrLen = HttpHeaders::buildHTTPResponseHeader
(td->buffer->getBuffer(),
+ u_long hdrLen = HttpHeaders::buildHTTPResponseHeader
(td->buffer->getBuffer (),
&td->response);
td->buffer->setLength (hdrLen);
@@ -527,7 +527,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
* file to the socket.
*/
if (!useChunks && chain.isEmpty () && !td->appendOutputs
- && !(td->http->getProtocolOptions() & PROTOCOL_USES_SSL))
+ && !(td->http->getProtocolOptions () & PROTOCOL_USES_SSL))
{
u_long nbw = 0;
int ret = file->fastCopyToSocket (td->connection->socket, firstByte,
@@ -555,8 +555,8 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
*/
if (memStream.availableToRead ())
{
- if (memStream.read (td->buffer->getBuffer(),
- td->buffer->getRealLength(),
+ if (memStream.read (td->buffer->getBuffer (),
+ td->buffer->getRealLength (),
&nbr))
{
file->close ();
@@ -569,8 +569,8 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
if (nbr)
{
- if (HttpDataHandler::appendDataToHTTPChannel(td,
- td->buffer->getBuffer(),
+ if (HttpDataHandler::appendDataToHTTPChannel (td,
+ td->buffer->getBuffer (),
nbr, &(td->outputData),
&chain, td->appendOutputs,
useChunks))
@@ -582,7 +582,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
dataSent += nbw;
}
} /* nbr. */
- } /* memStream.availableToRead(). */
+ } /* memStream.availableToRead (). */
/* Flush the rest of the file. */
for (;;)
@@ -594,9 +594,9 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
if (bytesToSend)
{
/* Read from the file the bytes to send. */
- if (ret = file->read (td->buffer->getBuffer(),
+ if (ret = file->read (td->buffer->getBuffer (),
std::min (static_cast<u_long> (bytesToSend),
- static_cast<u_long> (td->buffer->getRealLength() / 2)),
+ static_cast<u_long> (td->buffer->getRealLength () / 2)),
&nbr))
break;
@@ -615,7 +615,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
dataSent += nbr;
}
- else /* if(bytesToSend) */
+ else /* if (bytesToSend) */
{
/* If we don't use chunks we can flush directly. */
if (!useChunks)
@@ -639,7 +639,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
chain.setStream (tmpStream);
if (ret = memStream.read (td->buffer->getBuffer (),
- td->buffer->getRealLength(), &nbr))
+ td->buffer->getRealLength (), &nbr))
break;
if (ret = HttpDataHandler::appendDataToHTTPChannel (td,
diff --git a/myserver/src/http_handler/isapi/isapi.cpp
b/myserver/src/http_handler/isapi/isapi.cpp
index db701cb..d6eee57 100644
--- a/myserver/src/http_handler/isapi/isapi.cpp
+++ b/myserver/src/http_handler/isapi/isapi.cpp
@@ -38,7 +38,7 @@ Mutex *Isapi::isapiMutex = 0;
ConnTableRecord *Isapi::connTable = 0;
-BOOL WINAPI ISAPI_ServerSupportFunctionExport(HCONN hConn, DWORD dwHSERRequest,
+BOOL WINAPI ISAPI_ServerSupportFunctionExport (HCONN hConn, DWORD
dwHSERRequest,
LPVOID lpvBuffer, LPDWORD
lpdwSize,
LPDWORD lpdwDataType)
{
@@ -47,12 +47,12 @@ BOOL WINAPI ISAPI_ServerSupportFunctionExport(HCONN hConn,
DWORD dwHSERRequest,
int ret;
char *buffer = 0;
char uri[MAX_PATH];/*! Under windows use MAX_PATH. */
- Isapi::isapiMutex->lock();
- ConnInfo = Isapi::HConnRecord(hConn);
- Isapi::isapiMutex->unlock();
+ Isapi::isapiMutex->lock ();
+ ConnInfo = Isapi::HConnRecord (hConn);
+ Isapi::isapiMutex->unlock ();
if (ConnInfo == NULL)
{
- Server::getInstance()->log("isapi::ServerSupportFunctionExport: invalid
hConn");
+ Server::getInstance ()->log ("isapi::ServerSupportFunctionExport:
invalid hConn");
return 0;
}
@@ -62,70 +62,70 @@ BOOL WINAPI ISAPI_ServerSupportFunctionExport(HCONN hConn,
DWORD dwHSERRequest,
HSE_URL_MAPEX_INFO *mapInfo;
mapInfo=(HSE_URL_MAPEX_INFO*)lpdwDataType;
mapInfo->lpszPath = 0;
- tmp.assign(mapInfo->lpszPath);
- ret=ConnInfo->td->http->getPath(tmp,(char*)lpvBuffer, 0);
- if(ret != 200)
+ tmp.assign (mapInfo->lpszPath);
+ ret=ConnInfo->td->http->getPath (tmp,(char*)lpvBuffer, 0);
+ if (ret != 200)
return 1;
- mapInfo->cchMatchingURL=(DWORD)strlen((char*)lpvBuffer);
- mapInfo->cchMatchingPath=(DWORD)strlen(mapInfo->lpszPath);
+ mapInfo->cchMatchingURL=(DWORD)strlen ((char*)lpvBuffer);
+ mapInfo->cchMatchingPath=(DWORD)strlen (mapInfo->lpszPath);
delete [] mapInfo->lpszPath;
- mapInfo->lpszPath = new char[tmp.length() + 1];
- if(mapInfo->lpszPath == 0)
- if(buffer==0)
+ mapInfo->lpszPath = new char[tmp.length () + 1];
+ if (mapInfo->lpszPath == 0)
+ if (buffer==0)
{
- SetLastError(ERROR_INSUFFICIENT_BUFFER);
+ SetLastError (ERROR_INSUFFICIENT_BUFFER);
return 0;
}
- strcpy(mapInfo->lpszPath, tmp.c_str());
+ strcpy (mapInfo->lpszPath, tmp.c_str ());
mapInfo->dwFlags = HSE_URL_FLAGS_WRITE | HSE_URL_FLAGS_SCRIPT
| HSE_URL_FLAGS_EXECUTE;
break;
case HSE_REQ_MAP_URL_TO_PATH:
- if(((char*)lpvBuffer)[0])
- strcpy(uri,(char*)lpvBuffer);
+ if (((char*)lpvBuffer)[0])
+ strcpy (uri,(char*)lpvBuffer);
else
- lstrcpyn(uri,ConnInfo->td->request.uri.c_str(),
-
(int)ConnInfo->td->request.uri.length()-ConnInfo->td->pathInfo.length() +1);
- ret = ConnInfo->td->http->getPath(tmp ,uri,0);
- if(ret!=200)
+ lstrcpyn (uri,ConnInfo->td->request.uri.c_str (),
+ (int)ConnInfo->td->request.uri.length
()-ConnInfo->td->pathInfo.length () +1);
+ ret = ConnInfo->td->http->getPath (tmp ,uri,0);
+ if (ret!=200)
{
- if(buffer)
+ if (buffer)
delete [] buffer;
return 1;
}
- if(tmp.length() >= *lpdwSize)
+ if (tmp.length () >= *lpdwSize)
{
- SetLastError(ERROR_INSUFFICIENT_BUFFER);
+ SetLastError (ERROR_INSUFFICIENT_BUFFER);
return 0;
}
- strcpy((char*)lpvBuffer, tmp.c_str());
- if(FilesUtility::completePath((char**)&lpvBuffer,(int*)lpdwSize, 1))
+ strcpy ((char*)lpvBuffer, tmp.c_str ());
+ if (FilesUtility::completePath ((char**)&lpvBuffer,(int*)lpdwSize, 1))
{
- SetLastError(ERROR_INSUFFICIENT_BUFFER);
+ SetLastError (ERROR_INSUFFICIENT_BUFFER);
return 0;
}
- *lpdwSize=(DWORD)strlen((char*)lpvBuffer);
+ *lpdwSize=(DWORD)strlen ((char*)lpvBuffer);
break;
case HSE_REQ_SEND_URL_REDIRECT_RESP:
- return ((Isapi*)ConnInfo->isapi)->Redirect(ConnInfo->td,
+ return ((Isapi*)ConnInfo->isapi)->Redirect (ConnInfo->td,
ConnInfo->connection,(char
*)lpvBuffer);
break;
case HSE_REQ_SEND_URL:
- return ((Isapi*)ConnInfo->isapi)->Senduri(ConnInfo->td,
+ return ((Isapi*)ConnInfo->isapi)->Senduri (ConnInfo->td,
ConnInfo->connection,(char
*)lpvBuffer);
break;
case HSE_REQ_SEND_RESPONSE_HEADER:
- return ((Isapi*)ConnInfo->isapi)->SendHeader(ConnInfo->td,
+ return ((Isapi*)ConnInfo->isapi)->SendHeader (ConnInfo->td,
ConnInfo->connection,(char
*)lpvBuffer);
break;
case HSE_REQ_DONE_WITH_SESSION:
ConnInfo->td->response.httpStatus=*(DWORD*)lpvBuffer;
- SetEvent(ConnInfo->ISAPIDoneEvent);
+ SetEvent (ConnInfo->ISAPIDoneEvent);
break;
case HSE_REQ_IS_KEEP_CONN:
- if(ConnInfo->td->request.isKeepAlive())
+ if (ConnInfo->td->request.isKeepAlive ())
*((BOOL*)lpvBuffer)=1;
else
*((BOOL*)lpvBuffer)=0;
@@ -158,27 +158,27 @@ ConnTableRecord *Isapi::HConnRecord (HCONN hConn)
/*!
*Send an HTTP redirect.
*/
-int Isapi::Redirect(HttpThreadContext* td, ConnectionPtr a, char *URL)
+int Isapi::Redirect (HttpThreadContext* td, ConnectionPtr a, char *URL)
{
- return td->http->sendHTTPRedirect(URL);
+ return td->http->sendHTTPRedirect (URL);
}
/*!
*Send an HTTP URI.
*/
-int Isapi::Senduri(HttpThreadContext* td, ConnectionPtr a, char *URL)
+int Isapi::Senduri (HttpThreadContext* td, ConnectionPtr a, char *URL)
{
string tmp;
- tmp.assign(URL);
- return td->http->sendHTTPResource(tmp, 0, 0);
+ tmp.assign (URL);
+ return td->http->sendHTTPResource (tmp, 0, 0);
}
/*!
*Send the ISAPI header.
*/
-int Isapi::SendHeader(HttpThreadContext* td,ConnectionPtr a,char *data)
+int Isapi::SendHeader (HttpThreadContext* td,ConnectionPtr a,char *data)
{
- HttpHeaders::buildHTTPResponseHeaderStruct(data,
+ HttpHeaders::buildHTTPResponseHeaderStruct (data,
&td->response,
&(td->nBytesToRead));
return 1;
@@ -187,7 +187,7 @@ int Isapi::SendHeader(HttpThreadContext* td,ConnectionPtr
a,char *data)
/*!
*Write directly to the output.
*/
-BOOL WINAPI ISAPI_WriteClientExport(HCONN hConn, LPVOID Buffer, LPDWORD
lpdwBytes,
+BOOL WINAPI ISAPI_WriteClientExport (HCONN hConn, LPVOID Buffer, LPDWORD
lpdwBytes,
DWORD /*!dwReserved*/)
{
int keepalive;
@@ -196,53 +196,53 @@ BOOL WINAPI ISAPI_WriteClientExport(HCONN hConn, LPVOID
Buffer, LPDWORD lpdwByte
char chunkSize[15];
u_long nbw=0;
- if(*lpdwBytes == 0)
+ if (*lpdwBytes == 0)
return 1;
- Isapi::isapiMutex->lock();
- ConnInfo = Isapi::HConnRecord(hConn);
- Isapi::isapiMutex->unlock();
+ Isapi::isapiMutex->lock ();
+ ConnInfo = Isapi::HConnRecord (hConn);
+ Isapi::isapiMutex->unlock ();
- if(ConnInfo == NULL)
+ if (ConnInfo == NULL)
return 1;
- buffer=(char*)ConnInfo->td->buffer->getBuffer();
- HttpRequestHeader::Entry *connection =
ConnInfo->td->request.other.get("Connection");
+ buffer=(char*)ConnInfo->td->buffer->getBuffer ();
+ HttpRequestHeader::Entry *connection = ConnInfo->td->request.other.get
("Connection");
if (ConnInfo == NULL)
{
- ((Vhost*)(ConnInfo->td->connection->host))->warningsLogWrite(_("ISAPI:
internal error"));
+ ((Vhost*)(ConnInfo->td->connection->host))->warningsLogWrite (_("ISAPI:
internal error"));
return 0;
}
- keepalive =connection && (!stringcmpi(connection->value->c_str(),
"keep-alive")) ;
+ keepalive =connection && (!stringcmpi (connection->value->c_str (),
"keep-alive")) ;
/*If the HTTP header was sent do not send it again. */
- if(!ConnInfo->headerSent)
+ if (!ConnInfo->headerSent)
{
int headerSize = 0;
- u_long size = (u_long)strlen(buffer);
- strncat(buffer, (char*)Buffer, *lpdwBytes);
+ u_long size = (u_long)strlen (buffer);
+ strncat (buffer, (char*)Buffer, *lpdwBytes);
ConnInfo->headerSize += *lpdwBytes;
- if(buffer[0] == '\r')
+ if (buffer[0] == '\r')
{
- if(buffer[1] == '\n')
+ if (buffer[1] == '\n')
headerSize = 2;
}
else
{
- for(u_long i = 0; i < size; i++)
+ for (u_long i = 0; i < size; i++)
{
- if(buffer[i] == '\r')
- if(buffer[i+1] == '\n')
- if(buffer[i+2] == '\r')
- if(buffer[i+3] == '\n')
+ if (buffer[i] == '\r')
+ if (buffer[i+1] == '\n')
+ if (buffer[i+2] == '\r')
+ if (buffer[i+3] == '\n')
{
headerSize = i + 4;
buffer[i + 2]='\0';
break;
}
- if(buffer[i] == '\n')
+ if (buffer[i] == '\n')
{
- if(buffer[i+1] == '\n')
+ if (buffer[i+1] == '\n')
{
headerSize = i + 2;
buffer[i + 1]='\0';
@@ -254,77 +254,77 @@ BOOL WINAPI ISAPI_WriteClientExport(HCONN hConn, LPVOID
Buffer, LPDWORD lpdwByte
/*!
*Handle the HTTP header if exists.
*/
- if(headerSize)
+ if (headerSize)
{
int len = ConnInfo->headerSize-headerSize;
-
HttpHeaders::buildHTTPResponseHeaderStruct(ConnInfo->td->buffer->getBuffer(),
+ HttpHeaders::buildHTTPResponseHeaderStruct
(ConnInfo->td->buffer->getBuffer (),
&ConnInfo->td->response,
&(ConnInfo->td->nBytesToRead));
- if(!ConnInfo->td->appendOutputs)
+ if (!ConnInfo->td->appendOutputs)
{
- if(keepalive)
+ if (keepalive)
{
HttpResponseHeader::Entry *e;
- e = ConnInfo->td->response.other.get("Transfer-Encoding");
- if(e)
- e->value->assign("chunked");
+ e = ConnInfo->td->response.other.get ("Transfer-Encoding");
+ if (e)
+ e->value->assign ("chunked");
else
{
- e = new HttpResponseHeader::Entry();
- e->name->assign("Transfer-Encoding");
- e->value->assign("chunked");
- ConnInfo->td->response.other.put(*(e->name), e);
+ e = new HttpResponseHeader::Entry ();
+ e->name->assign ("Transfer-Encoding");
+ e->value->assign ("chunked");
+ ConnInfo->td->response.other.put (*(e->name), e);
}
}
else
- ConnInfo->td->response.connection.assign("Close");
+ ConnInfo->td->response.connection.assign ("Close");
- u_long hdrLen = HttpHeaders::buildHTTPResponseHeader
((char*)ConnInfo->td->secondaryBuffer->getBuffer(),
+ u_long hdrLen = HttpHeaders::buildHTTPResponseHeader
((char*)ConnInfo->td->secondaryBuffer->getBuffer (),
&(ConnInfo->td->response));
- if(ConnInfo->connection->socket->send(
- (char*)ConnInfo->td->secondaryBuffer->getBuffer(),
hdrLen, 0)==-1)
+ if (ConnInfo->connection->socket->send (
+ (char*)ConnInfo->td->secondaryBuffer->getBuffer (),
hdrLen, 0)==-1)
return 0;
}
/*! Save the headerSent status. */
ConnInfo->headerSent=1;
/*! If only the header was requested return. */
- if(ConnInfo->headerSent && ConnInfo->onlyHeader ||
ConnInfo->td->response.getStatusType () == HttpResponseHeader::SUCCESSFUL)
+ if (ConnInfo->headerSent && ConnInfo->onlyHeader ||
ConnInfo->td->response.getStatusType () == HttpResponseHeader::SUCCESSFUL)
return 0;
/*!Send the first chunk. */
- if(len)
+ if (len)
{
/*! With keep-alive connections use chunks.*/
- if(keepalive && (!ConnInfo->td->appendOutputs))
+ if (keepalive && (!ConnInfo->td->appendOutputs))
{
- sprintf(chunkSize, "%x\r\n", len);
- if(ConnInfo->chain.getStream ()->write(chunkSize,
- (int)strlen(chunkSize), &nbw))
+ sprintf (chunkSize, "%x\r\n", len);
+ if (ConnInfo->chain.getStream ()->write (chunkSize,
+ (int)strlen (chunkSize),
&nbw))
return 0;
}
- if(ConnInfo->td->appendOutputs)
+ if (ConnInfo->td->appendOutputs)
{
- if(ConnInfo->td->outputData.writeToFile((char*)(buffer + headerSize),
+ if (ConnInfo->td->outputData.writeToFile ((char*)(buffer +
headerSize),
len, &nbw))
return 0;
ConnInfo->dataSent += nbw;
}
else
{
- if(ConnInfo->chain.write ((char*)(buffer + headerSize),
+ if (ConnInfo->chain.write ((char*)(buffer + headerSize),
len, &nbw))
return 0;
ConnInfo->dataSent += nbw;
}
/*! Send the chunk footer. */
- if(keepalive && (!ConnInfo->td->appendOutputs))
+ if (keepalive && (!ConnInfo->td->appendOutputs))
{
if (ConnInfo->chain.getStream ()->write ("\r\n", 2, &nbw))
return 0;
@@ -338,32 +338,32 @@ BOOL WINAPI ISAPI_WriteClientExport(HCONN hConn, LPVOID
Buffer, LPDWORD lpdwByte
}
else/*!Continue to send data chunks*/
{
- if(keepalive && (!ConnInfo->td->appendOutputs))
+ if (keepalive && (!ConnInfo->td->appendOutputs))
{
sprintf (chunkSize, "%x\r\n", *lpdwBytes);
nbw = ConnInfo->connection->socket->send (chunkSize,
- (int)strlen(chunkSize), 0);
- if((nbw == (u_long)-1) || (!nbw))
+ (int)strlen (chunkSize), 0);
+ if ((nbw == (u_long)-1) || (!nbw))
return 0;
}
- if(ConnInfo->td->appendOutputs)
+ if (ConnInfo->td->appendOutputs)
{
- if(ConnInfo->td->outputData.writeToFile((char*)Buffer,*lpdwBytes, &nbw))
+ if (ConnInfo->td->outputData.writeToFile ((char*)Buffer,*lpdwBytes,
&nbw))
return 0;
ConnInfo->dataSent += nbw;
}
else
{
- if(ConnInfo->chain.write((char*)Buffer,*lpdwBytes, &nbw))
+ if (ConnInfo->chain.write ((char*)Buffer,*lpdwBytes, &nbw))
return 0;
ConnInfo->dataSent += nbw;
}
- if(keepalive && (!ConnInfo->td->appendOutputs))
+ if (keepalive && (!ConnInfo->td->appendOutputs))
{
- nbw = ConnInfo->connection->socket->send("\r\n", 2, 0);
- if((nbw == (u_long)-1) || (!nbw))
+ nbw = ConnInfo->connection->socket->send ("\r\n", 2, 0);
+ if ((nbw == (u_long)-1) || (!nbw))
return 0;
}
}
@@ -378,22 +378,22 @@ BOOL WINAPI ISAPI_WriteClientExport(HCONN hConn, LPVOID
Buffer, LPDWORD lpdwByte
/*!
*Read directly from the client.
*/
-BOOL WINAPI ISAPI_ReadClientExport(HCONN hConn, LPVOID lpvBuffer,
+BOOL WINAPI ISAPI_ReadClientExport (HCONN hConn, LPVOID lpvBuffer,
LPDWORD lpdwSize )
{
ConnTableRecord *ConnInfo;
u_long NumRead;
- Isapi::isapiMutex->lock();
- ConnInfo = Isapi::HConnRecord(hConn);
- Isapi::isapiMutex->unlock();
+ Isapi::isapiMutex->lock ();
+ ConnInfo = Isapi::HConnRecord (hConn);
+ Isapi::isapiMutex->unlock ();
if (ConnInfo == NULL)
{
- ((Vhost*)(ConnInfo->td->connection->host))->warningsLogWrite(_("ISAPI:
internal error"));
+ ((Vhost*)(ConnInfo->td->connection->host))->warningsLogWrite (_("ISAPI:
internal error"));
return 0;
}
- ConnInfo->td->inputData.read((char*)lpvBuffer, *lpdwSize, &NumRead);
+ ConnInfo->td->inputData.read ((char*)lpvBuffer, *lpdwSize, &NumRead);
if (NumRead == -1)
{
@@ -410,43 +410,43 @@ BOOL WINAPI ISAPI_ReadClientExport(HCONN hConn, LPVOID
lpvBuffer,
/*!
*Get server environment variable.
*/
-BOOL WINAPI ISAPI_GetServerVariableExport(HCONN hConn,
+BOOL WINAPI ISAPI_GetServerVariableExport (HCONN hConn,
LPSTR lpszVariableName,
LPVOID lpvBuffer,
LPDWORD lpdwSize)
{
ConnTableRecord *ConnInfo;
BOOL ret =1;
- Isapi::isapiMutex->lock();
- ConnInfo = Isapi::HConnRecord(hConn);
- Isapi::isapiMutex->unlock();
+ Isapi::isapiMutex->lock ();
+ ConnInfo = Isapi::HConnRecord (hConn);
+ Isapi::isapiMutex->unlock ();
if (ConnInfo == NULL)
{
- Server::getInstance()->log(
+ Server::getInstance ()->log (
"Isapi::GetServerVariableExport: invalid hConn");
return 0;
}
- if (!strcmp(lpszVariableName, "ALL_HTTP"))
+ if (!strcmp (lpszVariableName, "ALL_HTTP"))
{
- if(Isapi::buildAllHttpHeaders(ConnInfo->td,ConnInfo->connection,
lpvBuffer, lpdwSize))
+ if (Isapi::buildAllHttpHeaders (ConnInfo->td,ConnInfo->connection,
lpvBuffer, lpdwSize))
ret=1;
else
{
- SetLastError(ERROR_INSUFFICIENT_BUFFER);
+ SetLastError (ERROR_INSUFFICIENT_BUFFER);
ret=0;
}
- }else if(!strcmp(lpszVariableName, "ALL_RAW"))
+ }else if (!strcmp (lpszVariableName, "ALL_RAW"))
{
- if(Isapi::buildAllRawHeaders(ConnInfo->td,ConnInfo->connection,
+ if (Isapi::buildAllRawHeaders (ConnInfo->td,ConnInfo->connection,
lpvBuffer, lpdwSize))
ret = 1;
else
{
- SetLastError(ERROR_INSUFFICIENT_BUFFER);
+ SetLastError (ERROR_INSUFFICIENT_BUFFER);
ret = 0;
}
@@ -461,174 +461,174 @@ BOOL WINAPI ISAPI_GetServerVariableExport(HCONN hConn,
int variableNameLen;
((char*)lpvBuffer)[0]='\0';
localEnv = ConnInfo->envString;
- variableNameLen = (int)strlen(lpszVariableName);
- for(u_long i = 0;;i += (u_long)strlen(&localEnv[i]) + 1)
+ variableNameLen = (int)strlen (lpszVariableName);
+ for (u_long i = 0;;i += (u_long)strlen (&localEnv[i]) + 1)
{
- if(((localEnv[i + variableNameLen]) == '=') &&
- (!strncmp(&localEnv[i], lpszVariableName, variableNameLen)))
+ if (((localEnv[i + variableNameLen]) == '=') &&
+ (!strncmp (&localEnv[i], lpszVariableName, variableNameLen)))
{
- strncpy((char*)lpvBuffer, &localEnv[i + variableNameLen + 1],
+ strncpy ((char*)lpvBuffer, &localEnv[i + variableNameLen + 1],
*lpdwSize);
break;
}
- else if((localEnv[i] == '\0') && (localEnv[i + 1] == '\0'))
+ else if ((localEnv[i] == '\0') && (localEnv[i + 1] == '\0'))
{
break;
}
}
}
- *lpdwSize =(DWORD)strlen((char*)lpvBuffer);
+ *lpdwSize =(DWORD)strlen ((char*)lpvBuffer);
return ret;
}
/*!
*Build the string that contains all the HTTP headers.
*/
-BOOL Isapi::buildAllHttpHeaders(HttpThreadContext* td, ConnectionPtr /*!a*/,
+BOOL Isapi::buildAllHttpHeaders (HttpThreadContext* td, ConnectionPtr /*!a*/,
LPVOID output, LPDWORD dwMaxLen)
{
DWORD valLen = 0;
DWORD maxLen = *dwMaxLen;
char *ValStr=(char*)output;
- HttpRequestHeader::Entry *accept = td->request.other.get("Accept");
- HttpRequestHeader::Entry *cache = td->request.other.get("Cache-Control");
+ HttpRequestHeader::Entry *accept = td->request.other.get ("Accept");
+ HttpRequestHeader::Entry *cache = td->request.other.get ("Cache-Control");
- if(accept && accept->value->length() && (valLen+30<maxLen))
- valLen += sprintf(&ValStr[valLen],"HTTP_ACCEPT:%s\n",
- accept->value->c_str());
- else if(valLen + 30 < maxLen)
+ if (accept && accept->value->length () && (valLen+30<maxLen))
+ valLen += sprintf (&ValStr[valLen],"HTTP_ACCEPT:%s\n",
+ accept->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
- if(cache && cache->value->length() && (valLen+30<maxLen))
- valLen += sprintf(&ValStr[valLen], "HTTP_CACHE_CONTROL:%s\n",
- cache->value->c_str());
- else if(valLen + 30 < maxLen)
+ if (cache && cache->value->length () && (valLen+30<maxLen))
+ valLen += sprintf (&ValStr[valLen], "HTTP_CACHE_CONTROL:%s\n",
+ cache->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
- if((td->request.rangeByteBegin || td->request.rangeByteEnd) &&
+ if ((td->request.rangeByteBegin || td->request.rangeByteEnd) &&
(valLen + 30 < maxLen))
{
ostringstream rangeBuffer;
rangeBuffer << "HTTP_RANGE:" << td->request.rangeType << "=" ;
- if(td->request.rangeByteBegin)
+ if (td->request.rangeByteBegin)
{
rangeBuffer << (int)td->request.rangeByteBegin;
}
rangeBuffer << "-";
- if(td->request.rangeByteEnd)
+ if (td->request.rangeByteEnd)
{
rangeBuffer << td->request.rangeByteEnd;
}
- valLen += sprintf(&ValStr[valLen], "%s\n", rangeBuffer.str().c_str());
+ valLen += sprintf (&ValStr[valLen], "%s\n", rangeBuffer.str ().c_str ());
}
{
- HttpRequestHeader::Entry* e = td->request.other.get("Accept-Encoding");
- if(e && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen], "HTTP_ACCEPT_ENCODING:%s\n",
- e->value->c_str());
- else if(valLen + 30 < maxLen)
+ HttpRequestHeader::Entry* e = td->request.other.get ("Accept-Encoding");
+ if (e && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen], "HTTP_ACCEPT_ENCODING:%s\n",
+ e->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
}
{
- HttpRequestHeader::Entry* e = td->request.other.get("Accept-Language");
- if(e && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen],"HTTP_ACCEPT_LANGUAGE:%s\n",
- e->value->c_str());
- else if(valLen + 30 < maxLen)
+ HttpRequestHeader::Entry* e = td->request.other.get ("Accept-Language");
+ if (e && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen],"HTTP_ACCEPT_LANGUAGE:%s\n",
+ e->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
}
{
- HttpRequestHeader::Entry* e = td->request.other.get("Accept-Charset");
- if(e && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen],"HTTP_ACCEPT_CHARSET:%s\n",
- e->value->c_str());
- else if(valLen + 30 < maxLen)
+ HttpRequestHeader::Entry* e = td->request.other.get ("Accept-Charset");
+ if (e && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen],"HTTP_ACCEPT_CHARSET:%s\n",
+ e->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
}
{
- HttpRequestHeader::Entry* e = td->request.other.get("Pragma");
- if(e && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen],"HTTP_PRAGMA:%s\n",
- e->value->c_str());
- else if(valLen + 30 < maxLen)
+ HttpRequestHeader::Entry* e = td->request.other.get ("Pragma");
+ if (e && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen],"HTTP_PRAGMA:%s\n",
+ e->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
}
{
- HttpRequestHeader::Entry* e = td->request.other.get("Connection");
- if(e && (valLen + 30< maxLen))
- valLen += sprintf(&ValStr[valLen],"HTTP_CONNECTION:%s\n",
- e->value->c_str());
- else if(valLen + 30 < maxLen)
+ HttpRequestHeader::Entry* e = td->request.other.get ("Connection");
+ if (e && (valLen + 30< maxLen))
+ valLen += sprintf (&ValStr[valLen],"HTTP_CONNECTION:%s\n",
+ e->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
}
{
- HttpRequestHeader::Entry* e = td->request.other.get("Cookie");
- if(e && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen],"HTTP_COOKIE:%s\n",
- e->value->c_str());
- else if(valLen + 30 < maxLen)
+ HttpRequestHeader::Entry* e = td->request.other.get ("Cookie");
+ if (e && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen],"HTTP_COOKIE:%s\n",
+ e->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
}
{
- HttpRequestHeader::Entry* e = td->request.other.get("Host");
- if(e && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen],"HTTP_HOST:%s\n",
- e->value->c_str());
- else if(valLen + 30 < maxLen)
+ HttpRequestHeader::Entry* e = td->request.other.get ("Host");
+ if (e && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen],"HTTP_HOST:%s\n",
+ e->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
}
{
- HttpRequestHeader::Entry* e = td->request.other.get("Date");
- if(e && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen],"HTTP_DATE:%s\n",
- e->value->c_str());
- else if(valLen + 30 < maxLen)
+ HttpRequestHeader::Entry* e = td->request.other.get ("Date");
+ if (e && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen],"HTTP_DATE:%s\n",
+ e->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
}
{
- HttpRequestHeader::Entry* e = td->request.other.get("If-Modified-Since");
- if(e && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen],"HTTP_IF_MODIFIED_SINCE:%s\n",
- e->value->c_str());
- else if(valLen + 30 < maxLen)
+ HttpRequestHeader::Entry* e = td->request.other.get ("If-Modified-Since");
+ if (e && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen],"HTTP_IF_MODIFIED_SINCE:%s\n",
+ e->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
}
{
- HttpRequestHeader::Entry* e = td->request.other.get("Referer");
- if(e && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen],"HTTP_REFERER:%s\n",
- e->value->c_str());
- else if(valLen + 30 < maxLen)
+ HttpRequestHeader::Entry* e = td->request.other.get ("Referer");
+ if (e && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen],"HTTP_REFERER:%s\n",
+ e->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
}
{
- HttpRequestHeader::Entry* e = td->request.other.get("User-Agent");
- if(e && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen],"HTTP_USER_AGENT:%s\n",
- e->value->c_str());
- else if(valLen + 30 < maxLen)
+ HttpRequestHeader::Entry* e = td->request.other.get ("User-Agent");
+ if (e && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen],"HTTP_USER_AGENT:%s\n",
+ e->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
}
{
- HttpRequestHeader::Entry* e = td->request.other.get("From");
- if(e && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen],"HTTP_FROM:%s\n",
- e->value->c_str());
- else if(valLen + 30 < maxLen)
+ HttpRequestHeader::Entry* e = td->request.other.get ("From");
+ if (e && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen],"HTTP_FROM:%s\n",
+ e->value->c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
}
@@ -638,87 +638,87 @@ BOOL Isapi::buildAllHttpHeaders(HttpThreadContext* td,
ConnectionPtr /*!a*/,
/*!
*Build the string that contains all the headers.
*/
-BOOL Isapi::buildAllRawHeaders(HttpThreadContext* td,ConnectionPtr a,
+BOOL Isapi::buildAllRawHeaders (HttpThreadContext* td,ConnectionPtr a,
LPVOID output,LPDWORD dwMaxLen)
{
DWORD valLen = 0;
DWORD maxLen = *dwMaxLen;
char *ValStr = (char*)output;
- if(buildAllHttpHeaders(td, a, output, dwMaxLen) == 0)
+ if (buildAllHttpHeaders (td, a, output, dwMaxLen) == 0)
return 0;
- valLen = (DWORD)strlen(ValStr);
+ valLen = (DWORD)strlen (ValStr);
- if(td->pathInfo.length() && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen], "PATH_INFO:%s\n",
- td->pathInfo.c_str());
- else if(valLen + 30 < maxLen)
+ if (td->pathInfo.length () && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen], "PATH_INFO:%s\n",
+ td->pathInfo.c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
- if(td->pathTranslated.length() && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen], "PATH_INFO:%s\n",
- td->pathTranslated.c_str());
- else if(valLen + 30 < maxLen)
+ if (td->pathTranslated.length () && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen], "PATH_INFO:%s\n",
+ td->pathTranslated.c_str ());
+ else if (valLen + 30 < maxLen)
return 0;
- if(td->request.uriOpts[0] && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen], "QUERY_STRING:%s\n",
+ if (td->request.uriOpts[0] && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen], "QUERY_STRING:%s\n",
td->request.uriOpts[0]);
- else if(valLen + 30 < maxLen)
+ else if (valLen + 30 < maxLen)
return 0;
- if(td->request.cmd[0] && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen], "REQUEST_METHOD:%s\n",
+ if (td->request.cmd[0] && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen], "REQUEST_METHOD:%s\n",
td->request.cmd[0]);
- else if(valLen + 30 < maxLen)
+ else if (valLen + 30 < maxLen)
return 0;
- if(td->filenamePath.length() && (valLen + 30 < maxLen))
- valLen += sprintf(&ValStr[valLen], "SCRIPT_FILENAME:%s\n",
+ if (td->filenamePath.length () && (valLen + 30 < maxLen))
+ valLen += sprintf (&ValStr[valLen], "SCRIPT_FILENAME:%s\n",
td->filenamePath[0]);
- else if(valLen + 30 < maxLen)
+ else if (valLen + 30 < maxLen)
return 0;
- if(valLen + 30 < maxLen)
- valLen += sprintf(&ValStr[valLen], "SERVER_PORT:%u\n",
- td->connection->getLocalPort());
- else if(valLen + 30 < maxLen)
+ if (valLen + 30 < maxLen)
+ valLen += sprintf (&ValStr[valLen], "SERVER_PORT:%u\n",
+ td->connection->getLocalPort ());
+ else if (valLen + 30 < maxLen)
return 0;
- if(valLen + 30 < maxLen)
- valLen += sprintf(&ValStr[valLen],
+ if (valLen + 30 < maxLen)
+ valLen += sprintf (&ValStr[valLen],
"SERVER_SIGNATURE:<address>%s</address>\n",
MYSERVER_VERSION);
- else if(valLen + 30 < maxLen)
+ else if (valLen + 30 < maxLen)
return 0;
- if(td->connection->getIpAddr()[0] && valLen + 30 < maxLen)
- valLen += sprintf(&ValStr[valLen], "REMOTE_ADDR:\n",
- td->connection->getIpAddr());
- else if(valLen + 30 < maxLen)
+ if (td->connection->getIpAddr ()[0] && valLen + 30 < maxLen)
+ valLen += sprintf (&ValStr[valLen], "REMOTE_ADDR:\n",
+ td->connection->getIpAddr ());
+ else if (valLen + 30 < maxLen)
return 0;
- if(td->connection->getPort() && valLen + 30 < maxLen)
- valLen += sprintf(&ValStr[valLen], "REMOTE_PORT:%u\n",
- td->connection->getPort());
- else if(valLen + 30 < maxLen)
+ if (td->connection->getPort () && valLen + 30 < maxLen)
+ valLen += sprintf (&ValStr[valLen], "REMOTE_PORT:%u\n",
+ td->connection->getPort ());
+ else if (valLen + 30 < maxLen)
return 0;
- if(valLen + 30 < maxLen)
- valLen += sprintf(&ValStr[valLen], "SERVER_ADMIN:%s\n",
+ if (valLen + 30 < maxLen)
+ valLen += sprintf (&ValStr[valLen], "SERVER_ADMIN:%s\n",
td->securityToken.getData ("server.admin",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
""));
- else if(valLen + 30 < maxLen)
+ else if (valLen + 30 < maxLen)
return 0;
- if(valLen + MAX_PATH < maxLen)
+ if (valLen + MAX_PATH < maxLen)
{
- valLen += sprintf(&ValStr[valLen],"SCRIPT_NAME:");
- lstrcpyn(&ValStr[valLen], td->request.uri.c_str(),
- td->request.uri.length()- td->pathInfo.length() + 1);
- valLen += (DWORD)td->request.uri.length()-td->pathInfo.length() + 1;
- valLen += (DWORD)sprintf(&ValStr[valLen],"\n");
+ valLen += sprintf (&ValStr[valLen],"SCRIPT_NAME:");
+ lstrcpyn (&ValStr[valLen], td->request.uri.c_str (),
+ td->request.uri.length ()- td->pathInfo.length () + 1);
+ valLen += (DWORD)td->request.uri.length ()-td->pathInfo.length () + 1;
+ valLen += (DWORD)sprintf (&ValStr[valLen],"\n");
}
- else if(valLen + 30 < maxLen)
+ else if (valLen + 30 < maxLen)
return 0;
return 1;
}
@@ -728,7 +728,7 @@ BOOL Isapi::buildAllRawHeaders(HttpThreadContext*
td,ConnectionPtr a,
/*!
*Main procedure to call an ISAPI module.
*/
-int Isapi::send(HttpThreadContext* td,
+int Isapi::send (HttpThreadContext* td,
const char* scriptpath, const char *cgipath,
bool execute, bool onlyHeader)
{
@@ -750,10 +750,10 @@ int Isapi::send(HttpThreadContext* td,
if (!execute)
{
- if (cgipath && strlen(cgipath))
- sprintf (fullpath, "%s \"%s\"", cgipath, td->filenamePath.c_str());
+ if (cgipath && strlen (cgipath))
+ sprintf (fullpath, "%s \"%s\"", cgipath, td->filenamePath.c_str ());
else
- sprintf (fullpath, "%s", td->filenamePath.c_str());
+ sprintf (fullpath, "%s", td->filenamePath.c_str ());
}
else
{
@@ -761,54 +761,54 @@ int Isapi::send(HttpThreadContext* td,
}
if (!(td->permissions & MYSERVER_PERMISSION_EXECUTE))
- return td->http->sendAuth();
+ return td->http->sendAuth ();
td->inputData.seek (0);
- EnterCriticalSection(&GetTableEntryCritSec);
+ EnterCriticalSection (&GetTableEntryCritSec);
connIndex = 0;
- Isapi::isapiMutex->lock();
+ Isapi::isapiMutex->lock ();
while ((connTable[connIndex].Allocated != 0) &&
(connIndex < maxConnections))
{
connIndex++;
}
- Isapi::isapiMutex->unlock();
- LeaveCriticalSection(&GetTableEntryCritSec);
+ Isapi::isapiMutex->unlock ();
+ LeaveCriticalSection (&GetTableEntryCritSec);
if (connIndex == maxConnections)
{
td->connection->host->warningsLogWrite (_("ISAPI: max connections"));
return td->http->raiseHTTPError (503);
}
- if(execute)
+ if (execute)
loadLib = scriptpath;
else
loadLib = cgipath;
- Ret = appHnd.loadLibrary(loadLib);
+ Ret = appHnd.loadLibrary (loadLib);
- if(Ret)
+ if (Ret)
{
td->connection->host->warningsLogWrite (_("ISAPI: cannot load %s"),
loadLib);
- return td->http->raiseHTTPError(500);
+ return td->http->raiseHTTPError (500);
}
- connTable[connIndex].chain.setProtocol(td->http);
- connTable[connIndex].chain.setProtocolData(td);
- connTable[connIndex].chain.setStream(td->connection->socket);
- if(td->mime)
+ connTable[connIndex].chain.setProtocol (td->http);
+ connTable[connIndex].chain.setProtocolData (td);
+ connTable[connIndex].chain.setStream (td->connection->socket);
+ if (td->mime)
{
u_long nbw;
- if(td->mime && Server::getInstance()->getFiltersFactory()->chain (
+ if (td->mime && Server::getInstance ()->getFiltersFactory ()->chain (
&(connTable[connIndex].chain),
td->mime->filters,
td->connection->socket,
&nbw, 1))
{
td->connection->host->warningsLogWrite (_("ISAPI: internal error"));
- connTable[connIndex].chain.clearAllFilters();
- return td->http->raiseHTTPError(500);
+ connTable[connIndex].chain.clearAllFilters ();
+ return td->http->raiseHTTPError (500);
}
}
@@ -836,9 +836,9 @@ int Isapi::send(HttpThreadContext* td,
td->connection->host->warningsLogWrite (_("ISAPI: internal error"));
appHnd.close ();
connTable[connIndex].chain.clearAllFilters ();
- return td->http->raiseHTTPError(500);
+ return td->http->raiseHTTPError (500);
}
- if (Ver.dwExtensionVersion > MAKELONG(HSE_VERSION_MINOR,
+ if (Ver.dwExtensionVersion > MAKELONG (HSE_VERSION_MINOR,
HSE_VERSION_MAJOR))
{
td->connection->host->warningsLogWrite (_("ISAPI: version not supported"));
@@ -849,12 +849,12 @@ int Isapi::send(HttpThreadContext* td,
/*!
*Store the environment string in the secondaryBuffer.
*/
- connTable[connIndex].envString=td->secondaryBuffer->getBuffer();
+ connTable[connIndex].envString=td->secondaryBuffer->getBuffer ();
/*!
*Build the environment string.
*/
- td->scriptPath.assign(scriptpath);
+ td->scriptPath.assign (scriptpath);
string tmp;
tmp.assign (cgipath);
@@ -863,11 +863,11 @@ int Isapi::send(HttpThreadContext* td,
FilesUtility::splitPath (tmp, td->scriptDir, td->scriptFile);
connTable[connIndex].envString[0]='\0';
- Env::buildEnvironmentString(td,connTable[connIndex].envString);
+ Env::buildEnvironmentString (td,connTable[connIndex].envString);
- ZeroMemory(&ExtCtrlBlk, sizeof(ExtCtrlBlk));
- ExtCtrlBlk.cbSize = sizeof(ExtCtrlBlk);
- ExtCtrlBlk.dwVersion = MAKELONG(HSE_VERSION_MINOR, HSE_VERSION_MAJOR);
+ ZeroMemory (&ExtCtrlBlk, sizeof (ExtCtrlBlk));
+ ExtCtrlBlk.cbSize = sizeof (ExtCtrlBlk);
+ ExtCtrlBlk.dwVersion = MAKELONG (HSE_VERSION_MINOR, HSE_VERSION_MAJOR);
ExtCtrlBlk.GetServerVariable = ISAPI_GetServerVariableExport;
ExtCtrlBlk.ReadClient = ISAPI_ReadClientExport;
ExtCtrlBlk.WriteClient = ISAPI_WriteClientExport;
@@ -875,49 +875,49 @@ int Isapi::send(HttpThreadContext* td,
ExtCtrlBlk.ConnID = (HCONN) (connIndex + 1);
ExtCtrlBlk.dwHttpStatusCode = 200;
ExtCtrlBlk.lpszLogData[0] = '0';
- ExtCtrlBlk.lpszMethod = (char*)td->request.cmd.c_str();
- ExtCtrlBlk.lpszQueryString =(char*) td->request.uriOpts.c_str();
- ExtCtrlBlk.lpszPathInfo = td->pathInfo.length() ?
(char*)td->pathInfo.c_str() : (CHAR*)"" ;
- if(td->pathInfo.length())
- ExtCtrlBlk.lpszPathTranslated = (char*)td->pathTranslated.c_str();
+ ExtCtrlBlk.lpszMethod = (char*)td->request.cmd.c_str ();
+ ExtCtrlBlk.lpszQueryString =(char*) td->request.uriOpts.c_str ();
+ ExtCtrlBlk.lpszPathInfo = td->pathInfo.length () ? (char*)td->pathInfo.c_str
() : (CHAR*)"" ;
+ if (td->pathInfo.length ())
+ ExtCtrlBlk.lpszPathTranslated = (char*)td->pathTranslated.c_str ();
else
- ExtCtrlBlk.lpszPathTranslated = (char*)td->filenamePath.c_str();
- ExtCtrlBlk.cbTotalBytes = td->inputData.getFileSize();
+ ExtCtrlBlk.lpszPathTranslated = (char*)td->filenamePath.c_str ();
+ ExtCtrlBlk.cbTotalBytes = td->inputData.getFileSize ();
ExtCtrlBlk.cbAvailable = 0;
ExtCtrlBlk.lpbData = 0;
{
HttpRequestHeader::Entry *content =
- td->request.other.get("Content-Type");
- ExtCtrlBlk.lpszContentType = content ? (char*)content->value->c_str()
+ td->request.other.get ("Content-Type");
+ ExtCtrlBlk.lpszContentType = content ? (char*)content->value->c_str ()
: 0;
}
- connTable[connIndex].td->buffer->setLength(0);
- connTable[connIndex].td->buffer->getAt(0)='\0';
- HttpExtensionProc =
(PFN_HTTPEXTENSIONPROC)appHnd.getProc("HttpExtensionProc");
+ connTable[connIndex].td->buffer->setLength (0);
+ connTable[connIndex].td->buffer->getAt (0)='\0';
+ HttpExtensionProc = (PFN_HTTPEXTENSIONPROC)appHnd.getProc
("HttpExtensionProc");
if (HttpExtensionProc == NULL)
{
- td->connection->host->warningsLogWrite(_("ISAPI: internal error"));
- appHnd.close();
- connTable[connIndex].chain.clearAllFilters();
- return td->http->raiseHTTPError(500);
+ td->connection->host->warningsLogWrite (_("ISAPI: internal error"));
+ appHnd.close ();
+ connTable[connIndex].chain.clearAllFilters ();
+ return td->http->raiseHTTPError (500);
}
- Ret = HttpExtensionProc(&ExtCtrlBlk);
+ Ret = HttpExtensionProc (&ExtCtrlBlk);
if (Ret == HSE_STATUS_PENDING)
{
- WaitForSingleObject(connTable[connIndex].ISAPIDoneEvent,
td->http->getTimeout ());
+ WaitForSingleObject (connTable[connIndex].ISAPIDoneEvent,
td->http->getTimeout ());
}
{
u_long nbw = 0;
- HttpRequestHeader::Entry *connection =
connTable[connIndex].td->request.other.get("Connection");
+ HttpRequestHeader::Entry *connection =
connTable[connIndex].td->request.other.get ("Connection");
- if(connection && !stringcmpi(connection->value->c_str(), "keep-alive"))
- Ret = connTable[connIndex].chain.getStream ()->write("0\r\n\r\n", 5,
&nbw);
+ if (connection && !stringcmpi (connection->value->c_str (), "keep-alive"))
+ Ret = connTable[connIndex].chain.getStream ()->write ("0\r\n\r\n", 5,
&nbw);
}
- switch(Ret)
+ switch (Ret)
{
case HSE_STATUS_SUCCESS_AND_KEEP_CONN:
retvalue = 1;
@@ -930,12 +930,12 @@ int Isapi::send(HttpThreadContext* td,
break;
}
- appHnd.close();
+ appHnd.close ();
ostringstream tmp;
tmp << connTable[connIndex].dataSent;
connTable[connIndex].td->response.contentLength.assign (tmp.str ());
- connTable[connIndex].chain.clearAllFilters();
+ connTable[connIndex].chain.clearAllFilters ();
connTable[connIndex].Allocated = 0;
return retvalue;
#else
@@ -943,14 +943,14 @@ int Isapi::send(HttpThreadContext* td,
* On other archs returns a non implemented error.
*/
td->connection->host->warningsLogWrite (_("ISAPI: Not implemented"));
- return td->http->raiseHTTPError(501);
+ return td->http->raiseHTTPError (501);
#endif
}
/*!
* Constructor for the ISAPI class.
*/
-Isapi::Isapi()
+Isapi::Isapi ()
{
}
@@ -961,18 +961,18 @@ Isapi::Isapi()
int Isapi::load ()
{
#ifdef WIN32
- u_long nThreads = Server::getInstance()->getMaxThreads()/2;
- if(initialized)
+ u_long nThreads = Server::getInstance ()->getMaxThreads ()/2;
+ if (initialized)
return 0;
isapiMutex = new Mutex;
maxConnections = nThreads ? nThreads : 20 ;
- if(connTable)
- free(connTable);
+ if (connTable)
+ free (connTable);
connTable = new ConnTableRecord[maxConnections];
- for(int i=0;i<maxConnections; i++)
+ for (int i=0;i<maxConnections; i++)
{
connTable[i].Allocated=0;
connTable[i].onlyHeader=0;
@@ -985,7 +985,7 @@ int Isapi::load ()
connTable[i].ISAPIDoneEvent=0;
connTable[i].isapi=0;
}
- InitializeCriticalSection(&GetTableEntryCritSec);
+ InitializeCriticalSection (&GetTableEntryCritSec);
initialized=1;
#endif
return 0;
@@ -994,12 +994,12 @@ int Isapi::load ()
/*!
* Cleanup the memory used by ISAPI.
*/
-int Isapi::unLoad()
+int Isapi::unLoad ()
{
#ifdef WIN32
delete isapiMutex;
- DeleteCriticalSection(&GetTableEntryCritSec);
- if(connTable)
+ DeleteCriticalSection (&GetTableEntryCritSec);
+ if (connTable)
delete [] connTable;
connTable=0;
initialized=0;
diff --git a/myserver/src/http_handler/mscgi/mscgi.cpp
b/myserver/src/http_handler/mscgi/mscgi.cpp
index c51ba45..6ddc726 100644
--- a/myserver/src/http_handler/mscgi/mscgi.cpp
+++ b/myserver/src/http_handler/mscgi/mscgi.cpp
@@ -48,7 +48,7 @@ int MsCgi::send (HttpThreadContext* td, const char* exec,
const char* cmdLine,
* This files differently from standard CGI don't need a new process to run
* but are allocated in the caller process virtual space.
* Usually these files are faster than standard CGI.
- * Actually myServerCGI(.mscgi) is only at an alpha status.
+ * Actually myServerCGI (.mscgi) is only at an alpha status.
*/
ostringstream tmpStream;
string outDataPath;
@@ -63,7 +63,7 @@ int MsCgi::send (HttpThreadContext* td, const char* exec,
const char* cmdLine,
#endif
data.envString = td->request.uriOptsPtr ?
- td->request.uriOptsPtr : (char*) td->buffer->getBuffer();
+ td->request.uriOptsPtr : (char*) td->buffer->getBuffer ();
data.td = td;
data.errorPage = 0;
@@ -95,7 +95,7 @@ int MsCgi::send (HttpThreadContext* td, const char* exec,
const char* cmdLine,
chain.setProtocolData (td);
chain.setStream (td->connection->socket);
- if (td->mime && Server::getInstance ()->getFiltersFactory ()->chain(&chain,
+ if (td->mime && Server::getInstance ()->getFiltersFactory ()->chain (&chain,
td->mime->filters,
td->connection->socket,
&nbw,
@@ -120,7 +120,7 @@ int MsCgi::send (HttpThreadContext* td, const char* exec,
const char* cmdLine,
td->secondaryBuffer->getAt (0) = '\0';
- ProcMain = (CGIMAIN) hinstLib.getProc( "myserver_main");
+ ProcMain = (CGIMAIN) hinstLib.getProc ( "myserver_main");
if (ProcMain)
(ProcMain)(td->request.uriOpts.c_str (), &data);
else
@@ -141,12 +141,12 @@ int MsCgi::send (HttpThreadContext* td, const char* exec,
const char* cmdLine,
&& chain.getStream ()->write ("0\r\n\r\n", 5, &nbw))
return 0;
- if(!data.error)
+ if (!data.error)
return 0;
ostringstream tmp;
tmp << td->sentData;
- td->response.contentLength.assign(tmp.str());
+ td->response.contentLength.assign (tmp.str ());
chain.clearAllFilters ();
return 1;
@@ -196,11 +196,11 @@ int MsCgi::sendHeader (MsCgiData* mcd)
if (!mcd->td->appendOutputs)
{
HttpThreadContext* td = mcd->td;
- char *buffer = td->secondaryBuffer->getBuffer();
+ char *buffer = td->secondaryBuffer->getBuffer ();
ConnectionPtr s = td->connection;
u_long hdrLen = HttpHeaders::buildHTTPResponseHeader (buffer,
&(td->response));
- if(td->connection->socket->send (buffer, hdrLen, 0) == SOCKET_ERROR)
+ if (td->connection->socket->send (buffer, hdrLen, 0) == SOCKET_ERROR)
return 1;
}
diff --git a/myserver/src/http_handler/mscgi/mscgi_manager.cpp
b/myserver/src/http_handler/mscgi/mscgi_manager.cpp
index 17a00bb..459ba18 100644
--- a/myserver/src/http_handler/mscgi/mscgi_manager.cpp
+++ b/myserver/src/http_handler/mscgi/mscgi_manager.cpp
@@ -30,20 +30,20 @@ using namespace std;
/*!
*Write to the stdout.
*/
-int MscgiManager::write(const char* str)
+int MscgiManager::write (const char* str)
{
- return cgidata->mscgi->write(str, (u_long)strlen(str), cgidata);
+ return cgidata->mscgi->write (str, (u_long)strlen (str), cgidata);
}
/*!
*Write binary to the stdout.
*/
-int MscgiManager::write(const void* data, int len)
+int MscgiManager::write (const void* data, int len)
{
- return cgidata->mscgi->write((const char*)data, len, cgidata);
+ return cgidata->mscgi->write ((const char*)data, len, cgidata);
}
-Server* MscgiManager::getServer()
+Server* MscgiManager::getServer ()
{
return cgidata->server;
}
@@ -51,7 +51,7 @@ Server* MscgiManager::getServer()
/*!
*Start the execution of the CGI.
*/
-int MscgiManager::start(MsCgiData* data)
+int MscgiManager::start (MsCgiData* data)
{
cgidata = data;
td = data->td;
@@ -61,7 +61,7 @@ int MscgiManager::start(MsCgiData* data)
/*!
*Clean the memory allocated by the CGI.
*/
-int MscgiManager::clean()
+int MscgiManager::clean ()
{
return 1;
}
@@ -69,7 +69,7 @@ int MscgiManager::clean()
/*!
*Set the HTTP error identifier.
*/
-int MscgiManager::setPageError(int ID)
+int MscgiManager::setPageError (int ID)
{
td->response.httpStatus = ID;
return 1;
@@ -78,7 +78,7 @@ int MscgiManager::setPageError(int ID)
/*!
*Raise an HTTP error
*/
-int MscgiManager::raiseError(int ID)
+int MscgiManager::raiseError (int ID)
{
cgidata->errorPage = ID;
return 1;
@@ -87,49 +87,49 @@ int MscgiManager::raiseError(int ID)
/*!
*Constructor of the class
*/
-MscgiManager::MscgiManager(MsCgiData* data)
+MscgiManager::MscgiManager (MsCgiData* data)
{
- start(data);
+ start (data);
}
/*!
*Destructor of the class
*/
-MscgiManager::~MscgiManager(void)
+MscgiManager::~MscgiManager (void)
{
- clean();
+ clean ();
}
/*!
*Returns the value of a param passed through the URL.
*/
-char* MscgiManager::getParam(const char* param)
+char* MscgiManager::getParam (const char* param)
{
const char* c;
u_long len = 0;
- if(td->request.uriOpts.length() == 0)
+ if (td->request.uriOpts.length () == 0)
return 0;
localbuffer[0]='\0';
- c = td->request.uriOpts.c_str();
- for(;;)
+ c = td->request.uriOpts.c_str ();
+ for (;;)
{
- while((*c) && strncmp(c, param, std::min(strlen(param), strlen(c))))
+ while ((*c) && strncmp (c, param, std::min (strlen (param), strlen (c))))
c++;
- if(*c == '\0')
+ if (*c == '\0')
{
return &localbuffer[0];
}
- c += strlen(param);
+ c += strlen (param);
- if(*c == '=')
+ if (*c == '=')
{
c++;
break;
}
}
- while((c[len]) && (c[len] != '&') && (len < LOCAL_BUFFER_DIM-1 ))
+ while ((c[len]) && (c[len] != '&') && (len < LOCAL_BUFFER_DIM-1 ))
{
localbuffer[len] = c[len];
localbuffer[len+1] = '\0';
@@ -141,43 +141,43 @@ char* MscgiManager::getParam(const char* param)
/*!
*Returns the value of a param passed through a POST request.
*/
-char* MscgiManager::postParam(const char* param)
+char* MscgiManager::postParam (const char* param)
{
char buffer[LOCAL_BUFFER_DIM + 50];
u_long nbr = 0;
char c;
- u_long toRead = td->inputData.getFileSize();
+ u_long toRead = td->inputData.getFileSize ();
buffer[0] = '\0';
localbuffer[0] = '\0';
- if( (toRead == 0) || (toRead == (u_long)-1) )
+ if ( (toRead == 0) || (toRead == (u_long)-1) )
return 0;
do
{
- cgidata->td->inputData.read(&c, 1, &nbr);
- if(nbr == 0)
+ cgidata->td->inputData.read (&c, 1, &nbr);
+ if (nbr == 0)
break;
- if((c == '&') |(toRead == 1))
+ if ((c == '&') |(toRead == 1))
{
- if(!strncmp(param, buffer, strlen(param)))
+ if (!strncmp (param, buffer, strlen (param)))
{
- myserver_strlcpy(localbuffer, &buffer[strlen(param)],
LOCAL_BUFFER_DIM);
+ myserver_strlcpy (localbuffer, &buffer[strlen (param)],
LOCAL_BUFFER_DIM);
break;
}
buffer[0] = '\0';
}
else
{
- size_t len = strlen(buffer);
- if(len + 1 < LOCAL_BUFFER_DIM + 50)
+ size_t len = strlen (buffer);
+ if (len + 1 < LOCAL_BUFFER_DIM + 50)
{
buffer[len] = c;
buffer[len + 1] = '\0';
}
}
- }while(--toRead);
+ }while (--toRead);
return localbuffer;
@@ -188,7 +188,7 @@ char* MscgiManager::postParam(const char* param)
*/
int MscgiManager::operator <<(const char* str)
{
- return write(str);
+ return write (str);
}
/*!
@@ -200,47 +200,47 @@ char *MscgiManager::operator >>(const char* str)
*If it is a POST request return a param from the POST values
*else return a GET param.
*/
- if(td->request.uriOptsPtr)
- return postParam(str);
+ if (td->request.uriOptsPtr)
+ return postParam (str);
else
- return getParam(str);
+ return getParam (str);
}
/*!
*Get the value of an environment variable.
*/
-void MscgiManager::getenv(const char* lpszVariableName, char *lpvBuffer,
+void MscgiManager::getenv (const char* lpszVariableName, char *lpvBuffer,
u_long* lpdwSize)
{
((char*)lpvBuffer)[0] = '\0';
char *localEnv = cgidata->envString;
- size_t variableNameLen = strlen(lpszVariableName);
- for(u_long i = 0; ; i += (u_long)strlen(&localEnv[i]) + 1)
+ size_t variableNameLen = strlen (lpszVariableName);
+ for (u_long i = 0; ; i += (u_long)strlen (&localEnv[i]) + 1)
{
- if(((localEnv[i+variableNameLen])== '=') &&
- (!strncmp(&localEnv[i], lpszVariableName, variableNameLen)))
+ if (((localEnv[i+variableNameLen])== '=') &&
+ (!strncmp (&localEnv[i], lpszVariableName, variableNameLen)))
{
u_long j = 0;
- u_long min_v = std::min((u_long)strlen(&localEnv[i + variableNameLen+1]),
+ u_long min_v = std::min ((u_long)strlen (&localEnv[i +
variableNameLen+1]),
(u_long)(*lpvBuffer)-1);
- for(j = 0; j < min_v; j++)
+ for (j = 0; j < min_v; j++)
lpvBuffer[j] = localEnv[i + variableNameLen + j + 1];
lpvBuffer[j] = '\0';
break;
}
- else if((localEnv[i] == '\0') && (localEnv[i + 1] == '\0'))
+ else if ((localEnv[i] == '\0') && (localEnv[i + 1] == '\0'))
{
break;
}
}
- *lpdwSize = (u_int)strlen((char*)lpvBuffer);
+ *lpdwSize = (u_int)strlen ((char*)lpvBuffer);
}
/*!
*Returns the CGI data structure.
*This structure is shared with the MyServer core so use it carefully!
*/
-MsCgiData* MscgiManager::getCgiData()
+MsCgiData* MscgiManager::getCgiData ()
{
return cgidata;
}
@@ -248,7 +248,7 @@ MsCgiData* MscgiManager::getCgiData()
/*!
*Specify the MIME type for the data.
*/
-void MscgiManager::setContentType(const char * type)
+void MscgiManager::setContentType (const char * type)
{
td->response.setValue ("ContentType", type);
}
@@ -256,8 +256,8 @@ void MscgiManager::setContentType(const char * type)
/*!
*Add an HTTP header to the response.
*/
-void MscgiManager::addHeader(const char* name, const char *value)
+void MscgiManager::addHeader (const char* name, const char *value)
{
- td->response.setValue(name, value);
+ td->response.setValue (name, value);
}
diff --git a/myserver/src/http_handler/proxy/proxy.cpp
b/myserver/src/http_handler/proxy/proxy.cpp
index 26d7ab1..e8c8cd4 100644
--- a/myserver/src/http_handler/proxy/proxy.cpp
+++ b/myserver/src/http_handler/proxy/proxy.cpp
@@ -107,11 +107,11 @@ int Proxy::send (HttpThreadContext *td,
return td->http->raiseHTTPError (500);
}
- chain.setProtocol(td->http);
- chain.setProtocolData(td);
- chain.setStream(td->connection->socket);
+ chain.setProtocol (td->http);
+ chain.setProtocolData (td);
+ chain.setStream (td->connection->socket);
- if(td->mime && Server::getInstance()->getFiltersFactory()->chain(&chain,
+ if (td->mime && Server::getInstance ()->getFiltersFactory ()->chain (&chain,
td->mime->filters,
td->connection->socket,
&nbw,
@@ -123,7 +123,7 @@ int Proxy::send (HttpThreadContext *td,
int ret = flushToClient (td, sock, chain, onlyHeader);
- chain.clearAllFilters();
+ chain.clearAllFilters ();
sock.close ();
req.free ();
@@ -206,7 +206,7 @@ int Proxy::flushToClient (HttpThreadContext* td, Socket&
client,
&td->response,
&out,
&client,
- td->secondaryBuffer->getBuffer() + headerLength,
+ td->secondaryBuffer->getBuffer () + headerLength,
read - headerLength,
td->http->getTimeout (),
useChunks,
@@ -256,7 +256,7 @@ int Proxy::readPayLoad (HttpThreadContext* td,
/* Only the chunked transfer encoding is supported. */
- if(serverTransferEncoding && serverTransferEncoding->compare("chunked"))
+ if (serverTransferEncoding && serverTransferEncoding->compare ("chunked"))
return -1;
if (res->contentLength.length ())
@@ -268,14 +268,14 @@ int Proxy::readPayLoad (HttpThreadContext* td,
length = contentLength;
- bufferDataSize = (td->nBytesToRead < td->buffer->getRealLength() - 1
+ bufferDataSize = (td->nBytesToRead < td->buffer->getRealLength () - 1
? td->nBytesToRead
- : td->buffer->getRealLength() - 1 ) - td->nHeaderChars;
+ : td->buffer->getRealLength () - 1 ) - td->nHeaderChars;
/* If it is specified a transfer encoding read data using it. */
- if(serverTransferEncoding)
+ if (serverTransferEncoding)
{
- if(!serverTransferEncoding->compare("chunked"))
+ if (!serverTransferEncoding->compare ("chunked"))
{
for (;;)
{
@@ -283,8 +283,8 @@ int Proxy::readPayLoad (HttpThreadContext* td,
&inPos,
initBufferSize,
client,
- td->buffer->getBuffer(),
- td->buffer->getRealLength() -
1,
+ td->buffer->getBuffer (),
+ td->buffer->getRealLength ()
- 1,
&nbr,
timeout,
NULL,
@@ -295,7 +295,7 @@ int Proxy::readPayLoad (HttpThreadContext* td,
break;
if (HttpDataHandler::appendDataToHTTPChannel (td,
-
td->buffer->getBuffer(),
+ td->buffer->getBuffer
(),
nbr,
&(td->outputData),
out,
@@ -308,10 +308,10 @@ int Proxy::readPayLoad (HttpThreadContext* td,
}
}
/* If it is not specified an encoding, read the data as it is. */
- else for(;;)
+ else for (;;)
{
- u_long len = td->buffer->getRealLength() - 1;
+ u_long len = td->buffer->getRealLength () - 1;
if (contentLength && length < len)
len = length;
@@ -319,11 +319,11 @@ int Proxy::readPayLoad (HttpThreadContext* td,
if (len == 0)
break;
- if(HttpDataRead::readContiguousPrimitivePostData (initBuffer,
+ if (HttpDataRead::readContiguousPrimitivePostData (initBuffer,
&inPos,
initBufferSize,
client,
- td->buffer->getBuffer(),
+ td->buffer->getBuffer (),
len,
&nbr,
timeout))
@@ -348,11 +348,11 @@ int Proxy::readPayLoad (HttpThreadContext* td,
written += nbr;
- if(contentLength && length == 0)
+ if (contentLength && length == 0)
break;
}
- if(useChunks && out->getStream ()->write ("0\r\n\r\n", 5, &nbw))
+ if (useChunks && out->getStream ()->write ("0\r\n\r\n", 5, &nbw))
return -1;
return written;
diff --git a/myserver/src/http_handler/scgi/scgi.cpp
b/myserver/src/http_handler/scgi/scgi.cpp
index 216e962..838214d 100644
--- a/myserver/src/http_handler/scgi/scgi.cpp
+++ b/myserver/src/http_handler/scgi/scgi.cpp
@@ -38,7 +38,7 @@ ProcessServerManager *Scgi::processServerManager = 0;
/*!
*Entry-Point to manage a SCGI request.
*/
-int Scgi::send(HttpThreadContext* td, const char* scriptpath,
+int Scgi::send (HttpThreadContext* td, const char* scriptpath,
const char *cgipath, bool execute, bool onlyHeader)
{
ScgiContext con;
@@ -55,45 +55,45 @@ int Scgi::send(HttpThreadContext* td, const char*
scriptpath,
string moreArg;
con.td = td;
- td->scriptPath.assign(scriptpath);
+ td->scriptPath.assign (scriptpath);
if (!(td->permissions & MYSERVER_PERMISSION_EXECUTE))
- return td->http->sendAuth();
+ return td->http->sendAuth ();
{
string tmp;
- tmp.assign(cgipath);
- FilesUtility::splitPath(tmp, td->cgiRoot, td->cgiFile);
- tmp.assign(scriptpath);
- FilesUtility::splitPath(tmp, td->scriptDir, td->scriptFile);
+ tmp.assign (cgipath);
+ FilesUtility::splitPath (tmp, td->cgiRoot, td->cgiFile);
+ tmp.assign (scriptpath);
+ FilesUtility::splitPath (tmp, td->scriptDir, td->scriptFile);
}
- chain.setProtocol(td->http);
- chain.setProtocolData(td);
- chain.setStream(td->connection->socket);
+ chain.setProtocol (td->http);
+ chain.setProtocolData (td);
+ chain.setStream (td->connection->socket);
if (td->mime)
{
u_long nbw;
- if (td->mime && Server::getInstance()->getFiltersFactory ()->chain(&chain,
+ if (td->mime && Server::getInstance ()->getFiltersFactory ()->chain
(&chain,
td->mime->filters,
td->connection->socket,
&nbw,
1))
{
- td->connection->host->warningsLogWrite(_("SCGI: internal error"));
- chain.clearAllFilters();
+ td->connection->host->warningsLogWrite (_("SCGI: internal error"));
+ chain.clearAllFilters ();
return td->http->raiseHTTPError (500);
}
}
- td->buffer->setLength(0);
- td->secondaryBuffer->getAt(0) = '\0';
+ td->buffer->setLength (0);
+ td->secondaryBuffer->getAt (0) = '\0';
{
/*! Do not modify the text between " and ". */
int i;
int subString = cgipath[0] == '"';
- int len = strlen(cgipath);
+ int len = strlen (cgipath);
string tmpCgiPath;
for (i = 1; i < len; i++)
{
@@ -112,34 +112,34 @@ int Scgi::send(HttpThreadContext* td, const char*
scriptpath,
{
if (i < len)
{
- string tmpString(cgipath);
+ string tmpString (cgipath);
int begin = tmpString[0]=='"' ? 1: 0;
int end = tmpString[i] == '"' ? i - 1: i;
- tmpCgiPath.assign(tmpString.substr (begin, end - begin));
- moreArg.assign(tmpString.substr (i, len - 1));
+ tmpCgiPath.assign (tmpString.substr (begin, end - begin));
+ moreArg.assign (tmpString.substr (i, len - 1));
}
else
{
int begin = (cgipath[0] == '"') ? 1 : 0;
int end = (cgipath[len] == '"') ? len - 1 : len;
- tmpCgiPath.assign(&cgipath[begin], end - begin);
- moreArg.assign("");
+ tmpCgiPath.assign (&cgipath[begin], end - begin);
+ moreArg.assign ("");
}
- FilesUtility::splitPath(tmpCgiPath, td->cgiRoot, td->cgiFile);
+ FilesUtility::splitPath (tmpCgiPath, td->cgiRoot, td->cgiFile);
}
- tmpCgiPath.assign(scriptpath);
- FilesUtility::splitPath(tmpCgiPath, td->scriptDir, td->scriptFile);
+ tmpCgiPath.assign (scriptpath);
+ FilesUtility::splitPath (tmpCgiPath, td->scriptDir, td->scriptFile);
}
if (execute)
{
- if (cgipath && strlen(cgipath))
+ if (cgipath && strlen (cgipath))
{
#ifdef WIN32
{
int x;
- string cgipathString(cgipath);
- int len = strlen(cgipath);
+ string cgipathString (cgipath);
+ int len = strlen (cgipath);
int subString = cgipath[0] == '"';
cmdLine << "\"" << td->cgiRoot << "/" << td->cgiFile << "\" "
@@ -164,53 +164,53 @@ int Scgi::send(HttpThreadContext* td, const char*
scriptpath,
#endif
}
- Env::buildEnvironmentString(td, td->buffer->getBuffer ());
- sizeEnvString = buildScgiEnvironmentString(td,td->buffer->getBuffer (),
+ Env::buildEnvironmentString (td, td->buffer->getBuffer ());
+ sizeEnvString = buildScgiEnvironmentString (td,td->buffer->getBuffer (),
td->secondaryBuffer->getBuffer
());
if (sizeEnvString == -1)
{
- td->connection->host->warningsLogWrite(_("SCGI: internal error"));
- chain.clearAllFilters();
+ td->connection->host->warningsLogWrite (_("SCGI: internal error"));
+ chain.clearAllFilters ();
return td->http->raiseHTTPError (500);
}
- td->inputData.close();
- if (td->inputData.openFile(td->inputDataPath, File::READ |
+ td->inputData.close ();
+ if (td->inputData.openFile (td->inputDataPath, File::READ |
File::FILE_OPEN_ALWAYS |
File::NO_INHERIT))
{
- td->connection->host->warningsLogWrite(_("SCGI: internal error"));
- chain.clearAllFilters();
+ td->connection->host->warningsLogWrite (_("SCGI: internal error"));
+ chain.clearAllFilters ();
return td->http->raiseHTTPError (500);
}
- server = connect(&con, cmdLine.str ().c_str ());
+ server = connect (&con, cmdLine.str ().c_str ());
if (server == 0)
{
- td->connection->host->warningsLogWrite(_("SCGI: error connecting to the
process %s"),
+ td->connection->host->warningsLogWrite (_("SCGI: error connecting to the
process %s"),
cmdLine.str ().c_str ());
- chain.clearAllFilters();
+ chain.clearAllFilters ();
return td->http->raiseHTTPError (500);
}
- ret = sendNetString(&con, td->secondaryBuffer->getBuffer (), sizeEnvString);
+ ret = sendNetString (&con, td->secondaryBuffer->getBuffer (), sizeEnvString);
- if (td->request.contentLength.size() &&
- !td->request.contentLength.compare("0"))
+ if (td->request.contentLength.size () &&
+ !td->request.contentLength.compare ("0"))
{
- if (sendPostData(&con))
+ if (sendPostData (&con))
{
- chain.clearAllFilters();
+ chain.clearAllFilters ();
return td->http->raiseHTTPError (500);
}
}
- ret = !sendResponse(&con, onlyHeader, &chain);
+ ret = !sendResponse (&con, onlyHeader, &chain);
- chain.clearAllFilters();
- con.tempOut.close();
+ chain.clearAllFilters ();
+ con.tempOut.close ();
- con.sock.close();
+ con.sock.close ();
return ret;
}
@@ -218,9 +218,9 @@ int Scgi::send(HttpThreadContext* td, const char*
scriptpath,
/*!
*Send the response to the client.
*/
-int Scgi::sendResponse(ScgiContext* ctx, int onlyHeader, FiltersChain* chain)
+int Scgi::sendResponse (ScgiContext* ctx, int onlyHeader, FiltersChain* chain)
{
- clock_t initialTicks = getTicks();
+ clock_t initialTicks = getTicks ();
bool useChunks = false;
bool keepalive = false;
u_long read = 0;
@@ -230,22 +230,22 @@ int Scgi::sendResponse(ScgiContext* ctx, int onlyHeader,
FiltersChain* chain)
u_long sentData = 0;
HttpThreadContext* td = ctx->td;
- checkDataChunks(td, &keepalive, &useChunks);
+ checkDataChunks (td, &keepalive, &useChunks);
for (;;)
{
- while(!ctx->sock.bytesToRead())
+ while (!ctx->sock.bytesToRead ())
{
- if ((clock_t)(getTicks() - initialTicks) > td->http->getTimeout ())
+ if ((clock_t)(getTicks () - initialTicks) > td->http->getTimeout ())
break;
- Thread::wait(1);
+ Thread::wait (1);
}
- if (!ctx->sock.bytesToRead())
+ if (!ctx->sock.bytesToRead ())
return -1;
- nbr = ctx->sock.recv(td->secondaryBuffer->getBuffer () + read,
- td->secondaryBuffer->getRealLength() - read,
+ nbr = ctx->sock.recv (td->secondaryBuffer->getBuffer () + read,
+ td->secondaryBuffer->getRealLength () - read,
td->http->getTimeout ());
read += nbr;
@@ -271,19 +271,19 @@ int Scgi::sendResponse(ScgiContext* ctx, int onlyHeader,
FiltersChain* chain)
{
if (headerSize)
{
-
HttpHeaders::buildHTTPResponseHeaderStruct(td->secondaryBuffer->getBuffer (),
+ HttpHeaders::buildHTTPResponseHeaderStruct
(td->secondaryBuffer->getBuffer (),
&td->response,
&(td->nBytesToRead));
}
u_long hdrLen = HttpHeaders::buildHTTPResponseHeader
(td->buffer->getBuffer (),
&td->response);
- if (chain->write(td->buffer->getBuffer (), hdrLen, &nbw))
+ if (chain->write (td->buffer->getBuffer (), hdrLen, &nbw))
return -1;
}
if (read - headerSize)
- if (appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer () +
headerSize,
+ if (appendDataToHTTPChannel (td, td->secondaryBuffer->getBuffer () +
headerSize,
read - headerSize,
&(td->outputData),
chain,
@@ -297,14 +297,14 @@ int Scgi::sendResponse(ScgiContext* ctx, int onlyHeader,
FiltersChain* chain)
{
for (;;)
{
- nbr = ctx->sock.recv(td->secondaryBuffer->getBuffer (),
- td->secondaryBuffer->getRealLength(),
+ nbr = ctx->sock.recv (td->secondaryBuffer->getBuffer (),
+ td->secondaryBuffer->getRealLength (),
0);
if (!nbr || (nbr == (u_long)-1))
break;
- if (appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer (),
+ if (appendDataToHTTPChannel (td, td->secondaryBuffer->getBuffer (),
nbr,
&(td->outputData),
chain,
@@ -317,7 +317,7 @@ int Scgi::sendResponse(ScgiContext* ctx, int onlyHeader,
FiltersChain* chain)
if (!td->appendOutputs && useChunks)
{
- if (chain->getStream ()->write("0\r\n\r\n", 5, &nbw))
+ if (chain->getStream ()->write ("0\r\n\r\n", 5, &nbw))
return -1;
}
}
@@ -330,18 +330,18 @@ int Scgi::sendResponse(ScgiContext* ctx, int onlyHeader,
FiltersChain* chain)
/*!
*Send a netstring to the SCGI server.
*/
-int Scgi::sendNetString(ScgiContext* ctx, const char* data, int len)
+int Scgi::sendNetString (ScgiContext* ctx, const char* data, int len)
{
char header[7];
int headerLen = sprintf (header, "%i:", len);
- if (ctx->sock.send(header, headerLen, 0) == -1)
+ if (ctx->sock.send (header, headerLen, 0) == -1)
return -1;
- if (ctx->sock.send(data, len, 0) == -1)
+ if (ctx->sock.send (data, len, 0) == -1)
return -1;
- if (ctx->sock.send(",", 1, 0) == -1)
+ if (ctx->sock.send (",", 1, 0) == -1)
return -1;
return 0;
@@ -350,24 +350,24 @@ int Scgi::sendNetString(ScgiContext* ctx, const char*
data, int len)
/*!
*Send the post data to the SCGI server.
*/
-int Scgi::sendPostData(ScgiContext* ctx)
+int Scgi::sendPostData (ScgiContext* ctx)
{
u_long nbr;
do
{
- if (ctx->td->inputData.read(ctx->td->secondaryBuffer->getBuffer (),
-
ctx->td->secondaryBuffer->getRealLength(),
+ if (ctx->td->inputData.read (ctx->td->secondaryBuffer->getBuffer (),
+
ctx->td->secondaryBuffer->getRealLength (),
&nbr))
{
return -1;
}
- if (nbr && (ctx->sock.send(ctx->td->secondaryBuffer->getBuffer (), nbr,
0) == -1))
+ if (nbr && (ctx->sock.send (ctx->td->secondaryBuffer->getBuffer (), nbr,
0) == -1))
{
return -1;
}
}
- while(nbr);
+ while (nbr);
return 0;
}
@@ -375,7 +375,7 @@ int Scgi::sendPostData(ScgiContext* ctx)
*Trasform from a standard environment string to the SCGI environment
*string.
*/
-int Scgi::buildScgiEnvironmentString(HttpThreadContext* td, char* src,
+int Scgi::buildScgiEnvironmentString (HttpThreadContext* td, char* src,
char* dest)
{
char *ptr = dest;
@@ -386,9 +386,9 @@ int Scgi::buildScgiEnvironmentString(HttpThreadContext* td,
char* src,
ptr += myserver_strlcpy (ptr, "CONTENT_LENGTH", 15);
*ptr++ = '\0';
- if ( td->request.contentLength.size())
+ if ( td->request.contentLength.size ())
ptr += myserver_strlcpy (ptr, td->request.contentLength.c_str (),
- td->request.contentLength.size() + 1);
+ td->request.contentLength.size () + 1);
else
*ptr++ = '0';
@@ -411,10 +411,10 @@ int Scgi::buildScgiEnvironmentString(HttpThreadContext*
td, char* src,
varName[0] = '\0';
varValue[0] = '\0';
- while(*sptr == '\0')
+ while (*sptr == '\0')
sptr++;
- while((--max) && *sptr != '=')
+ while ((--max) && *sptr != '=')
{
varName[varNameLen++] = *sptr++;
varName[varNameLen] = '\0';
@@ -423,7 +423,7 @@ int Scgi::buildScgiEnvironmentString(HttpThreadContext* td,
char* src,
return -1;
sptr++;
max = 2500;
- while((--max) && *sptr != '\0')
+ while ((--max) && *sptr != '\0')
{
varValue[varValueLen++] = *sptr++;
varValue[varValueLen] = '\0';
@@ -432,7 +432,7 @@ int Scgi::buildScgiEnvironmentString(HttpThreadContext* td,
char* src,
if (max == 0)
return -1;
- if (!strcmpi(varName, "CONTENT_LENGTH") || !strcmpi(varName, "SCGI") ||
+ if (!strcmpi (varName, "CONTENT_LENGTH") || !strcmpi (varName, "SCGI") ||
!varNameLen || !varValueLen)
continue;
@@ -453,7 +453,7 @@ int Scgi::buildScgiEnvironmentString(HttpThreadContext* td,
char* src,
/*!
*Constructor for the FASTCGI class
*/
-Scgi::Scgi()
+Scgi::Scgi ()
{
}
@@ -466,15 +466,15 @@ int Scgi::load ()
if (initialized)
return 1;
initialized = 1;
- processServerManager = Server::getInstance()->getProcessServerManager ();
- processServerManager->createDomain(SERVERS_DOMAIN);
+ processServerManager = Server::getInstance ()->getProcessServerManager ();
+ processServerManager->createDomain (SERVERS_DOMAIN);
return 0;
}
/*!
*Clean the memory and the processes occuped by the FastCGI servers
*/
-int Scgi::unLoad()
+int Scgi::unLoad ()
{
initialized = 0;
return 0;
@@ -484,7 +484,7 @@ int Scgi::unLoad()
*Return the the running server specified by path.
*If the server is not running returns 0.
*/
-ScgiServer* Scgi::isScgiServerRunning(const char* path)
+ScgiServer* Scgi::isScgiServerRunning (const char* path)
{
return processServerManager->getServer (SERVERS_DOMAIN, path);
}
@@ -493,7 +493,7 @@ ScgiServer* Scgi::isScgiServerRunning(const char* path)
/*!
*Get a connection to the FastCGI server.
*/
-ScgiServer* Scgi::connect(ScgiContext* con, const char* path)
+ScgiServer* Scgi::connect (ScgiContext* con, const char* path)
{
ScgiServer* server = runScgiServer (con, path);
/*!
@@ -501,7 +501,7 @@ ScgiServer* Scgi::connect(ScgiContext* con, const char*
path)
*/
if (server)
{
- int ret = processServerManager->connect(&(con->sock), server);
+ int ret = processServerManager->connect (&(con->sock), server);
if (ret == -1)
return 0;
@@ -537,15 +537,15 @@ ScgiServer* Scgi::runScgiServer (ScgiContext* context,
char host[128];
char port[6];
- while(path[i] && path[i] != ':')
+ while (path[i] && path[i] != ':')
i++;
- myserver_strlcpy (host, &path[1], min(128, i));
+ myserver_strlcpy (host, &path[1], min (128, i));
myserver_strlcpy (port, &path[i + 1], 6);
return processServerManager->addRemoteServer (SERVERS_DOMAIN, path,
- host, atoi(port));
+ host, atoi (port));
}
return processServerManager->runAndAddServer (SERVERS_DOMAIN, path);
diff --git a/myserver/src/http_handler/wincgi/wincgi.cpp
b/myserver/src/http_handler/wincgi/wincgi.cpp
index 7bd6e15..bd07a5f 100644
--- a/myserver/src/http_handler/wincgi/wincgi.cpp
+++ b/myserver/src/http_handler/wincgi/wincgi.cpp
@@ -91,28 +91,28 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
if (!FilesUtility::fileExists (scriptpath))
return td->http->raiseHTTPError (404);
- FilesUtility::splitPath(scriptpath, pathname, execname);
+ FilesUtility::splitPath (scriptpath, pathname, execname);
- getdefaultwd(dataFilePath,MAX_PATH);
+ getdefaultwd (dataFilePath,MAX_PATH);
GetShortPathName (dataFilePath,dataFilePath,MAX_PATH);
- sprintf (&dataFilePath[strlen(dataFilePath)],"/data_%u.ini",td->id);
+ sprintf (&dataFilePath[strlen (dataFilePath)],"/data_%u.ini",td->id);
strcpy (outFilePath,td->outputDataPath.c_str ());
- strcat(outFilePath,"WC");
+ strcat (outFilePath,"WC");
td->inputData.seek (0);
- chain.setProtocol(td->http);
- chain.setProtocolData(td);
- chain.setStream(td->connection->socket);
+ chain.setProtocol (td->http);
+ chain.setProtocolData (td);
+ chain.setStream (td->connection->socket);
if (td->mime)
{
u_long nbw2;
- if (td->mime && Server::getInstance ()->getFiltersFactory
()->chain(&chain,
+ if (td->mime && Server::getInstance ()->getFiltersFactory ()->chain
(&chain,
td->mime->filters,
td->connection->socket, &nbw2, 1))
{
td->connection->host->warningsLogWrite (_("WinCGI: internal error"));
- chain.clearAllFilters();
+ chain.clearAllFilters ();
return td->http->raiseHTTPError (500);
}
}
@@ -129,7 +129,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
return td->http->raiseHTTPError (500);
}
- td->secondaryBuffer->setLength(0);
+ td->secondaryBuffer->setLength (0);
buffer = td->secondaryBuffer->getBuffer ();
strcpy (buffer, "[CGI]\r\n");
@@ -141,7 +141,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
*td->secondaryBuffer << "Server Admin=" <<
td->securityToken.getData ("server.admin", MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF, "")<< "\r\n";
- DataFileHandle.writeToFile (buffer,td->secondaryBuffer->getLength(),&nbr);
+ DataFileHandle.writeToFile (buffer,td->secondaryBuffer->getLength (),&nbr);
{
if (td->request.isKeepAlive ())
@@ -156,62 +156,62 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
}
}
- td->secondaryBuffer->setLength(0);
+ td->secondaryBuffer->setLength (0);
*td->secondaryBuffer << "Request Method=" << td->request.cmd << "\r\n";
- DataFileHandle.writeToFile (buffer, td->secondaryBuffer->getLength(), &nbr);
+ DataFileHandle.writeToFile (buffer, td->secondaryBuffer->getLength (), &nbr);
- td->secondaryBuffer->setLength(0);
+ td->secondaryBuffer->setLength (0);
*td->secondaryBuffer << "Request Protocol=HTTP/" << td->request.ver <<
"\r\n";
- DataFileHandle.writeToFile (buffer, td->secondaryBuffer->getLength(), &nbr);
+ DataFileHandle.writeToFile (buffer, td->secondaryBuffer->getLength (), &nbr);
- td->secondaryBuffer->setLength(0);
+ td->secondaryBuffer->setLength (0);
*td->secondaryBuffer << "Executable Path=" << execname << "\r\n";
- DataFileHandle.writeToFile (buffer,td->secondaryBuffer->getLength(),&nbr);
+ DataFileHandle.writeToFile (buffer,td->secondaryBuffer->getLength (),&nbr);
if (td->request.uriOpts[0])
{
sprintf (buffer, "Query String=%s\r\n", td->request.uriOpts.c_str ());
- DataFileHandle.writeToFile (buffer,(u_long)strlen(buffer), &nbr);
+ DataFileHandle.writeToFile (buffer,(u_long)strlen (buffer), &nbr);
}
{
- HttpRequestHeader::Entry *referer = td->request.other.get("Referer");
+ HttpRequestHeader::Entry *referer = td->request.other.get ("Referer");
- if (referer && referer->value->length())
+ if (referer && referer->value->length ())
{
sprintf (buffer,"Referer=%s\r\n", referer->value->c_str ());
- DataFileHandle.writeToFile (buffer,(u_long)strlen(buffer),&nbr);
+ DataFileHandle.writeToFile (buffer,(u_long)strlen (buffer),&nbr);
}
}
{
- HttpRequestHeader::Entry *contentType =
td->request.other.get("Content-Type");
+ HttpRequestHeader::Entry *contentType = td->request.other.get
("Content-Type");
- if (contentType && contentType->value->length())
+ if (contentType && contentType->value->length ())
{
sprintf (buffer, "Content Type=%s\r\n", contentType->value->c_str ());
- DataFileHandle.writeToFile (buffer, (u_long)strlen(buffer), &nbr);
+ DataFileHandle.writeToFile (buffer, (u_long)strlen (buffer), &nbr);
}
}
{
- HttpRequestHeader::Entry *userAgent = td->request.other.get("User-Agent");
+ HttpRequestHeader::Entry *userAgent = td->request.other.get ("User-Agent");
- if (userAgent && userAgent->value->length())
+ if (userAgent && userAgent->value->length ())
{
sprintf (buffer,"User Agent=%s\r\n", userAgent->value->c_str ());
- DataFileHandle.writeToFile (buffer, (u_long)strlen(buffer), &nbr);
+ DataFileHandle.writeToFile (buffer, (u_long)strlen (buffer), &nbr);
}
}
sprintf (buffer,"Content File=%s\r\n", td->inputData.getFilename ());
- DataFileHandle.writeToFile (buffer, (u_long)strlen(buffer), &nbr);
+ DataFileHandle.writeToFile (buffer, (u_long)strlen (buffer), &nbr);
if (td->request.contentLength[0])
{
sprintf (buffer, "Content Length=%s\r\n",
td->request.contentLength.c_str ());
- DataFileHandle.writeToFile (buffer, (u_long)strlen(buffer), &nbr);
+ DataFileHandle.writeToFile (buffer, (u_long)strlen (buffer), &nbr);
}
else
{
@@ -223,26 +223,26 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
DataFileHandle.writeToFile (buffer, 26, &nbr);
sprintf (buffer, "Remote Address=%s\r\n", td->connection->getIpAddr ());
- DataFileHandle.writeToFile (buffer, (u_long)strlen(buffer), &nbr);
+ DataFileHandle.writeToFile (buffer, (u_long)strlen (buffer), &nbr);
- sprintf (buffer, "Server Port=%u\r\n", td->connection->getLocalPort());
- DataFileHandle.writeToFile (buffer, (u_long)strlen(buffer), &nbr);
+ sprintf (buffer, "Server Port=%u\r\n", td->connection->getLocalPort ());
+ DataFileHandle.writeToFile (buffer, (u_long)strlen (buffer), &nbr);
{
- HttpRequestHeader::Entry *host = td->request.other.get("Host");
+ HttpRequestHeader::Entry *host = td->request.other.get ("Host");
if (host)
sprintf (buffer, "Server Name=%s\r\n", host->value->c_str ());
- DataFileHandle.writeToFile (buffer, (u_long)strlen(buffer), &nbr);
+ DataFileHandle.writeToFile (buffer, (u_long)strlen (buffer), &nbr);
}
strcpy (buffer, "[System]\r\n");
DataFileHandle.writeToFile (buffer, 10, &nbr);
sprintf (buffer, "Output File=%s\r\n", outFilePath);
- DataFileHandle.writeToFile (buffer, (u_long)strlen(buffer), &nbr);
+ DataFileHandle.writeToFile (buffer, (u_long)strlen (buffer), &nbr);
sprintf (buffer,"Content File=%s\r\n", td->inputData.getFilename ());
- DataFileHandle.writeToFile (buffer, (u_long)strlen(buffer), &nbr);
+ DataFileHandle.writeToFile (buffer, (u_long)strlen (buffer), &nbr);
/*
*Compute the local offset from the GMT time
@@ -254,7 +254,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
bias = myserver_localtime (<ime, &tmpTm)->tm_hour - gmhour;
}
sprintf (buffer, "GMT Offset=%i\r\n", bias);
- DataFileHandle.writeToFile (buffer, (u_long)strlen(buffer), &nbr);
+ DataFileHandle.writeToFile (buffer, (u_long)strlen (buffer), &nbr);
sprintf (buffer, "Debug Mode=No\r\n", bias);
DataFileHandle.writeToFile (buffer, 15, &nbr);
@@ -264,7 +264,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
/*
*Create the out file.
*/
- if (!FilesUtility::fileExists(outFilePath))
+ if (!FilesUtility::fileExists (outFilePath))
{
ret = OutFileHandle.openFile (outFilePath, File::FILE_CREATE_ALWAYS);
if (ret)
@@ -273,16 +273,16 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
DataFileHandle.close ();
FilesUtility::deleteFile (outFilePath);
FilesUtility::deleteFile (dataFilePath);
- chain.clearAllFilters();
+ chain.clearAllFilters ();
return td->http->raiseHTTPError (500);
}
}
OutFileHandle.close ();
- spi.cmdLine.assign("cmd /c \"");
- spi.cmdLine.append(scriptpath);
- spi.cmdLine.append("\" ");
- spi.cmdLine.append(dataFilePath);
- spi.cwd.assign(pathname);
+ spi.cmdLine.assign ("cmd /c \"");
+ spi.cmdLine.append (scriptpath);
+ spi.cmdLine.append ("\" ");
+ spi.cmdLine.append (dataFilePath);
+ spi.cwd.assign (pathname);
spi.envString = 0;
if (proc.exec (&spi, true))
{
@@ -290,7 +290,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
FilesUtility::deleteFile (outFilePath);
FilesUtility::deleteFile (dataFilePath);
- chain.clearAllFilters();
+ chain.clearAllFilters ();
return td->http->raiseHTTPError (500);
}
@@ -301,10 +301,10 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
ostringstream msg;
msg << "WinCGI: Error opening output file " << outFilePath;
td->connection->host->warningsLogWrite (msg.str ().c_str ());
- chain.clearAllFilters();
+ chain.clearAllFilters ();
return td->http->raiseHTTPError (500);
}
- OutFileHandle.read(buffer,td->secondaryBuffer->getRealLength(),&nBytesRead);
+ OutFileHandle.read (buffer,td->secondaryBuffer->getRealLength
(),&nBytesRead);
if (!nBytesRead)
{
ostringstream msg;
@@ -314,7 +314,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
OutFileHandle.close ();
FilesUtility::deleteFile (outFilePath);
FilesUtility::deleteFile (dataFilePath);
- chain.clearAllFilters();
+ chain.clearAllFilters ();
return td->http->raiseHTTPError (500);
}
@@ -334,15 +334,15 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
}
if (td->request.isKeepAlive ())
- td->response.connection.assign("keep-alive");
+ td->response.connection.assign ("keep-alive");
- HttpHeaders::buildHTTPResponseHeaderStruct(buffer, &td->response,
&(td->nBytesToRead));
+ HttpHeaders::buildHTTPResponseHeaderStruct (buffer, &td->response,
&(td->nBytesToRead));
/*
*Always specify the size of the HTTP contents.
*/
stream << OutFileHandle.getFileSize () - headerSize;
- td->response.contentLength.assign(stream.str ());
+ td->response.contentLength.assign (stream.str ());
if (!td->appendOutputs)
{
u_long nbw2;
@@ -358,7 +358,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
OutFileHandle.close ();
FilesUtility::deleteFile (outFilePath);
FilesUtility::deleteFile (dataFilePath);
- chain.clearAllFilters();
+ chain.clearAllFilters ();
return 0;
}
@@ -367,7 +367,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
OutFileHandle.close ();
FilesUtility::deleteFile (outFilePath);
FilesUtility::deleteFile (dataFilePath);
- chain.clearAllFilters();
+ chain.clearAllFilters ();
return 1;
}
/*!
@@ -384,7 +384,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
&td->response);
if (onlyHeader)
{
- chain.clearAllFilters();
+ chain.clearAllFilters ();
return 1;
}
@@ -399,7 +399,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
/* Flush the rest of the file. */
do
{
- OutFileHandle.read(buffer, td->secondaryBuffer->getLength(),
+ OutFileHandle.read (buffer, td->secondaryBuffer->getLength (),
&nBytesRead);
if (nBytesRead)
{
@@ -412,7 +412,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
OutFileHandle.close ();
FilesUtility::deleteFile (outFilePath);
FilesUtility::deleteFile (dataFilePath);
- chain.clearAllFilters();
+ chain.clearAllFilters ();
return 0;
}
}
@@ -425,7 +425,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
OutFileHandle.close ();
FilesUtility::deleteFile (outFilePath);
FilesUtility::deleteFile (dataFilePath);
- chain.clearAllFilters();
+ chain.clearAllFilters ();
return 0;
}
}
@@ -437,7 +437,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
}
td->sentData += nbw;
- chain.clearAllFilters();
+ chain.clearAllFilters ();
OutFileHandle.close ();
FilesUtility::deleteFile (outFilePath);
FilesUtility::deleteFile (dataFilePath);
@@ -447,7 +447,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
* WinCGI is available only under windows. Raise the right error
* when it is used under another architecture.
*/
- td->connection->host->warningsLogWrite(_("WinCGI: not implemented"));
+ td->connection->host->warningsLogWrite (_("WinCGI: not implemented"));
return td->http->raiseHTTPError (501);
#endif
diff --git a/myserver/src/log/log_manager.cpp b/myserver/src/log/log_manager.cpp
index 0558311..274ba6c 100644
--- a/myserver/src/log/log_manager.cpp
+++ b/myserver/src/log/log_manager.cpp
@@ -624,7 +624,7 @@ LogManager::log (const void* owner, const string & type,
LoggingLevel level,
int len;
time[0] = '[';
getRFC822GMTTime (&time[1], 32);
- len = strlen(time);
+ len = strlen (time);
time[len + 0] = ']';
time[len + 1] = ' ';
time[len + 2] = '-';
diff --git a/myserver/src/log/stream/log_stream_factory.cpp
b/myserver/src/log/stream/log_stream_factory.cpp
index 8d73d20..18c1f8f 100644
--- a/myserver/src/log/stream/log_stream_factory.cpp
+++ b/myserver/src/log/stream/log_stream_factory.cpp
@@ -51,7 +51,7 @@ string
LogStreamFactory::getProtocol (string location)
{
if (location.find ("://") != string::npos)
- return (location.substr (0, location.find("://"))).append ("://");
+ return (location.substr (0, location.find ("://"))).append ("://");
return string ("");
}
diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index 4170385..b9db330 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -67,9 +67,9 @@ void registerSignals ();
#ifndef WIN32
void Sig_Quit (int signal)
{
- Server::getInstance ()->log("Exiting...");
+ Server::getInstance ()->log ("Exiting...");
sync ();
- Server::getInstance ()->stop();
+ Server::getInstance ()->stop ();
registerSignals ();
}
@@ -97,25 +97,25 @@ void registerSignals ()
struct sigaction sig1, sig2, sig3;
struct sigaction sa;
- memset(&sa, 0, sizeof(sa));
+ memset (&sa, 0, sizeof (sa));
sa.sa_handler = SIG_IGN;
sa.sa_flags = SA_RESTART;
- memset(&sig1, 0, sizeof(sig1));
- memset(&sig2, 0, sizeof(sig2));
- memset(&sig3, 0, sizeof(sig3));
+ memset (&sig1, 0, sizeof (sig1));
+ memset (&sig2, 0, sizeof (sig2));
+ memset (&sig3, 0, sizeof (sig3));
sig1.sa_handler = SIG_IGN;
sig2.sa_handler = Sig_Quit;
sig3.sa_handler = Sig_Hup;
- sigaction(SIGPIPE,&sig1,NULL); // catch broken pipes
- sigaction(SIGINT, &sig2,NULL); // catch ctrl-c
- sigaction(SIGTERM,&sig2,NULL); // catch the kill signal
- sigaction(SIGHUP,&sig3,NULL); // catch the HUP signal
+ sigaction (SIGPIPE,&sig1,NULL); // catch broken pipes
+ sigaction (SIGINT, &sig2,NULL); // catch ctrl-c
+ sigaction (SIGTERM,&sig2,NULL); // catch the kill signal
+ sigaction (SIGHUP,&sig3,NULL); // catch the HUP signal
/* Avoid zombie processes. */
- sigaction(SIGCHLD, &sa, (struct sigaction *)NULL);
+ sigaction (SIGCHLD, &sa, (struct sigaction *)NULL);
#else
- SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), ENABLE_PROCESSED_INPUT);
- SetConsoleCtrlHandler((PHANDLER_ROUTINE) SignalHandler, TRUE);
+ SetConsoleMode (GetStdHandle (STD_INPUT_HANDLE), ENABLE_PROCESSED_INPUT);
+ SetConsoleCtrlHandler ((PHANDLER_ROUTINE) SignalHandler, TRUE);
#endif
}
@@ -165,21 +165,21 @@ static struct argp_option options[] =
{0}
};
-static error_t parseOpt(int key, char *arg, struct argp_state *state)
+static error_t parseOpt (int key, char *arg, struct argp_state *state)
{
argp_input *in = static_cast<argp_input*>(state->input);
- switch(key)
+ switch (key)
{
case 'v':
in->version = 1;
break;
case 'r':
- if(arg)
+ if (arg)
{
- if(!strcmpi(arg, "CONSOLE"))
+ if (!strcmpi (arg, "CONSOLE"))
in->runas = MYSERVER_RUNAS_CONSOLE;
- else if(!strcmpi(arg, "SERVICE"))
+ else if (!strcmpi (arg, "SERVICE"))
in->runas = MYSERVER_RUNAS_SERVICE;
}
else
@@ -221,7 +221,7 @@ static struct argp myserverArgp = {options, parseOpt,
argsDoc, doc};
* Load the external path.
* Return nonzero on errors.
*/
-int loadExternalPath(string &externalPath)
+int loadExternalPath (string &externalPath)
{
try
{
@@ -353,7 +353,7 @@ int main (int argn, char **argv)
{
Server::createInstance ();
}
- catch(...)
+ catch (...)
{
/* Die if we get exceptions here. */
return (1);
@@ -487,7 +487,7 @@ int main (int argn, char **argv)
loadConfFilesLocation (mainConf, mimeConf, vhostConf, externPath,
input.confFilesLocation);
- switch(runas)
+ switch (runas)
{
case MYSERVER_RUNAS_CONSOLE:
consoleService (mainConf, mimeConf, vhostConf, externPath);
@@ -514,10 +514,10 @@ int main (int argn, char **argv)
if (pid)
{
# ifdef ARGP
- if(input.pidFileName)
+ if (input.pidFileName)
writePidfile (input.pidFileName);
else
- writePidfile();
+ writePidfile ();
# else
writePidfile ();
# endif
@@ -535,7 +535,7 @@ int main (int argn, char **argv)
break;
}
}
- catch(...)
+ catch (...)
{
return 1;
};
@@ -576,8 +576,8 @@ int writePidfile (const char* filename)
return -1;
sprintf (buff,"%i\n", pid);
- ret = write (pidfile, buff, strlen(buff));
- if(ret == -1)
+ ret = write (pidfile, buff, strlen (buff));
+ if (ret == -1)
{
close (pidfile);
return -1;
@@ -589,9 +589,9 @@ int writePidfile (const char* filename)
/*!
* Start MyServer in console mode.
*/
-void consoleService(string &mainConf, string &mimeConf, string &vhostConf,
string &externPath)
+void consoleService (string &mainConf, string &mimeConf, string &vhostConf,
string &externPath)
{
- Server::getInstance()->start(mainConf, mimeConf, vhostConf, externPath);
+ Server::getInstance ()->start (mainConf, mimeConf, vhostConf, externPath);
}
@@ -621,36 +621,36 @@ void __stdcall myServerMainNT (u_long, LPTSTR*)
{
Server::createInstance ();
}
- catch(...)
+ catch (...)
{
/* Die if we get exceptions here. */
return;
};
- MyServiceStatusHandle = RegisterServiceCtrlHandler("GNU MyServer",
+ MyServiceStatusHandle = RegisterServiceCtrlHandler ("GNU MyServer",
myServerCtrlHandler);
- if(MyServiceStatusHandle)
+ if (MyServiceStatusHandle)
{
MyServiceStatus.dwCurrentState = SERVICE_START_PENDING;
- SetServiceStatus(MyServiceStatusHandle, &MyServiceStatus);
+ SetServiceStatus (MyServiceStatusHandle, &MyServiceStatus);
MyServiceStatus.dwControlsAccepted |= (SERVICE_ACCEPT_STOP
| SERVICE_ACCEPT_SHUTDOWN);
MyServiceStatus.dwCurrentState = SERVICE_RUNNING;
- SetServiceStatus(MyServiceStatusHandle, &MyServiceStatus);
+ SetServiceStatus (MyServiceStatusHandle, &MyServiceStatus);
loadConfFilesLocation (mainConf, mimeConf, vhostConf, externPath, NULL);
- Server::getInstance()->start (mainConf, mimeConf, vhostConf, externPath);
+ Server::getInstance ()->start (mainConf, mimeConf, vhostConf,
externPath);
MyServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
- SetServiceStatus(MyServiceStatusHandle, &MyServiceStatus);
+ SetServiceStatus (MyServiceStatusHandle, &MyServiceStatus);
MyServiceStatus.dwControlsAccepted &= ~(SERVICE_ACCEPT_STOP
| SERVICE_ACCEPT_SHUTDOWN);
MyServiceStatus.dwCurrentState = SERVICE_STOPPED;
- SetServiceStatus(MyServiceStatusHandle, &MyServiceStatus);
+ SetServiceStatus (MyServiceStatusHandle, &MyServiceStatus);
}
}
@@ -658,7 +658,7 @@ void __stdcall myServerMainNT (u_long, LPTSTR*)
/*!
* Manage the NT service.
*/
-void __stdcall myServerCtrlHandler(u_long fdwControl)
+void __stdcall myServerCtrlHandler (u_long fdwControl)
{
switch (fdwControl)
{
@@ -688,7 +688,7 @@ void __stdcall myServerCtrlHandler(u_long fdwControl)
*/
void runService ()
{
- Server::getInstance()->log ("Running service...");
+ Server::getInstance ()->log ("Running service...");
#ifdef WIN32
SERVICE_TABLE_ENTRY serviceTable[] =
{
@@ -699,11 +699,11 @@ void runService ()
if (!StartServiceCtrlDispatcher (serviceTable))
{
if (GetLastError () == ERROR_INVALID_DATA)
- Server::getInstance ()->log("Invalid data");
+ Server::getInstance ()->log ("Invalid data");
else if (GetLastError () == ERROR_SERVICE_ALREADY_RUNNING)
- Server::getInstance ()->log("Already running");
+ Server::getInstance ()->log ("Already running");
else
- Server::getInstance ()->log("Error running service");
+ Server::getInstance ()->log ("Error running service");
}
#endif
}
@@ -740,11 +740,11 @@ void registerService ()
/*
*Unregister the OS service.
*/
-void removeService()
+void removeService ()
{
#ifdef WIN32
SC_HANDLE service,manager;
- manager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS);
+ manager = OpenSCManager (NULL,NULL,SC_MANAGER_ALL_ACCESS);
if (manager)
{
service = OpenService (manager, "GNU MyServer", SERVICE_ALL_ACCESS);
@@ -754,7 +754,7 @@ void removeService()
while (QueryServiceStatus (service, &MyServiceStatus))
if (MyServiceStatus.dwCurrentState != SERVICE_STOP_PENDING)
break;
- DeleteService(service);
+ DeleteService (service);
CloseServiceHandle (service);
CloseServiceHandle (manager);
}
diff --git a/myserver/src/plugin/plugin.cpp b/myserver/src/plugin/plugin.cpp
index ee6c601..5fe7eb7 100644
--- a/myserver/src/plugin/plugin.cpp
+++ b/myserver/src/plugin/plugin.cpp
@@ -75,11 +75,11 @@ int Plugin::preLoad (string& file, bool global)
* \param languageFile The language file to use to retrieve warnings/errors
* messages.
*/
-int Plugin::postLoad(Server* server)
+int Plugin::postLoad (Server* server)
{
if (hinstLib.validHandle ())
{
- postLoadPROC proc = (postLoadPROC)hinstLib.getProc("postLoad");
+ postLoadPROC proc = (postLoadPROC)hinstLib.getProc ("postLoad");
if (proc)
return proc (server);
}
diff --git a/myserver/src/plugin/plugin_info.cpp
b/myserver/src/plugin/plugin_info.cpp
index ce78fcd..540b59d 100644
--- a/myserver/src/plugin/plugin_info.cpp
+++ b/myserver/src/plugin/plugin_info.cpp
@@ -1,18 +1,18 @@
/*
-MyServer
-Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
-This program 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 3 of the License, or
-(at your option) any later version.
-
-This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ MyServer
+ Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+ This program 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 3 of the License, or
+ (at your option) any later version.
+
+ This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <include/plugin/plugin_info.h>
@@ -20,7 +20,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
using namespace std;
-Regex* PluginInfo::regex = new
Regex("^[1-2]?[1-9]?[0-9](\\.[1-2]?[0-9]?[0-9](\\.[1-2]?[0-9]?[0-9](\\.[1-2]?[0-9]?[0-9])?)?)?$",REG_EXTENDED
| REG_NOSUB);
+Regex* PluginInfo::regex = new Regex
("^[1-2]?[1-9]?[0-9](\\.[1-2]?[0-9]?[0-9](\\.[1-2]?[0-9]?[0-9](\\.[1-2]?[0-9]?[0-9])?)?)?$",REG_EXTENDED
| REG_NOSUB);
/*!
@@ -29,7 +29,7 @@ Regex* PluginInfo::regex = new
Regex("^[1-2]?[1-9]?[0-9](\\.[1-2]?[0-9]?[0-9](\\
*\param enabled is true if the plugin has to be enabled.
*\param global is true if the plugin's symbols have to be loaded globally.
*/
-PluginInfo::PluginInfo(string& name, bool enabled, bool global)
+PluginInfo::PluginInfo (string& name, bool enabled, bool global)
{
this->name = name;
this->enabled = enabled;
@@ -45,8 +45,8 @@ PluginInfo::PluginInfo(string& name, bool enabled, bool
global)
/*!
*Destroy the object.
-*/
-PluginInfo::~PluginInfo()
+ */
+PluginInfo::~PluginInfo ()
{
if (this->plugin)
delete this->plugin;
@@ -54,16 +54,16 @@ PluginInfo::~PluginInfo()
/*!
*Returns true if the plugin is enabled.
-*/
-bool PluginInfo::isEnabled()
+ */
+bool PluginInfo::isEnabled ()
{
return this->enabled;
}
/*!
*Returns true if the plugin is loaded globally.
-*/
-bool PluginInfo::isGlobal()
+ */
+bool PluginInfo::isGlobal ()
{
return this->global;
}
@@ -73,41 +73,40 @@ bool PluginInfo::isGlobal()
*\param name plugin name
*\param minVersion min version for the dependence.
*\param maxVersion max version for the dependence.
-*/
-void PluginInfo::addDependence(string name, int minVersion, int maxVersion)
+ */
+void PluginInfo::addDependence (string name, int minVersion, int maxVersion)
{
- dependences.put(name, new pair<int,int>(minVersion,maxVersion));
+ dependences.put (name, new pair<int,int>(minVersion,maxVersion));
}
/*!
* Returns the plugin version.
-*/
-int PluginInfo::getVersion()
+ */
+int PluginInfo::getVersion ()
{
return this->version;
}
/*!
* Sets the plugin version.
-*/
-void PluginInfo::setVersion(int v)
+ */
+void PluginInfo::setVersion (int v)
{
this->version = v;
}
/*!
* Returns the minimum MyServer version plugin is compatible.
-*/
-int PluginInfo::getMyServerMinVersion()
+ */
+int PluginInfo::getMyServerMinVersion ()
{
return this->msMinVersion;
}
-
/*!
* Returns the maximum MyServer version plugin is compatible.
-*/
-int PluginInfo::getMyServerMaxVersion()
+ */
+int PluginInfo::getMyServerMaxVersion ()
{
return this->msMaxVersion;
}
@@ -115,8 +114,8 @@ int PluginInfo::getMyServerMaxVersion()
/*!
* Sets the minimum MyServer version plugin is compatible.
-*/
-int PluginInfo::setMyServerMinVersion(int v)
+ */
+int PluginInfo::setMyServerMinVersion (int v)
{
this->msMinVersion = v;
return this->msMinVersion;
@@ -124,8 +123,8 @@ int PluginInfo::setMyServerMinVersion(int v)
/*!
* Sets the maximum MyServer version plugin is compatible.
-*/
-int PluginInfo::setMyServerMaxVersion(int v)
+ */
+int PluginInfo::setMyServerMaxVersion (int v)
{
this->msMaxVersion = v;
return this->msMaxVersion;
@@ -133,58 +132,56 @@ int PluginInfo::setMyServerMaxVersion(int v)
/*!
* Returns the plugin name
-*/
-string PluginInfo::getName()
+ */
+string PluginInfo::getName ()
{
return this->name;
}
/*!
* Returns the plugin object.
-*/
-Plugin* PluginInfo::getPlugin()
+ */
+Plugin* PluginInfo::getPlugin ()
{
return this->plugin;
}
/*!
* Sets the state of the plugin.
-*/
-void PluginInfo::setEnabled(bool enabled)
+ */
+void PluginInfo::setEnabled (bool enabled)
{
this->enabled = enabled;
}
/*!
* Returns the depandence, if any exists, with a plugin with the specified
name.
-*/
-pair<int,int>* PluginInfo::getDependence(string name)
+ */
+pair<int,int>* PluginInfo::getDependence (string name)
{
- if(dependences.empty())
+ if (dependences.empty ())
return NULL;
- if (!this->dependences.containsKey(name))
+ if (!this->dependences.containsKey (name))
return NULL;
- pair<int,int>* p = this->dependences.get(name);
- if (p)
- return p;
- return NULL;
+ pair<int,int>* p = this->dependences.get (name);
+ if (p)
+ return p;
+ return NULL;
}
/*!
* Sets the plugin object.
-*/
-void PluginInfo::setPlugin(Plugin* plugin)
+ */
+void PluginInfo::setPlugin (Plugin* plugin)
{
- //if(this->plugin)
- // delete this->plugin;
this->plugin = plugin;
}
/*!
* Removes the plugin object.
-*/
-Plugin* PluginInfo::removePlugin()
+ */
+Plugin* PluginInfo::removePlugin ()
{
- if(this->plugin)
+ if (this->plugin)
delete this->plugin;
this->plugin = NULL;
return NULL;
@@ -192,26 +189,26 @@ Plugin* PluginInfo::removePlugin()
/*!
* Converts a string in the format "a.b.c.d" in an int in the format abcd
where each number takes 8 bit.
-*/
-int PluginInfo::convertVersion(string* s)
+ */
+int PluginInfo::convertVersion (string* s)
{
- int ret = regex->exec(s->c_str(),0,NULL,0);
+ int ret = regex->exec (s->c_str (), 0, NULL, 0);
if (ret!=0)
return -1;
- string::size_type pos = s->find(".",0);
+ string::size_type pos = s->find (".",0);
if (pos == string::npos)
- return atoi(s->c_str()) << 24;
+ return atoi (s->c_str ()) << 24;
int n1 = 0;
int n2 = 0;
int n3 = 0;
int n4 = 0;
- string sa = s->substr(0,pos);
- n1 = atoi(sa.c_str());
+ string sa = s->substr (0, pos);
+ n1 = atoi (sa.c_str ());
if (n1>255)
return -1;
@@ -219,35 +216,35 @@ int PluginInfo::convertVersion(string* s)
if (oldpos!=string::npos)
- {
- pos = s->find(".",oldpos+1);
- string sa = s->substr(oldpos+1,pos - oldpos);
- n2 = atoi(sa.c_str());
- if (n2>255)
- return -1;
- }
+ {
+ pos = s->find (".",oldpos + 1);
+ string sa = s->substr (oldpos + 1, pos - oldpos);
+ n2 = atoi (sa.c_str ());
+ if (n2>255)
+ return -1;
+ }
oldpos = pos;
if (oldpos!=string::npos)
- {
- pos = s->find(".",oldpos+1);
- string sa = s->substr(oldpos+1,pos - oldpos);
- n3 = atoi(sa.c_str());
- if (n3>255)
- return -1;
- }
+ {
+ pos = s->find (".",oldpos + 1);
+ string sa = s->substr (oldpos + 1, pos - oldpos);
+ n3 = atoi (sa.c_str ());
+ if (n3>255)
+ return -1;
+ }
oldpos = pos;
- if (oldpos!=string::npos)
- {
- pos = s->find(".",oldpos+1);
- string sa = s->substr(oldpos+1,pos - oldpos);
- n4 = atoi(sa.c_str());
- if (n4>255)
- return -1;
- }
-
- return (n1<<24) + (n2<<16) + (n3<<8) + n4;
+ if (oldpos != string::npos)
+ {
+ pos = s->find (".",oldpos + 1);
+ string sa = s->substr (oldpos + 1, pos - oldpos);
+ n4 = atoi (sa.c_str ());
+ if (n4 > 255)
+ return -1;
+ }
+
+ return (n1 << 24) + (n2 << 16) + (n3 << 8) + n4;
}
diff --git a/myserver/src/plugin/plugins_manager.cpp
b/myserver/src/plugin/plugins_manager.cpp
index bf97140..7f2b7ae 100644
--- a/myserver/src/plugin/plugins_manager.cpp
+++ b/myserver/src/plugin/plugins_manager.cpp
@@ -314,7 +314,7 @@ PluginsManager::loadInfo (Server* server, string& name,
string& path)
delete xpathRes;
- xpathRes = xml.evaluateXpath ("/PLUGIN/NAME/text()");
+ xpathRes = xml.evaluateXpath ("/PLUGIN/NAME/text ()");
nodes = xpathRes->getNodeSet ();
size = (nodes) ? nodes->nodeNr : 0;
@@ -338,7 +338,7 @@ PluginsManager::loadInfo (Server* server, string& name,
string& path)
delete xpathRes;
- xpathRes = xml.evaluateXpath ("/PLUGIN/VERSION/text()");
+ xpathRes = xml.evaluateXpath ("/PLUGIN/VERSION/text ()");
nodes = xpathRes->getNodeSet ();
size = (nodes) ? nodes->nodeNr : 0;
@@ -351,7 +351,7 @@ PluginsManager::loadInfo (Server* server, string& name,
string& path)
return NULL;
}
- string verStr((char*) nodes->nodeTab[0]->content);
+ string verStr ((char*) nodes->nodeTab[0]->content);
int version = PluginInfo::convertVersion (&verStr);
if (version != -1)
diff --git a/myserver/src/protocol/control/control_header.cpp
b/myserver/src/protocol/control/control_header.cpp
index f3ea4f7..10dc818 100644
--- a/myserver/src/protocol/control/control_header.cpp
+++ b/myserver/src/protocol/control/control_header.cpp
@@ -35,7 +35,7 @@ extern "C"
/*!
*Return a string containing options specified by the client.
*/
-char* ControlHeader::getOptions()
+char* ControlHeader::getOptions ()
{
return cmdOptions;
}
@@ -43,7 +43,7 @@ char* ControlHeader::getOptions()
/*!
*Return a string containing the auth login name in the MD5 format.
*/
-char* ControlHeader::getAuthLogin()
+char* ControlHeader::getAuthLogin ()
{
return authLogin;
}
@@ -51,7 +51,7 @@ char* ControlHeader::getAuthLogin()
/*!
*Return a string containing the auth login password in the MD5 format.
*/
-char* ControlHeader::getAuthPassword()
+char* ControlHeader::getAuthPassword ()
{
return authPassword;
}
@@ -59,7 +59,7 @@ char* ControlHeader::getAuthPassword()
/*!
*Return a string containing the command specified in the request.
*/
-char* ControlHeader::getCommand()
+char* ControlHeader::getCommand ()
{
return command;
}
@@ -68,7 +68,7 @@ char* ControlHeader::getCommand()
*Return a string containing the connection type.
*Connection can be Closed or Keep-Alive.
*/
-char* ControlHeader::getConnection()
+char* ControlHeader::getConnection ()
{
return connection;
}
@@ -76,7 +76,7 @@ char* ControlHeader::getConnection()
/*!
*Return the version of protocol used.
*/
-char *ControlHeader::getVersion()
+char *ControlHeader::getVersion ()
{
return version;
}
@@ -84,7 +84,7 @@ char *ControlHeader::getVersion()
/*!
*Return the data length specified in the client header.
*/
-int ControlHeader::getLength()
+int ControlHeader::getLength ()
{
return length;
}
@@ -93,15 +93,15 @@ int ControlHeader::getLength()
/*!
*Costructor for the class.
*/
-ControlHeader::ControlHeader()
+ControlHeader::ControlHeader ()
{
- reset();
+ reset ();
}
/*!
*Reset everything.
*/
-void ControlHeader::reset()
+void ControlHeader::reset ()
{
/*! Reset everything. */
command[0]='\0';
@@ -115,7 +115,7 @@ void ControlHeader::reset()
/*!
*Destructor for the ControlHeader class.
*/
-ControlHeader::~ControlHeader()
+ControlHeader::~ControlHeader ()
{
}
@@ -136,20 +136,20 @@ ControlHeader::~ControlHeader()
*_"CRNL" -> Header ends with a "CRNL".
*_Data...
*/
-int ControlHeader::parse_header(char *buffer, int bufferlen, int *len)
+int ControlHeader::parse_header (char *buffer, int bufferlen, int *len)
{
/*! Do a reset before the parsing. */
- reset();
+ reset ();
/*! Do we find a \r\n\r\n sequence? */
int end_reached = 0;
/*! No buffer was specified. */
- if(buffer == 0)
+ if (buffer == 0)
return CONTROL_INTERNAL;
/*! Nothing to parse. */
- if(bufferlen == 0)
+ if (bufferlen == 0)
return CONTROL_INTERNAL;
/*! buffer offset that we are parsing. */
@@ -158,14 +158,14 @@ int ControlHeader::parse_header(char *buffer, int
bufferlen, int *len)
/*! # of the line we are parsing. */
int nLine = 1;
- for( ; ; )
+ for ( ; ; )
{
char *field = (char*)offset ;
/*! Get the length of the field name. */
int fieldLen = 0;
- if(nLine == 1)
+ if (nLine == 1)
{
/*!
*Do not copy initial /.
@@ -174,40 +174,40 @@ int ControlHeader::parse_header(char *buffer, int
bufferlen, int *len)
offset++ ;
/*! Get the length of the field name. */
- fieldLen = getCharInString(field, " ", 32);
+ fieldLen = getCharInString (field, " ", 32);
/*! Return nonzero on errors. */
- if(fieldLen == -1)
+ if (fieldLen == -1)
return CONTROL_MALFORMED;
/*!
*For first line field name is the command itself.
*Do not copy initial /.
*/
- myserver_strlcpy(command, field, std::min(fieldLen + 1 , 32) );
+ myserver_strlcpy (command, field, std::min (fieldLen + 1 , 32) );
/*! Update the offset. */
offset += fieldLen + 1;
- int versionLen = getCharInString(offset, " \r", 32);
- if(versionLen == -1)
+ int versionLen = getCharInString (offset, " \r", 32);
+ if (versionLen == -1)
return CONTROL_MALFORMED;
- myserver_strlcpy(version, offset, std::min(versionLen + 1, 12) );
+ myserver_strlcpy (version, offset, std::min (versionLen + 1, 12) );
offset += versionLen + 1;
- int optionsLen = getCharInString(offset, "\r", 32);
- if(optionsLen == -1)
+ int optionsLen = getCharInString (offset, "\r", 32);
+ if (optionsLen == -1)
cmdOptions[0]='\0';
else
- myserver_strlcpy(cmdOptions, offset, std::min(optionsLen + 1, 64) );
+ myserver_strlcpy (cmdOptions, offset, std::min (optionsLen + 1, 64) );
/*! Put the offset at the end of \r\n. */
offset += ((optionsLen!= -1)?optionsLen:0) + 2 ;
}
else/*! Handle other lines after the first one. */
{
/*! We reach the end of the request. */
- if(field[0]=='\r' && field[1]=='\n')
+ if (field[0]=='\r' && field[1]=='\n')
{
end_reached = 1;
offset += 2 ;
@@ -215,51 +215,51 @@ int ControlHeader::parse_header(char *buffer, int
bufferlen, int *len)
}
/*! Get the length of the field name. */
- fieldLen = getCharInString(field, " ", 32);
+ fieldLen = getCharInString (field, " ", 32);
- if(fieldLen == -1)
+ if (fieldLen == -1)
{
return -1;
}
- if(!strncmp(field, "/AUTH ", 6))
+ if (!strncmp (field, "/AUTH ", 6))
{
offset += 6;
- int len = getCharInString(offset, ":", 64);
- if(len == -1)
+ int len = getCharInString (offset, ":", 64);
+ if (len == -1)
return CONTROL_MALFORMED;
- myserver_strlcpy(authLogin, offset, std::min(len + 1, 64));
+ myserver_strlcpy (authLogin, offset, std::min (len + 1, 64));
offset+=len + 1;
- len = getCharInString(offset, "\r", 64);
- if(len == -1)
+ len = getCharInString (offset, "\r", 64);
+ if (len == -1)
return CONTROL_MALFORMED;
- myserver_strlcpy(authPassword, offset, std::min(len + 1, 64));
+ myserver_strlcpy (authPassword, offset, std::min (len + 1, 64));
offset += len + 2;
}
- else if(!strncmp(field, "/CONNECTION ", 12))
+ else if (!strncmp (field, "/CONNECTION ", 12))
{
offset += 12;
- int len = getCharInString(offset, "\r", 32);
- if(len == -1)
+ int len = getCharInString (offset, "\r", 32);
+ if (len == -1)
return CONTROL_MALFORMED;
- myserver_strlcpy(connection, offset, std::min(len + 1, 32));
+ myserver_strlcpy (connection, offset, std::min (len + 1, 32));
offset += len + 2;
}
- else if(!strncmp(field, "/LEN ", 5))
+ else if (!strncmp (field, "/LEN ", 5))
{
offset += 5;
- int len = getCharInString(offset, "\r", 32);
- if(len == -1)
+ int len = getCharInString (offset, "\r", 32);
+ if (len == -1)
return CONTROL_MALFORMED;
char tmp_buff[12];
- myserver_strlcpy(tmp_buff, offset, std::min(len + 1 , 12));
- length = atoi(tmp_buff);
+ myserver_strlcpy (tmp_buff, offset, std::min (len + 1 , 12));
+ length = atoi (tmp_buff);
offset += len + 2;
}
else
{
- int len = getCharInString(offset, "\r", 32);
- if(len == -1)
+ int len = getCharInString (offset, "\r", 32);
+ if (len == -1)
return CONTROL_MALFORMED;
offset += len + 2;
}
@@ -268,14 +268,14 @@ int ControlHeader::parse_header(char *buffer, int
bufferlen, int *len)
nLine++;
/*! Do we need more than 20 lines? */
- if(nLine > 20)
+ if (nLine > 20)
return CONTROL_MALFORMED;
}
/*! Save the effective request length. */
- if(len)
+ if (len)
*len = static_cast<int>(offset - buffer);
- if(end_reached)
+ if (end_reached)
return CONTROL_OK;
else
return -1;
diff --git a/myserver/src/protocol/control/control_protocol.cpp
b/myserver/src/protocol/control/control_protocol.cpp
index 51e2aa6..b4e2e2a 100644
--- a/myserver/src/protocol/control/control_protocol.cpp
+++ b/myserver/src/protocol/control/control_protocol.cpp
@@ -168,8 +168,8 @@ int ControlProtocol::checkAuth (ControlHeader& header)
/*! Return 0 if we haven't enabled the service. */
if (!controlEnabled)
return 0;
- headerLogin = header.getAuthLogin();
- headerPassword = header.getAuthPassword();
+ headerLogin = header.getAuthLogin ();
+ headerPassword = header.getAuthPassword ();
authLoginHeaderMD5[0] = authPasswordHeaderMD5[0] = '\0';
md5.init ();
md5.update ((unsigned char const*) headerLogin, (unsigned int)strlen (
headerLogin ) );
@@ -242,12 +242,12 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
{
return 2;
}
- sendResponse(b2, bs2, a, ret, header, 0);
+ sendResponse (b2, bs2, a, ret, header, 0);
return 0;
}
specifiedLength = header.getLength ();
version = header.getVersion ();
- timeout=getTicks();
+ timeout=getTicks ();
if (specifiedLength)
{
inFile = new File ();
@@ -257,15 +257,15 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
return 0;
}
- inFilePath << getdefaultwd(0,0) << "/ControlInput_" << (u_int) id;
+ inFilePath << getdefaultwd (0,0) << "/ControlInput_" << (u_int) id;
- ret = inFile->createTemporaryFile (inFilePath.str().c_str());
+ ret = inFile->createTemporaryFile (inFilePath.str ().c_str ());
if (ret)
{
a->host->warningsLogWrite (_("Control: internal error"));
sendResponse (b2, bs2, a, CONTROL_INTERNAL, header, 0);
inFile->close ();
- FilesUtility::deleteFile (inFilePath.str().c_str());
+ FilesUtility::deleteFile (inFilePath.str ().c_str ());
delete inFile;
return 0;
}
@@ -277,9 +277,9 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
if (ret)
{
a->host->warningsLogWrite (_("Control: internal error"));
- sendResponse(b2, bs2, a, CONTROL_INTERNAL, header, 0);
+ sendResponse (b2, bs2, a, CONTROL_INTERNAL, header, 0);
inFile->close ();
- FilesUtility::deleteFile (inFilePath.str().c_str());
+ FilesUtility::deleteFile (inFilePath.str ().c_str ());
delete inFile;
inFile=0;
return 0;
@@ -293,15 +293,15 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
/* Check if we can read all the specified data. */
while (specifiedLength != static_cast<int>(nbtr - realHeaderLength))
{
- if (a->socket->bytesToRead())
+ if (a->socket->bytesToRead ())
{
- ret = a->socket->recv(b2, bs2, 0);
+ ret = a->socket->recv (b2, bs2, 0);
if (ret == -1)
{
a->host->warningsLogWrite (_("Control: internal error"));
sendResponse (b2, bs2, a, CONTROL_INTERNAL, header, 0);
inFile->close ();
- FilesUtility::deleteFile (inFilePath.str().c_str());
+ FilesUtility::deleteFile (inFilePath.str ().c_str ());
delete inFile;
inFile=0;
return -1;
@@ -313,20 +313,20 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
a->host->warningsLogWrite (_("Control: internal error"));
sendResponse (b2, bs2, a, CONTROL_INTERNAL, header, 0);
inFile->close ();
- FilesUtility::deleteFile (inFilePath.str().c_str());
+ FilesUtility::deleteFile (inFilePath.str ().c_str ());
delete inFile;
inFile=0;
}
if (dataWritten >= specifiedLength)
break;
- timeout = getTicks();
+ timeout = getTicks ();
}
- else if (getTicks() - timeout > MYSERVER_SEC(5))
+ else if (getTicks () - timeout > MYSERVER_SEC (5))
{
sendResponse (b2, bs2, a, CONTROL_BAD_LEN, header, 0);
inFile->close ();
- FilesUtility::deleteFile (inFilePath.str().c_str());
+ FilesUtility::deleteFile (inFilePath.str ().c_str ());
delete inFile;
inFile=0;
return 0;
@@ -349,15 +349,15 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
if (inFile)
{
inFile->close ();
- FilesUtility::deleteFile (inFilePath.str().c_str());
+ FilesUtility::deleteFile (inFilePath.str ().c_str ());
delete inFile;
inFile = 0;
}
- sendResponse(b2, bs2, a, CONTROL_BAD_VERSION, header, 0);
+ sendResponse (b2, bs2, a, CONTROL_BAD_VERSION, header, 0);
return 0;
}
- authorized = checkAuth(header);
+ authorized = checkAuth (header);
/*
*If the client is not authorized remove the connection.
@@ -367,11 +367,11 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
if (inFile)
{
inFile->close ();
- FilesUtility::deleteFile (inFilePath.str().c_str());
+ FilesUtility::deleteFile (inFilePath.str ().c_str ());
delete inFile;
inFile=0;
}
- sendResponse(b2, bs2, a, CONTROL_AUTH, header, 0);
+ sendResponse (b2, bs2, a, CONTROL_AUTH, header, 0);
return 0;
}
/*
@@ -383,16 +383,16 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
if (inFile)
{
inFile->close ();
- FilesUtility::deleteFile (inFilePath.str().c_str());
+ FilesUtility::deleteFile (inFilePath.str ().c_str ());
delete inFile;
inFile = 0;
}
- sendResponse(b2, bs2, a, CONTROL_BAD_LEN, header, 0);
+ sendResponse (b2, bs2, a, CONTROL_BAD_LEN, header, 0);
return 0;
}
- command = header.getCommand();
- opt = header.getOptions();
+ command = header.getCommand ();
+ opt = header.getOptions ();
knownCommand = 0;
@@ -403,7 +403,7 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
outFile = new File ();
outFilePath << getdefaultwd (0, 0) << "/ControlOutput_" << (u_int) id;
- ret = outFile->createTemporaryFile (outFilePath.str().c_str());
+ ret = outFile->createTemporaryFile (outFilePath.str ().c_str ());
if (ret)
{
a->host->warningsLogWrite (_("Control: internal error"));
@@ -412,17 +412,17 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
inFile->close ();
delete inFile;
- FilesUtility::deleteFile (inFilePath.str().c_str());
- FilesUtility::deleteFile (outFilePath.str().c_str());
+ FilesUtility::deleteFile (inFilePath.str ().c_str ());
+ FilesUtility::deleteFile (outFilePath.str ().c_str ());
inFile=0;
outFile=0;
return 0;
}
- if (!strcmp(command, "SHOWCONNECTIONS"))
+ if (!strcmp (command, "SHOWCONNECTIONS"))
{
knownCommand = 1;
- ret = showConnections(a, outFile, b1, bs1, header);
+ ret = showConnections (a, outFile, b1, bs1, header);
}
else if (!strcmp (command, "KILLCONNECTION"))
{
@@ -432,40 +432,40 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
strncpy (buff, header.getOptions (), 10 );
buff[10] = '\0';
id = header.getOptions () ? atol (buff) : 0;
- ret = killConnection(a, id, outFile, b1, bs1, header);
+ ret = killConnection (a, id, outFile, b1, bs1, header);
}
- else if (!strcmp(command, "REBOOT"))
+ else if (!strcmp (command, "REBOOT"))
{
knownCommand = 1;
Server::getInstance ()->rebootOnNextLoop ();
ret = 0;
}
- else if (!strcmp(command, "GETFILE"))
+ else if (!strcmp (command, "GETFILE"))
{
knownCommand = 1;
ret = getFile (a,header.getOptions (), inFile, outFile, b1, bs1, header);
}
- else if (!strcmp(command, "PUTFILE"))
+ else if (!strcmp (command, "PUTFILE"))
{
knownCommand = 1;
ret = putFile (a,header.getOptions (), inFile, outFile, b1, bs1, header);
}
- else if (!strcmp(command, "DISABLEREBOOT"))
+ else if (!strcmp (command, "DISABLEREBOOT"))
{
Server::getInstance ()->disableAutoReboot ();
knownCommand = 1;
}
- else if (!strcmp(command, "ENABLEREBOOT"))
+ else if (!strcmp (command, "ENABLEREBOOT"))
{
- Server::getInstance ()->enableAutoReboot();
+ Server::getInstance ()->enableAutoReboot ();
knownCommand = 1;
}
- else if (!strcmp(command, "VERSION"))
+ else if (!strcmp (command, "VERSION"))
{
knownCommand = 1;
- ret = getVersion(a, outFile, b1, bs1, header);
+ ret = getVersion (a, outFile, b1, bs1, header);
}
if (knownCommand)
@@ -474,10 +474,10 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
outFile->seek (0);
if (ret)
{
- sendResponse(b2, bs2, a, CONTROL_INTERNAL, header, 0);
+ sendResponse (b2, bs2, a, CONTROL_INTERNAL, header, 0);
}
else
- sendResponse(b2, bs2, a, CONTROL_OK, header, outFile);
+ sendResponse (b2, bs2, a, CONTROL_OK, header, outFile);
if (inFile)
{
inFile->close ();
@@ -490,9 +490,9 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
delete outFile;
outFile=0;
}
- FilesUtility::deleteFile (inFilePath.str().c_str());
- FilesUtility::deleteFile (outFilePath.str().c_str());
- connection = header.getConnection();
+ FilesUtility::deleteFile (inFilePath.str ().c_str ());
+ FilesUtility::deleteFile (outFilePath.str ().c_str ());
+ connection = header.getConnection ();
/*
*If the Keep-Alive was specified keep the connection in the
*active connections list.
@@ -504,7 +504,7 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
}
else
{
- sendResponse(b2, bs2, a, CONTROL_CMD_NOT_FOUND, header, 0);
+ sendResponse (b2, bs2, a, CONTROL_CMD_NOT_FOUND, header, 0);
if (inFile)
{
@@ -518,8 +518,8 @@ int ControlProtocol::controlConnection (ConnectionPtr a,
char *b1, char *b2,
delete outFile;
outFile = NULL;
}
- FilesUtility::deleteFile (inFilePath.str().c_str());
- FilesUtility::deleteFile (outFilePath.str().c_str());
+ FilesUtility::deleteFile (inFilePath.str ().c_str ());
+ FilesUtility::deleteFile (outFilePath.str ().c_str ());
return 0;
}
}
@@ -531,12 +531,12 @@ int ControlProtocol::addToLog (int retCode, ConnectionPtr
con, char *b1,
int bs1, ControlHeader& header)
{
string time;
- getRFC822GMTTime(time, 32);
+ getRFC822GMTTime (time, 32);
#ifdef HAVE_SNPRINTF
- snprintf(b1, bs1,
+ snprintf (b1, bs1,
#else
- sprintf(b1,
+ sprintf (b1,
#endif
"%s [%s] %s:%s:%s - %s - %i", con->getIpAddr (), time.c_str (),
header.getCommand (), header.getVersion (), header.getOptions (),
@@ -578,9 +578,9 @@ int ControlProtocol::sendResponse (char *buffer, int
buffersize,
/* Build and send the Length line. */
#ifdef HAVE_SNPRINTF
- snprintf(buffer, buffersize,
+ snprintf (buffer, buffersize,
#else
- sprintf(buffer,
+ sprintf (buffer,
#endif
"/LEN %u\r\n", (u_int)dataLength);
@@ -604,9 +604,9 @@ int ControlProtocol::sendResponse (char *buffer, int
buffersize,
{
int dataToSend = dataLength;
u_long nbr;
- for( ; ; )
+ for ( ; ; )
{
- err = outFile->read(buffer, min (dataToSend, buffersize), &nbr);
+ err = outFile->read (buffer, min (dataToSend, buffersize), &nbr);
if (err)
{
a->host->warningsLogWrite (_("Control: internal error"));
@@ -647,7 +647,7 @@ int ControlProtocol::showConnections (ConnectionPtr
a,File* out, char *b1,
/*!
*Kill a connection by its ID.
*/
-int ControlProtocol::killConnection(ConnectionPtr a, u_long id, File* out,
+int ControlProtocol::killConnection (ConnectionPtr a, u_long id, File* out,
char *b1, int bs1, ControlHeader& header)
{
if (id == 0)
@@ -662,7 +662,7 @@ int ControlProtocol::killConnection(ConnectionPtr a, u_long
id, File* out,
args.bs1 = bs1;
args.header = &header;
- Server::getInstance ()->getConnectionsScheduler ()->accept(this, &args);
+ Server::getInstance ()->getConnectionsScheduler ()->accept (this, &args);
return 0;
}
@@ -680,16 +680,16 @@ int ControlProtocol::visitConnection (ConnectionPtr con,
void* argP)
{
#ifdef HAVE_SNPRINTF
snprintf (arg->b1, arg->bs1, "%i - %s - %i - %s - %i - %s - %s\r\n",
- static_cast<int>(con->getID()), con->getIpAddr(),
- static_cast<int>(con->getPort()),
- con->getLocalIpAddr(), static_cast<int>(con->getLocalPort()),
- con->getLogin(), con->getPassword());
+ static_cast<int>(con->getID ()), con->getIpAddr (),
+ static_cast<int>(con->getPort ()),
+ con->getLocalIpAddr (), static_cast<int>(con->getLocalPort ()),
+ con->getLogin (), con->getPassword ());
#else
sprintf (arg->b1, "%i - %s - %i - %s - %i - %s - %s\r\n",
- static_cast<int>(con->getID()), con->getIpAddr(),
- static_cast<int>(con->getPort()),
- con->getLocalIpAddr(), static_cast<int>(con->getLocalPort()),
- con->getLogin(), con->getPassword());
+ static_cast<int>(con->getID ()), con->getIpAddr (),
+ static_cast<int>(con->getPort ()),
+ con->getLocalIpAddr (), static_cast<int>(con->getLocalPort ()),
+ con->getLogin (), con->getPassword ());
#endif
ret = arg->out->writeToFile (arg->b1, strlen (arg->b1), &nbw);
@@ -750,9 +750,9 @@ int ControlProtocol::getFile (ConnectionPtr a, char* fn,
File* in, File* out,
a->host->warningsLogWrite (_("Control: internal error"));
return CONTROL_INTERNAL;
}
- for(;;)
+ for (;;)
{
- ret = localfile.read(b1, bs1, &nbr);
+ ret = localfile.read (b1, bs1, &nbr);
if (ret)
{
a->host->warningsLogWrite (_("Control: internal error"));
@@ -785,13 +785,13 @@ int ControlProtocol::putFile (ConnectionPtr a, char* fn,
File* in,
{
const char *filename = 0;
File localfile;
- int isAutoRebootToEnable = Server::getInstance ()->isAutorebootEnabled();
+ int isAutoRebootToEnable = Server::getInstance ()->isAutorebootEnabled ();
int ret = 0;
/*! # of bytes read. */
u_long nbr = 0;
/*! # of bytes written. */
u_long nbw = 0;
- Server::getInstance ()->disableAutoReboot();
+ Server::getInstance ()->disableAutoReboot ();
if (!strcmpi (fn, "myserver.xml"))
filename = Server::getInstance ()->getMainConfFile ();
@@ -827,9 +827,9 @@ int ControlProtocol::putFile (ConnectionPtr a, char* fn,
File* in,
return CONTROL_INTERNAL;
}
- for(;;)
+ for (;;)
{
- ret = in->read(b1, bs1, &nbr);
+ ret = in->read (b1, bs1, &nbr);
if (ret)
{
diff --git a/myserver/src/protocol/ftp/ftp.cpp
b/myserver/src/protocol/ftp/ftp.cpp
index ec6a914..573cd15 100644
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -335,7 +335,7 @@ int Ftp::controlConnection (ConnectionPtr pConnection, char
*b1, char *b2,
if (pFtpuserData == NULL)
return ClientsThread::DELETE_CONNECTION;
- // check if ftp is busy(return 120) or unavailable(return 421)
+ // check if ftp is busy (return 120) or unavailable (return 421)
if (pConnection->getToRemove () == Connection::REMOVE_OVERLOAD)
{
pFtpuserData->m_nFtpstate = FtpuserData::BUISY;
@@ -742,7 +742,7 @@ DEFINE_THREAD (SendAsciiFile, pParam)
#endif
}
- File *file = NULL; //new File();
+ File *file = NULL; //new File ();
try
{
file =
@@ -1442,7 +1442,7 @@ bool Ftp::userLoggedIn ()
}
/*!
- *Converts from relative client's path to local path(out path may not exist).
+ *Converts from relative client's path to local path (out path may not exist).
*\param sPathIn client's relative path
*\param sOutPath local path
*\return Return true if path exist, file is a normal one and is into the
ftp's root folder
diff --git a/myserver/src/protocol/ftp/ftp_lexer.cpp
b/myserver/src/protocol/ftp/ftp_lexer.cpp
index 0ed4ff6..a612c9a 100644
--- a/myserver/src/protocol/ftp/ftp_lexer.cpp
+++ b/myserver/src/protocol/ftp/ftp_lexer.cpp
@@ -2,7 +2,7 @@
#line 4 "ftp_lexer.cpp"
-#define YY_INT_ALIGNED short int
+#define YY_INT_ALIGNED short int
/* A lexical scanner generated by flex */
@@ -11,7 +11,7 @@
#define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35
#if YY_FLEX_SUBMINOR_VERSION > 0
-# define FLEX_BETA
+#define FLEX_BETA
#endif
/* First, we deal with platform-specific or compiler-specific issues. */
@@ -27,27 +27,27 @@
/* flex integer type definitions */
#ifndef FLEXINT_H
-# define FLEXINT_H
+#define FLEXINT_H
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types.
*/
-# ifndef __STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS 1
-# endif
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
-# include <inttypes.h>
+#include <inttypes.h>
typedef int8_t flex_int8_t;
typedef uint8_t flex_uint8_t;
typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t;
-# else
+#else
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
typedef int flex_int32_t;
@@ -56,57 +56,57 @@ typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
/* Limits of integral types. */
-# ifndef INT8_MIN
-# define INT8_MIN (-128)
-# endif
-# ifndef INT16_MIN
-# define INT16_MIN (-32767-1)
-# endif
-# ifndef INT32_MIN
-# define INT32_MIN (-2147483647-1)
-# endif
-# ifndef INT8_MAX
-# define INT8_MAX (127)
-# endif
-# ifndef INT16_MAX
-# define INT16_MAX (32767)
-# endif
-# ifndef INT32_MAX
-# define INT32_MAX (2147483647)
-# endif
-# ifndef UINT8_MAX
-# define UINT8_MAX (255U)
-# endif
-# ifndef UINT16_MAX
-# define UINT16_MAX (65535U)
-# endif
-# ifndef UINT32_MAX
-# define UINT32_MAX (4294967295U)
-# endif
-
-# endif /* ! C99 */
+#ifndef INT8_MIN
+#define INT8_MIN (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX (4294967295U)
+#endif
+
+#endif /* ! C99 */
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
/* The "const" storage-class-modifier is valid. */
-# define YY_USE_CONST
+#define YY_USE_CONST
#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
-# if defined (__STDC__)
+#if defined (__STDC__)
-# define YY_USE_CONST
+#define YY_USE_CONST
-# endif /* defined (__STDC__) */
+#endif /* defined (__STDC__) */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
-# define yyconst const
+#define yyconst const
#else
-# define yyconst
+#define yyconst
#endif
/* Returned upon end-of-file. */
@@ -121,7 +121,7 @@ typedef unsigned int flex_uint32_t;
/* An opaque pointer. */
#ifndef YY_TYPEDEF_YY_SCANNER_T
-# define YY_TYPEDEF_YY_SCANNER_T
+#define YY_TYPEDEF_YY_SCANNER_T
typedef void* yyscan_t;
#endif
@@ -159,15 +159,15 @@ typedef void* yyscan_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
-# ifdef __ia64__
+#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k.
* Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
* Ditto for the __ia64__ case accordingly.
*/
-# define YY_BUF_SIZE 32768
-# else
-# define YY_BUF_SIZE 16384
-# endif /* __ia64__ */
+#define YY_BUF_SIZE 32768
+#else
+#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the
main buffer.
@@ -175,7 +175,7 @@ typedef void* yyscan_t;
#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-# define YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
@@ -183,7 +183,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
#define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2
-#define YY_LESS_LINENO(n)
+ #define YY_LESS_LINENO(n)
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
@@ -202,12 +202,12 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
#ifndef YY_TYPEDEF_YY_SIZE_T
-# define YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
#ifndef YY_STRUCT_YY_BUFFER_STATE
-# define YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
{
FILE *yy_input_file;
@@ -254,8 +254,8 @@ struct yy_buffer_state
int yy_buffer_status;
-# define YY_BUFFER_NEW 0
-# define YY_BUFFER_NORMAL 1
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
/* When an EOF's been seen but there's still some text to process
* then we mark the buffer as YY_EOF_PENDING, to indicate that we
* shouldn't try reading from the input source any more. We might
@@ -266,7 +266,7 @@ struct yy_buffer_state
* (via yyrestart()), so that the user can continue scanning by
* just pointing yyin at a new input file.
*/
-# define YY_BUFFER_EOF_PENDING 2
+#define YY_BUFFER_EOF_PENDING 2
};
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
@@ -585,11 +585,11 @@ static yyconst flex_int16_t yy_chk[368] =
* down here because we want the user's section 1 to have been scanned first.
* The user has a chance to override it with an option.
*/
-# include <unistd.h>
+#include <unistd.h>
#endif
#ifndef YY_EXTRA_TYPE
-# define YY_EXTRA_TYPE void *
+#define YY_EXTRA_TYPE void *
#endif
/* Holds the entire state of the reentrant scanner. */
@@ -634,9 +634,9 @@ static int yy_init_globals (yyscan_t yyscanner );
/* This must go here because YYSTYPE and YYLTYPE are included
* from bison output in section 1.*/
-#define yylval yyg->yylval_r
+ # define yylval yyg->yylval_r
-#define yylloc yyg->yylloc_r
+ # define yylloc yyg->yylloc_r
int yylex_init (yyscan_t* scanner);
@@ -684,11 +684,11 @@ void yyset_lval (YYSTYPE * yylval_param ,yyscan_t
yyscanner );
*/
#ifndef YY_SKIP_YYWRAP
-# ifdef __cplusplus
+#ifdef __cplusplus
extern "C" int yywrap (yyscan_t yyscanner );
-# else
+#else
extern int yywrap (yyscan_t yyscanner );
-# endif
+#endif
#endif
static void yyunput (int c,char *buf_ptr ,yyscan_t yyscanner);
@@ -703,22 +703,22 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t
yyscanner);
#ifndef YY_NO_INPUT
-# ifdef __cplusplus
+#ifdef __cplusplus
static int yyinput (yyscan_t yyscanner );
-# else
+#else
static int input (yyscan_t yyscanner );
-# endif
+#endif
#endif
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
-# ifdef __ia64__
+#ifdef __ia64__
/* On IA-64, the buffer size is 16k, not 8k */
-# define YY_READ_BUF_SIZE 16384
-# else
-# define YY_READ_BUF_SIZE 8192
-# endif /* __ia64__ */
+#define YY_READ_BUF_SIZE 16384
+#else
+#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -726,14 +726,14 @@ static int input (yyscan_t yyscanner );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-# define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
* is returned in "result".
*/
#ifndef YY_INPUT
-# define YY_INPUT(buf,result,max_size) \
+#define YY_INPUT(buf,result,max_size) \
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
@@ -770,17 +770,17 @@ static int input (yyscan_t yyscanner );
* some compilers to complain about unreachable statements.
*/
#ifndef yyterminate
-# define yyterminate() return YY_NULL
+#define yyterminate() return YY_NULL
#endif
/* Number of entries by which start-condition stack grows. */
#ifndef YY_START_STACK_INCR
-# define YY_START_STACK_INCR 25
+#define YY_START_STACK_INCR 25
#endif
/* Report a fatal error. */
#ifndef YY_FATAL_ERROR
-# define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)
#endif
/* end tables serialization structures and prototypes */
@@ -789,12 +789,12 @@ static int input (yyscan_t yyscanner );
* easily add parameters.
*/
#ifndef YY_DECL
-# define YY_DECL_IS_OURS 1
+#define YY_DECL_IS_OURS 1
extern int yylex \
(YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t
yyscanner);
-# define YY_DECL int yylex \
+#define YY_DECL int yylex \
(YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t
yyscanner)
#endif /* !YY_DECL */
@@ -802,12 +802,12 @@ extern int yylex \
* have been set up.
*/
#ifndef YY_USER_ACTION
-# define YY_USER_ACTION
+#define YY_USER_ACTION
#endif
/* Code executed at the end of each rule. */
#ifndef YY_BREAK
-# define YY_BREAK break;
+#define YY_BREAK break;
#endif
#define YY_RULE_SETUP \
@@ -1780,11 +1780,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
}
#ifndef YY_NO_INPUT
-# ifdef __cplusplus
+#ifdef __cplusplus
static int yyinput (yyscan_t yyscanner)
-# else
+#else
static int input (yyscan_t yyscanner)
-# endif
+#endif
{
int c;
@@ -1832,11 +1832,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
if ( ! yyg->yy_did_buffer_switch_on_eof
)
YY_NEW_FILE;
-# ifdef __cplusplus
+#ifdef __cplusplus
return yyinput(yyscanner);
-# else
+#else
return input(yyscanner);
-# endif
+#endif
}
case EOB_ACT_CONTINUE_SCAN:
@@ -2217,7 +2217,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes,
int _yybytes_len , yysc
}
#ifndef YY_EXIT_FAILURE
-# define YY_EXIT_FAILURE 2
+#define YY_EXIT_FAILURE 2
#endif
static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
diff --git a/myserver/src/protocol/ftp/ftp_parser.cpp
b/myserver/src/protocol/ftp/ftp_parser.cpp
index f7bfb81..deea0ab 100644
--- a/myserver/src/protocol/ftp/ftp_parser.cpp
+++ b/myserver/src/protocol/ftp/ftp_parser.cpp
@@ -2,20 +2,20 @@
/* A Bison parser, made by GNU Bison 2.4.1. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
-
+
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
-
+
This program 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 3 of the License, or
(at your option) any later version.
-
+
This program 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 this program. If not, see <http://www.gnu.org/licenses/>. */
@@ -28,7 +28,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -195,7 +195,7 @@ typedef union YYSTYPE
{
/* Line 214 of yacc.c */
-# line 15 "ftp_parser.ypp"
+#line 15 "ftp_parser.ypp"
int m_nInt;
char m_nChar;
@@ -205,7 +205,7 @@ typedef union YYSTYPE
/* Line 214 of yacc.c */
-# line 209 "ftp_parser.cpp"
+#line 209 "ftp_parser.cpp"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -307,15 +307,15 @@ typedef short int yytype_int16;
#ifndef lint
# define YYID(n) (n)
#else
-# if (defined __STDC__ || defined __C99__FUNC__ \
+#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
YYID (int yyi)
-# else
+#else
static int
YYID (yyi)
int yyi;
-# endif
+#endif
{
return yyi;
}
@@ -586,7 +586,7 @@ static const char *const yytname[] =
};
#endif
-#ifdef YYPRINT
+# ifdef YYPRINT
/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
token YYLEX-NUM. */
static const yytype_uint16 yytoknum[] =
@@ -598,7 +598,7 @@ static const yytype_uint16 yytoknum[] =
295, 296, 114, 44, 115, 98, 99, 102, 112, 97,
105, 101, 108, 110, 116
};
-#endif
+# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
@@ -885,11 +885,11 @@ do {
\
`--------------------------------*/
/*ARGSUSED*/
-# if (defined __STDC__ || defined __C99__FUNC__ \
+#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const
yyvaluep, YYLTYPE const * const yylocationp, Ftp *pContext)
-# else
+#else
static void
yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, pContext)
FILE *yyoutput;
@@ -897,7 +897,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep,
yylocationp, pContext)
YYSTYPE const * const yyvaluep;
YYLTYPE const * const yylocationp;
Ftp *pContext;
-# endif
+#endif
{
if (!yyvaluep)
return;
@@ -921,11 +921,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep,
yylocationp, pContext)
| Print this symbol on YYOUTPUT. |
`--------------------------------*/
-# if (defined __STDC__ || defined __C99__FUNC__ \
+#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep,
YYLTYPE const * const yylocationp, Ftp *pContext)
-# else
+#else
static void
yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, pContext)
FILE *yyoutput;
@@ -933,7 +933,7 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp,
pContext)
YYSTYPE const * const yyvaluep;
YYLTYPE const * const yylocationp;
Ftp *pContext;
-# endif
+#endif
{
if (yytype < YYNTOKENS)
YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
@@ -951,16 +951,16 @@ yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp,
pContext)
| TOP (included). |
`------------------------------------------------------------------*/
-# if (defined __STDC__ || defined __C99__FUNC__ \
+#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-# else
+#else
static void
yy_stack_print (yybottom, yytop)
yytype_int16 *yybottom;
yytype_int16 *yytop;
-# endif
+#endif
{
YYFPRINTF (stderr, "Stack now");
for (; yybottom <= yytop; yybottom++)
@@ -982,18 +982,18 @@ do {
\
| Report that the YYRULE is going to be reduced. |
`------------------------------------------------*/
-# if (defined __STDC__ || defined __C99__FUNC__ \
+#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, Ftp *pContext)
-# else
+#else
static void
yy_reduce_print (yyvsp, yylsp, yyrule, pContext)
YYSTYPE *yyvsp;
YYLTYPE *yylsp;
int yyrule;
Ftp *pContext;
-# endif
+#endif
{
int yynrhs = yyr2[yyrule];
int yyi;
@@ -1029,7 +1029,7 @@ int yydebug;
/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef YYINITDEPTH
+#ifndef YYINITDEPTH
# define YYINITDEPTH 200
#endif
@@ -1053,15 +1053,15 @@ int yydebug;
# define yystrlen strlen
# else
/* Return the length of YYSTR. */
-# if (defined __STDC__ || defined __C99__FUNC__ \
+#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static YYSIZE_T
yystrlen (const char *yystr)
-# else
+#else
static YYSIZE_T
yystrlen (yystr)
const char *yystr;
-# endif
+#endif
{
YYSIZE_T yylen;
for (yylen = 0; yystr[yylen]; yylen++)
@@ -1077,16 +1077,16 @@ yystrlen (yystr)
# else
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
YYDEST. */
-# if (defined __STDC__ || defined __C99__FUNC__ \
+#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static char *
yystpcpy (char *yydest, const char *yysrc)
-# else
+#else
static char *
yystpcpy (yydest, yysrc)
char *yydest;
const char *yysrc;
-# endif
+#endif
{
char *yyd = yydest;
const char *yys = yysrc;
@@ -1294,17 +1294,17 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp,
pContext)
/* Prevent warnings from -Wmissing-prototypes. */
#ifdef YYPARSE_PARAM
-# if defined __STDC__ || defined __cplusplus
+#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
-# else
+#else
int yyparse ();
-# endif
+#endif
#else /* ! YYPARSE_PARAM */
-# if defined __STDC__ || defined __cplusplus
+#if defined __STDC__ || defined __cplusplus
int yyparse (Ftp *pContext);
-# else
+#else
int yyparse ();
-# endif
+#endif
#endif /* ! YYPARSE_PARAM */
@@ -1316,25 +1316,25 @@ int yyparse ();
`-------------------------*/
#ifdef YYPARSE_PARAM
-# if (defined __STDC__ || defined __C99__FUNC__ \
+#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
int
yyparse (void *YYPARSE_PARAM)
-# else
+#else
int
yyparse (YYPARSE_PARAM)
void *YYPARSE_PARAM;
-# endif
+#endif
#else /* ! YYPARSE_PARAM */
-# if (defined __STDC__ || defined __C99__FUNC__ \
+#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
int
yyparse (Ftp *pContext)
-# else
+#else
int
yyparse (pContext)
Ftp *pContext;
-# endif
+#endif
#endif
{
/* The lookahead symbol. */
diff --git a/myserver/src/protocol/http/dyn_http_command.cpp
b/myserver/src/protocol/http/dyn_http_command.cpp
index 9bcae78..6a70eb7 100644
--- a/myserver/src/protocol/http/dyn_http_command.cpp
+++ b/myserver/src/protocol/http/dyn_http_command.cpp
@@ -23,7 +23,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
/*!
*Default constructor.
*/
-DynamicHttpCommand::DynamicHttpCommand(string& name)
+DynamicHttpCommand::DynamicHttpCommand (string& name)
{
this->name = name;
}
@@ -31,7 +31,7 @@ DynamicHttpCommand::DynamicHttpCommand(string& name)
/*!
*Default constructor.
*/
-string DynamicHttpCommand::getName()
+string DynamicHttpCommand::getName ()
{
return name;
}
@@ -39,7 +39,7 @@ string DynamicHttpCommand::getName()
/*!
*Destroy the object.
*/
-DynamicHttpCommand::~DynamicHttpCommand()
+DynamicHttpCommand::~DynamicHttpCommand ()
{
}
diff --git a/myserver/src/protocol/http/dyn_http_command_manager.cpp
b/myserver/src/protocol/http/dyn_http_command_manager.cpp
index 42d0aae..33ef910 100644
--- a/myserver/src/protocol/http/dyn_http_command_manager.cpp
+++ b/myserver/src/protocol/http/dyn_http_command_manager.cpp
@@ -25,7 +25,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
/*!
*Initialize the object.
*/
-DynHttpCommandManager::DynHttpCommandManager()
+DynHttpCommandManager::DynHttpCommandManager ()
{
}
@@ -33,7 +33,7 @@ DynHttpCommandManager::DynHttpCommandManager()
/*!
*Destroy the object.
*/
-DynHttpCommandManager::~DynHttpCommandManager()
+DynHttpCommandManager::~DynHttpCommandManager ()
{
}
@@ -42,9 +42,9 @@ DynHttpCommandManager::~DynHttpCommandManager()
*Get the DynamicHttpCommand.
*\param name http command name.
*/
-DynamicHttpCommand* DynHttpCommandManager::getHttpCommand(string& name)
+DynamicHttpCommand* DynHttpCommandManager::getHttpCommand (string& name)
{
- return dynamicHttpCommands.get(name);
+ return dynamicHttpCommands.get (name);
}
/*!
@@ -52,9 +52,9 @@ DynamicHttpCommand*
DynHttpCommandManager::getHttpCommand(string& name)
*\param name http command name.
*\param httpCommand http command to add.
*/
-void DynHttpCommandManager::addHttpCommand(string& name, DynamicHttpCommand*
httpCommand)
+void DynHttpCommandManager::addHttpCommand (string& name, DynamicHttpCommand*
httpCommand)
{
- dynamicHttpCommands.put(name,httpCommand);
+ dynamicHttpCommands.put (name,httpCommand);
}
/*!
diff --git a/myserver/src/protocol/http/dyn_http_manager.cpp
b/myserver/src/protocol/http/dyn_http_manager.cpp
index cdaa155..c9f47cf 100644
--- a/myserver/src/protocol/http/dyn_http_manager.cpp
+++ b/myserver/src/protocol/http/dyn_http_manager.cpp
@@ -26,7 +26,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
/*!
*Default constructor.
*/
-DynamicHttpManager::DynamicHttpManager()
+DynamicHttpManager::DynamicHttpManager ()
{
}
@@ -34,7 +34,7 @@ DynamicHttpManager::DynamicHttpManager()
/*!
*Destroy the object.
*/
-DynamicHttpManager::~DynamicHttpManager()
+DynamicHttpManager::~DynamicHttpManager ()
{
}
diff --git a/myserver/src/protocol/http/env/env.cpp
b/myserver/src/protocol/http/env/env.cpp
index d1e7d72..9cc48fa 100644
--- a/myserver/src/protocol/http/env/env.cpp
+++ b/myserver/src/protocol/http/env/env.cpp
@@ -44,7 +44,7 @@ using namespace std;
*\param processEnv Specify if add current process environment
*variables too.
*/
-void Env::buildEnvironmentString(HttpThreadContext* td, char *cgiEnv,
+void Env::buildEnvironmentString (HttpThreadContext* td, char *cgiEnv,
int processEnv)
{
MemBuf memCgi;
@@ -53,7 +53,7 @@ void Env::buildEnvironmentString(HttpThreadContext* td, char
*cgiEnv,
char strTmp[32];
HttpRequestHeader::Entry* reqEntry = NULL;
- memCgi.setExternalBuffer(cgiEnv, td->secondaryBuffer->getRealLength());
+ memCgi.setExternalBuffer (cgiEnv, td->secondaryBuffer->getRealLength ());
memCgi << "SERVER_SOFTWARE=GNU MyServer " << MYSERVER_VERSION;
#ifdef WIN32
@@ -69,15 +69,15 @@ void Env::buildEnvironmentString(HttpThreadContext* td,
char *cgiEnv,
memCgi << end_str << "REDIRECT_STATUS=TRUE";
memCgi << end_str << "SERVER_NAME=";
- memCgi << Server::getInstance()->getServerName();
+ memCgi << Server::getInstance ()->getServerName ();
memCgi << end_str << "SERVER_SIGNATURE=";
memCgi << "<address>GNU MyServer " << MYSERVER_VERSION << "</address>";
memCgi << end_str << "SERVER_PROTOCOL=";
- memCgi << td->request.ver.c_str();
+ memCgi << td->request.ver.c_str ();
- portBuffer.uintToStr( td->connection->getLocalPort());
+ portBuffer.uintToStr ( td->connection->getLocalPort ());
memCgi << end_str << "SERVER_PORT="<< portBuffer;
memCgi << end_str << "SERVER_ADMIN=";
@@ -86,50 +86,50 @@ void Env::buildEnvironmentString(HttpThreadContext* td,
char *cgiEnv,
MYSERVER_SERVER_CONF, "");
memCgi << end_str << "REQUEST_METHOD=";
- memCgi << td->request.cmd.c_str();
+ memCgi << td->request.cmd.c_str ();
memCgi << end_str << "REQUEST_URI=";
- memCgi << td->request.uri.c_str();
+ memCgi << td->request.uri.c_str ();
memCgi << end_str << "QUERY_STRING=";
- memCgi << td->request.uriOpts.c_str();
+ memCgi << td->request.uriOpts.c_str ();
memCgi << end_str << "GATEWAY_INTERFACE=CGI/1.1";
- if(td->request.contentLength.length())
+ if (td->request.contentLength.length ())
{
memCgi << end_str << "CONTENT_LENGTH=";
- memCgi << td->request.contentLength.c_str();
+ memCgi << td->request.contentLength.c_str ();
}
else
{
u_long fs = 0;
ostringstream stream;
- if(td->inputData.getHandle())
- fs = td->inputData.getFileSize();
+ if (td->inputData.getHandle ())
+ fs = td->inputData.getFileSize ();
stream << fs;
- memCgi << end_str << "CONTENT_LENGTH=" << stream.str().c_str();
+ memCgi << end_str << "CONTENT_LENGTH=" << stream.str ().c_str ();
}
- if(td->request.rangeByteBegin || td->request.rangeByteEnd)
+ if (td->request.rangeByteBegin || td->request.rangeByteEnd)
{
ostringstream rangeBuffer;
memCgi << end_str << "HTTP_RANGE=" << td->request.rangeType << "=" ;
- if(td->request.rangeByteBegin)
+ if (td->request.rangeByteBegin)
{
rangeBuffer << static_cast<int>(td->request.rangeByteBegin);
- memCgi << rangeBuffer.str();
+ memCgi << rangeBuffer.str ();
}
memCgi << "-";
- if(td->request.rangeByteEnd)
+ if (td->request.rangeByteEnd)
{
rangeBuffer << td->request.rangeByteEnd;
- memCgi << rangeBuffer.str();
+ memCgi << rangeBuffer.str ();
}
}
@@ -138,21 +138,21 @@ void Env::buildEnvironmentString(HttpThreadContext* td,
char *cgiEnv,
memCgi << td->cgiRoot;
memCgi << end_str << "REMOTE_ADDR=";
- memCgi << td->connection->getIpAddr();
+ memCgi << td->connection->getIpAddr ();
- remotePortBuffer.MemBuf::uintToStr(td->connection->getPort() );
+ remotePortBuffer.MemBuf::uintToStr (td->connection->getPort () );
memCgi << end_str << "REMOTE_PORT=" << remotePortBuffer;
memCgi << end_str << "REMOTE_USER=";
- memCgi << td->connection->getLogin();
+ memCgi << td->connection->getLogin ();
- if(td->http->getProtocolOptions() & PROTOCOL_USES_SSL)
+ if (td->http->getProtocolOptions () & PROTOCOL_USES_SSL)
memCgi << end_str << "SSL=ON";
else
memCgi << end_str << "SSL=OFF";
- if(td->pathInfo.length())
+ if (td->pathInfo.length ())
{
memCgi << end_str << "PATH_INFO=";
memCgi << td->pathInfo;
@@ -174,47 +174,47 @@ void Env::buildEnvironmentString(HttpThreadContext* td,
char *cgiEnv,
*requested uri without the pathInfo.
*/
memCgi << end_str << "SCRIPT_NAME=";
- memCgi << td->request.uri.c_str();
+ memCgi << td->request.uri.c_str ();
memCgi << end_str << "SCRIPT_URL=";
- memCgi << td->request.uri.c_str();
+ memCgi << td->request.uri.c_str ();
memCgi << end_str << "DATE_GMT=";
- getRFC822GMTTime(strTmp, 32);
+ getRFC822GMTTime (strTmp, 32);
memCgi << strTmp;
memCgi << end_str << "DATE_LOCAL=";
- getRFC822LocalTime(strTmp, 32);
+ getRFC822LocalTime (strTmp, 32);
memCgi << strTmp;
memCgi << end_str << "DOCUMENT_ROOT=";
- memCgi << td->connection->host->getDocumentRoot();
+ memCgi << td->connection->host->getDocumentRoot ();
memCgi << end_str << "DOCUMENT_URI=";
- memCgi << td->request.uri.c_str();
+ memCgi << td->request.uri.c_str ();
memCgi << end_str << "DOCUMENT_NAME=";
memCgi << td->filenamePath;
memCgi << end_str << "REMOTE_IDENT=";
- memCgi << td->connection->getLogin();
+ memCgi << td->connection->getLogin ();
memCgi << end_str << "AUTH_TYPE=";
- memCgi << td->request.auth.c_str();
+ memCgi << td->request.auth.c_str ();
- reqEntry = td->request.other.get("Content-Type");
+ reqEntry = td->request.other.get ("Content-Type");
- if(reqEntry)
+ if (reqEntry)
{
memCgi << end_str << "CONTENT_TYPE=";
- memCgi << reqEntry->value->c_str();
+ memCgi << reqEntry->value->c_str ();
}
- buildHttpHeaderEnvString(memCgi, td->request);
+ buildHttpHeaderEnvString (memCgi, td->request);
- if(processEnv)
- buildProcessEnvString(memCgi);
+ if (processEnv)
+ buildProcessEnvString (memCgi);
memCgi << end_str << end_str << end_str << end_str << end_str ;
@@ -223,44 +223,44 @@ void Env::buildEnvironmentString(HttpThreadContext* td,
char *cgiEnv,
/*!
*Append to the environment string variables from the HTTP request header.
*/
-void Env::buildHttpHeaderEnvString(MemBuf& memCgi, HttpRequestHeader & req)
+void Env::buildHttpHeaderEnvString (MemBuf& memCgi, HttpRequestHeader & req)
{
- HashMap<string, HttpRequestHeader::Entry*>::Iterator it = req.begin();
- for(; it != req.end(); it++)
+ HashMap<string, HttpRequestHeader::Entry*>::Iterator it = req.begin ();
+ for (; it != req.end (); it++)
{
HttpRequestHeader::Entry* en = *it;
string name;
- name.assign("HTTP_");
- name.append(en->name->c_str());
- transform(name.begin()+5, name.end(), name.begin()+5, ::toupper);
- for(int i = name.length(); i > 5; i--)
- if(name[i] == '-')
+ name.assign ("HTTP_");
+ name.append (en->name->c_str ());
+ transform (name.begin ()+5, name.end (), name.begin ()+5, ::toupper);
+ for (int i = name.length (); i > 5; i--)
+ if (name[i] == '-')
name[i] = '_';
- memCgi << end_str << name.c_str() << "=" << en->value->c_str();
+ memCgi << end_str << name.c_str () << "=" << en->value->c_str ();
}
}
/*!
*Append to the environment string process env variables.
*/
-void Env::buildProcessEnvString(MemBuf& memCgi)
+void Env::buildProcessEnvString (MemBuf& memCgi)
{
#ifdef WIN32
LPTSTR lpszVariable;
LPVOID lpvEnv;
- lpvEnv = Server::getInstance()->getEnvString();
+ lpvEnv = Server::getInstance ()->getEnvString ();
memCgi << end_str;
if (lpvEnv)
for (lpszVariable = (LPTSTR) lpvEnv; *lpszVariable; lpszVariable++)
{
- if(((char*)lpszVariable)[0] != '=' )
+ if (((char*)lpszVariable)[0] != '=' )
{
memCgi << (char*)lpszVariable << end_str;
}
- while(*lpszVariable)
+ while (*lpszVariable)
*lpszVariable++;
}
#endif
diff --git a/myserver/src/protocol/http/http.cpp
b/myserver/src/protocol/http/http.cpp
index e2d38a4..91c9ede 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -408,7 +408,7 @@ int Http::preprocessHttpRequest (string& filename, int
yetmapped, int* permissio
try
{
if (td->request.isKeepAlive ())
- td->response.setValue("Connection", "keep-alive");
+ td->response.setValue ("Connection", "keep-alive");
ret = getFilePermissions (filename, directory, file,
td->filenamePath, yetmapped, permissions);
@@ -1088,7 +1088,7 @@ int Http::controlConnection (ConnectionPtr a, char*
/*b1*/, char* /*b2*/,
+ td->nHeaderChars);
u_long toCopy = nbtr - td->nHeaderChars;
- a->getConnectionBuffer()->setBuffer (data, toCopy);
+ a->getConnectionBuffer ()->setBuffer (data, toCopy);
retvalue = ClientsThread::INCOMPLETE_REQUEST_NO_WAIT;
}
else
@@ -1172,7 +1172,7 @@ int Http::controlConnection (ConnectionPtr a, char*
/*b1*/, char* /*b2*/,
else
{
/*
- *Return Method not implemented(501) if there
+ *Return Method not implemented (501) if there
*is not a dynamic methods manager.
*/
if (!dynamicCommand)
diff --git a/myserver/src/protocol/http/http_data_handler.cpp
b/myserver/src/protocol/http/http_data_handler.cpp
index 8d37368..2b9b665 100644
--- a/myserver/src/protocol/http/http_data_handler.cpp
+++ b/myserver/src/protocol/http/http_data_handler.cpp
@@ -113,7 +113,7 @@ int HttpDataHandler::appendDataToHTTPChannel
(HttpThreadContext* td,
chain->setStream (oldStream);
/*
- *Use of chain->getStream() is needed to write directly on the
+ *Use of chain->getStream () is needed to write directly on the
*final stream.
*/
return appendDataToHTTPChannel (td, buffer, nbr, appendFile, chain, append,
diff --git a/myserver/src/protocol/http/http_data_read.cpp
b/myserver/src/protocol/http/http_data_read.cpp
index d8e17f3..19b0fa4 100644
--- a/myserver/src/protocol/http/http_data_read.cpp
+++ b/myserver/src/protocol/http/http_data_read.cpp
@@ -47,7 +47,7 @@ using namespace std;
*\param timeout Timeout value to use on the socket.
*\return Return 0 on success.
*/
-int HttpDataRead::readContiguousPrimitivePostData(const char* inBuffer,
+int HttpDataRead::readContiguousPrimitivePostData (const char* inBuffer,
u_long *inBufferPos,
u_long inBufferSize,
Socket *inSocket,
@@ -58,22 +58,22 @@ int HttpDataRead::readContiguousPrimitivePostData(const
char* inBuffer,
{
int ret;
*nbr = 0;
- if(inBufferSize - *inBufferPos)
+ if (inBufferSize - *inBufferPos)
{
- *nbr = min(outBufferSize, inBufferSize - *inBufferPos);
- memcpy(outBuffer, inBuffer + *inBufferPos, *nbr);
+ *nbr = min (outBufferSize, inBufferSize - *inBufferPos);
+ memcpy (outBuffer, inBuffer + *inBufferPos, *nbr);
*inBufferPos += *nbr;
}
/*
* No other space in the out buffer, return from the function with success.
*/
- if(outBufferSize == *nbr)
+ if (outBufferSize == *nbr)
return 0;
- ret = inSocket->recv(outBuffer + *nbr, outBufferSize - *nbr, 0, timeout);
+ ret = inSocket->recv (outBuffer + *nbr, outBufferSize - *nbr, 0, timeout);
- if(ret == -1)
+ if (ret == -1)
return -1;
*nbr += ret;
@@ -100,7 +100,7 @@ int HttpDataRead::readContiguousPrimitivePostData(const
char* inBuffer,
*\return -1 on internal error.
*\return Any other value is the HTTP error code.
*/
-int HttpDataRead::readChunkedPostData(const char* inBuffer,
+int HttpDataRead::readChunkedPostData (const char* inBuffer,
u_long *inBufferPos,
u_long inBufferSize,
Socket *inSocket,
@@ -124,9 +124,9 @@ int HttpDataRead::readChunkedPostData(const char* inBuffer,
char c;
bufferlen = 0;
buffer[0] = '\0';
- for(;;)
+ for (;;)
{
- if(readContiguousPrimitivePostData(inBuffer,
+ if (readContiguousPrimitivePostData (inBuffer,
inBufferPos,
inBufferSize,
inSocket,
@@ -136,10 +136,10 @@ int HttpDataRead::readChunkedPostData(const char*
inBuffer,
timeout))
return -1;
- if(nbr != 1)
+ if (nbr != 1)
return -1;
- if((c != '\r') && (bufferlen < 19))
+ if ((c != '\r') && (bufferlen < 19))
{
buffer[bufferlen++] = c;
buffer[bufferlen] = '\0';
@@ -149,7 +149,7 @@ int HttpDataRead::readChunkedPostData(const char* inBuffer,
}
/* Read the \n character too. */
- if(readContiguousPrimitivePostData(inBuffer,
+ if (readContiguousPrimitivePostData (inBuffer,
inBufferPos,
inBufferSize,
inSocket,
@@ -159,19 +159,19 @@ int HttpDataRead::readChunkedPostData(const char*
inBuffer,
timeout))
return -1;
- dataToRead = (u_long)hexToInt(buffer);
+ dataToRead = (u_long)hexToInt (buffer);
/*! The last chunk length is 0. */
- if(dataToRead == 0)
+ if (dataToRead == 0)
break;
chunkNbr = 0;
- while(chunkNbr < dataToRead)
+ while (chunkNbr < dataToRead)
{
- u_long rs = min(outBufferSize , dataToRead - chunkNbr);
+ u_long rs = min (outBufferSize , dataToRead - chunkNbr);
- if(readContiguousPrimitivePostData(inBuffer,
+ if (readContiguousPrimitivePostData (inBuffer,
inBufferPos,
inBufferSize,
inSocket,
@@ -183,7 +183,7 @@ int HttpDataRead::readChunkedPostData(const char* inBuffer,
return -1;
}
- if(nbr == 0)
+ if (nbr == 0)
return -1;
chunkNbr += nbr;
@@ -191,7 +191,7 @@ int HttpDataRead::readChunkedPostData(const char* inBuffer,
if (out && out->write (outBuffer, nbr, &nbw))
return -1;
- if(nbw != nbr)
+ if (nbw != nbr)
return -1;
if (out)
@@ -200,7 +200,7 @@ int HttpDataRead::readChunkedPostData(const char* inBuffer,
*outNbr += nbr;
/* Read final chunk \r\n. */
- if(readContiguousPrimitivePostData(inBuffer,
+ if (readContiguousPrimitivePostData (inBuffer,
inBufferPos,
inBufferSize,
inSocket,
@@ -227,7 +227,7 @@ int HttpDataRead::readChunkedPostData(const char* inBuffer,
* the connection should be removed immediately.
*\return Any other value is a protocol error specified in HTTPRETCODE.
*/
-int HttpDataRead::readPostData(HttpThreadContext* td, int* httpRetCode)
+int HttpDataRead::readPostData (HttpThreadContext* td, int* httpRetCode)
{
int contentLength = 0;
bool contentLengthSpecified = false;
@@ -235,38 +235,38 @@ int HttpDataRead::readPostData(HttpThreadContext* td,
int* httpRetCode)
u_long bufferDataSize = 0;
- u_long timeout = MYSERVER_SEC(10);
+ u_long timeout = MYSERVER_SEC (10);
u_long inPos = 0;
u_long nbr;
u_long length;
HttpRequestHeader::Entry *contentType =
- td->request.other.get("Content-Type");
+ td->request.other.get ("Content-Type");
HttpRequestHeader::Entry *encoding =
- td->request.other.get("Transfer-Encoding");
+ td->request.other.get ("Transfer-Encoding");
/* Specify a type if it not specified by the client. */
- if(contentType == 0)
+ if (contentType == 0)
{
- contentType = new HttpRequestHeader::Entry();
- contentType->name->assign("Content-Type");
- contentType->value->assign("application/x-www-form-urlencoded");
+ contentType = new HttpRequestHeader::Entry ();
+ contentType->name->assign ("Content-Type");
+ contentType->value->assign ("application/x-www-form-urlencoded");
}
- else if(contentType->value->length() == 0)
+ else if (contentType->value->length () == 0)
{
- contentType->value->assign("application/x-www-form-urlencoded");
+ contentType->value->assign ("application/x-www-form-urlencoded");
}
- td->request.uriOptsPtr = &(td->buffer->getBuffer())[td->nHeaderChars];
- td->buffer->getBuffer()[td->nBytesToRead < td->buffer->getRealLength() - 1
- ? td->nBytesToRead : td->buffer->getRealLength()-1] = '\0';
+ td->request.uriOptsPtr = &(td->buffer->getBuffer ())[td->nHeaderChars];
+ td->buffer->getBuffer ()[td->nBytesToRead < td->buffer->getRealLength () - 1
+ ? td->nBytesToRead : td->buffer->getRealLength ()-1] = '\0';
- if(td->request.contentLength.length())
+ if (td->request.contentLength.length ())
{
- contentLength = atoi(td->request.contentLength.c_str());
+ contentLength = atoi (td->request.contentLength.c_str ());
contentLengthSpecified = true;
- if(contentLength < 0)
+ if (contentLength < 0)
{
*httpRetCode = 400;
return 1;
@@ -279,13 +279,13 @@ int HttpDataRead::readPostData(HttpThreadContext* td,
int* httpRetCode)
*If a CONTENT-ENCODING is specified the CONTENT-LENGTH is not
*always needed.
*/
- if(!contentLengthSpecified && td->request.isKeepAlive ())
+ if (!contentLengthSpecified && td->request.isKeepAlive ())
{
HttpRequestHeader::Entry *content =
- td->request.other.get("Content-Encoding");
+ td->request.other.get ("Content-Encoding");
- if(content && (content->value->length() == '\0')
- && (td->request.contentLength.length() == 0))
+ if (content && (content->value->length () == '\0')
+ && (td->request.contentLength.length () == 0))
{
*httpRetCode = 400;
return 1;
@@ -296,7 +296,7 @@ int HttpDataRead::readPostData(HttpThreadContext* td, int*
httpRetCode)
*Create the file that contains the posted data.
*This data is the stdin file in the CGI.
*/
- if(td->inputData.openFile(td->inputDataPath, File::FILE_CREATE_ALWAYS |
+ if (td->inputData.openFile (td->inputDataPath, File::FILE_CREATE_ALWAYS |
File::READ |
File::WRITE))
{
@@ -306,34 +306,34 @@ int HttpDataRead::readPostData(HttpThreadContext* td,
int* httpRetCode)
length = contentLength;
- bufferDataSize = (td->nBytesToRead < td->buffer->getRealLength() - 1
+ bufferDataSize = (td->nBytesToRead < td->buffer->getRealLength () - 1
? td->nBytesToRead
- : td->buffer->getRealLength() - 1 ) - td->nHeaderChars;
+ : td->buffer->getRealLength () - 1 ) - td->nHeaderChars;
/* If it is specified a transfer encoding read data using it. */
- if(encoding)
+ if (encoding)
{
- if(!encoding->value->compare("chunked"))
+ if (!encoding->value->compare ("chunked"))
{
int ret = readChunkedPostData (td->request.uriOptsPtr,
&inPos,
bufferDataSize,
td->connection->socket,
- td->secondaryBuffer->getBuffer(),
- td->secondaryBuffer->getRealLength() - 1,
+ td->secondaryBuffer->getBuffer (),
+ td->secondaryBuffer->getRealLength () - 1,
&nbr,
timeout,
&(td->inputData),
0);
- if(ret == -1)
+ if (ret == -1)
{
- td->inputDataPath.assign("");
- td->outputDataPath.assign("");
- td->inputData.close();
+ td->inputDataPath.assign ("");
+ td->outputDataPath.assign ("");
+ td->inputData.close ();
return -1;
}
- else if(ret)
+ else if (ret)
{
*httpRetCode = ret;
return 1;
@@ -359,7 +359,7 @@ int HttpDataRead::readPostData(HttpThreadContext* td, int*
httpRetCode)
{
/* Do not try to read more than what we expect. */
- u_long dimBuffer = std::min (td->secondaryBuffer->getRealLength() -
1ul,
+ u_long dimBuffer = std::min (td->secondaryBuffer->getRealLength () -
1ul,
length);
if (readContiguousPrimitivePostData (td->request.uriOptsPtr,
diff --git a/myserver/src/protocol/http/http_errors.cpp
b/myserver/src/protocol/http/http_errors.cpp
index a685e6b..aa73a5d 100644
--- a/myserver/src/protocol/http/http_errors.cpp
+++ b/myserver/src/protocol/http/http_errors.cpp
@@ -59,7 +59,7 @@ void HttpErrors::getErrorMessage (int statusCode, string& out)
*/
void HttpErrors::unLoad ()
{
- messagesMap.clear();
+ messagesMap.clear ();
}
/*!
diff --git a/myserver/src/protocol/http/http_headers.cpp
b/myserver/src/protocol/http/http_headers.cpp
index e4fa388..4f8493b 100644
--- a/myserver/src/protocol/http/http_headers.cpp
+++ b/myserver/src/protocol/http/http_headers.cpp
@@ -85,8 +85,8 @@ u_long HttpHeaders::buildHTTPResponseHeader (char *str,
}
HashMap<string, HttpResponseHeader::Entry*>::Iterator it =
- response->other.begin();
- for (; it != response->other.end(); it++)
+ response->other.begin ();
+ for (; it != response->other.end (); it++)
{
HttpResponseHeader::Entry *e = *it;
pos += myserver_strlcpy (pos, e->name->c_str (), MAX-(long)(pos-str));
@@ -112,7 +112,7 @@ u_long HttpHeaders::buildHTTPResponseHeader (char *str,
u_long HttpHeaders::buildHTTPRequestHeader (char * str,HttpRequestHeader*
request)
{
char *pos = str;
- const int MAX = MYSERVER_KB(8);
+ const int MAX = MYSERVER_KB (8);
/* First line. */
pos += myserver_strlcpy (pos, request->cmd.c_str (), MAX-(long)(pos-str));
@@ -152,25 +152,25 @@ u_long HttpHeaders::buildHTTPRequestHeader (char *
str,HttpRequestHeader* reques
if (request->rangeByteBegin != (u_long)-1)
{
- sprintf(buffer, "%lu", request->rangeByteBegin);
+ sprintf (buffer, "%lu", request->rangeByteBegin);
pos += myserver_strlcpy (pos, buffer, MAX-(long)(pos-str));
}
pos += myserver_strlcpy (pos, "-", MAX-(long)(pos-str));
if (request->rangeByteEnd != (u_long)-1)
{
- sprintf(buffer, "%lu", request->rangeByteEnd);
+ sprintf (buffer, "%lu", request->rangeByteEnd);
pos += myserver_strlcpy (pos, buffer, MAX-(long)(pos-str));
}
pos += myserver_strlcpy (pos, "\r\n", MAX-(long)(pos-str));
}
- if (request->other.size())
+ if (request->other.size ())
{
HashMap<string, HttpRequestHeader::Entry*>::Iterator it =
- request->other.begin();
+ request->other.begin ();
- for(; it != request->other.end(); it++)
+ for (; it != request->other.end (); it++)
{
HttpRequestHeader::Entry *e = *it;
if (e)
@@ -192,9 +192,9 @@ u_long HttpHeaders::buildHTTPRequestHeader (char *
str,HttpRequestHeader* reques
* \param response The HTTP response header structure to fullfill with
* the default data.
*/
-void HttpHeaders::buildDefaultHTTPResponseHeader(HttpResponseHeader* response)
+void HttpHeaders::buildDefaultHTTPResponseHeader (HttpResponseHeader* response)
{
- resetHTTPResponse(response);
+ resetHTTPResponse (response);
response->setValue ("Content-Type", "text/html");
response->ver.assign ("HTTP/1.1");
@@ -206,14 +206,14 @@ void
HttpHeaders::buildDefaultHTTPResponseHeader(HttpResponseHeader* response)
* \param request The HTTP response header structure to fullfill with
* the default data.
*/
-void HttpHeaders::buildDefaultHTTPRequestHeader(HttpRequestHeader* request)
+void HttpHeaders::buildDefaultHTTPRequestHeader (HttpRequestHeader* request)
{
request->cmd.assign ("GET");
request->ver.assign ("HTTP/1.1");
request->uri.assign ("/");
/* HTTP/1.1 MUST specify a host. */
- request->setValue("Host", "localhost");
+ request->setValue ("Host", "localhost");
request->uriOpts.assign ("");
request->uriOptsPtr = 0;
}
@@ -222,18 +222,18 @@ void
HttpHeaders::buildDefaultHTTPRequestHeader(HttpRequestHeader* request)
* Reset all the HTTP_REQUEST_HEADER structure members.
* \param request the HTTP request header to free.
*/
-void HttpHeaders::resetHTTPRequest(HttpRequestHeader *request)
+void HttpHeaders::resetHTTPRequest (HttpRequestHeader *request)
{
- request->free();
+ request->free ();
}
/*!
* Reset all the HttpResponseHeader structure members.
* \param response the HTTP response header to free.
*/
-void HttpHeaders::resetHTTPResponse(HttpResponseHeader *response)
+void HttpHeaders::resetHTTPResponse (HttpResponseHeader *response)
{
- response->free();
+ response->free ();
}
/*!
@@ -243,7 +243,7 @@ void HttpHeaders::resetHTTPResponse(HttpResponseHeader
*response)
* \param nLinesptr is a value of the lines number in the HEADER.
* \param ncharsptr is a value of the characters number in the HEADER.
*/
-int HttpHeaders::validHTTPResponse(const char *res, u_long* nLinesptr, u_long*
ncharsptr)
+int HttpHeaders::validHTTPResponse (const char *res, u_long* nLinesptr,
u_long* ncharsptr)
{
u_long i;
u_long nLinechars = 0;
@@ -254,7 +254,7 @@ int HttpHeaders::validHTTPResponse(const char *res, u_long*
nLinesptr, u_long* n
/*
* Count the number of lines in the header.
*/
- for(i = 0; res[i]; i++)
+ for (i = 0; res[i]; i++)
{
if (res[i]=='\n')
{
@@ -299,7 +299,7 @@ int HttpHeaders::validHTTPResponse(const char *res, u_long*
nLinesptr, u_long* n
* \param request HTTP request structure to fullfill with data.
* \param connection The current connection.
*/
-int HttpHeaders::buildHTTPRequestHeaderStruct(const char* input,
+int HttpHeaders::buildHTTPRequestHeaderStruct (const char* input,
u_long inputSize,
u_long* nHeaderChars,
HttpRequestHeader *request,
@@ -339,7 +339,7 @@ int HttpHeaders::buildHTTPRequestHeaderStruct(const char*
input,
/*
*Control if the HTTP header is a valid header.
*/
- validRequest = validHTTPRequest(input, inputSize, &nLines, &maxTotchars);
+ validRequest = validHTTPRequest (input, inputSize, &nLines, &maxTotchars);
/* Invalid header. */
if (validRequest!=200)
@@ -348,23 +348,23 @@ int HttpHeaders::buildHTTPRequestHeaderStruct(const char*
input,
if (validRequest==-1)
return -1;
/* Keep trace of first line for logging. */
- tokenOff = getEndLine(input, HTTP_REQUEST_URI_DIM);
+ tokenOff = getEndLine (input, HTTP_REQUEST_URI_DIM);
if (tokenOff > 0)
- request->uri.assign ( input, min(HTTP_REQUEST_URI_DIM, tokenOff) );
+ request->uri.assign ( input, min (HTTP_REQUEST_URI_DIM, tokenOff) );
else
request->uri.assign (input, HTTP_REQUEST_URI_DIM );
return validRequest;
}
/* Get the first token, this is the HTTP command.*/
- tokenOff = getCharInString(token, cmdSeps, HTTP_REQUEST_CMD_DIM);
+ tokenOff = getCharInString (token, cmdSeps, HTTP_REQUEST_CMD_DIM);
if (tokenOff == -1)
{
/* Keep trace of first line for logging. */
- tokenOff = getEndLine(token, HTTP_REQUEST_URI_DIM);
+ tokenOff = getEndLine (token, HTTP_REQUEST_URI_DIM);
if (tokenOff > 0)
- request->uri.assign (input, min(HTTP_REQUEST_URI_DIM, tokenOff) );
+ request->uri.assign (input, min (HTTP_REQUEST_URI_DIM, tokenOff) );
else
request->uri.assign (input, HTTP_REQUEST_URI_DIM );
}
@@ -374,14 +374,14 @@ int HttpHeaders::buildHTTPRequestHeaderStruct(const char*
input,
if (tokenOff== -1 )
return 400;
- /* Copy the HTTP field(this is the command if we are on the first line).
*/
- myserver_strlcpy (command, token, min(commandSize, tokenOff + 1) );
+ /* Copy the HTTP field (this is the command if we are on the first
line). */
+ myserver_strlcpy (command, token, min (commandSize, tokenOff + 1) );
token += tokenOff;
if (*token == ':')
token++;
- while(*token == ' ')
+ while (*token == ' ')
token++;
nLineControlled++;
lineControlled = 0;
@@ -397,8 +397,8 @@ int HttpHeaders::buildHTTPRequestHeaderStruct(const char*
input,
lineControlled = 1;
/* Copy the method type. */
- request->cmd.assign (command, min(HTTP_REQUEST_CMD_DIM, tokenOff));
- tokenOff = getEndLine(token, HTTP_REQUEST_VER_DIM
+ request->cmd.assign (command, min (HTTP_REQUEST_CMD_DIM, tokenOff));
+ tokenOff = getEndLine (token, HTTP_REQUEST_VER_DIM
+ HTTP_REQUEST_URI_DIM + 10);
lenToken = tokenOff;
if (tokenOff == -1)
@@ -414,11 +414,11 @@ int HttpHeaders::buildHTTPRequestHeaderStruct(const char*
input,
}
if (tokenOff > maxUri)
{
- request->ver.clear();
- request->cmd.clear();
- tokenOff = getEndLine(input, HTTP_REQUEST_URI_DIM);
+ request->ver.clear ();
+ request->cmd.clear ();
+ tokenOff = getEndLine (input, HTTP_REQUEST_URI_DIM);
if (tokenOff > 0)
- request->uri.assign (input, min(HTTP_REQUEST_URI_DIM,
tokenOff) );
+ request->uri.assign (input, min (HTTP_REQUEST_URI_DIM,
tokenOff) );
else
request->uri.assign (input, HTTP_REQUEST_URI_DIM );
return 400;
@@ -460,13 +460,13 @@ int HttpHeaders::buildHTTPRequestHeaderStruct(const char*
input,
if (containOpts)
{
j = getEndLine (&token[i], HTTP_REQUEST_URI_DIM);
- for(j = 0; ((int)(i + j + 1) < max) && (j <
HTTP_REQUEST_URI_OPTS_DIM-1); j++)
+ for (j = 0; ((int)(i + j + 1) < max) && (j <
HTTP_REQUEST_URI_OPTS_DIM-1); j++)
++j;
}
/*
* Save the query data and seek the cursor at the end of it. Start
copying
- * from the second byte(do not store the ? character).
+ * from the second byte (do not store the ? character).
*/
request->uriOpts.assign (&token[i + 1], j);
i += j + 1;
@@ -475,7 +475,7 @@ int HttpHeaders::buildHTTPRequestHeaderStruct(const char*
input,
* Seek the cursor at the end of the spaces. Do not allow more than
* 10 spaces character between the uri token and the HTTP version.
*/
- for(j = 0; j < 10; j++)
+ for (j = 0; j < 10; j++)
{
if (token[i]==' ')
i++;
@@ -492,7 +492,7 @@ int HttpHeaders::buildHTTPRequestHeaderStruct(const char*
input,
request->cmd.clear ();
tokenOff = getEndLine (input, HTTP_REQUEST_URI_DIM);
if (tokenOff > 0)
- request->uri.assign (input, min(HTTP_REQUEST_URI_DIM,
tokenOff) );
+ request->uri.assign (input, min (HTTP_REQUEST_URI_DIM,
tokenOff) );
else
request->uri.assign (input, HTTP_REQUEST_URI_DIM);
return 400;
@@ -543,13 +543,13 @@ int HttpHeaders::buildHTTPRequestHeaderStruct(const char*
input,
}
else if (!strcmpi (command, (char*)"Content-Length"))
{
- tokenOff = getEndLine(token, HTTP_REQUEST_CONTENT_LENGTH_DIM);
+ tokenOff = getEndLine (token, HTTP_REQUEST_CONTENT_LENGTH_DIM);
if (tokenOff == -1)
return 400;
lineControlled = 1;
request->contentLength.assign (token,tokenOff);
}
- else if (!strcmpi(command, (char*)"Range"))
+ else if (!strcmpi (command, (char*)"Range"))
{
int ret = readReqRangeLine (request, connection, token, &tokenOff);
if (ret)
@@ -558,34 +558,34 @@ int HttpHeaders::buildHTTPRequestHeaderStruct(const char*
input,
}
else if (!lineControlled)
{
- tokenOff = getEndLine(token, maxTotchars);
+ tokenOff = getEndLine (token, maxTotchars);
if (tokenOff==-1)
return 400;
- string cmdStr(command);
- HttpRequestHeader::Entry *old = request->other.get(cmdStr);
+ string cmdStr (command);
+ HttpRequestHeader::Entry *old = request->other.get (cmdStr);
if (old)
{
- old->value->append(", ");
- old->value->append(token,
-
std::min(static_cast<int>(HTTP_RESPONSE_OTHER_DIM
- -
old->value->length()),
+ old->value->append (", ");
+ old->value->append (token,
+ std::min
(static_cast<int>(HTTP_RESPONSE_OTHER_DIM
+ -
old->value->length ()),
static_cast<int>(tokenOff)));
}
else
{
- HttpRequestHeader::Entry *e = new HttpRequestHeader::Entry();
+ HttpRequestHeader::Entry *e = new HttpRequestHeader::Entry ();
if (e)
{
e->name->assign (command, HTTP_RESPONSE_OTHER_DIM);
e->value->assign (token,
- std::min(HTTP_RESPONSE_OTHER_DIM,
tokenOff));
+ std::min (HTTP_RESPONSE_OTHER_DIM,
tokenOff));
request->other.put (cmdStr, e);
}
}
}
token += tokenOff + 2;
- tokenOff = getCharInString(token, ":", maxTotchars);
+ tokenOff = getCharInString (token, ":", maxTotchars);
}
while (((u_long)(token - input) < maxTotchars) && token[0] != '\r');
@@ -613,7 +613,7 @@ int HttpHeaders::readReqRangeLine (HttpRequestHeader
*request,
rangeByteBegin[0] = '\0';
rangeByteEnd[0] = '\0';
- int tokenOff = getEndLine(token, HTTP_REQUEST_RANGE_TYPE_DIM + 30);
+ int tokenOff = getEndLine (token, HTTP_REQUEST_RANGE_TYPE_DIM + 30);
if (tokenOff ==-1)
return 400;
@@ -650,24 +650,24 @@ int HttpHeaders::readReqRangeLine (HttpRequestHeader
*request,
if (request->rangeType[i] == '=')
request->rangeType[i] = '\0';
- for(i = 0; i < static_cast<int>(strlen (rangeByteBegin)); i++)
+ for (i = 0; i < static_cast<int>(strlen (rangeByteBegin)); i++)
if (rangeByteBegin[i] == '=')
rangeByteBegin[i] = '\0';
- for(i = 0; i < static_cast<int>(strlen (rangeByteEnd)); i++)
+ for (i = 0; i < static_cast<int>(strlen (rangeByteEnd)); i++)
if (rangeByteEnd[i]== '=')
rangeByteEnd[i]='\0';
if (rangeByteBegin[0] == 0)
request->rangeByteBegin=0;
else
- request->rangeByteBegin = (u_long)atol(rangeByteBegin);
+ request->rangeByteBegin = (u_long)atol (rangeByteBegin);
if (rangeByteEnd[0] == '\r')
request->rangeByteEnd = 0;
else
{
- request->rangeByteEnd = (u_long)atol(rangeByteEnd);
+ request->rangeByteEnd = (u_long)atol (rangeByteEnd);
if (request->rangeByteEnd < request->rangeByteBegin)
return 400;
}
@@ -699,7 +699,7 @@ int HttpHeaders::readReqAuthLine (HttpRequestHeader
*request,
connection->setLogin ("");
connection->setPassword ("");
- if (!request->auth.compare("Basic"))
+ if (!request->auth.compare ("Basic"))
{
u_long i;
const char *base64 = &token[6];
@@ -724,16 +724,16 @@ int HttpHeaders::readReqAuthLine (HttpRequestHeader
*request,
if (len <= 1)
return 400;
- lsecondaryBuffer = base64Utils.decode(base64, &len);
+ lsecondaryBuffer = base64Utils.decode (base64, &len);
lsecondaryBufferOr = lsecondaryBuffer;
- for(i = 0; (*lsecondaryBuffer != ':') && (i < 32);i++)
+ for (i = 0; (*lsecondaryBuffer != ':') && (i < 32);i++)
login[i] = *lsecondaryBuffer++;
login[i] = '\0';
lsecondaryBuffer++;
- for(i = 0; (*lsecondaryBuffer) && (i < 31); i++)
+ for (i = 0; (*lsecondaryBuffer) && (i < 31); i++)
password[i] = *lsecondaryBuffer++;
password[i] = '\0';
@@ -747,10 +747,10 @@ int HttpHeaders::readReqAuthLine (HttpRequestHeader
*request,
char *digestBuff;
char *digestToken;
token += tokenOff;
- while(*token == ' ')
+ while (*token == ' ')
token++;
- *lenOut = tokenOff = getEndLine(token, 1024);
+ *lenOut = tokenOff = getEndLine (token, 1024);
if (tokenOff == -1)
return 400;
@@ -784,7 +784,7 @@ int HttpHeaders::readReqAuthLine (HttpRequestHeader
*request,
myserver_strlcpy (request->digestOpaque,digestToken,48 + 1);
}
}
- else if (!strcmpi(digestToken, (char*)"uri"))
+ else if (!strcmpi (digestToken, (char*)"uri"))
{
digestToken = strtok (NULL, (char*)"\r\n," );
if (digestToken)
@@ -793,7 +793,7 @@ int HttpHeaders::readReqAuthLine (HttpRequestHeader
*request,
myserver_strlcpy (request->digestUri,digestToken,1024 + 1);
}
}
- else if (!strcmpi(digestToken, (char*)"method"))
+ else if (!strcmpi (digestToken, (char*)"method"))
{
digestToken = strtok (NULL, (char*)"\r\n," );
if (digestToken)
@@ -802,7 +802,7 @@ int HttpHeaders::readReqAuthLine (HttpRequestHeader
*request,
myserver_strlcpy (request->digestMethod,digestToken,16 + 1);
}
}
- else if (!strcmpi(digestToken, (char*)"qop"))
+ else if (!strcmpi (digestToken, (char*)"qop"))
{
digestToken = strtok (NULL, (char*)"\r\n," );
if (digestToken)
@@ -820,7 +820,7 @@ int HttpHeaders::readReqAuthLine (HttpRequestHeader
*request,
myserver_strlcpy (request->digestRealm,digestToken,48 + 1);
}
}
- else if (!strcmpi(digestToken, (char*)"cnonce"))
+ else if (!strcmpi (digestToken, (char*)"cnonce"))
{
digestToken = strtok (NULL, (char*)"\r\n," );
if (digestToken)
@@ -839,7 +839,7 @@ int HttpHeaders::readReqAuthLine (HttpRequestHeader
*request,
connection->setLogin (digestToken);
}
}
- else if (!strcmpi(digestToken, (char*)"response"))
+ else if (!strcmpi (digestToken, (char*)"response"))
{
digestToken = strtok (NULL, "\r\n," );
if (digestToken)
@@ -863,7 +863,7 @@ int HttpHeaders::readReqAuthLine (HttpRequestHeader
*request,
}
/* Update digestToken. */
digestToken = strtok (NULL, (char*)"=" );
- }while(digestToken);
+ }while (digestToken);
delete [] digestBuff;
}
return 0;
@@ -878,7 +878,7 @@ int HttpHeaders::readReqAuthLine (HttpRequestHeader
*request,
*\param response The HTTP response structure to fullfill.
*\param nbtr Bytes of the header.
*/
-int HttpHeaders::buildHTTPResponseHeaderStruct(const char *input,
+int HttpHeaders::buildHTTPResponseHeaderStruct (const char *input,
HttpResponseHeader *response,
u_long *nbtr)
{
@@ -908,7 +908,7 @@ int HttpHeaders::buildHTTPResponseHeaderStruct(const char
*input,
/* Control if the HTTP header is a valid header. */
if (input[0] == 0)
return 0;
- validResponse = validHTTPResponse(input,&nLines, &maxTotchars);
+ validResponse = validHTTPResponse (input,&nLines, &maxTotchars);
if (validResponse)
{
@@ -919,7 +919,7 @@ int HttpHeaders::buildHTTPResponseHeaderStruct(const char
*input,
* FIXME:
* Don't alloc new memory but simply use a no-destructive parsing.
*/
- memcpy(newInput, input, maxTotchars);
+ memcpy (newInput, input, maxTotchars);
newInput[maxTotchars] = '\0';
input = newInput;
}
@@ -960,13 +960,13 @@ int HttpHeaders::buildHTTPResponseHeaderStruct(const char
*input,
token = strtok (NULL, " ,\t\n\r" );
if (token)
- response->httpStatus = atoi(token);
+ response->httpStatus = atoi (token);
token = strtok (NULL, "\r\n\0" );
if (token)
response->errorType.assign (token);
}
- else if (!strcmpi(command,"Status"))
+ else if (!strcmpi (command,"Status"))
{
token = strtok (NULL, "\r\n\0" );
lineControlled = 1;
@@ -977,7 +977,7 @@ int HttpHeaders::buildHTTPResponseHeaderStruct(const char
*input,
/* If the response status is different from 200 don't modify it. */
if (response->httpStatus == 200)
if (token)
- response->httpStatus = atoi(token);
+ response->httpStatus = atoi (token);
}
else if (!strcmpi (command, "Content-Length"))
{
@@ -998,7 +998,7 @@ int HttpHeaders::buildHTTPResponseHeaderStruct(const char
*input,
{
token = strtok (NULL, "\r\n");
- while(token && *token == ' ')
+ while (token && *token == ' ')
token++;
if (token)
@@ -1012,7 +1012,7 @@ int HttpHeaders::buildHTTPResponseHeaderStruct(const char
*input,
}
HttpResponseHeader::Entry *old = NULL;
- HttpResponseHeader::Entry *e = new HttpResponseHeader::Entry();
+ HttpResponseHeader::Entry *e = new HttpResponseHeader::Entry ();
e->name->assign (command);
string cmdString (command);
old = response->other.put (cmdString, e);
@@ -1046,7 +1046,7 @@ int HttpHeaders::buildHTTPResponseHeaderStruct(const char
*input,
* \param nLinesptr Lines in the header.
* \param ncharsptr Characters in the header.
*/
-int HttpHeaders::validHTTPRequest(const char *req, u_long size,
+int HttpHeaders::validHTTPRequest (const char *req, u_long size,
u_long* nLinesptr, u_long* ncharsptr)
{
u_long i = 0;
@@ -1057,7 +1057,7 @@ int HttpHeaders::validHTTPRequest(const char *req, u_long
size,
if (req == 0)
return 400;
- for(;i < MYSERVER_KB(8); i++)
+ for (;i < MYSERVER_KB (8); i++)
{
if (req[i] == '\n')
{
diff --git a/myserver/src/protocol/http/http_request.cpp
b/myserver/src/protocol/http/http_request.cpp
index a9dc63b..232b098 100644
--- a/myserver/src/protocol/http/http_request.cpp
+++ b/myserver/src/protocol/http/http_request.cpp
@@ -27,41 +27,41 @@ using namespace std;
/*!
*Create the object.
*/
-HttpRequestHeader::HttpRequestHeader()
+HttpRequestHeader::HttpRequestHeader ()
{
- free();
+ free ();
}
/*!
*Destroy the object.
*/
-HttpRequestHeader::~HttpRequestHeader()
+HttpRequestHeader::~HttpRequestHeader ()
{
- HashMap<string, HttpRequestHeader::Entry*>::Iterator it = other.begin();
- for(; it != other.end(); it++)
+ HashMap<string, HttpRequestHeader::Entry*>::Iterator it = other.begin ();
+ for (; it != other.end (); it++)
delete (*it);
}
/*!
*Free the structure.
*/
-void HttpRequestHeader::free()
+void HttpRequestHeader::free ()
{
- ver.clear();
- cmd.clear();
- auth.clear();
- contentLength.clear();
- uri.clear();
- uriOpts.clear();
+ ver.clear ();
+ cmd.clear ();
+ auth.clear ();
+ contentLength.clear ();
+ uri.clear ();
+ uriOpts.clear ();
uriOptsPtr = NULL;
{
- HashMap<string, HttpRequestHeader::Entry*>::Iterator it = other.begin();
- for(; it != other.end(); it++)
+ HashMap<string, HttpRequestHeader::Entry*>::Iterator it = other.begin ();
+ for (; it != other.end (); it++)
delete (*it);
}
- other.clear();
- rangeType.clear();
+ other.clear ();
+ rangeType.clear ();
rangeByteBegin = 0;
rangeByteEnd = 0;
uriEndsWithSlash = 0;
@@ -80,14 +80,14 @@ void HttpRequestHeader::free()
/*!
*Check if this request is keep-alive.
*/
-bool HttpRequestHeader::isKeepAlive()
+bool HttpRequestHeader::isKeepAlive ()
{
- Entry *connection = other.get("Connection");
- if(connection)
+ Entry *connection = other.get ("Connection");
+ if (connection)
{
- string value(*connection->value);
- std::transform(value.begin(), value.end(), value.begin(), (int(*)(int))
tolower);
- return value.find("keep-alive") != string::npos;
+ string value (*connection->value);
+ std::transform (value.begin (), value.end (), value.begin (), (int
(*)(int)) tolower);
+ return value.find ("keep-alive") != string::npos;
}
return false;
}
@@ -95,81 +95,81 @@ bool HttpRequestHeader::isKeepAlive()
/*!
*Get the value of the [name] field.
*/
-string* HttpRequestHeader::getValue(const char* name, string* out)
+string* HttpRequestHeader::getValue (const char* name, string* out)
{
- if(!strcmpi(name, "cmd"))
+ if (!strcmpi (name, "cmd"))
{
- if(out)
- out->assign(cmd.c_str());
+ if (out)
+ out->assign (cmd.c_str ());
return &cmd;
}
- if(!strcmpi(name, "ver"))
+ if (!strcmpi (name, "ver"))
{
- if(out)
- out->assign(ver.c_str());
+ if (out)
+ out->assign (ver.c_str ());
return &ver;
}
- if(!strcmpi(name, "uri"))
+ if (!strcmpi (name, "uri"))
{
- if(out)
- out->assign(uri.c_str());
+ if (out)
+ out->assign (uri.c_str ());
return &uri;
}
- if(!strcmpi(name, "uriOpts"))
+ if (!strcmpi (name, "uriOpts"))
{
- if(out)
- out->assign(uriOpts.c_str());
+ if (out)
+ out->assign (uriOpts.c_str ());
return &uriOpts;
}
- if(!strcmpi(name, "Authorization"))
+ if (!strcmpi (name, "Authorization"))
{
- if(out)
- out->assign(auth.c_str());
+ if (out)
+ out->assign (auth.c_str ());
return &auth;
}
- if(!strcmpi(name, "Content-Length"))
+ if (!strcmpi (name, "Content-Length"))
{
- if(out)
- out->assign(contentLength.c_str());
+ if (out)
+ out->assign (contentLength.c_str ());
return &contentLength;
}
- if(!strcmpi(name, "rangeType"))
+ if (!strcmpi (name, "rangeType"))
{
- if(out)
- out->assign(rangeType.c_str());
+ if (out)
+ out->assign (rangeType.c_str ());
return &rangeType;
}
- if(!strcmpi(name, "rangeByteBegin"))
+ if (!strcmpi (name, "rangeByteBegin"))
{
ostringstream s;
s << rangeByteBegin;
- if(out)
- out->assign(s.str());
+ if (out)
+ out->assign (s.str ());
return 0;
}
- if(!strcmpi(name, "rangeByteEnd"))
+ if (!strcmpi (name, "rangeByteEnd"))
{
ostringstream s;
s << rangeByteEnd;
- if(out)
- out->assign(s.str());
+ if (out)
+ out->assign (s.str ());
return 0;
}
{
- HttpRequestHeader::Entry *e = other.get(name);
- if(e)
+ HttpRequestHeader::Entry *e = other.get (name);
+ if (e)
{
- if(out)
- out->assign(*(e->value));
+ if (out)
+ out->assign (*(e->value));
return (e->value);
}
return 0;
@@ -182,75 +182,75 @@ string* HttpRequestHeader::getValue(const char* name,
string* out)
/*!
*Set the value of the [name] field to [in].
*/
-string* HttpRequestHeader::setValue(const char* name, const char* in)
+string* HttpRequestHeader::setValue (const char* name, const char* in)
{
- if(!strcmpi(name, "cmd"))
+ if (!strcmpi (name, "cmd"))
{
- cmd.assign(in);
+ cmd.assign (in);
return &cmd;
}
- if(!strcmpi(name, "ver"))
+ if (!strcmpi (name, "ver"))
{
- ver.assign(in);
+ ver.assign (in);
return &ver;
}
- if(!strcmpi(name, "uri"))
+ if (!strcmpi (name, "uri"))
{
- uri.assign(in);
+ uri.assign (in);
return &uri;
}
- if(!strcmpi(name, "uriOpts"))
+ if (!strcmpi (name, "uriOpts"))
{
- uriOpts.assign(in);
+ uriOpts.assign (in);
return &uriOpts;
}
- if(!strcmpi(name, "Authorization"))
+ if (!strcmpi (name, "Authorization"))
{
- auth.assign(in);
+ auth.assign (in);
return &auth;
}
- if(!strcmpi(name, "Content-Length"))
+ if (!strcmpi (name, "Content-Length"))
{
- contentLength.assign(in);
+ contentLength.assign (in);
return &contentLength;
}
- if(!strcmpi(name, "rangeType"))
+ if (!strcmpi (name, "rangeType"))
{
- rangeType.assign(in);
+ rangeType.assign (in);
return &rangeType;
}
- if(!strcmpi(name, "rangeByteBegin"))
+ if (!strcmpi (name, "rangeByteBegin"))
{
- rangeByteBegin = atoi(in);
+ rangeByteBegin = atoi (in);
return 0;
}
- if(!strcmpi(name, "rangeByteEnd"))
+ if (!strcmpi (name, "rangeByteEnd"))
{
- rangeByteEnd = atoi(in);
+ rangeByteEnd = atoi (in);
return 0;
}
{
- HttpRequestHeader::Entry *e = other.get(name);
- if(e)
+ HttpRequestHeader::Entry *e = other.get (name);
+ if (e)
{
- e->value->assign(in);
+ e->value->assign (in);
return (e->value);
}
else
{
e = new HttpRequestHeader::Entry;
- e->name->assign(name);
- e->value->assign(in);
- other.put(*e->name, e);
+ e->name->assign (name);
+ e->value->assign (in);
+ other.put (*e->name, e);
}
return 0;
}
diff --git a/myserver/src/protocol/http/http_response.cpp
b/myserver/src/protocol/http/http_response.cpp
index e592557..797751d 100644
--- a/myserver/src/protocol/http/http_response.cpp
+++ b/myserver/src/protocol/http/http_response.cpp
@@ -27,7 +27,7 @@ using namespace std;
*/
HttpResponseHeader::HttpResponseHeader ()
{
- free();
+ free ();
}
@@ -37,14 +37,14 @@ HttpResponseHeader::HttpResponseHeader ()
HttpResponseHeader::~HttpResponseHeader ()
{
HashMap<string, HttpResponseHeader::Entry*>::Iterator it = other.begin ();
- for (;it != other.end(); it++)
+ for (;it != other.end (); it++)
delete (*it);
}
/*!
*Reset the object.
*/
-void HttpResponseHeader::free()
+void HttpResponseHeader::free ()
{
ver.clear ();
contentLength.clear ();
@@ -76,7 +76,7 @@ string* HttpResponseHeader::getValue (const char* name,
string* out)
return &contentLength;
}
- HttpResponseHeader::Entry *e = other.get(name);
+ HttpResponseHeader::Entry *e = other.get (name);
if (e)
{
if (out)
@@ -104,7 +104,7 @@ string* HttpResponseHeader::setValue (const char* name,
const char* in)
}
{
- HttpResponseHeader::Entry *e = other.get(name);
+ HttpResponseHeader::Entry *e = other.get (name);
if (e)
{
e->value->assign (in);
diff --git a/myserver/src/protocol/http/http_thread_context.cpp
b/myserver/src/protocol/http/http_thread_context.cpp
index 8630bfc..aad9af2 100644
--- a/myserver/src/protocol/http/http_thread_context.cpp
+++ b/myserver/src/protocol/http/http_thread_context.cpp
@@ -57,7 +57,7 @@ const char *HttpThreadContext::getVhostDir ()
*/
const char *HttpThreadContext::getVhostSys ()
{
- if (vhostSys.length() > 1)
+ if (vhostSys.length () > 1)
return vhostSys.c_str ();
if (connection && connection->host)
diff --git a/myserver/src/protocol/https/https.cpp
b/myserver/src/protocol/https/https.cpp
index 714d341..c7f0b5a 100644
--- a/myserver/src/protocol/https/https.cpp
+++ b/myserver/src/protocol/https/https.cpp
@@ -35,33 +35,33 @@ extern "C"
*Returns the name of the protocol. If an out buffer is defined
*fullfill it with the name too.
*/
-char* Https::registerNameImpl(char* out, int len)
+char* Https::registerNameImpl (char* out, int len)
{
- if(out)
+ if (out)
{
- strncpy(out, "HTTPS", len);
+ strncpy (out, "HTTPS", len);
}
return (char*)"HTTPS";
}
-char* Https::registerName(char* out, int len)
+char* Https::registerName (char* out, int len)
{
- return registerNameImpl(out, len);
+ return registerNameImpl (out, len);
}
/*!
*Https class constructor.
*/
-Https::Https()
+Https::Https ()
{
- protocolPrefix.assign("https://";);
+ protocolPrefix.assign ("https://";);
protocolOptions = PROTOCOL_USES_SSL;
}
/*!
*Destructor for the class Https.
*/
-Https::~Https()
+Https::~Https ()
{
}
diff --git a/myserver/src/protocol/protocol_buffer.cpp
b/myserver/src/protocol/protocol_buffer.cpp
index f8186a6..87e4698 100644
--- a/myserver/src/protocol/protocol_buffer.cpp
+++ b/myserver/src/protocol/protocol_buffer.cpp
@@ -20,7 +20,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
/*!
*Create the buffer.
*/
-ProtocolBuffer::ProtocolBuffer()
+ProtocolBuffer::ProtocolBuffer ()
{
}
@@ -28,7 +28,7 @@ ProtocolBuffer::ProtocolBuffer()
/*!
*Destroy the protocol buffer object.
*/
-ProtocolBuffer::~ProtocolBuffer()
+ProtocolBuffer::~ProtocolBuffer ()
{
}
@@ -38,7 +38,7 @@ ProtocolBuffer::~ProtocolBuffer()
*\param wait Define if the protocol can wait that the current job is
*finished before.
*/
-bool ProtocolBuffer::allowDelete(bool wait)
+bool ProtocolBuffer::allowDelete (bool wait)
{
return true;
}
diff --git a/myserver/src/protocol/protocols_manager.cpp
b/myserver/src/protocol/protocols_manager.cpp
index ff3fc5b..1ae14ee 100644
--- a/myserver/src/protocol/protocols_manager.cpp
+++ b/myserver/src/protocol/protocols_manager.cpp
@@ -51,7 +51,7 @@ Protocol* ProtocolsManager::getProtocol (string& name)
void ProtocolsManager::addProtocol (string& name, Protocol* protocol)
{
std::transform (name.begin (), name.end (), name.begin (),
- static_cast < int(*)(int) > (tolower));
+ static_cast < int (*)(int) > (tolower));
staticProtocols.put (name, protocol);
staticProtocolsList.push_back (protocol);
diff --git a/myserver/src/server/clients_thread.cpp
b/myserver/src/server/clients_thread.cpp
index 8fcecb9..6a7d288 100644
--- a/myserver/src/server/clients_thread.cpp
+++ b/myserver/src/server/clients_thread.cpp
@@ -68,7 +68,7 @@ ClientsThread::ClientsThread (Server* server)
/*!
*Destroy the ClientsThread object.
*/
-ClientsThread::~ClientsThread()
+ClientsThread::~ClientsThread ()
{
if (!initialized)
return;
@@ -113,7 +113,7 @@ void ClientsThread::setTimeout (int newTimeout)
* class instance.
* \param pParam Params to pass to the new thread.
*/
-DEFINE_THREAD(clients_thread, pParam)
+DEFINE_THREAD (clients_thread, pParam)
{
#ifndef WIN32
/* Block SigTerm, SigInt, and SigPipe in threads. */
@@ -150,11 +150,11 @@ DEFINE_THREAD(clients_thread, pParam)
ct->server->increaseFreeThread ();
/* Wait that the server is ready before go in the running loop. */
- while (!ct->server->isServerReady() && ct->threadIsRunning)
- Thread::wait(500);
+ while (!ct->server->isServerReady () && ct->threadIsRunning)
+ Thread::wait (500);
/*
- * This function when is alive only call the controlConnections(...) function
+ * This function when is alive only call the controlConnections (...)
function
* of the ClientsThread class instance used for control the thread.
*/
while (ct->threadIsRunning)
@@ -222,7 +222,7 @@ int ClientsThread::run ()
/*!
* Returns if the thread can be destroyed.
*/
-bool ClientsThread::isToDestroy()
+bool ClientsThread::isToDestroy ()
{
return toDestroy;
}
@@ -230,7 +230,7 @@ bool ClientsThread::isToDestroy()
/*!
* Check if the thread is a static one.
*/
-bool ClientsThread::isStatic()
+bool ClientsThread::isStatic ()
{
return staticThread;
}
@@ -248,7 +248,7 @@ void ClientsThread::setStatic (bool value)
* Set if the thread can be destroyed.
* \param value The new destroy value.
*/
-void ClientsThread::setToDestroy(bool value)
+void ClientsThread::setToDestroy (bool value)
{
toDestroy = value;
}
@@ -280,10 +280,10 @@ int ClientsThread::controlConnections ()
busy = 1;
dataRead = c->getConnectionBuffer ()->getLength ();
- err = c->socket->recv(&((char*)(buffer.getBuffer()))[dataRead],
- MYSERVER_KB(8) - dataRead - 1, 0);
+ err = c->socket->recv (&((char*)(buffer.getBuffer ()))[dataRead],
+ MYSERVER_KB (8) - dataRead - 1, 0);
- if(err == -1 && !server->deleteConnection(c))
+ if (err == -1 && !server->deleteConnection (c))
return 0;
buffer.setLength (dataRead + err);
@@ -293,18 +293,18 @@ int ClientsThread::controlConnections ()
nBytesToRead = dataRead + err;
if ((dataRead + err) < MYSERVER_KB (8))
- ((char*)buffer.getBuffer())[dataRead + err] = '\0';
+ ((char*)buffer.getBuffer ())[dataRead + err] = '\0';
else
{
server->deleteConnection (c);
return 0;
}
- if (getTicks() - c->getTimeout () > 5000)
+ if (getTicks () - c->getTimeout () > 5000)
c->setnTries (0);
if (dataRead)
- memcpy ((char*)buffer.getBuffer(), c->getConnectionBuffer ()->getBuffer (),
+ memcpy ((char*)buffer.getBuffer (), c->getConnectionBuffer ()->getBuffer
(),
dataRead);
c->setActiveThread (this);
@@ -312,10 +312,10 @@ int ClientsThread::controlConnections ()
{
if (c->hasContinuation ())
{
- retcode = c->getContinuation ()(c, (char*)buffer.getBuffer(),
- (char*)secondaryBuffer.getBuffer(),
- buffer.getRealLength(),
- secondaryBuffer.getRealLength(),
+ retcode = c->getContinuation ()(c, (char*)buffer.getBuffer (),
+ (char*)secondaryBuffer.getBuffer (),
+ buffer.getRealLength (),
+ secondaryBuffer.getRealLength (),
nBytesToRead, id);
c->setContinuation (NULL);
}
@@ -323,10 +323,10 @@ int ClientsThread::controlConnections ()
{
protocol = server->getProtocol (c->host->getProtocolName ());
if (protocol)
- retcode = protocol->controlConnection (c, (char*)buffer.getBuffer(),
- (char*)secondaryBuffer.getBuffer(),
- buffer.getRealLength(),
- secondaryBuffer.getRealLength(),
+ retcode = protocol->controlConnection (c, (char*)buffer.getBuffer (),
+ (char*)secondaryBuffer.getBuffer (),
+ buffer.getRealLength (),
+ secondaryBuffer.getRealLength (),
nBytesToRead, id);
else
retcode = DELETE_CONNECTION;
@@ -375,7 +375,7 @@ int ClientsThread::controlConnections ()
/*!
* Stop the thread.
*/
-void ClientsThread::stop()
+void ClientsThread::stop ()
{
/*
* Set the run flag to False.
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index fc8396b..4f597b4 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -196,7 +196,7 @@ void Server::start (string &mainConf, string &mimeConf,
string &vhostConf,
return;
/* Initialize the SSL library. */
- initializeSSL();
+ initializeSSL ();
log (MYSERVER_LOG_MSG_INFO, _("Loading server configuration..."));
@@ -222,11 +222,11 @@ void Server::start (string &mainConf, string &mimeConf,
string &vhostConf,
mainLoop ();
}
- catch(bad_alloc &ba)
+ catch (bad_alloc &ba)
{
log (MYSERVER_LOG_MSG_ERROR, _("Bad alloc: %s"), ba.what ());
}
- catch(exception &e)
+ catch (exception &e)
{
log (MYSERVER_LOG_MSG_ERROR, _("Error: %s"), e.what ());
};
@@ -273,7 +273,7 @@ int Server::postLoad ()
mimeManager = new MimeManager ();
- if (int nMIMEtypes = mimeManager->loadXML(mimeConfigurationFile.c_str ()))
+ if (int nMIMEtypes = mimeManager->loadXML (mimeConfigurationFile.c_str ()))
log (MYSERVER_LOG_MSG_INFO, _("Using %i MIME types"), nMIMEtypes);
else
log (MYSERVER_LOG_MSG_ERROR, _("Error while loading MIME types"));
@@ -342,10 +342,10 @@ void Server::loadPlugins ()
if (filtersFactory.insert ("gzip", Gzip::factory))
log (MYSERVER_LOG_MSG_ERROR, _("Error while loading plugins"));
- Protocol *protocolsSet[] = {new HttpProtocol(),
- new HttpsProtocol(),
- new FtpProtocol(),
- new ControlProtocol(),
+ Protocol *protocolsSet[] = {new HttpProtocol (),
+ new HttpsProtocol (),
+ new FtpProtocol (),
+ new ControlProtocol (),
NULL};
for (int j = 0; protocolsSet[j]; j++)
@@ -365,7 +365,7 @@ void Server::loadPlugins ()
/*!
* Server main loop.
*/
-void Server::mainLoop()
+void Server::mainLoop ()
{
time_t mainConfTime;
time_t hostsConfTime;
@@ -508,7 +508,7 @@ void Server::displayBoot ()
if (logLocation.find ("console://") != string::npos)
{
# ifdef WIN32
- _flushall();
+ _flushall ();
system ("cls");
# else
sync ();
@@ -530,13 +530,13 @@ void Server::displayBoot ()
softwareSignature.assign ("************ GNU MyServer ");
softwareSignature.append (MYSERVER_VERSION);
softwareSignature.append (" ************");
- length = softwareSignature.length();
+ length = softwareSignature.length ();
logWriteNTimes ("*", length);
logManager->log (this, "MAINLOG", logLocation, softwareSignature,
true);
logWriteNTimes ("*", length);
}
- catch(exception& e)
+ catch (exception& e)
{
ostringstream err;
err << "Error: " << e.what ();
@@ -544,7 +544,7 @@ void Server::displayBoot ()
logManager->log (this, "MAINLOG", logLocation, str, true);
return;
}
- catch(...)
+ catch (...)
{
return;
};
@@ -826,29 +826,29 @@ int Server::initialize ()
data = getData ("server.buffer_size");
if (data)
- buffersize = secondaryBufferSize= (atol(data) > 81920) ? atol(data) :
81920 ;
+ buffersize = secondaryBufferSize= (atol (data) > 81920) ? atol (data) :
81920 ;
data = getData ("server.connection_timeout");
if (data)
- connectionTimeout = MYSERVER_SEC ((u_long)atol(data));
+ connectionTimeout = MYSERVER_SEC ((u_long)atol (data));
data = getData ("server.static_threads");
if (data)
- nStaticThreads = atoi(data);
+ nStaticThreads = atoi (data);
data = getData ("server.max_threads");
if (data)
- nMaxThreads = atoi(data);
+ nMaxThreads = atoi (data);
/* Get the max connections number to allow. */
data = getData ("server.max_connections");
if (data)
- maxConnections = atoi(data);
+ maxConnections = atoi (data);
/* Get the max connections number to accept. */
data = getData ("server.max_accepted_connections");
if (data)
- maxConnectionsToAccept = atoi(data);
+ maxConnectionsToAccept = atoi (data);
data = getData ("server.connections_pool.size");
if (data)
@@ -857,16 +857,16 @@ int Server::initialize ()
/* Get the default throttling rate to use on connections. */
data = getData ("connection.throttling");
if (data)
- throttlingRate = (u_long)atoi(data);
+ throttlingRate = (u_long)atoi (data);
data = getData ("server.max_log_size");
if (data)
- maxLogFileSize=(u_long)atol(data);
+ maxLogFileSize=(u_long)atol (data);
data = getData ("server.max_files_cache");
if (data)
{
- u_long maxSize = (u_long)atol(data);
+ u_long maxSize = (u_long)atol (data);
cachedFiles.initialize (maxSize);
}
else
@@ -885,14 +885,14 @@ int Server::initialize ()
data = getData ("server.max_file_cache");
if (data)
{
- u_long maxSize = (u_long)atol(data);
+ u_long maxSize = (u_long)atol (data);
cachedFiles.setMaxSize (maxSize);
}
data = getData ("server.min_file_cache");
if (data)
{
- u_long minSize = (u_long)atol(data);
+ u_long minSize = (u_long)atol (data);
cachedFiles.setMinSize (minSize);
}
@@ -911,7 +911,7 @@ int Server::initialize ()
data = getData ("server.max_servers");
if (data)
{
- int maxServersProcesses = atoi(data);
+ int maxServersProcesses = atoi (data);
getProcessServerManager ()->setMaxServers (maxServersProcesses);
}
@@ -1017,33 +1017,33 @@ int Server::addConnection (Socket s,
MYSERVER_SOCKADDRIN *asockIn)
#if ( HAVE_IPV6 )
if ( asockIn->ss_family == AF_INET )
ret = getnameinfo (reinterpret_cast<const sockaddr *>(asockIn),
- sizeof(sockaddr_in),
+ sizeof (sockaddr_in),
ip, MAX_IP_STRING_LEN, NULL, 0, NI_NUMERICHOST);
else
ret = getnameinfo (reinterpret_cast<const sockaddr *>(asockIn),
- sizeof(sockaddr_in6), ip, MAX_IP_STRING_LEN,
+ sizeof (sockaddr_in6), ip, MAX_IP_STRING_LEN,
NULL, 0, NI_NUMERICHOST);
if (ret)
return 0;
if ( asockIn->ss_family == AF_INET )
- dim = sizeof(sockaddr_in);
+ dim = sizeof (sockaddr_in);
else
- dim = sizeof(sockaddr_in6);
+ dim = sizeof (sockaddr_in6);
s.getsockname ((MYSERVER_SOCKADDR*)&localSockIn, &dim);
if ( asockIn->ss_family == AF_INET )
ret = getnameinfo (reinterpret_cast<const sockaddr *>(&localSockIn),
- sizeof(sockaddr_in), localIp, MAX_IP_STRING_LEN,
+ sizeof (sockaddr_in), localIp, MAX_IP_STRING_LEN,
NULL, 0, NI_NUMERICHOST);
else// AF_INET6
ret = getnameinfo (reinterpret_cast<const sockaddr *>(&localSockIn),
- sizeof(sockaddr_in6), localIp, MAX_IP_STRING_LEN,
+ sizeof (sockaddr_in6), localIp, MAX_IP_STRING_LEN,
NULL, 0, NI_NUMERICHOST);
if (ret)
return 0;
#else// !HAVE_IPV6
- dim = sizeof(localSockIn);
+ dim = sizeof (localSockIn);
s.getsockname ((MYSERVER_SOCKADDR*)&localSockIn, &dim);
strncpy (ip, inet_ntoa (((sockaddr_in *)asockIn)->sin_addr),
MAX_IP_STRING_LEN);
@@ -1133,7 +1133,7 @@ ConnectionPtr Server::addConnectionToList (Socket* s,
return 0;
}
- protocol = getProtocol(newConnection->host->getProtocolName ());
+ protocol = getProtocol (newConnection->host->getProtocolName ());
if (protocol)
opts = protocol->getProtocolOptions ();
@@ -1266,7 +1266,7 @@ void Server::clearAllConnections ()
for (it = connections.begin (); it != connections.end (); it++)
deleteConnection (*it);
}
- catch(...)
+ catch (...)
{
throw;
};
@@ -1350,7 +1350,7 @@ int Server::freeHashedData ()
hashedDataTrees.clear ();
hashedData.clear ();
}
- catch(...)
+ catch (...)
{
return 1;
}
@@ -1670,7 +1670,7 @@ int Server::removeThread (u_long ID)
{
if ((*it)->id == ID)
{
- (*it)->stop();
+ (*it)->stop ();
ret = 0;
threads.erase (it);
break;
diff --git a/myserver/tests/main.cpp b/myserver/tests/main.cpp
index b6e974d..0119e97 100644
--- a/myserver/tests/main.cpp
+++ b/myserver/tests/main.cpp
@@ -46,20 +46,20 @@ int main (int argc, char* argv[])
}
CppUnit::Outputter * out;
- CppUnit::Test *suite =
CppUnit::TestFactoryRegistry::getRegistry().makeTest();
+ CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry ().makeTest
();
CppUnit::TextUi::TestRunner runner;
runner.addTest ( suite );
if (xml)
- out = new CppUnit::XmlOutputter( &runner.result(), *str );
+ out = new CppUnit::XmlOutputter ( &runner.result (), *str );
else if (compiler)
- out = new CppUnit::CompilerOutputter( &runner.result(), *str );
+ out = new CppUnit::CompilerOutputter ( &runner.result (), *str );
else
- out = new CppUnit::TextOutputter( &runner.result(), *str );
+ out = new CppUnit::TextOutputter ( &runner.result (), *str );
- runner.setOutputter( out );
+ runner.setOutputter ( out );
- int ret = runner.run() ? 0 : 1;
+ int ret = runner.run () ? 0 : 1;
if (filename)
ofile.close ();
diff --git a/myserver/tests/test_auth_domain.cpp
b/myserver/tests/test_auth_domain.cpp
index 1bbe25e..cb0b93a 100644
--- a/myserver/tests/test_auth_domain.cpp
+++ b/myserver/tests/test_auth_domain.cpp
@@ -31,31 +31,31 @@ using namespace std;
class TestAuthDomain : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestAuthDomain );
- CPPUNIT_TEST( testGetName );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestAuthDomain );
+ CPPUNIT_TEST ( testGetName );
+ CPPUNIT_TEST_SUITE_END ();
SecurityToken *secToken;
AuthDomain* authDomain;
public:
- void setUp()
+ void setUp ()
{
- secToken = new SecurityToken();
- authDomain = new AuthDomain(secToken);
+ secToken = new SecurityToken ();
+ authDomain = new AuthDomain (secToken);
}
- void tearDown()
+ void tearDown ()
{
delete authDomain;
delete secToken;
}
- void testGetName()
+ void testGetName ()
{
- CPPUNIT_ASSERT_EQUAL(authDomain->getName().compare(""), 0);
+ CPPUNIT_ASSERT_EQUAL (authDomain->getName ().compare (""), 0);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestAuthDomain );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestAuthDomain );
diff --git a/myserver/tests/test_base64.cpp b/myserver/tests/test_base64.cpp
index b719a4e..07b4e87 100644
--- a/myserver/tests/test_base64.cpp
+++ b/myserver/tests/test_base64.cpp
@@ -30,39 +30,39 @@ using namespace std;
class TestBase64 : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestBase64 );
- CPPUNIT_TEST( testEncodeDecode );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestBase64 );
+ CPPUNIT_TEST ( testEncodeDecode );
+ CPPUNIT_TEST_SUITE_END ();
CBase64Utils *base64;
public:
- void setUp()
+ void setUp ()
{
- base64 = new CBase64Utils();
+ base64 = new CBase64Utils ();
}
- void tearDown()
+ void tearDown ()
{
delete base64;
}
- void testEncodeDecode()
+ void testEncodeDecode ()
{
int len = 0;
char* input = (char*) "Hello world!\n";
- char* encoded = base64->encode(input, 13);
+ char* encoded = base64->encode (input, 13);
- len = strlen(encoded);
+ len = strlen (encoded);
- char* decoded = base64->decode(encoded, &len);
+ char* decoded = base64->decode (encoded, &len);
- CPPUNIT_ASSERT_EQUAL(strlen(input), strlen(decoded));
+ CPPUNIT_ASSERT_EQUAL (strlen (input), strlen (decoded));
- for (unsigned int i = 0; i < strlen(decoded); i++)
- CPPUNIT_ASSERT_EQUAL(input[i], decoded[i]);
+ for (unsigned int i = 0; i < strlen (decoded); i++)
+ CPPUNIT_ASSERT_EQUAL (input[i], decoded[i]);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestBase64 );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestBase64 );
diff --git a/myserver/tests/test_cached_file.cpp
b/myserver/tests/test_cached_file.cpp
index ce9bd24..59498d7 100644
--- a/myserver/tests/test_cached_file.cpp
+++ b/myserver/tests/test_cached_file.cpp
@@ -27,79 +27,79 @@ using namespace std;
class TestCachedFile : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestCachedFile );
+ CPPUNIT_TEST_SUITE ( TestCachedFile );
- CPPUNIT_TEST(testFilePointer);
- CPPUNIT_TEST(testGetHandle);
- CPPUNIT_TEST(testOpenFile);
- CPPUNIT_TEST(testCreateTemporaryFile);
- CPPUNIT_TEST(testWrite);
- CPPUNIT_TEST(testRead);
+ CPPUNIT_TEST (testFilePointer);
+ CPPUNIT_TEST (testGetHandle);
+ CPPUNIT_TEST (testOpenFile);
+ CPPUNIT_TEST (testCreateTemporaryFile);
+ CPPUNIT_TEST (testWrite);
+ CPPUNIT_TEST (testRead);
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END ();
CachedFileBuffer *cfb;
CachedFile *cf;
public:
- void setUp()
+ void setUp ()
{
const char* buffer = "hello world!!!";
- cfb = new CachedFileBuffer(buffer, strlen(buffer));
+ cfb = new CachedFileBuffer (buffer, strlen (buffer));
- cf = new CachedFile(cfb);
+ cf = new CachedFile (cfb);
}
- void tearDown()
+ void tearDown ()
{
delete cf;
delete cfb;
}
- void testFilePointer()
+ void testFilePointer ()
{
- CPPUNIT_ASSERT_EQUAL(cf->seek (3), 0);
- CPPUNIT_ASSERT(cf->seek (100000));
+ CPPUNIT_ASSERT_EQUAL (cf->seek (3), 0);
+ CPPUNIT_ASSERT (cf->seek (100000));
}
- void testGetHandle()
+ void testGetHandle ()
{
- CPPUNIT_ASSERT_EQUAL(cf->getHandle(), (Handle)-1);
+ CPPUNIT_ASSERT_EQUAL (cf->getHandle (), (Handle)-1);
}
- void testOpenFile()
+ void testOpenFile ()
{
string filename;
- CPPUNIT_ASSERT(cf->openFile(NULL, 0));
- CPPUNIT_ASSERT(cf->openFile(filename, 0));
+ CPPUNIT_ASSERT (cf->openFile (NULL, 0));
+ CPPUNIT_ASSERT (cf->openFile (filename, 0));
}
- void testCreateTemporaryFile()
+ void testCreateTemporaryFile ()
{
- CPPUNIT_ASSERT(cf->createTemporaryFile(NULL));
+ CPPUNIT_ASSERT (cf->createTemporaryFile (NULL));
}
- void testWrite()
+ void testWrite ()
{
- CPPUNIT_ASSERT(cf->writeToFile(NULL, 0, NULL));
+ CPPUNIT_ASSERT (cf->writeToFile (NULL, 0, NULL));
}
- void testRead()
+ void testRead ()
{
u_long nbr = 0;
- u_long size = cf->getFileSize();
+ u_long size = cf->getFileSize ();
- CPPUNIT_ASSERT(size > 0);
+ CPPUNIT_ASSERT (size > 0);
char *buffer =new char[size];
- int ret = cf->read(buffer, size, &nbr);
+ int ret = cf->read (buffer, size, &nbr);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
- CPPUNIT_ASSERT(nbr > 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
+ CPPUNIT_ASSERT (nbr > 0);
delete [] buffer;
}
@@ -108,4 +108,4 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestCachedFile );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestCachedFile );
diff --git a/myserver/tests/test_cached_file_buffer.cpp
b/myserver/tests/test_cached_file_buffer.cpp
index ee07dbf..f458db9 100644
--- a/myserver/tests/test_cached_file_buffer.cpp
+++ b/myserver/tests/test_cached_file_buffer.cpp
@@ -28,59 +28,59 @@ using namespace std;
class TestCachedFileBuffer : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestCachedFileBuffer );
+ CPPUNIT_TEST_SUITE ( TestCachedFileBuffer );
- CPPUNIT_TEST(testGetFileSize);
- CPPUNIT_TEST(testFactoryToNotify);
- CPPUNIT_TEST(testRefCounter);
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST (testGetFileSize);
+ CPPUNIT_TEST (testFactoryToNotify);
+ CPPUNIT_TEST (testRefCounter);
+ CPPUNIT_TEST_SUITE_END ();
CachedFileBuffer *cfb;
public:
- void setUp()
+ void setUp ()
{
const char* buffer = "hello world!!!";
- cfb = new CachedFileBuffer(buffer, strlen(buffer));
+ cfb = new CachedFileBuffer (buffer, strlen (buffer));
}
- void tearDown()
+ void tearDown ()
{
delete cfb;
}
- void testGetFileSize()
+ void testGetFileSize ()
{
- CPPUNIT_ASSERT(cfb->getFileSize());
+ CPPUNIT_ASSERT (cfb->getFileSize ());
}
- void testFactoryToNotify()
+ void testFactoryToNotify ()
{
CachedFileFactory cff;
- cfb->setFactoryToNotify(&cff);
- CPPUNIT_ASSERT_EQUAL(cfb->getFactoryToNotify(), &cff);
+ cfb->setFactoryToNotify (&cff);
+ CPPUNIT_ASSERT_EQUAL (cfb->getFactoryToNotify (), &cff);
- cfb->setFactoryToNotify(NULL);
- CPPUNIT_ASSERT_EQUAL(cfb->getFactoryToNotify(), (CachedFileFactory*)NULL);
+ cfb->setFactoryToNotify (NULL);
+ CPPUNIT_ASSERT_EQUAL (cfb->getFactoryToNotify (),
(CachedFileFactory*)NULL);
}
- void testRefCounter()
+ void testRefCounter ()
{
- for(u_long i = 1; i <= 20; i++)
+ for (u_long i = 1; i <= 20; i++)
{
- cfb->addRef();
- CPPUNIT_ASSERT_EQUAL(cfb->getReferenceCounter(), i);
+ cfb->addRef ();
+ CPPUNIT_ASSERT_EQUAL (cfb->getReferenceCounter (), i);
}
- for(u_long i = 1; i <= 20; i++)
+ for (u_long i = 1; i <= 20; i++)
{
- cfb->decRef();
- CPPUNIT_ASSERT_EQUAL(cfb->getReferenceCounter(), 20 - i);
+ cfb->decRef ();
+ CPPUNIT_ASSERT_EQUAL (cfb->getReferenceCounter (), 20 - i);
}
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestCachedFileBuffer );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestCachedFileBuffer );
diff --git a/myserver/tests/test_cached_file_factory.cpp
b/myserver/tests/test_cached_file_factory.cpp
index 7830d3f..ec0e98b 100644
--- a/myserver/tests/test_cached_file_factory.cpp
+++ b/myserver/tests/test_cached_file_factory.cpp
@@ -28,66 +28,66 @@ using namespace std;
class TestCachedFileFactory : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestCachedFileFactory );
+ CPPUNIT_TEST_SUITE ( TestCachedFileFactory );
- CPPUNIT_TEST(testInitialize);
- CPPUNIT_TEST(testSize);
- CPPUNIT_TEST(testMaxSize);
- CPPUNIT_TEST(testMinSize);
+ CPPUNIT_TEST (testInitialize);
+ CPPUNIT_TEST (testSize);
+ CPPUNIT_TEST (testMaxSize);
+ CPPUNIT_TEST (testMinSize);
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END ();
CachedFileFactory *cff;
public:
- void setUp()
+ void setUp ()
{
- cff = new CachedFileFactory();
+ cff = new CachedFileFactory ();
}
- void tearDown()
+ void tearDown ()
{
delete cff;
}
- void testInitialize()
+ void testInitialize ()
{
- cff->initialize(20);
-
- CPPUNIT_ASSERT_EQUAL(cff->getSize(), 20ul);
- CPPUNIT_ASSERT_EQUAL(cff->getUsed(), 0ul);
- CPPUNIT_ASSERT_EQUAL(cff->getUsedSize(), 0ul);
- CPPUNIT_ASSERT_EQUAL(cff->getMaxSize(), 0ul);
- CPPUNIT_ASSERT_EQUAL(cff->getMinSize(), 0ul);
- CPPUNIT_ASSERT_EQUAL(cff->getMaxSize(), 0ul);
+ cff->initialize (20);
+
+ CPPUNIT_ASSERT_EQUAL (cff->getSize (), 20ul);
+ CPPUNIT_ASSERT_EQUAL (cff->getUsed (), 0ul);
+ CPPUNIT_ASSERT_EQUAL (cff->getUsedSize (), 0ul);
+ CPPUNIT_ASSERT_EQUAL (cff->getMaxSize (), 0ul);
+ CPPUNIT_ASSERT_EQUAL (cff->getMinSize (), 0ul);
+ CPPUNIT_ASSERT_EQUAL (cff->getMaxSize (), 0ul);
}
- void testSize()
+ void testSize ()
{
- for(u_long i = 0; i < 100; i += 10)
+ for (u_long i = 0; i < 100; i += 10)
{
- cff->setSize(i);
- CPPUNIT_ASSERT_EQUAL(cff->getSize(), i);
+ cff->setSize (i);
+ CPPUNIT_ASSERT_EQUAL (cff->getSize (), i);
}
}
- void testMaxSize()
+ void testMaxSize ()
{
- for(u_long i = 0; i < 100; i += 10)
+ for (u_long i = 0; i < 100; i += 10)
{
- cff->setMaxSize(i);
- CPPUNIT_ASSERT_EQUAL(cff->getMaxSize(), i);
+ cff->setMaxSize (i);
+ CPPUNIT_ASSERT_EQUAL (cff->getMaxSize (), i);
}
}
- void testMinSize()
+ void testMinSize ()
{
- for(u_long i = 0; i < 100; i += 10)
+ for (u_long i = 0; i < 100; i += 10)
{
- cff->setMinSize(i);
- CPPUNIT_ASSERT_EQUAL(cff->getMinSize(), i);
+ cff->setMinSize (i);
+ CPPUNIT_ASSERT_EQUAL (cff->getMinSize (), i);
}
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestCachedFileFactory );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestCachedFileFactory );
diff --git a/myserver/tests/test_connection.cpp
b/myserver/tests/test_connection.cpp
index 8786ecc..9961433 100644
--- a/myserver/tests/test_connection.cpp
+++ b/myserver/tests/test_connection.cpp
@@ -26,170 +26,170 @@
class TestConnection : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestConnection );
- CPPUNIT_TEST( testID );
- CPPUNIT_TEST( testTimeout );
- CPPUNIT_TEST( testLocalPort );
- CPPUNIT_TEST( testIpAddress );
- CPPUNIT_TEST( testActiveThread );
- CPPUNIT_TEST( testLocalIpAddress );
- CPPUNIT_TEST( testTries );
- CPPUNIT_TEST( testPort );
- CPPUNIT_TEST( testLogin );
- CPPUNIT_TEST( testPassword );
- CPPUNIT_TEST( testForceControl );
- CPPUNIT_TEST( testToRemove );
- CPPUNIT_TEST( testScheduled );
- CPPUNIT_TEST( testPriority );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestConnection );
+ CPPUNIT_TEST ( testID );
+ CPPUNIT_TEST ( testTimeout );
+ CPPUNIT_TEST ( testLocalPort );
+ CPPUNIT_TEST ( testIpAddress );
+ CPPUNIT_TEST ( testActiveThread );
+ CPPUNIT_TEST ( testLocalIpAddress );
+ CPPUNIT_TEST ( testTries );
+ CPPUNIT_TEST ( testPort );
+ CPPUNIT_TEST ( testLogin );
+ CPPUNIT_TEST ( testPassword );
+ CPPUNIT_TEST ( testForceControl );
+ CPPUNIT_TEST ( testToRemove );
+ CPPUNIT_TEST ( testScheduled );
+ CPPUNIT_TEST ( testPriority );
+ CPPUNIT_TEST_SUITE_END ();
ConnectionPtr connection;
public:
- void setUp()
+ void setUp ()
{
connection = new Connection;
}
- void tearDown()
+ void tearDown ()
{
delete connection;
}
- void testID()
+ void testID ()
{
- for(u_long i = 0; i < 100; i += 10)
+ for (u_long i = 0; i < 100; i += 10)
{
- connection->setID(i);
- CPPUNIT_ASSERT_EQUAL(connection->getID(), i);
+ connection->setID (i);
+ CPPUNIT_ASSERT_EQUAL (connection->getID (), i);
}
}
- void testTimeout()
+ void testTimeout ()
{
- for(u_long i = 0; i < 100; i += 10)
+ for (u_long i = 0; i < 100; i += 10)
{
- connection->setTimeout(i);
- CPPUNIT_ASSERT_EQUAL(connection->getTimeout(), i);
+ connection->setTimeout (i);
+ CPPUNIT_ASSERT_EQUAL (connection->getTimeout (), i);
}
}
- void testLocalPort()
+ void testLocalPort ()
{
- for(u_short i = 0; i < 100; i += 10)
+ for (u_short i = 0; i < 100; i += 10)
{
- connection->setLocalPort(i);
- CPPUNIT_ASSERT_EQUAL(connection->getLocalPort(), i);
+ connection->setLocalPort (i);
+ CPPUNIT_ASSERT_EQUAL (connection->getLocalPort (), i);
}
}
- void testIpAddress()
+ void testIpAddress ()
{
- connection->setIpAddr("127.0.0.1");
- CPPUNIT_ASSERT(strcmp(connection->getIpAddr(), "127.0.0.1") == 0);
+ connection->setIpAddr ("127.0.0.1");
+ CPPUNIT_ASSERT (strcmp (connection->getIpAddr (), "127.0.0.1") == 0);
}
- void testActiveThread()
+ void testActiveThread ()
{
- ClientsThread *ct = new ClientsThread(NULL);
+ ClientsThread *ct = new ClientsThread (NULL);
- connection->setActiveThread(ct);
+ connection->setActiveThread (ct);
- CPPUNIT_ASSERT_EQUAL(connection->getActiveThread(), ct);
+ CPPUNIT_ASSERT_EQUAL (connection->getActiveThread (), ct);
delete ct;
}
- void testLocalIpAddress()
+ void testLocalIpAddress ()
{
- connection->setLocalIpAddr("127.0.0.1");
- CPPUNIT_ASSERT(strcmp(connection->getLocalIpAddr(), "127.0.0.1") == 0);
+ connection->setLocalIpAddr ("127.0.0.1");
+ CPPUNIT_ASSERT (strcmp (connection->getLocalIpAddr (), "127.0.0.1") == 0);
}
- void testTries()
+ void testTries ()
{
char tries = 0;
- connection->setnTries(tries);
- CPPUNIT_ASSERT_EQUAL(connection->getnTries(), tries);
+ connection->setnTries (tries);
+ CPPUNIT_ASSERT_EQUAL (connection->getnTries (), tries);
- for(int i = 0; i < 10; i++)
+ for (int i = 0; i < 10; i++)
{
tries++;
- connection->incnTries();
- CPPUNIT_ASSERT_EQUAL(connection->getnTries(), tries);
+ connection->incnTries ();
+ CPPUNIT_ASSERT_EQUAL (connection->getnTries (), tries);
}
}
- void testPort()
+ void testPort ()
{
- for(u_short i = 0; i < 100; i += 10)
+ for (u_short i = 0; i < 100; i += 10)
{
- connection->setPort(i);
- CPPUNIT_ASSERT_EQUAL(connection->getPort(), i);
+ connection->setPort (i);
+ CPPUNIT_ASSERT_EQUAL (connection->getPort (), i);
}
}
- void testLogin()
+ void testLogin ()
{
- connection->setLogin("username");
- CPPUNIT_ASSERT(strcmp(connection->getLogin(), "username") == 0);
+ connection->setLogin ("username");
+ CPPUNIT_ASSERT (strcmp (connection->getLogin (), "username") == 0);
}
- void testPassword()
+ void testPassword ()
{
- connection->setPassword("password");
- CPPUNIT_ASSERT(strcmp(connection->getPassword(), "password") == 0);
+ connection->setPassword ("password");
+ CPPUNIT_ASSERT (strcmp (connection->getPassword (), "password") == 0);
}
- void testForceControl()
+ void testForceControl ()
{
- connection->setForceControl(0);
- CPPUNIT_ASSERT_EQUAL(connection->isForceControl(), 0);
+ connection->setForceControl (0);
+ CPPUNIT_ASSERT_EQUAL (connection->isForceControl (), 0);
- connection->setForceControl(1);
- CPPUNIT_ASSERT_EQUAL(connection->isForceControl(), 1);
+ connection->setForceControl (1);
+ CPPUNIT_ASSERT_EQUAL (connection->isForceControl (), 1);
}
- void testToRemove()
+ void testToRemove ()
{
- connection->setToRemove(0);
- CPPUNIT_ASSERT_EQUAL(connection->getToRemove(), 0);
+ connection->setToRemove (0);
+ CPPUNIT_ASSERT_EQUAL (connection->getToRemove (), 0);
- connection->setToRemove(1);
- CPPUNIT_ASSERT_EQUAL(connection->getToRemove(), 1);
+ connection->setToRemove (1);
+ CPPUNIT_ASSERT_EQUAL (connection->getToRemove (), 1);
}
- void testScheduled()
+ void testScheduled ()
{
- connection->setScheduled(0);
- CPPUNIT_ASSERT_EQUAL(connection->isScheduled(), 0);
+ connection->setScheduled (0);
+ CPPUNIT_ASSERT_EQUAL (connection->isScheduled (), 0);
- connection->setScheduled(1);
- CPPUNIT_ASSERT_EQUAL(connection->isScheduled(), 1);
+ connection->setScheduled (1);
+ CPPUNIT_ASSERT_EQUAL (connection->isScheduled (), 1);
}
- void testPriority()
+ void testPriority ()
{
- for(int i = 0; i < 100; i += 10)
+ for (int i = 0; i < 100; i += 10)
{
- connection->setPriority(i);
- CPPUNIT_ASSERT_EQUAL(connection->getPriority(), i);
+ connection->setPriority (i);
+ CPPUNIT_ASSERT_EQUAL (connection->getPriority (), i);
}
}
- void testContinuation()
+ void testContinuation ()
{
continuationPROC continuation = (continuationPROC) 100;
- CPPUNIT_ASSERT(connection->getContinuation() == NULL);
- connection->setContinuation(continuation);
+ CPPUNIT_ASSERT (connection->getContinuation () == NULL);
+ connection->setContinuation (continuation);
- CPPUNIT_ASSERT(connection->getContinuation() == continuation);
+ CPPUNIT_ASSERT (connection->getContinuation () == continuation);
}
@@ -197,4 +197,4 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestConnection );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestConnection );
diff --git a/myserver/tests/test_connections_scheduler.cpp
b/myserver/tests/test_connections_scheduler.cpp
index 16f4011..d254c8b 100644
--- a/myserver/tests/test_connections_scheduler.cpp
+++ b/myserver/tests/test_connections_scheduler.cpp
@@ -33,38 +33,38 @@ public:
* BE SURE TO USE VALID HANDLES.
* 0, 1, 2 are valid ones.
*/
- MockSocket(FileHandle handle)
+ MockSocket (FileHandle handle)
{
this->handle = handle;
}
- virtual int connect(MYSERVER_SOCKADDR*, int)
+ virtual int connect (MYSERVER_SOCKADDR*, int)
{
return 0;
}
- virtual int closesocket()
+ virtual int closesocket ()
{
return 0;
}
- virtual int shutdown(int how)
+ virtual int shutdown (int how)
{
return 0;
}
- virtual int recv(char*, int, int, u_long)
+ virtual int recv (char*, int, int, u_long)
{
return 0;
}
- virtual int recv(char*, int, int)
+ virtual int recv (char*, int, int)
{
return 0;
}
- virtual u_long bytesToRead()
+ virtual u_long bytesToRead ()
{
return 0;
}
- virtual Handle getHandle()
+ virtual Handle getHandle ()
{
return (Handle) handle;
}
@@ -75,17 +75,17 @@ public:
class TestSchedulerVisitor : public ConnectionsSchedulerVisitor
{
public:
- TestSchedulerVisitor()
+ TestSchedulerVisitor ()
{
arg = NULL;
}
- void *getArg()
+ void *getArg ()
{
return arg;
}
- virtual int visitConnection(ConnectionPtr conn, void* param)
+ virtual int visitConnection (ConnectionPtr conn, void* param)
{
arg = param;
return 0;
@@ -97,129 +97,129 @@ private:
class TestConnectionsScheduler : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestConnectionsScheduler );
- CPPUNIT_TEST( testAddNewConnection );
- CPPUNIT_TEST( testGetNumTotalConnections );
- CPPUNIT_TEST( testAddNewReadyConnection );
- CPPUNIT_TEST( testGetConnections );
- CPPUNIT_TEST( testVisitor );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestConnectionsScheduler );
+ CPPUNIT_TEST ( testAddNewConnection );
+ CPPUNIT_TEST ( testGetNumTotalConnections );
+ CPPUNIT_TEST ( testAddNewReadyConnection );
+ CPPUNIT_TEST ( testGetConnections );
+ CPPUNIT_TEST ( testVisitor );
+ CPPUNIT_TEST_SUITE_END ();
ConnectionsScheduler* scheduler;
public:
- void setUp()
+ void setUp ()
{
- CPPUNIT_ASSERT_EQUAL( Socket::startupSocketLib ( ), 0 );
+ CPPUNIT_ASSERT_EQUAL ( Socket::startupSocketLib ( ), 0 );
scheduler = new ConnectionsScheduler ();
- scheduler->initialize();
+ scheduler->initialize ();
}
- void tearDown()
+ void tearDown ()
{
- scheduler->release();
+ scheduler->release ();
delete scheduler;
}
- void testVisitor()
+ void testVisitor ()
{
TestSchedulerVisitor visitor;
void* arg = this;
u_long max = 3;
- for(u_long i = 0; i < max; i++)
+ for (u_long i = 0; i < max; i++)
{
ConnectionPtr conn = new Connection;
- conn->socket = new MockSocket((FileHandle) i);
- scheduler->addWaitingConnection(conn);
+ conn->socket = new MockSocket ((FileHandle) i);
+ scheduler->addWaitingConnection (conn);
}
- scheduler->accept(&visitor, arg);
+ scheduler->accept (&visitor, arg);
- CPPUNIT_ASSERT_EQUAL(arg, visitor.getArg());
+ CPPUNIT_ASSERT_EQUAL (arg, visitor.getArg ());
}
- void testGetConnections()
+ void testGetConnections ()
{
ConnectionPtr conn = new Connection;
- conn->socket = new MockSocket((FileHandle) 1);
+ conn->socket = new MockSocket ((FileHandle) 1);
list<ConnectionPtr> out;
- scheduler->getConnections(out);
+ scheduler->getConnections (out);
- CPPUNIT_ASSERT_EQUAL(out.size(), (size_t)0);
+ CPPUNIT_ASSERT_EQUAL (out.size (), (size_t)0);
conn = new Connection;
- conn->socket = new MockSocket((FileHandle) 2);
+ conn->socket = new MockSocket ((FileHandle) 2);
- scheduler->addWaitingConnection(conn);
+ scheduler->addWaitingConnection (conn);
- scheduler->getConnections(out);
+ scheduler->getConnections (out);
- CPPUNIT_ASSERT_EQUAL(out.size(), (size_t)1);
+ CPPUNIT_ASSERT_EQUAL (out.size (), (size_t)1);
}
- void testGetNumTotalConnections()
+ void testGetNumTotalConnections ()
{
ConnectionPtr conn = new Connection;
- conn->socket = new MockSocket((FileHandle) 1);
+ conn->socket = new MockSocket ((FileHandle) 1);
- CPPUNIT_ASSERT_EQUAL(scheduler->getNumTotalConnections(), 0ul);
+ CPPUNIT_ASSERT_EQUAL (scheduler->getNumTotalConnections (), 0ul);
- scheduler->registerConnectionID(conn);
+ scheduler->registerConnectionID (conn);
- CPPUNIT_ASSERT_EQUAL(scheduler->getNumTotalConnections(), 1ul);
+ CPPUNIT_ASSERT_EQUAL (scheduler->getNumTotalConnections (), 1ul);
- scheduler->registerConnectionID(conn);
+ scheduler->registerConnectionID (conn);
- CPPUNIT_ASSERT_EQUAL(scheduler->getNumTotalConnections(), 2ul);
+ CPPUNIT_ASSERT_EQUAL (scheduler->getNumTotalConnections (), 2ul);
- scheduler->registerConnectionID(conn);
+ scheduler->registerConnectionID (conn);
- CPPUNIT_ASSERT_EQUAL(scheduler->getNumTotalConnections(), 3ul);
+ CPPUNIT_ASSERT_EQUAL (scheduler->getNumTotalConnections (), 3ul);
delete conn;
}
- void testAddNewReadyConnection()
+ void testAddNewReadyConnection ()
{
ConnectionPtr gotConn;
ConnectionPtr conn = new Connection;
- conn->socket = new MockSocket((FileHandle) 1);
+ conn->socket = new MockSocket ((FileHandle) 1);
- CPPUNIT_ASSERT_EQUAL(scheduler->getNumTotalConnections(), 0ul);
+ CPPUNIT_ASSERT_EQUAL (scheduler->getNumTotalConnections (), 0ul);
- scheduler->addReadyConnection(conn);
+ scheduler->addReadyConnection (conn);
- CPPUNIT_ASSERT_EQUAL(scheduler->getNumTotalConnections(), 0ul);
+ CPPUNIT_ASSERT_EQUAL (scheduler->getNumTotalConnections (), 0ul);
- gotConn = scheduler->getConnection();
+ gotConn = scheduler->getConnection ();
- CPPUNIT_ASSERT_EQUAL(scheduler->getNumTotalConnections(), 0ul);
- CPPUNIT_ASSERT_EQUAL(conn, gotConn);
+ CPPUNIT_ASSERT_EQUAL (scheduler->getNumTotalConnections (), 0ul);
+ CPPUNIT_ASSERT_EQUAL (conn, gotConn);
delete conn;
}
- void testAddNewConnection()
+ void testAddNewConnection ()
{
ConnectionPtr conn = new Connection;
- conn->socket = new MockSocket((FileHandle) 1);
+ conn->socket = new MockSocket ((FileHandle) 1);
- CPPUNIT_ASSERT_EQUAL(scheduler->getNumTotalConnections(), 0ul);
+ CPPUNIT_ASSERT_EQUAL (scheduler->getNumTotalConnections (), 0ul);
- scheduler->addWaitingConnection(conn);
+ scheduler->addWaitingConnection (conn);
- CPPUNIT_ASSERT_EQUAL(scheduler->getConnectionsNumber(), 1ul);
+ CPPUNIT_ASSERT_EQUAL (scheduler->getConnectionsNumber (), 1ul);
- scheduler->removeConnection(conn);
+ scheduler->removeConnection (conn);
- CPPUNIT_ASSERT_EQUAL(scheduler->getNumTotalConnections(), 0ul);
+ CPPUNIT_ASSERT_EQUAL (scheduler->getNumTotalConnections (), 0ul);
//The connection is freed by the scheduler.
}
@@ -229,4 +229,4 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestConnectionsScheduler );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestConnectionsScheduler );
diff --git a/myserver/tests/test_file.cpp b/myserver/tests/test_file.cpp
index e4c1d9b..731a0fa 100644
--- a/myserver/tests/test_file.cpp
+++ b/myserver/tests/test_file.cpp
@@ -59,7 +59,7 @@ public:
void testCreateTemporaryFile ()
{
- CPPUNIT_ASSERT_EQUAL (tfile->createTemporaryFile (fname.c_str()), 0);
+ CPPUNIT_ASSERT_EQUAL (tfile->createTemporaryFile (fname.c_str ()), 0);
CPPUNIT_ASSERT_EQUAL (tfile->close (), 0);
}
diff --git a/myserver/tests/test_files_utility.cpp
b/myserver/tests/test_files_utility.cpp
index 029e61e..0603f1b 100644
--- a/myserver/tests/test_files_utility.cpp
+++ b/myserver/tests/test_files_utility.cpp
@@ -28,116 +28,116 @@ using namespace std;
class TestFilesUtility : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestFilesUtility );
- CPPUNIT_TEST( testGetPathRecursionLevel );
- CPPUNIT_TEST( testSplitPath );
- CPPUNIT_TEST( testSplitPathString );
- CPPUNIT_TEST( testSplitPathLength );
- CPPUNIT_TEST( testGetFileExt );
+ CPPUNIT_TEST_SUITE ( TestFilesUtility );
+ CPPUNIT_TEST ( testGetPathRecursionLevel );
+ CPPUNIT_TEST ( testSplitPath );
+ CPPUNIT_TEST ( testSplitPathString );
+ CPPUNIT_TEST ( testSplitPathLength );
+ CPPUNIT_TEST ( testGetFileExt );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END ();
public:
- void setUp() {}
- void tearDown() {}
- void testGetPathRecursionLevel()
+ void setUp () {}
+ void tearDown () {}
+ void testGetPathRecursionLevel ()
{
- CPPUNIT_ASSERT(FilesUtility::getPathRecursionLevel("/foo/bar") > 0);
- CPPUNIT_ASSERT(FilesUtility::getPathRecursionLevel("/foo/././././bar") >
0);
-
CPPUNIT_ASSERT(FilesUtility::getPathRecursionLevel("/home/.././../../bar/") <
0);
- CPPUNIT_ASSERT(FilesUtility::getPathRecursionLevel("./.././../../bar/") <
0);
- CPPUNIT_ASSERT(FilesUtility::getPathRecursionLevel("") == 0);
- CPPUNIT_ASSERT(FilesUtility::getPathRecursionLevel(".") == 0);
- CPPUNIT_ASSERT(FilesUtility::getPathRecursionLevel("/./././..") < 0);
+ CPPUNIT_ASSERT (FilesUtility::getPathRecursionLevel ("/foo/bar") > 0);
+ CPPUNIT_ASSERT (FilesUtility::getPathRecursionLevel ("/foo/././././bar") >
0);
+ CPPUNIT_ASSERT (FilesUtility::getPathRecursionLevel
("/home/.././../../bar/") < 0);
+ CPPUNIT_ASSERT (FilesUtility::getPathRecursionLevel ("./.././../../bar/")
< 0);
+ CPPUNIT_ASSERT (FilesUtility::getPathRecursionLevel ("") == 0);
+ CPPUNIT_ASSERT (FilesUtility::getPathRecursionLevel (".") == 0);
+ CPPUNIT_ASSERT (FilesUtility::getPathRecursionLevel ("/./././..") < 0);
}
- void testSplitPathString()
+ void testSplitPathString ()
{
string path;
string dir;
string file;
- path.assign("/foo/bar/baz");
+ path.assign ("/foo/bar/baz");
- FilesUtility::splitPath(path, dir, file);
+ FilesUtility::splitPath (path, dir, file);
- CPPUNIT_ASSERT(dir.compare("/foo/bar/") == 0);
- CPPUNIT_ASSERT(file.compare("baz") == 0);
+ CPPUNIT_ASSERT (dir.compare ("/foo/bar/") == 0);
+ CPPUNIT_ASSERT (file.compare ("baz") == 0);
- path.assign("/foo/bar/");
+ path.assign ("/foo/bar/");
- FilesUtility::splitPath(path, dir, file);
+ FilesUtility::splitPath (path, dir, file);
- CPPUNIT_ASSERT(dir.compare("/foo/bar/") == 0);
- CPPUNIT_ASSERT(file.compare("") == 0);
+ CPPUNIT_ASSERT (dir.compare ("/foo/bar/") == 0);
+ CPPUNIT_ASSERT (file.compare ("") == 0);
- path.assign("baz");
+ path.assign ("baz");
- FilesUtility::splitPath(path, dir, file);
+ FilesUtility::splitPath (path, dir, file);
- CPPUNIT_ASSERT(dir.compare("") == 0);
- CPPUNIT_ASSERT(file.compare("baz") == 0);
+ CPPUNIT_ASSERT (dir.compare ("") == 0);
+ CPPUNIT_ASSERT (file.compare ("baz") == 0);
}
- void testSplitPath()
+ void testSplitPath ()
{
char dir[256];
char file[256];
- FilesUtility::splitPath("/foo/bar/baz", dir, file);
+ FilesUtility::splitPath ("/foo/bar/baz", dir, file);
- CPPUNIT_ASSERT(strcmp(dir, "/foo/bar/") == 0);
- CPPUNIT_ASSERT(strcmp(file, "baz") == 0);
+ CPPUNIT_ASSERT (strcmp (dir, "/foo/bar/") == 0);
+ CPPUNIT_ASSERT (strcmp (file, "baz") == 0);
- FilesUtility::splitPath("/foo/bar/", dir, file);
+ FilesUtility::splitPath ("/foo/bar/", dir, file);
- CPPUNIT_ASSERT(strcmp(dir, "/foo/bar/") == 0);
- CPPUNIT_ASSERT(strcmp(file, "") == 0);
+ CPPUNIT_ASSERT (strcmp (dir, "/foo/bar/") == 0);
+ CPPUNIT_ASSERT (strcmp (file, "") == 0);
- FilesUtility::splitPath("baz", dir, file);
+ FilesUtility::splitPath ("baz", dir, file);
- CPPUNIT_ASSERT(strcmp(dir, "") == 0);
- CPPUNIT_ASSERT(strcmp(file, "baz") == 0);
+ CPPUNIT_ASSERT (strcmp (dir, "") == 0);
+ CPPUNIT_ASSERT (strcmp (file, "baz") == 0);
}
- void testSplitPathLength()
+ void testSplitPathLength ()
{
int dir;
int file;
- FilesUtility::splitPathLength("/foo/bar/baz", &dir, &file);
+ FilesUtility::splitPathLength ("/foo/bar/baz", &dir, &file);
- CPPUNIT_ASSERT(dir >= 10 && dir <= 12);
- CPPUNIT_ASSERT(file >= 4 && file <= 6);
+ CPPUNIT_ASSERT (dir >= 10 && dir <= 12);
+ CPPUNIT_ASSERT (file >= 4 && file <= 6);
- FilesUtility::splitPathLength("/foo/bar/", &dir, &file);
+ FilesUtility::splitPathLength ("/foo/bar/", &dir, &file);
- CPPUNIT_ASSERT(dir >= 10 && dir <= 12);
- CPPUNIT_ASSERT(file >= 1 && file <= 3);
+ CPPUNIT_ASSERT (dir >= 10 && dir <= 12);
+ CPPUNIT_ASSERT (file >= 1 && file <= 3);
- FilesUtility::splitPathLength("baz", &dir, &file);
+ FilesUtility::splitPathLength ("baz", &dir, &file);
- CPPUNIT_ASSERT(dir >= 1 && dir <= 3);
- CPPUNIT_ASSERT(file >= 4 && file <= 6);
+ CPPUNIT_ASSERT (dir >= 1 && dir <= 3);
+ CPPUNIT_ASSERT (file >= 4 && file <= 6);
}
- void testGetFileExt()
+ void testGetFileExt ()
{
char ext[12];
- FilesUtility::getFileExt(ext, "myserver.exe");
- CPPUNIT_ASSERT(strcmp(ext, "exe") == 0);
+ FilesUtility::getFileExt (ext, "myserver.exe");
+ CPPUNIT_ASSERT (strcmp (ext, "exe") == 0);
- FilesUtility::getFileExt(ext, "myserver");
- CPPUNIT_ASSERT(strcmp(ext, "") == 0);
+ FilesUtility::getFileExt (ext, "myserver");
+ CPPUNIT_ASSERT (strcmp (ext, "") == 0);
- FilesUtility::getFileExt(ext, "myserver.exe.sh");
- CPPUNIT_ASSERT(strcmp(ext, "sh") == 0);
+ FilesUtility::getFileExt (ext, "myserver.exe.sh");
+ CPPUNIT_ASSERT (strcmp (ext, "sh") == 0);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestFilesUtility );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestFilesUtility );
diff --git a/myserver/tests/test_filter_chain.cpp
b/myserver/tests/test_filter_chain.cpp
index 01a4793..3572908 100644
--- a/myserver/tests/test_filter_chain.cpp
+++ b/myserver/tests/test_filter_chain.cpp
@@ -33,153 +33,153 @@ class MyProtocol : public Protocol
class TestFilterChain : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestFilterChain );
- CPPUNIT_TEST( testGzipChain );
- CPPUNIT_TEST( testProtocol );
- CPPUNIT_TEST( testIsEmpty );
- CPPUNIT_TEST( testProtocolData );
- CPPUNIT_TEST( testAcceptDuplicates );
- CPPUNIT_TEST( testStream );
- CPPUNIT_TEST( testIsFilterPresent );
- CPPUNIT_TEST( testRemoveFilter );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestFilterChain );
+ CPPUNIT_TEST ( testGzipChain );
+ CPPUNIT_TEST ( testProtocol );
+ CPPUNIT_TEST ( testIsEmpty );
+ CPPUNIT_TEST ( testProtocolData );
+ CPPUNIT_TEST ( testAcceptDuplicates );
+ CPPUNIT_TEST ( testStream );
+ CPPUNIT_TEST ( testIsFilterPresent );
+ CPPUNIT_TEST ( testRemoveFilter );
+ CPPUNIT_TEST_SUITE_END ();
FiltersChain *fc;
public:
- void setUp()
+ void setUp ()
{
fc = new FiltersChain;
}
- void tearDown()
+ void tearDown ()
{
delete fc;
}
- void testGzipChain()
+ void testGzipChain ()
{
char szTest[64], szTemp[64], szExpected[64];
- strcpy(szTest, "The quick brown fox jumps over the lazy dog");
- int nLength = strlen(szTest);
+ strcpy (szTest, "The quick brown fox jumps over the lazy dog");
+ int nLength = strlen (szTest);
u_long nbw = 0;
MemBuf mb;
- MemoryStream ms(&mb);
- ms.write(szTest, 64, &nbw);
+ MemoryStream ms (&mb);
+ ms.write (szTest, 64, &nbw);
- fc->setStream(&ms);
- fc->addFilter(Gzip::factory("GzipFilter"), &nbw);
- fc->addFilter(GzipDecompress::factory("GzipDecompressFilter"), &nbw);
+ fc->setStream (&ms);
+ fc->addFilter (Gzip::factory ("GzipFilter"), &nbw);
+ fc->addFilter (GzipDecompress::factory ("GzipDecompressFilter"), &nbw);
char *pBuff = szExpected;
int i = nLength;
- while ( !fc->read(szTemp, 64, &nbw) && nbw > 0 && i > 0 )
+ while ( !fc->read (szTemp, 64, &nbw) && nbw > 0 && i > 0 )
{
strncpy (pBuff, szTemp, (int)nbw > i ? i : nbw);
pBuff += nbw;
i -= nbw;
}
szExpected[nLength] = '\0';
- fc->clearAllFilters();
+ fc->clearAllFilters ();
- CPPUNIT_ASSERT(strncmp(szTest, szExpected, nbw) == 0);
+ CPPUNIT_ASSERT (strncmp (szTest, szExpected, nbw) == 0);
}
- void testProtocol()
+ void testProtocol ()
{
MyProtocol mp;
- fc->setProtocol(&mp);
- CPPUNIT_ASSERT_EQUAL((Protocol*)&mp, fc->getProtocol());
+ fc->setProtocol (&mp);
+ CPPUNIT_ASSERT_EQUAL ((Protocol*)&mp, fc->getProtocol ());
}
- void testAcceptDuplicates()
+ void testAcceptDuplicates ()
{
- fc->setAcceptDuplicates(0);
- CPPUNIT_ASSERT_EQUAL(fc->getAcceptDuplicates(), 0);
+ fc->setAcceptDuplicates (0);
+ CPPUNIT_ASSERT_EQUAL (fc->getAcceptDuplicates (), 0);
- fc->setAcceptDuplicates(1);
- CPPUNIT_ASSERT_EQUAL(fc->getAcceptDuplicates(), 1);
+ fc->setAcceptDuplicates (1);
+ CPPUNIT_ASSERT_EQUAL (fc->getAcceptDuplicates (), 1);
}
- void testStream()
+ void testStream ()
{
MemBuf mb;
- MemoryStream ms(&mb);
+ MemoryStream ms (&mb);
- fc->setStream(&ms);
+ fc->setStream (&ms);
- CPPUNIT_ASSERT_EQUAL((Stream*)&ms, fc->getStream());
+ CPPUNIT_ASSERT_EQUAL ((Stream*)&ms, fc->getStream ());
}
- void testProtocolData()
+ void testProtocolData ()
{
char *data = new char[2];
- fc->setProtocolData(data);
- CPPUNIT_ASSERT_EQUAL(data, (char*)fc->getProtocolData());
+ fc->setProtocolData (data);
+ CPPUNIT_ASSERT_EQUAL (data, (char*)fc->getProtocolData ());
delete [] data;
}
- void testIsEmpty()
+ void testIsEmpty ()
{
u_long nbw;
MemBuf mb;
- MemoryStream ms(&mb);
+ MemoryStream ms (&mb);
- fc->setStream(&ms);
+ fc->setStream (&ms);
- CPPUNIT_ASSERT(fc->isEmpty() != 0);
+ CPPUNIT_ASSERT (fc->isEmpty () != 0);
- fc->addFilter(Gzip::factory("GzipFilter"), &nbw);
+ fc->addFilter (Gzip::factory ("GzipFilter"), &nbw);
- CPPUNIT_ASSERT_EQUAL(fc->isEmpty(), 0);
+ CPPUNIT_ASSERT_EQUAL (fc->isEmpty (), 0);
- fc->clearAllFilters();
+ fc->clearAllFilters ();
- CPPUNIT_ASSERT(fc->isEmpty() != 0);
+ CPPUNIT_ASSERT (fc->isEmpty () != 0);
}
- void testIsFilterPresent()
+ void testIsFilterPresent ()
{
u_long nbw;
- Filter* filter = Gzip::factory("GzipFilter");
+ Filter* filter = Gzip::factory ("GzipFilter");
MemBuf mb;
char name[32];
- MemoryStream ms(&mb);
+ MemoryStream ms (&mb);
- fc->setStream(&ms);
+ fc->setStream (&ms);
- CPPUNIT_ASSERT_EQUAL(fc->isFilterPresent(filter), 0);
- CPPUNIT_ASSERT_EQUAL(fc->isFilterPresent(filter->getName(name, 32)), 0);
+ CPPUNIT_ASSERT_EQUAL (fc->isFilterPresent (filter), 0);
+ CPPUNIT_ASSERT_EQUAL (fc->isFilterPresent (filter->getName (name, 32)), 0);
- fc->addFilter(filter, &nbw);
+ fc->addFilter (filter, &nbw);
- CPPUNIT_ASSERT(fc->isFilterPresent(filter) != 0);
- CPPUNIT_ASSERT(fc->isFilterPresent(filter->getName(name, 32)) != 0);
+ CPPUNIT_ASSERT (fc->isFilterPresent (filter) != 0);
+ CPPUNIT_ASSERT (fc->isFilterPresent (filter->getName (name, 32)) != 0);
}
- void testRemoveFilter()
+ void testRemoveFilter ()
{
char name[32];
MemBuf mb;
u_long nbw;
- Filter* filter = Gzip::factory("GzipFilter");
- MemoryStream ms(&mb);
+ Filter* filter = Gzip::factory ("GzipFilter");
+ MemoryStream ms (&mb);
- fc->setStream(&ms);
+ fc->setStream (&ms);
- fc->addFilter(filter, &nbw);
+ fc->addFilter (filter, &nbw);
- CPPUNIT_ASSERT(fc->isFilterPresent(filter) != 0);
- CPPUNIT_ASSERT(fc->isFilterPresent(filter->getName(name, 32)) != 0);
+ CPPUNIT_ASSERT (fc->isFilterPresent (filter) != 0);
+ CPPUNIT_ASSERT (fc->isFilterPresent (filter->getName (name, 32)) != 0);
- fc->removeFilter(filter);
+ fc->removeFilter (filter);
- CPPUNIT_ASSERT_EQUAL(fc->isFilterPresent(filter), 0);
- CPPUNIT_ASSERT_EQUAL(fc->isFilterPresent(filter->getName(name, 32)), 0);
+ CPPUNIT_ASSERT_EQUAL (fc->isFilterPresent (filter), 0);
+ CPPUNIT_ASSERT_EQUAL (fc->isFilterPresent (filter->getName (name, 32)), 0);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestFilterChain );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestFilterChain );
diff --git a/myserver/tests/test_fork_server.cpp
b/myserver/tests/test_fork_server.cpp
index bd3c9fa..3900fe7 100644
--- a/myserver/tests/test_fork_server.cpp
+++ b/myserver/tests/test_fork_server.cpp
@@ -30,20 +30,20 @@ using namespace std;
class TestForkServer : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestForkServer );
- CPPUNIT_TEST( testExecuteProcess );
+ CPPUNIT_TEST_SUITE ( TestForkServer );
+ CPPUNIT_TEST ( testExecuteProcess );
CPPUNIT_TEST (testStartKillLoop);
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END ();
ForkServer *fs;
public:
- void setUp()
+ void setUp ()
{
fs = new ForkServer;
}
- void tearDown()
+ void tearDown ()
{
delete fs;
}
@@ -63,7 +63,7 @@ public:
#endif
}
- void testExecuteProcess()
+ void testExecuteProcess ()
{
try
{
@@ -77,11 +77,11 @@ public:
int ret = fs->startForkServer ();
Pipe pipe;
- pipe.create();
+ pipe.create ();
spi.stdIn = -1;
spi.stdError = -1;
- spi.stdOut = pipe.getWriteHandle();
+ spi.stdOut = pipe.getWriteHandle ();
spi.cmd.assign ("/bin/echo");
spi.arg.assign (msg);
@@ -111,4 +111,4 @@ public:
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestForkServer );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestForkServer );
diff --git a/myserver/tests/test_gzip.cpp b/myserver/tests/test_gzip.cpp
index 24d807d..4702e48 100644
--- a/myserver/tests/test_gzip.cpp
+++ b/myserver/tests/test_gzip.cpp
@@ -24,26 +24,26 @@
class TestGzip : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestGzip );
- CPPUNIT_TEST( testGzipCompression );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestGzip );
+ CPPUNIT_TEST ( testGzipCompression );
+ CPPUNIT_TEST_SUITE_END ();
public:
- void setUp() {}
- void tearDown() {}
- void testGzipCompression()
+ void setUp () {}
+ void tearDown () {}
+ void testGzipCompression ()
{
Gzip gzip;
char szTest[64] = "The quick brown fox jumps over the lazy dog";
char szCompressed[64];
char szDecompressed[64];
- gzip.compress(szTest, 64, szCompressed, 64);
+ gzip.compress (szTest, 64, szCompressed, 64);
GzipDecompress gzipdc;
- gzipdc.decompress(szCompressed, 64, szDecompressed, 64);
+ gzipdc.decompress (szCompressed, 64, szDecompressed, 64);
- CPPUNIT_ASSERT(strcmp(szTest, szDecompressed) == 0);
+ CPPUNIT_ASSERT (strcmp (szTest, szDecompressed) == 0);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestGzip );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestGzip );
diff --git a/myserver/tests/test_hashmap.cpp b/myserver/tests/test_hashmap.cpp
index 479de46..0eee155 100644
--- a/myserver/tests/test_hashmap.cpp
+++ b/myserver/tests/test_hashmap.cpp
@@ -23,106 +23,106 @@
class TestHashmap : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestHashmap );
- CPPUNIT_TEST( testContainsKey );
- CPPUNIT_TEST( testClear );
- CPPUNIT_TEST( testSize );
- CPPUNIT_TEST( testEmpty );
- CPPUNIT_TEST( testPut );
- CPPUNIT_TEST( testRemove );
- CPPUNIT_TEST( testIterator );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestHashmap );
+ CPPUNIT_TEST ( testContainsKey );
+ CPPUNIT_TEST ( testClear );
+ CPPUNIT_TEST ( testSize );
+ CPPUNIT_TEST ( testEmpty );
+ CPPUNIT_TEST ( testPut );
+ CPPUNIT_TEST ( testRemove );
+ CPPUNIT_TEST ( testIterator );
+ CPPUNIT_TEST_SUITE_END ();
HashMap<char*, int> *map;
public:
- void setUp()
+ void setUp ()
{
map = new HashMap<char*, int>();
}
- void tearDown()
+ void tearDown ()
{
delete map;
}
- void testContainsKey()
+ void testContainsKey ()
{
- map->put((char*)"one", 1);
- CPPUNIT_ASSERT_EQUAL(map->containsKey("one"), true);
- CPPUNIT_ASSERT_EQUAL(map->containsKey("two"), false);
+ map->put ((char*)"one", 1);
+ CPPUNIT_ASSERT_EQUAL (map->containsKey ("one"), true);
+ CPPUNIT_ASSERT_EQUAL (map->containsKey ("two"), false);
}
- void testClear()
+ void testClear ()
{
- map->put((char*)"one", 1);
+ map->put ((char*)"one", 1);
- CPPUNIT_ASSERT_EQUAL(map->empty(), false);
+ CPPUNIT_ASSERT_EQUAL (map->empty (), false);
- map->clear();
+ map->clear ();
- CPPUNIT_ASSERT_EQUAL(map->empty(), true);
+ CPPUNIT_ASSERT_EQUAL (map->empty (), true);
}
- void testSize()
+ void testSize ()
{
- CPPUNIT_ASSERT_EQUAL(map->size(), 0);
- map->put((char*)"one", 1);
- CPPUNIT_ASSERT_EQUAL(map->size(), 1);
- map->put((char*)"two", 2);
- CPPUNIT_ASSERT_EQUAL(map->size(), 2);
+ CPPUNIT_ASSERT_EQUAL (map->size (), 0);
+ map->put ((char*)"one", 1);
+ CPPUNIT_ASSERT_EQUAL (map->size (), 1);
+ map->put ((char*)"two", 2);
+ CPPUNIT_ASSERT_EQUAL (map->size (), 2);
}
- void testEmpty()
+ void testEmpty ()
{
- CPPUNIT_ASSERT_EQUAL(map->empty(), true);
- map->put((char*)"key", 0);
- CPPUNIT_ASSERT_EQUAL(map->empty(), false);
+ CPPUNIT_ASSERT_EQUAL (map->empty (), true);
+ map->put ((char*)"key", 0);
+ CPPUNIT_ASSERT_EQUAL (map->empty (), false);
}
- void testPut()
+ void testPut ()
{
- map->put((char*)"one", 1);
- CPPUNIT_ASSERT_EQUAL(map->get((char*)"one"), 1);
+ map->put ((char*)"one", 1);
+ CPPUNIT_ASSERT_EQUAL (map->get ((char*)"one"), 1);
}
- void testRemove()
+ void testRemove ()
{
- map->put((char*)"one", 1);
- map->remove((char*)"one");
+ map->put ((char*)"one", 1);
+ map->remove ((char*)"one");
- CPPUNIT_ASSERT_EQUAL(map->get((char*)"one"), 0);
+ CPPUNIT_ASSERT_EQUAL (map->get ((char*)"one"), 0);
}
- void testIterator()
+ void testIterator ()
{
- map->put((char*)"zero", 0);
- map->put((char*)"one", 1);
- map->put((char*)"two", 2);
- map->put((char*)"three", 3);
- map->put((char*)"four", 4);
- map->put((char*)"five", 5);
- map->put((char*)"six", 6);
- map->put((char*)"seven", 7);
- map->put((char*)"eight", 8);
- map->put((char*)"nine", 9);
- map->put((char*)"ten", 10);
+ map->put ((char*)"zero", 0);
+ map->put ((char*)"one", 1);
+ map->put ((char*)"two", 2);
+ map->put ((char*)"three", 3);
+ map->put ((char*)"four", 4);
+ map->put ((char*)"five", 5);
+ map->put ((char*)"six", 6);
+ map->put ((char*)"seven", 7);
+ map->put ((char*)"eight", 8);
+ map->put ((char*)"nine", 9);
+ map->put ((char*)"ten", 10);
int values[11];
- for(int i = 0; i < 11; i++)
+ for (int i = 0; i < 11; i++)
values[i] = 0;
- for(HashMap<char*, int>::Iterator it = map->begin(); it != map->end();
it++)
+ for (HashMap<char*, int>::Iterator it = map->begin (); it != map->end ();
it++)
{
values[*it] = 1;
}
- for(int i = 0; i < 11; i++)
- CPPUNIT_ASSERT_EQUAL(values[i], 1);
+ for (int i = 0; i < 11; i++)
+ CPPUNIT_ASSERT_EQUAL (values[i], 1);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestHashmap );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestHashmap );
diff --git a/myserver/tests/test_homedir.cpp b/myserver/tests/test_homedir.cpp
index 745c152..b367420 100644
--- a/myserver/tests/test_homedir.cpp
+++ b/myserver/tests/test_homedir.cpp
@@ -23,48 +23,48 @@
class TestHomeDir : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestHomeDir );
- CPPUNIT_TEST( testLoadClear );
- CPPUNIT_TEST( testGetAdmin );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestHomeDir );
+ CPPUNIT_TEST ( testLoadClear );
+ CPPUNIT_TEST ( testGetAdmin );
+ CPPUNIT_TEST_SUITE_END ();
HomeDir *homeDir;
public:
- void setUp() {homeDir = new HomeDir();}
- void tearDown() {delete homeDir;}
+ void setUp () {homeDir = new HomeDir ();}
+ void tearDown () {delete homeDir;}
- void testLoadClear()
+ void testLoadClear ()
{
- CPPUNIT_ASSERT(!homeDir->isLoaded());
+ CPPUNIT_ASSERT (!homeDir->isLoaded ());
- homeDir->load();
+ homeDir->load ();
- CPPUNIT_ASSERT(homeDir->isLoaded());
+ CPPUNIT_ASSERT (homeDir->isLoaded ());
- homeDir->clear();
+ homeDir->clear ();
- CPPUNIT_ASSERT(!homeDir->isLoaded());
+ CPPUNIT_ASSERT (!homeDir->isLoaded ());
}
- void testGetAdmin()
+ void testGetAdmin ()
{
- homeDir->load();
+ homeDir->load ();
string username;
#ifdef WIN32
/* Try to get home dir for Administrator under Windows. */
- username.assign("Administrator");
+ username.assign ("Administrator");
#else
/* Under systems different than Windows, "root" should be present,
* if it doesn't handle this differently. */
- username.assign("root");
+ username.assign ("root");
#endif
string dir;
- CPPUNIT_ASSERT_EQUAL (homeDir->getHomeDir(username, dir), 0);
+ CPPUNIT_ASSERT_EQUAL (homeDir->getHomeDir (username, dir), 0);
- CPPUNIT_ASSERT(dir.length());
+ CPPUNIT_ASSERT (dir.length ());
- homeDir->clear();
+ homeDir->clear ();
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestHomeDir );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestHomeDir );
diff --git a/myserver/tests/test_http_req_security_domain.cpp
b/myserver/tests/test_http_req_security_domain.cpp
index 3939bab..d05d995 100644
--- a/myserver/tests/test_http_req_security_domain.cpp
+++ b/myserver/tests/test_http_req_security_domain.cpp
@@ -31,18 +31,18 @@ using namespace std;
class TestHttpReqSecurityDomain : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestHttpReqSecurityDomain );
- CPPUNIT_TEST( testConstructor );
- CPPUNIT_TEST( testGetValue );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestHttpReqSecurityDomain );
+ CPPUNIT_TEST ( testConstructor );
+ CPPUNIT_TEST ( testGetValue );
+ CPPUNIT_TEST_SUITE_END ();
public:
- void setUp()
+ void setUp ()
{
}
- void tearDown()
+ void tearDown ()
{
}
@@ -79,4 +79,4 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestHttpReqSecurityDomain );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestHttpReqSecurityDomain );
diff --git a/myserver/tests/test_http_request.cpp
b/myserver/tests/test_http_request.cpp
index 87b4622..87d8522 100644
--- a/myserver/tests/test_http_request.cpp
+++ b/myserver/tests/test_http_request.cpp
@@ -33,27 +33,27 @@ using namespace std;
class TestHttpRequest : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestHttpRequest );
- CPPUNIT_TEST( testSimpleHeader );
- CPPUNIT_TEST( testRange );
- CPPUNIT_TEST( testIncompleteHeader );
- CPPUNIT_TEST( testDefaultHttpRequest );
- CPPUNIT_TEST( testValidRequest );
- CPPUNIT_TEST( testResetHttpRequest );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestHttpRequest );
+ CPPUNIT_TEST ( testSimpleHeader );
+ CPPUNIT_TEST ( testRange );
+ CPPUNIT_TEST ( testIncompleteHeader );
+ CPPUNIT_TEST ( testDefaultHttpRequest );
+ CPPUNIT_TEST ( testValidRequest );
+ CPPUNIT_TEST ( testResetHttpRequest );
+ CPPUNIT_TEST_SUITE_END ();
public:
- void setUp()
+ void setUp ()
{
}
- void tearDown()
+ void tearDown ()
{
}
- void testSimpleHeader()
+ void testSimpleHeader ()
{
HttpRequestHeader header;
@@ -61,22 +61,22 @@ public:
const char * requestStr = "GET /resource?args HTTP/1.1\r\nHost:
localhost\r\n\r\n";
u_long bufferLength = strlen (requestStr);
u_long requestLength;
- int ret = HttpHeaders::buildHTTPRequestHeaderStruct(requestStr,
+ int ret = HttpHeaders::buildHTTPRequestHeaderStruct (requestStr,
bufferLength,
&requestLength,
&header,
&connection);
- CPPUNIT_ASSERT_EQUAL(ret, 200);
- CPPUNIT_ASSERT(header.cmd.compare("GET") == 0);
- CPPUNIT_ASSERT(header.ver.compare("HTTP/1.1") == 0);
- CPPUNIT_ASSERT(header.uri.compare("/resource") == 0);
- CPPUNIT_ASSERT(header.uriOpts.compare("args") == 0);
- CPPUNIT_ASSERT(header.getValue("Host", 0)->compare("localhost") == 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 200);
+ CPPUNIT_ASSERT (header.cmd.compare ("GET") == 0);
+ CPPUNIT_ASSERT (header.ver.compare ("HTTP/1.1") == 0);
+ CPPUNIT_ASSERT (header.uri.compare ("/resource") == 0);
+ CPPUNIT_ASSERT (header.uriOpts.compare ("args") == 0);
+ CPPUNIT_ASSERT (header.getValue ("Host", 0)->compare ("localhost") == 0);
}
- void testRange()
+ void testRange ()
{
HttpRequestHeader header;
Connection connection;
@@ -88,93 +88,93 @@ public:
requestStr = "GET /resource HTTP/1.1\r\nHost: localhost\r\nRange:
bytes=10-20\r\n\r\n";
bufferLength = strlen (requestStr);
- ret = HttpHeaders::buildHTTPRequestHeaderStruct(requestStr,
+ ret = HttpHeaders::buildHTTPRequestHeaderStruct (requestStr,
bufferLength,
&requestLength,
&header,
&connection);
- CPPUNIT_ASSERT(ret == 200);
- CPPUNIT_ASSERT(header.rangeByteBegin == 10);
- CPPUNIT_ASSERT(header.rangeByteEnd == 20);
- CPPUNIT_ASSERT(header.rangeType.compare("bytes") == 0);
+ CPPUNIT_ASSERT (ret == 200);
+ CPPUNIT_ASSERT (header.rangeByteBegin == 10);
+ CPPUNIT_ASSERT (header.rangeByteEnd == 20);
+ CPPUNIT_ASSERT (header.rangeType.compare ("bytes") == 0);
requestStr = "GET /resource HTTP/1.1\r\nHost: localhost\r\nRange:
bytes=10-\r\n\r\n";
bufferLength = strlen (requestStr);
- ret = HttpHeaders::buildHTTPRequestHeaderStruct(requestStr,
+ ret = HttpHeaders::buildHTTPRequestHeaderStruct (requestStr,
bufferLength,
&requestLength,
&header,
&connection);
- CPPUNIT_ASSERT(ret == 200);
- CPPUNIT_ASSERT(header.rangeByteBegin == 10);
- CPPUNIT_ASSERT(header.rangeByteEnd == 0);
- CPPUNIT_ASSERT(header.rangeType.compare("bytes") == 0);
+ CPPUNIT_ASSERT (ret == 200);
+ CPPUNIT_ASSERT (header.rangeByteBegin == 10);
+ CPPUNIT_ASSERT (header.rangeByteEnd == 0);
+ CPPUNIT_ASSERT (header.rangeType.compare ("bytes") == 0);
}
- void testValidRequest()
+ void testValidRequest ()
{
const char *request = "GET / HTTP/1.1\r\nHost: localhost\r\n\r\n";
int ret;
u_long nLines;
u_long nChars;
- ret = HttpHeaders::validHTTPRequest(request,
- strlen(request),
+ ret = HttpHeaders::validHTTPRequest (request,
+ strlen (request),
&nLines,
&nChars);
- CPPUNIT_ASSERT_EQUAL(ret, 200);
+ CPPUNIT_ASSERT_EQUAL (ret, 200);
}
- void testIncompleteHeader()
+ void testIncompleteHeader ()
{
const char *incompleteRequest = "GET / HTTP/1.1\r\nHost: localhost";
int ret;
u_long nLines;
u_long nChars;
- ret = HttpHeaders::validHTTPRequest(incompleteRequest,
- strlen(incompleteRequest),
+ ret = HttpHeaders::validHTTPRequest (incompleteRequest,
+ strlen (incompleteRequest),
&nLines,
&nChars);
- CPPUNIT_ASSERT_EQUAL(ret, -1);
+ CPPUNIT_ASSERT_EQUAL (ret, -1);
}
- void testDefaultHttpRequest()
+ void testDefaultHttpRequest ()
{
HttpRequestHeader header;
- HttpHeaders::buildDefaultHTTPRequestHeader(&header);
+ HttpHeaders::buildDefaultHTTPRequestHeader (&header);
- CPPUNIT_ASSERT(header.cmd.compare("GET") == 0);
- CPPUNIT_ASSERT(header.uri.compare("/") == 0);
- CPPUNIT_ASSERT(header.uriOpts.compare("") == 0);
- CPPUNIT_ASSERT(header.ver.compare("HTTP/1.1") == 0);
- CPPUNIT_ASSERT(header.uriOptsPtr == NULL);
- CPPUNIT_ASSERT(header.getValue("NotExists", 0) == NULL);
+ CPPUNIT_ASSERT (header.cmd.compare ("GET") == 0);
+ CPPUNIT_ASSERT (header.uri.compare ("/") == 0);
+ CPPUNIT_ASSERT (header.uriOpts.compare ("") == 0);
+ CPPUNIT_ASSERT (header.ver.compare ("HTTP/1.1") == 0);
+ CPPUNIT_ASSERT (header.uriOptsPtr == NULL);
+ CPPUNIT_ASSERT (header.getValue ("NotExists", 0) == NULL);
}
- void testResetHttpRequest()
+ void testResetHttpRequest ()
{
HttpRequestHeader header;
- HttpHeaders::resetHTTPRequest(&header);
-
- CPPUNIT_ASSERT(header.cmd.compare("") == 0);
- CPPUNIT_ASSERT(header.uri.compare("") == 0);
- CPPUNIT_ASSERT(header.uriOpts.compare("") == 0);
- CPPUNIT_ASSERT(header.ver.compare("") == 0);
- CPPUNIT_ASSERT(header.uriOptsPtr == NULL);
- CPPUNIT_ASSERT(header.getValue("NotExists", 0) == NULL);
+ HttpHeaders::resetHTTPRequest (&header);
+
+ CPPUNIT_ASSERT (header.cmd.compare ("") == 0);
+ CPPUNIT_ASSERT (header.uri.compare ("") == 0);
+ CPPUNIT_ASSERT (header.uriOpts.compare ("") == 0);
+ CPPUNIT_ASSERT (header.ver.compare ("") == 0);
+ CPPUNIT_ASSERT (header.uriOptsPtr == NULL);
+ CPPUNIT_ASSERT (header.getValue ("NotExists", 0) == NULL);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestHttpRequest );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestHttpRequest );
diff --git a/myserver/tests/test_http_response.cpp
b/myserver/tests/test_http_response.cpp
index 9519b09..8f02790 100644
--- a/myserver/tests/test_http_response.cpp
+++ b/myserver/tests/test_http_response.cpp
@@ -33,13 +33,13 @@ using namespace std;
class TestHttpResponse : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestHttpResponse );
- CPPUNIT_TEST( testSimpleHeader );
- CPPUNIT_TEST( testInvalidResponse );
- CPPUNIT_TEST( testJoinField );
- CPPUNIT_TEST( testValidResponse );
- CPPUNIT_TEST( testReset );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestHttpResponse );
+ CPPUNIT_TEST ( testSimpleHeader );
+ CPPUNIT_TEST ( testInvalidResponse );
+ CPPUNIT_TEST ( testJoinField );
+ CPPUNIT_TEST ( testValidResponse );
+ CPPUNIT_TEST ( testReset );
+ CPPUNIT_TEST_SUITE_END ();
public:
void setUp ()
@@ -57,13 +57,13 @@ public:
HttpResponseHeader header;
const char * responseStr = "HTTP/1.1 200 Success\r\nContent-Length:
0\r\n\r\n";
u_long nbtr;
- int ret = HttpHeaders::buildHTTPResponseHeaderStruct(responseStr,
+ int ret = HttpHeaders::buildHTTPResponseHeaderStruct (responseStr,
&header,
&nbtr);
- CPPUNIT_ASSERT_EQUAL(header.httpStatus, (int)200);
- CPPUNIT_ASSERT(header.contentLength.compare("0") == 0);
- CPPUNIT_ASSERT(ret != 0);
+ CPPUNIT_ASSERT_EQUAL (header.httpStatus, (int)200);
+ CPPUNIT_ASSERT (header.contentLength.compare ("0") == 0);
+ CPPUNIT_ASSERT (ret != 0);
}
void testJoinField ()
@@ -76,16 +76,16 @@ Content-Length: 0\r\n\
ToJoin: a\r\n\
ToJoin: b\r\n";
- int ret = HttpHeaders::buildHTTPResponseHeaderStruct(responseStr, &header,
&nbtr);
- CPPUNIT_ASSERT(ret != 0);
+ int ret = HttpHeaders::buildHTTPResponseHeaderStruct (responseStr,
&header, &nbtr);
+ CPPUNIT_ASSERT (ret != 0);
string *v = header.getValue ("ToJoin", NULL);
- CPPUNIT_ASSERT(v);
+ CPPUNIT_ASSERT (v);
- CPPUNIT_ASSERT(v->find ("a") != string::npos);
- CPPUNIT_ASSERT(v->find ("b") != string::npos);
- CPPUNIT_ASSERT(v->find (",") != string::npos);
- CPPUNIT_ASSERT(v->find ("x") == string::npos);
+ CPPUNIT_ASSERT (v->find ("a") != string::npos);
+ CPPUNIT_ASSERT (v->find ("b") != string::npos);
+ CPPUNIT_ASSERT (v->find (",") != string::npos);
+ CPPUNIT_ASSERT (v->find ("x") == string::npos);
}
void testValidResponse ()
@@ -95,11 +95,11 @@ ToJoin: b\r\n";
u_long nLinesptr;
u_long ncharsptr;
- int ret = HttpHeaders::validHTTPResponse(responseStr,
+ int ret = HttpHeaders::validHTTPResponse (responseStr,
&nLinesptr,
&ncharsptr);
- CPPUNIT_ASSERT(ret != 0);
+ CPPUNIT_ASSERT (ret != 0);
}
@@ -111,29 +111,29 @@ ToJoin: b\r\n";
u_long ncharsptr;
int ret;
- ret = HttpHeaders::validHTTPResponse(responseStr,
+ ret = HttpHeaders::validHTTPResponse (responseStr,
&nLinesptr,
&ncharsptr);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
- ret = HttpHeaders::validHTTPResponse(NULL,
+ ret = HttpHeaders::validHTTPResponse (NULL,
&nLinesptr,
&ncharsptr);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
}
void testReset ()
{
HttpResponseHeader header;
- HttpHeaders::resetHTTPResponse(&header);
+ HttpHeaders::resetHTTPResponse (&header);
- CPPUNIT_ASSERT(header.ver.length() == 0);
- CPPUNIT_ASSERT(header.contentLength.length() == 0);
- CPPUNIT_ASSERT(header.errorType.length() == 0);
+ CPPUNIT_ASSERT (header.ver.length () == 0);
+ CPPUNIT_ASSERT (header.contentLength.length () == 0);
+ CPPUNIT_ASSERT (header.errorType.length () == 0);
}
void testStatusType ()
@@ -141,23 +141,23 @@ ToJoin: b\r\n";
HttpResponseHeader header;
header.httpStatus = 100;
- CPPUNIT_ASSERT_EQUAL(header.getStatusType(),
HttpResponseHeader::INFORMATIONAL);
+ CPPUNIT_ASSERT_EQUAL (header.getStatusType (),
HttpResponseHeader::INFORMATIONAL);
header.httpStatus = 200;
- CPPUNIT_ASSERT_EQUAL(header.getStatusType(),
HttpResponseHeader::SUCCESSFUL);
+ CPPUNIT_ASSERT_EQUAL (header.getStatusType (),
HttpResponseHeader::SUCCESSFUL);
header.httpStatus = 300;
- CPPUNIT_ASSERT_EQUAL(header.getStatusType(),
HttpResponseHeader::REDIRECTION);
+ CPPUNIT_ASSERT_EQUAL (header.getStatusType (),
HttpResponseHeader::REDIRECTION);
header.httpStatus = 400;
- CPPUNIT_ASSERT_EQUAL(header.getStatusType(),
HttpResponseHeader::CLIENT_ERROR);
+ CPPUNIT_ASSERT_EQUAL (header.getStatusType (),
HttpResponseHeader::CLIENT_ERROR);
header.httpStatus = 500;
- CPPUNIT_ASSERT_EQUAL(header.getStatusType(),
HttpResponseHeader::SERVER_ERROR);
+ CPPUNIT_ASSERT_EQUAL (header.getStatusType (),
HttpResponseHeader::SERVER_ERROR);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestHttpResponse );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestHttpResponse );
diff --git a/myserver/tests/test_ip.cpp b/myserver/tests/test_ip.cpp
index 4cee1dc..a91b954 100644
--- a/myserver/tests/test_ip.cpp
+++ b/myserver/tests/test_ip.cpp
@@ -23,45 +23,45 @@
class TestIpRange : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestIpRange );
- CPPUNIT_TEST( testRangeInclusion );
- CPPUNIT_TEST( testIpInRange );
- CPPUNIT_TEST( testSingleIpRange );
- CPPUNIT_TEST( testEmptyRange );
- CPPUNIT_TEST( testRangeFactory );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestIpRange );
+ CPPUNIT_TEST ( testRangeInclusion );
+ CPPUNIT_TEST ( testIpInRange );
+ CPPUNIT_TEST ( testSingleIpRange );
+ CPPUNIT_TEST ( testEmptyRange );
+ CPPUNIT_TEST ( testRangeFactory );
+ CPPUNIT_TEST_SUITE_END ();
public:
- void setUp() {}
- void tearDown() {}
- void testRangeInclusion()
+ void setUp () {}
+ void tearDown () {}
+ void testRangeInclusion ()
{
- Ipv4Range LargeRange("192.168.0.0/24"),
InsideRange("192.168.0.100-192.168.0.200");
- CPPUNIT_ASSERT( LargeRange.InRange(&InsideRange) );
+ Ipv4Range LargeRange ("192.168.0.0/24"), InsideRange
("192.168.0.100-192.168.0.200");
+ CPPUNIT_ASSERT ( LargeRange.InRange (&InsideRange) );
}
- void testIpInRange()
+ void testIpInRange ()
{
- Ipv4Range testRange("192.168.0.0/24");
- CPPUNIT_ASSERT( testRange.InRange("192.168.0.127") );
+ Ipv4Range testRange ("192.168.0.0/24");
+ CPPUNIT_ASSERT ( testRange.InRange ("192.168.0.127") );
}
- void testSingleIpRange()
+ void testSingleIpRange ()
{
- Ipv4Range singleIpRange("192.168.0.100");
- CPPUNIT_ASSERT( singleIpRange.InRange(&singleIpRange) );
+ Ipv4Range singleIpRange ("192.168.0.100");
+ CPPUNIT_ASSERT ( singleIpRange.InRange (&singleIpRange) );
}
- void testEmptyRange()
+ void testEmptyRange ()
{
- Ipv4Range emptyRange("");
- CPPUNIT_ASSERT( emptyRange.InRange("10.0.0.0") );//anyy IP addr
+ Ipv4Range emptyRange ("");
+ CPPUNIT_ASSERT ( emptyRange.InRange ("10.0.0.0") );//anyy IP addr
}
- void testRangeFactory()
+ void testRangeFactory ()
{
- IpRange *pRange = IpRange::RangeFactory("192.168.51.0/23");
- CPPUNIT_ASSERT( pRange->InRange("192.168.51.100") );
+ IpRange *pRange = IpRange::RangeFactory ("192.168.51.0/23");
+ CPPUNIT_ASSERT ( pRange->InRange ("192.168.51.100") );
delete pRange;
pRange = NULL;
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestIpRange );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestIpRange );
diff --git a/myserver/tests/test_md5.cpp b/myserver/tests/test_md5.cpp
index 7304a19..45a2694 100644
--- a/myserver/tests/test_md5.cpp
+++ b/myserver/tests/test_md5.cpp
@@ -25,42 +25,42 @@
class TestMd5 : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestMd5 );
- CPPUNIT_TEST( testHash );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestMd5 );
+ CPPUNIT_TEST ( testHash );
+ CPPUNIT_TEST_SUITE_END ();
Md5* md5;
public:
- void setUp()
+ void setUp ()
{
md5 = new Md5();
}
- void tearDown()
+ void tearDown ()
{
delete md5;
}
- void testHash()
+ void testHash ()
{
unsigned char out[33];
const unsigned char* msg = (unsigned char* ) "hello world!\n";
char *expected = (char*) "c897d1410af8f2c74fba11b1db511e9e";
- md5->init();
- md5->update(msg, 13);
+ md5->init ();
+ md5->update (msg, 13);
- md5->end((char*)out);
+ md5->end ((char*)out);
- for(int i = 0; i < 32; i++)
+ for (int i = 0; i < 32; i++)
{
- CPPUNIT_ASSERT_EQUAL(tolower(expected[i]), tolower(out[i]));
+ CPPUNIT_ASSERT_EQUAL (tolower (expected[i]), tolower (out[i]));
}
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestMd5 );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestMd5 );
diff --git a/myserver/tests/test_mem_buff.cpp b/myserver/tests/test_mem_buff.cpp
index 9c1e7ec..b19f40f 100644
--- a/myserver/tests/test_mem_buff.cpp
+++ b/myserver/tests/test_mem_buff.cpp
@@ -26,162 +26,162 @@
class TestMemBuffer : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestMemBuffer );
- CPPUNIT_TEST( testLength );
- CPPUNIT_TEST( testFind );
- CPPUNIT_TEST( testReplace );
- CPPUNIT_TEST( testUintToStr );
- CPPUNIT_TEST( testIntToStr );
- CPPUNIT_TEST( testHexCharToNumber );
- CPPUNIT_TEST( testGetPart );
- CPPUNIT_TEST( testIsValid );
- CPPUNIT_TEST( testExternalBuffer );
- CPPUNIT_TEST( testGetAt );
- CPPUNIT_TEST( testGetBuffer );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestMemBuffer );
+ CPPUNIT_TEST ( testLength );
+ CPPUNIT_TEST ( testFind );
+ CPPUNIT_TEST ( testReplace );
+ CPPUNIT_TEST ( testUintToStr );
+ CPPUNIT_TEST ( testIntToStr );
+ CPPUNIT_TEST ( testHexCharToNumber );
+ CPPUNIT_TEST ( testGetPart );
+ CPPUNIT_TEST ( testIsValid );
+ CPPUNIT_TEST ( testExternalBuffer );
+ CPPUNIT_TEST ( testGetAt );
+ CPPUNIT_TEST ( testGetBuffer );
+ CPPUNIT_TEST_SUITE_END ();
MemBuf *memBuff;
public:
- void setUp()
+ void setUp ()
{
- memBuff = new MemBuf();
+ memBuff = new MemBuf ();
}
- void tearDown()
+ void tearDown ()
{
delete memBuff;
}
- void testLength()
+ void testLength ()
{
u_int len = 10;
- memBuff->setLength(len);
- CPPUNIT_ASSERT_EQUAL(memBuff->getRealLength(), len);
+ memBuff->setLength (len);
+ CPPUNIT_ASSERT_EQUAL (memBuff->getRealLength (), len);
- CPPUNIT_ASSERT_EQUAL(memBuff->getLength(), 0u);
+ CPPUNIT_ASSERT_EQUAL (memBuff->getLength (), 0u);
*memBuff << (const char*)"1234567890";
- CPPUNIT_ASSERT_EQUAL(memBuff->getLength(), 10u);
+ CPPUNIT_ASSERT_EQUAL (memBuff->getLength (), 10u);
}
- void testFind()
+ void testFind ()
{
*memBuff << (const char*)"1234567890";
- CPPUNIT_ASSERT_EQUAL(memBuff->find('5'), 4u);
+ CPPUNIT_ASSERT_EQUAL (memBuff->find ('5'), 4u);
- CPPUNIT_ASSERT_EQUAL(memBuff->find('5', 4), 4u);
+ CPPUNIT_ASSERT_EQUAL (memBuff->find ('5', 4), 4u);
- CPPUNIT_ASSERT_EQUAL(memBuff->find('5', 6), (u_int)-1);
+ CPPUNIT_ASSERT_EQUAL (memBuff->find ('5', 6), (u_int)-1);
}
- void testReplace()
+ void testReplace ()
{
*memBuff << (const char*)"1234567890";
- CPPUNIT_ASSERT_EQUAL(memBuff->find('5'), 4u);
+ CPPUNIT_ASSERT_EQUAL (memBuff->find ('5'), 4u);
- memBuff->replace('5', '6');
+ memBuff->replace ('5', '6');
- CPPUNIT_ASSERT_EQUAL(memBuff->find('5'), (u_int)-1);
+ CPPUNIT_ASSERT_EQUAL (memBuff->find ('5'), (u_int)-1);
}
- void testUintToStr()
+ void testUintToStr ()
{
- memBuff->uintToStr(0);
+ memBuff->uintToStr (0);
- CPPUNIT_ASSERT(strcmp(memBuff->getBuffer(), "0") == 0);
+ CPPUNIT_ASSERT (strcmp (memBuff->getBuffer (), "0") == 0);
- memBuff->setLength(0);
+ memBuff->setLength (0);
- memBuff->uintToStr(10);
- CPPUNIT_ASSERT(strcmp(memBuff->getBuffer(), "10") == 0);
+ memBuff->uintToStr (10);
+ CPPUNIT_ASSERT (strcmp (memBuff->getBuffer (), "10") == 0);
- memBuff->setLength(0);
+ memBuff->setLength (0);
- memBuff->uintToStr(100);
- CPPUNIT_ASSERT(strcmp(memBuff->getBuffer(), "100") == 0);
+ memBuff->uintToStr (100);
+ CPPUNIT_ASSERT (strcmp (memBuff->getBuffer (), "100") == 0);
}
- void testIntToStr()
+ void testIntToStr ()
{
- memBuff->intToStr(0);
- CPPUNIT_ASSERT(strcmp(memBuff->getBuffer(), "0") == 0);
+ memBuff->intToStr (0);
+ CPPUNIT_ASSERT (strcmp (memBuff->getBuffer (), "0") == 0);
- memBuff->setLength(0);
+ memBuff->setLength (0);
- memBuff->intToStr(10);
- CPPUNIT_ASSERT(strcmp(memBuff->getBuffer(), "10") == 0);
+ memBuff->intToStr (10);
+ CPPUNIT_ASSERT (strcmp (memBuff->getBuffer (), "10") == 0);
- memBuff->setLength(0);
+ memBuff->setLength (0);
- memBuff->intToStr(-100);
- CPPUNIT_ASSERT(strcmp(memBuff->getBuffer(), "-100") == 0);
+ memBuff->intToStr (-100);
+ CPPUNIT_ASSERT (strcmp (memBuff->getBuffer (), "-100") == 0);
}
- void testHexCharToNumber()
+ void testHexCharToNumber ()
{
- CPPUNIT_ASSERT_EQUAL(memBuff->hexCharToNumber('1'), (unsigned char) 1);
- CPPUNIT_ASSERT_EQUAL(memBuff->hexCharToNumber('a'), (unsigned char) 10);
+ CPPUNIT_ASSERT_EQUAL (memBuff->hexCharToNumber ('1'), (unsigned char) 1);
+ CPPUNIT_ASSERT_EQUAL (memBuff->hexCharToNumber ('a'), (unsigned char) 10);
}
- void testGetPart()
+ void testGetPart ()
{
*memBuff << "0123456789abcdef";
MemBuf dest;
- memBuff->getPart(3, 10, dest);
+ memBuff->getPart (3, 10, dest);
- CPPUNIT_ASSERT(memcmp(dest.getBuffer(), "3456789", 7) == 0);
+ CPPUNIT_ASSERT (memcmp (dest.getBuffer (), "3456789", 7) == 0);
}
- void testIsValid()
+ void testIsValid ()
{
- CPPUNIT_ASSERT_EQUAL(memBuff->isValid(), 0);
+ CPPUNIT_ASSERT_EQUAL (memBuff->isValid (), 0);
*memBuff << "123";
- CPPUNIT_ASSERT_EQUAL(memBuff->isValid(), 1);
+ CPPUNIT_ASSERT_EQUAL (memBuff->isValid (), 1);
}
- void testExternalBuffer()
+ void testExternalBuffer ()
{
char buffer[256];
- memBuff->setExternalBuffer(buffer, 256);
+ memBuff->setExternalBuffer (buffer, 256);
*memBuff << "foo";
- CPPUNIT_ASSERT(memcmp(buffer, "foo", 3) == 0);
+ CPPUNIT_ASSERT (memcmp (buffer, "foo", 3) == 0);
}
- void testGetAt()
+ void testGetAt ()
{
*memBuff << "foo";
- char val = memBuff->getAt(1);
+ char val = memBuff->getAt (1);
- CPPUNIT_ASSERT_EQUAL(val, 'o');
+ CPPUNIT_ASSERT_EQUAL (val, 'o');
val = (*memBuff)[1];
- CPPUNIT_ASSERT_EQUAL(val, 'o');
+ CPPUNIT_ASSERT_EQUAL (val, 'o');
}
- void testGetBuffer()
+ void testGetBuffer ()
{
*memBuff << "MyServer is a powerful and easy to configure web server.";
char szExpected[128];
- memset(szExpected, 0, 128);
- strcpy(szExpected, "MyServer is a powerful and easy to configure web
server.");
- CPPUNIT_ASSERT(memcmp(memBuff->getBuffer(), szExpected,
strlen(szExpected)) == 0);
+ memset (szExpected, 0, 128);
+ strcpy (szExpected, "MyServer is a powerful and easy to configure web
server.");
+ CPPUNIT_ASSERT (memcmp (memBuff->getBuffer (), szExpected, strlen
(szExpected)) == 0);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestMemBuffer );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestMemBuffer );
diff --git a/myserver/tests/test_mem_stream.cpp
b/myserver/tests/test_mem_stream.cpp
index 2aa0587..3db9e73 100644
--- a/myserver/tests/test_mem_stream.cpp
+++ b/myserver/tests/test_mem_stream.cpp
@@ -27,30 +27,30 @@
class TestMemStream : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestMemStream );
- CPPUNIT_TEST( testRead );
- CPPUNIT_TEST( testWrite );
- CPPUNIT_TEST( testFlush );
- CPPUNIT_TEST( testRefresh );
- CPPUNIT_TEST( testAvailableToRead );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestMemStream );
+ CPPUNIT_TEST ( testRead );
+ CPPUNIT_TEST ( testWrite );
+ CPPUNIT_TEST ( testFlush );
+ CPPUNIT_TEST ( testRefresh );
+ CPPUNIT_TEST ( testAvailableToRead );
+ CPPUNIT_TEST_SUITE_END ();
MemoryStream *stream;
public:
- void setUp()
+ void setUp ()
{
- stream = new MemoryStream();
+ stream = new MemoryStream ();
}
- void tearDown()
+ void tearDown ()
{
delete stream;
}
/* Helper method. */
- u_long addSomeData(MemoryStream* s)
+ u_long addSomeData (MemoryStream* s)
{
u_long nbw;
@@ -59,72 +59,72 @@ public:
the Free Software Foundation; either version 3 of the
License, or\n\
(at your option) any later version.\n";
- s->write(data, 512, &nbw);
+ s->write (data, 512, &nbw);
return nbw;
}
- void testAvailableToRead()
+ void testAvailableToRead ()
{
- u_long size = addSomeData(stream);
+ u_long size = addSomeData (stream);
- CPPUNIT_ASSERT_EQUAL(size, (u_long)stream->availableToRead());
+ CPPUNIT_ASSERT_EQUAL (size, (u_long)stream->availableToRead ());
}
- void testRead()
+ void testRead ()
{
u_long nbr;
- u_long size = addSomeData(stream);
+ u_long size = addSomeData (stream);
char buffer[20];
- CPPUNIT_ASSERT_EQUAL(size, (u_long)stream->availableToRead());
+ CPPUNIT_ASSERT_EQUAL (size, (u_long)stream->availableToRead ());
- stream->read(buffer, 20, &nbr);
+ stream->read (buffer, 20, &nbr);
- CPPUNIT_ASSERT_EQUAL(size - 20u, (u_long)stream->availableToRead());
+ CPPUNIT_ASSERT_EQUAL (size - 20u, (u_long)stream->availableToRead ());
}
- void testRefresh()
+ void testRefresh ()
{
u_long nbr;
- u_long size = addSomeData(stream);
+ u_long size = addSomeData (stream);
char buffer[20];
- CPPUNIT_ASSERT_EQUAL(size, (u_long)stream->availableToRead());
+ CPPUNIT_ASSERT_EQUAL (size, (u_long)stream->availableToRead ());
- stream->read(buffer, 20, &nbr);
- stream->refresh();
+ stream->read (buffer, 20, &nbr);
+ stream->refresh ();
- CPPUNIT_ASSERT_EQUAL((u_long)stream->availableToRead(), 0ul);
+ CPPUNIT_ASSERT_EQUAL ((u_long)stream->availableToRead (), 0ul);
}
- void testWrite()
+ void testWrite ()
{
u_long nbw;
- int ret = stream->write("hello world!", 12, &nbw);
+ int ret = stream->write ("hello world!", 12, &nbw);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
- CPPUNIT_ASSERT_EQUAL((u_long)stream->availableToRead(), 12ul);
+ CPPUNIT_ASSERT_EQUAL ((u_long)stream->availableToRead (), 12ul);
}
- void testFlush()
+ void testFlush ()
{
u_long nbw;
- addSomeData(stream);
- int ret = stream->flush(&nbw);
+ addSomeData (stream);
+ int ret = stream->flush (&nbw);
- CPPUNIT_ASSERT(nbw >= 0);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT (nbw >= 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestMemStream );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestMemStream );
diff --git a/myserver/tests/test_mime_manager.cpp
b/myserver/tests/test_mime_manager.cpp
index 1c5685b..835336d 100644
--- a/myserver/tests/test_mime_manager.cpp
+++ b/myserver/tests/test_mime_manager.cpp
@@ -52,12 +52,12 @@ public:
{
XmlParser *parser = getTestParser ();
- CPPUNIT_ASSERT_EQUAL (mm->isLoaded(), false);
+ CPPUNIT_ASSERT_EQUAL (mm->isLoaded (), false);
CPPUNIT_ASSERT_EQUAL (mm->loadXML (parser), 2ul);
- CPPUNIT_ASSERT_EQUAL (mm->getNumMIMELoaded(), 2ul);
+ CPPUNIT_ASSERT_EQUAL (mm->getNumMIMELoaded (), 2ul);
- CPPUNIT_ASSERT_EQUAL (mm->isLoaded(), true);
+ CPPUNIT_ASSERT_EQUAL (mm->isLoaded (), true);
delete parser;
}
@@ -68,11 +68,11 @@ public:
MimeRecord mr;
mm->loadXML (parser);
- CPPUNIT_ASSERT_EQUAL (mm->getNumMIMELoaded(), 2ul);
+ CPPUNIT_ASSERT_EQUAL (mm->getNumMIMELoaded (), 2ul);
mm->addRecord (&mr);
- CPPUNIT_ASSERT_EQUAL (mm->getNumMIMELoaded(), 3ul);
+ CPPUNIT_ASSERT_EQUAL (mm->getNumMIMELoaded (), 3ul);
delete parser;
}
@@ -92,11 +92,11 @@ private:
<EXTENSION value=\"txt\"/>\n</MIME>\n</MIMES>\n";
mb.addBuffer (buffer, strlen (buffer));
- parser->openMemBuf(mb);
+ parser->openMemBuf (mb);
return parser;
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestMimeManager );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestMimeManager );
diff --git a/myserver/tests/test_multicast.cpp
b/myserver/tests/test_multicast.cpp
index 2af3d0c..62a2699 100644
--- a/myserver/tests/test_multicast.cpp
+++ b/myserver/tests/test_multicast.cpp
@@ -29,12 +29,12 @@ using namespace std;
class TestMulticastRegistry : public MulticastRegistry< int, int, int >
{
public:
- int getHandlersSize(int msg)
+ int getHandlersSize (int msg)
{
- vector<Multicast<int, int, int>*>* handlers = getHandlers(msg);
+ vector<Multicast<int, int, int>*>* handlers = getHandlers (msg);
- if(handlers)
- return handlers->size();
+ if (handlers)
+ return handlers->size ();
return 0;
}
@@ -47,21 +47,21 @@ class TestMulticastObserver : public Multicast<int, int,
int>
int arg;
public:
- TestMulticastObserver() : msg(-1), arg(-1){}
+ TestMulticastObserver () : msg (-1), arg (-1){}
- virtual int updateMulticast(MulticastRegistry<int, int, int>* reg, int& msg,
int arg)
+ virtual int updateMulticast (MulticastRegistry<int, int, int>* reg, int&
msg, int arg)
{
this->msg = msg;
this->arg = arg;
return 0;
}
- int getMsg()
+ int getMsg ()
{
return msg;
}
- int getArg()
+ int getArg ()
{
return arg;
}
@@ -70,53 +70,53 @@ public:
class TestMulticast : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestMulticast );
- CPPUNIT_TEST( testMulticast );
- CPPUNIT_TEST( testAddRemove );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestMulticast );
+ CPPUNIT_TEST ( testMulticast );
+ CPPUNIT_TEST ( testAddRemove );
+ CPPUNIT_TEST_SUITE_END ();
TestMulticastRegistry* registry;
TestMulticastObserver* observer;
public:
- void setUp()
+ void setUp ()
{
- registry = new TestMulticastRegistry();
- observer = new TestMulticastObserver();
+ registry = new TestMulticastRegistry ();
+ observer = new TestMulticastObserver ();
}
- void tearDown()
+ void tearDown ()
{
delete observer;
delete registry;
}
- void testMulticast()
+ void testMulticast ()
{
int msg = 1;
int arg = 2;
- registry->addMulticast(msg, observer);
- registry->notifyMulticast(msg, arg);
+ registry->addMulticast (msg, observer);
+ registry->notifyMulticast (msg, arg);
- CPPUNIT_ASSERT_EQUAL(msg, observer->getMsg());
- CPPUNIT_ASSERT_EQUAL(arg, observer->getArg());
+ CPPUNIT_ASSERT_EQUAL (msg, observer->getMsg ());
+ CPPUNIT_ASSERT_EQUAL (arg, observer->getArg ());
}
- void testAddRemove()
+ void testAddRemove ()
{
int msg = 10;
- CPPUNIT_ASSERT_EQUAL(registry->getHandlersSize(msg), 0);
+ CPPUNIT_ASSERT_EQUAL (registry->getHandlersSize (msg), 0);
- registry->addMulticast(msg, observer);
+ registry->addMulticast (msg, observer);
- CPPUNIT_ASSERT_EQUAL(registry->getHandlersSize(msg), 1);
+ CPPUNIT_ASSERT_EQUAL (registry->getHandlersSize (msg), 1);
- registry->removeMulticast(msg, observer);
+ registry->removeMulticast (msg, observer);
- CPPUNIT_ASSERT_EQUAL(registry->getHandlersSize(msg), 0);
+ CPPUNIT_ASSERT_EQUAL (registry->getHandlersSize (msg), 0);
}
@@ -124,4 +124,4 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestMulticast );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestMulticast );
diff --git a/myserver/tests/test_mutex.cpp b/myserver/tests/test_mutex.cpp
index dd8cb9b..506c18d 100644
--- a/myserver/tests/test_mutex.cpp
+++ b/myserver/tests/test_mutex.cpp
@@ -37,15 +37,15 @@ struct TestMutexThreadArg
int max;
};
-static DEFINE_THREAD(test_mutex_incrementer, pParam)
+static DEFINE_THREAD (test_mutex_incrementer, pParam)
{
TestMutexThreadArg *arg = (TestMutexThreadArg*) pParam;
- for(int i = 0; i < arg->max; i++)
+ for (int i = 0; i < arg->max; i++)
{
- arg->mutex->lock();
+ arg->mutex->lock ();
arg->value++;
- arg->mutex->unlock();
+ arg->mutex->unlock ();
}
return NULL;
@@ -54,33 +54,33 @@ static DEFINE_THREAD(test_mutex_incrementer, pParam)
class TestMutex : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestMutex );
- CPPUNIT_TEST( testLockUnlock );
- CPPUNIT_TEST( testSynchronizedAccess );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestMutex );
+ CPPUNIT_TEST ( testLockUnlock );
+ CPPUNIT_TEST ( testSynchronizedAccess );
+ CPPUNIT_TEST_SUITE_END ();
Mutex *mutex;
public:
- void setUp()
+ void setUp ()
{
- mutex = new Mutex();
+ mutex = new Mutex ();
}
- void tearDown()
+ void tearDown ()
{
delete mutex;
}
- void testLockUnlock()
+ void testLockUnlock ()
{
- mutex->lock();
- CPPUNIT_ASSERT_EQUAL(mutex->isLocked(), true);
- mutex->unlock();
- CPPUNIT_ASSERT_EQUAL(mutex->isLocked(), false);
+ mutex->lock ();
+ CPPUNIT_ASSERT_EQUAL (mutex->isLocked (), true);
+ mutex->unlock ();
+ CPPUNIT_ASSERT_EQUAL (mutex->isLocked (), false);
}
- void testSynchronizedAccess()
+ void testSynchronizedAccess ()
{
const int N_THREADS = 10;
ThreadID tid[N_THREADS];
@@ -91,19 +91,19 @@ public:
arg.mutex = &mutex;
arg.max = 100;
- for(int i = 0; i < N_THREADS; i++)
+ for (int i = 0; i < N_THREADS; i++)
{
- int res = Thread::create(&(tid[i]), test_mutex_incrementer, &arg);
- CPPUNIT_ASSERT_EQUAL(res, 0);
+ int res = Thread::create (&(tid[i]), test_mutex_incrementer, &arg);
+ CPPUNIT_ASSERT_EQUAL (res, 0);
}
- for(int i = 0; i < N_THREADS; i++)
- Thread::join(tid[i]);
+ for (int i = 0; i < N_THREADS; i++)
+ Thread::join (tid[i]);
- CPPUNIT_ASSERT_EQUAL(arg.value, N_THREADS * arg.max);
+ CPPUNIT_ASSERT_EQUAL (arg.value, N_THREADS * arg.max);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestMutex );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestMutex );
diff --git a/myserver/tests/test_nodetree.cpp b/myserver/tests/test_nodetree.cpp
index 1cd1f3a..67bc30b 100644
--- a/myserver/tests/test_nodetree.cpp
+++ b/myserver/tests/test_nodetree.cpp
@@ -26,22 +26,22 @@
class TestNodeTree : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestNodeTree );
- CPPUNIT_TEST( testCreateDestroy );
- CPPUNIT_TEST( testAttributes );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestNodeTree );
+ CPPUNIT_TEST ( testCreateDestroy );
+ CPPUNIT_TEST ( testAttributes );
+ CPPUNIT_TEST_SUITE_END ();
public:
NodeTree<string> *node;
- void setUp()
+ void setUp ()
{
node = new NodeTree<string> ();
}
- void tearDown()
+ void tearDown ()
{
delete node;
}
@@ -100,4 +100,4 @@ protected:
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestNodeTree );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestNodeTree );
diff --git a/myserver/tests/test_pipe.cpp b/myserver/tests/test_pipe.cpp
index ff7619b..57c047e 100644
--- a/myserver/tests/test_pipe.cpp
+++ b/myserver/tests/test_pipe.cpp
@@ -26,103 +26,103 @@
class TestPipe : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestPipe );
- CPPUNIT_TEST( testCreateClose );
- CPPUNIT_TEST( testWriteRead );
- CPPUNIT_TEST( testInverted );
- CPPUNIT_TEST( testWaitForData );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestPipe );
+ CPPUNIT_TEST ( testCreateClose );
+ CPPUNIT_TEST ( testWriteRead );
+ CPPUNIT_TEST ( testInverted );
+ CPPUNIT_TEST ( testWaitForData );
+ CPPUNIT_TEST_SUITE_END ();
Pipe *pipe;
public:
- void setUp()
+ void setUp ()
{
- pipe = new Pipe();
+ pipe = new Pipe ();
}
- void tearDown()
+ void tearDown ()
{
delete pipe;
}
- void testCreateClose()
+ void testCreateClose ()
{
- int ret = pipe->create();
+ int ret = pipe->create ();
- CPPUNIT_ASSERT_EQUAL(pipe->pipeTerminated(), false);
+ CPPUNIT_ASSERT_EQUAL (pipe->pipeTerminated (), false);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
- pipe->close();
+ pipe->close ();
- CPPUNIT_ASSERT_EQUAL(pipe->pipeTerminated(), true);
+ CPPUNIT_ASSERT_EQUAL (pipe->pipeTerminated (), true);
}
- void testWriteRead()
+ void testWriteRead ()
{
char outBuff[256];
char inBuff[256];
u_long nbw;
u_long nbr;
- strcpy(outBuff, "MyServer is a powerful and easy to configure web server");
+ strcpy (outBuff, "MyServer is a powerful and easy to configure web
server");
- int ret = pipe->create();
+ int ret = pipe->create ();
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
- ret = pipe->write(outBuff, 256, &nbw);
+ ret = pipe->write (outBuff, 256, &nbw);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
- ret = pipe->read(inBuff, 256, &nbr);
+ ret = pipe->read (inBuff, 256, &nbr);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
- CPPUNIT_ASSERT_EQUAL(nbr, nbw);
- CPPUNIT_ASSERT(strcmp(outBuff, inBuff) == 0);
+ CPPUNIT_ASSERT_EQUAL (nbr, nbw);
+ CPPUNIT_ASSERT (strcmp (outBuff, inBuff) == 0);
- pipe->close();
+ pipe->close ();
}
- void testWaitForData()
+ void testWaitForData ()
{
char outBuff[256];
u_long nbw;
- strcpy(outBuff, "MyServer is a powerful and easy to configure web server");
+ strcpy (outBuff, "MyServer is a powerful and easy to configure web
server");
- int ret = pipe->create();
+ int ret = pipe->create ();
- CPPUNIT_ASSERT_EQUAL(pipe->waitForData(0, 100), 0);
+ CPPUNIT_ASSERT_EQUAL (pipe->waitForData (0, 100), 0);
- ret = pipe->write(outBuff, 256, &nbw);
+ ret = pipe->write (outBuff, 256, &nbw);
- CPPUNIT_ASSERT_EQUAL(pipe->waitForData(0, 100), 1);
+ CPPUNIT_ASSERT_EQUAL (pipe->waitForData (0, 100), 1);
- pipe->close();
+ pipe->close ();
}
- void testInverted()
+ void testInverted ()
{
Pipe pipeInv;
- int ret = pipe->create();
+ int ret = pipe->create ();
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
- pipe->inverted(pipeInv);
+ pipe->inverted (pipeInv);
- CPPUNIT_ASSERT_EQUAL(pipeInv.getReadHandle(), pipe->getWriteHandle());
- CPPUNIT_ASSERT_EQUAL(pipe->getReadHandle(), pipeInv.getWriteHandle());
+ CPPUNIT_ASSERT_EQUAL (pipeInv.getReadHandle (), pipe->getWriteHandle ());
+ CPPUNIT_ASSERT_EQUAL (pipe->getReadHandle (), pipeInv.getWriteHandle ());
- pipe->close();
+ pipe->close ();
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestPipe );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestPipe );
diff --git a/myserver/tests/test_plugin_info.cpp
b/myserver/tests/test_plugin_info.cpp
index dfe99f0..5295cb2 100644
--- a/myserver/tests/test_plugin_info.cpp
+++ b/myserver/tests/test_plugin_info.cpp
@@ -30,141 +30,141 @@ using namespace std;
class TestPluginInfo : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestPluginInfo );
- CPPUNIT_TEST( testIsNotEnabled );
- CPPUNIT_TEST( testIsEnabled );
- CPPUNIT_TEST( testIsNotGlobal );
- CPPUNIT_TEST( testIsGlobal );
- CPPUNIT_TEST( testGetVersion );
- CPPUNIT_TEST( testGetMyServerMinVersion );
- CPPUNIT_TEST( testGetMyServerMaxVersion );
- CPPUNIT_TEST( testGetName );
- CPPUNIT_TEST( testDependencies );
- CPPUNIT_TEST( testVersionConversionStringInt );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestPluginInfo );
+ CPPUNIT_TEST ( testIsNotEnabled );
+ CPPUNIT_TEST ( testIsEnabled );
+ CPPUNIT_TEST ( testIsNotGlobal );
+ CPPUNIT_TEST ( testIsGlobal );
+ CPPUNIT_TEST ( testGetVersion );
+ CPPUNIT_TEST ( testGetMyServerMinVersion );
+ CPPUNIT_TEST ( testGetMyServerMaxVersion );
+ CPPUNIT_TEST ( testGetName );
+ CPPUNIT_TEST ( testDependencies );
+ CPPUNIT_TEST ( testVersionConversionStringInt );
+ CPPUNIT_TEST_SUITE_END ();
private:
PluginInfo* pluginfo;
public:
- void setUp()
+ void setUp ()
{
- string name("test");
- pluginfo = new PluginInfo(name,false,false);
+ string name ("test");
+ pluginfo = new PluginInfo (name,false,false);
}
- void tearDown()
+ void tearDown ()
{
- delete(pluginfo);
+ delete (pluginfo);
}
- void testIsNotEnabled()
+ void testIsNotEnabled ()
{
- CPPUNIT_ASSERT(!pluginfo->isEnabled());
+ CPPUNIT_ASSERT (!pluginfo->isEnabled ());
}
- void testIsEnabled()
+ void testIsEnabled ()
{
- delete(pluginfo);
- string name("test");
- pluginfo = new PluginInfo(name,true,false);
- CPPUNIT_ASSERT(pluginfo->isEnabled());
+ delete (pluginfo);
+ string name ("test");
+ pluginfo = new PluginInfo (name,true,false);
+ CPPUNIT_ASSERT (pluginfo->isEnabled ());
}
- void testIsNotGlobal()
+ void testIsNotGlobal ()
{
- CPPUNIT_ASSERT(!pluginfo->isGlobal());
+ CPPUNIT_ASSERT (!pluginfo->isGlobal ());
}
- void testIsGlobal()
+ void testIsGlobal ()
{
- delete(pluginfo);
- string name("test");
- pluginfo = new PluginInfo(name,false,true);
- CPPUNIT_ASSERT(pluginfo->isGlobal());
+ delete (pluginfo);
+ string name ("test");
+ pluginfo = new PluginInfo (name,false,true);
+ CPPUNIT_ASSERT (pluginfo->isGlobal ());
}
- void testGetVersion()
+ void testGetVersion ()
{
- CPPUNIT_ASSERT_EQUAL(pluginfo->getVersion(),0);
+ CPPUNIT_ASSERT_EQUAL (pluginfo->getVersion (),0);
}
- void testGetMyServerMinVersion()
+ void testGetMyServerMinVersion ()
{
- CPPUNIT_ASSERT_EQUAL(pluginfo->getMyServerMinVersion(),0);
+ CPPUNIT_ASSERT_EQUAL (pluginfo->getMyServerMinVersion (),0);
}
- void testGetMyServerMaxVersion()
+ void testGetMyServerMaxVersion ()
{
- CPPUNIT_ASSERT_EQUAL(pluginfo->getMyServerMaxVersion(),0);
+ CPPUNIT_ASSERT_EQUAL (pluginfo->getMyServerMaxVersion (),0);
}
- void testGetName()
+ void testGetName ()
{
- CPPUNIT_ASSERT_EQUAL(pluginfo->getName().compare("test"),0);
+ CPPUNIT_ASSERT_EQUAL (pluginfo->getName ().compare ("test"),0);
}
- void testDependencies()
+ void testDependencies ()
{
- string test("test-dep");
- pluginfo->addDependence(test ,0,1);
- CPPUNIT_ASSERT_EQUAL( (*(pluginfo->begin()))->first , 0);
- CPPUNIT_ASSERT_EQUAL( (*(pluginfo->begin()))->second , 1);
- CPPUNIT_ASSERT_EQUAL( pluginfo->begin().getKey().compare("test-dep"),0);
+ string test ("test-dep");
+ pluginfo->addDependence (test ,0,1);
+ CPPUNIT_ASSERT_EQUAL ( (*(pluginfo->begin ()))->first , 0);
+ CPPUNIT_ASSERT_EQUAL ( (*(pluginfo->begin ()))->second , 1);
+ CPPUNIT_ASSERT_EQUAL ( pluginfo->begin ().getKey ().compare
("test-dep"),0);
}
- void testVersionConversionStringInt()
+ void testVersionConversionStringInt ()
{
- int v = PluginInfo::convertVersion(new string("1"));
- CPPUNIT_ASSERT_EQUAL(1<<24,v);
+ int v = PluginInfo::convertVersion (new string ("1"));
+ CPPUNIT_ASSERT_EQUAL (1<<24,v);
- v = PluginInfo::convertVersion(new string("255"));
- CPPUNIT_ASSERT_EQUAL(255<<24,v);
+ v = PluginInfo::convertVersion (new string ("255"));
+ CPPUNIT_ASSERT_EQUAL (255<<24,v);
- v = PluginInfo::convertVersion(new string("1.2"));
- CPPUNIT_ASSERT_EQUAL((1<<24) + (2<<16),v);
+ v = PluginInfo::convertVersion (new string ("1.2"));
+ CPPUNIT_ASSERT_EQUAL ((1<<24) + (2<<16),v);
- v = PluginInfo::convertVersion(new string("1.2.3"));
- CPPUNIT_ASSERT_EQUAL((1<<24) + (2<<16) + (3<<8),v);
+ v = PluginInfo::convertVersion (new string ("1.2.3"));
+ CPPUNIT_ASSERT_EQUAL ((1<<24) + (2<<16) + (3<<8),v);
- v = PluginInfo::convertVersion(new string("1.2.3.4"));
- CPPUNIT_ASSERT_EQUAL((1<<24) + (2<<16) + (3<<8) + 4,v);
+ v = PluginInfo::convertVersion (new string ("1.2.3.4"));
+ CPPUNIT_ASSERT_EQUAL ((1<<24) + (2<<16) + (3<<8) + 4,v);
- v = PluginInfo::convertVersion(new string("1."));
- CPPUNIT_ASSERT_EQUAL(-1,v);
+ v = PluginInfo::convertVersion (new string ("1."));
+ CPPUNIT_ASSERT_EQUAL (-1,v);
- v = PluginInfo::convertVersion(new string("1.2."));
- CPPUNIT_ASSERT_EQUAL(-1,v);
+ v = PluginInfo::convertVersion (new string ("1.2."));
+ CPPUNIT_ASSERT_EQUAL (-1,v);
- v = PluginInfo::convertVersion(new string("1.2.3."));
- CPPUNIT_ASSERT_EQUAL(-1,v);
+ v = PluginInfo::convertVersion (new string ("1.2.3."));
+ CPPUNIT_ASSERT_EQUAL (-1,v);
- v = PluginInfo::convertVersion(new string("1.2.3.4."));
- CPPUNIT_ASSERT_EQUAL(-1,v);
+ v = PluginInfo::convertVersion (new string ("1.2.3.4."));
+ CPPUNIT_ASSERT_EQUAL (-1,v);
- v = PluginInfo::convertVersion(new string("1.2.3.4...."));
- CPPUNIT_ASSERT_EQUAL(-1,v);
+ v = PluginInfo::convertVersion (new string ("1.2.3.4...."));
+ CPPUNIT_ASSERT_EQUAL (-1,v);
- v = PluginInfo::convertVersion(new string("......1.2.3.4"));
- CPPUNIT_ASSERT_EQUAL(-1,v);
+ v = PluginInfo::convertVersion (new string ("......1.2.3.4"));
+ CPPUNIT_ASSERT_EQUAL (-1,v);
- v = PluginInfo::convertVersion(new string("1..2.3.4"));
- CPPUNIT_ASSERT_EQUAL(-1,v);
+ v = PluginInfo::convertVersion (new string ("1..2.3.4"));
+ CPPUNIT_ASSERT_EQUAL (-1,v);
- v = PluginInfo::convertVersion(new string("1.2...3.4"));
- CPPUNIT_ASSERT_EQUAL(-1,v);
+ v = PluginInfo::convertVersion (new string ("1.2...3.4"));
+ CPPUNIT_ASSERT_EQUAL (-1,v);
- v = PluginInfo::convertVersion(new string("1.2.3....4"));
- CPPUNIT_ASSERT_EQUAL(-1,v);
+ v = PluginInfo::convertVersion (new string ("1.2.3....4"));
+ CPPUNIT_ASSERT_EQUAL (-1,v);
- v = PluginInfo::convertVersion(new string("1.300.3.4"));
- CPPUNIT_ASSERT_EQUAL(-1,v);
+ v = PluginInfo::convertVersion (new string ("1.300.3.4"));
+ CPPUNIT_ASSERT_EQUAL (-1,v);
- v = PluginInfo::convertVersion(new string("1.3.299.4"));
- CPPUNIT_ASSERT_EQUAL(-1,v);
+ v = PluginInfo::convertVersion (new string ("1.3.299.4"));
+ CPPUNIT_ASSERT_EQUAL (-1,v);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestPluginInfo );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestPluginInfo );
diff --git a/myserver/tests/test_recursive_mutex.cpp
b/myserver/tests/test_recursive_mutex.cpp
index e6a3564..32ded01 100644
--- a/myserver/tests/test_recursive_mutex.cpp
+++ b/myserver/tests/test_recursive_mutex.cpp
@@ -26,40 +26,40 @@
class TestRecursiveMutex : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestRecursiveMutex );
- CPPUNIT_TEST( testLockUnlock );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestRecursiveMutex );
+ CPPUNIT_TEST ( testLockUnlock );
+ CPPUNIT_TEST_SUITE_END ();
Mutex *mutex;
public:
- void setUp()
+ void setUp ()
{
- mutex = new RecursiveMutex();
+ mutex = new RecursiveMutex ();
}
- void tearDown()
+ void tearDown ()
{
delete mutex;
}
- void testLockUnlock()
+ void testLockUnlock ()
{
const int N_TIMES = 10;
//This shouldn't deadlock. If it does, then it is bug.
- for(int i = 0; i < N_TIMES; i++)
+ for (int i = 0; i < N_TIMES; i++)
{
- mutex->lock();
- CPPUNIT_ASSERT_EQUAL(mutex->isLocked(), true);
+ mutex->lock ();
+ CPPUNIT_ASSERT_EQUAL (mutex->isLocked (), true);
}
- for(int i = 0; i < N_TIMES; i++)
+ for (int i = 0; i < N_TIMES; i++)
{
- mutex->unlock();
- CPPUNIT_ASSERT_EQUAL(mutex->isLocked(), false);
+ mutex->unlock ();
+ CPPUNIT_ASSERT_EQUAL (mutex->isLocked (), false);
}
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestRecursiveMutex );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestRecursiveMutex );
diff --git a/myserver/tests/test_regex.cpp b/myserver/tests/test_regex.cpp
index f1404e2..56d7721 100644
--- a/myserver/tests/test_regex.cpp
+++ b/myserver/tests/test_regex.cpp
@@ -23,112 +23,112 @@
class TestRegex : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestRegex );
- CPPUNIT_TEST( testStarMatch );
- CPPUNIT_TEST( testPlusMatch );
- CPPUNIT_TEST( testGroup );
- CPPUNIT_TEST( testIsCompiled );
- CPPUNIT_TEST( testClone );
- CPPUNIT_TEST( testFree );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestRegex );
+ CPPUNIT_TEST ( testStarMatch );
+ CPPUNIT_TEST ( testPlusMatch );
+ CPPUNIT_TEST ( testGroup );
+ CPPUNIT_TEST ( testIsCompiled );
+ CPPUNIT_TEST ( testClone );
+ CPPUNIT_TEST ( testFree );
+ CPPUNIT_TEST_SUITE_END ();
Regex *regex;
public:
- void setUp()
+ void setUp ()
{
- regex = new Regex();
+ regex = new Regex ();
}
- void tearDown()
+ void tearDown ()
{
delete regex;
}
- void testGroup()
+ void testGroup ()
{
- int ret = regex->compile("hello (world)!*", REG_EXTENDED);
+ int ret = regex->compile ("hello (world)!*", REG_EXTENDED);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
regmatch_t pm[2];
- ret = regex->exec("hello world!!!", 2, pm, 0);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ ret = regex->exec ("hello world!!!", 2, pm, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
- CPPUNIT_ASSERT_EQUAL((int)pm[1].rm_so, 6);
- CPPUNIT_ASSERT_EQUAL((int)pm[1].rm_eo, 11);
+ CPPUNIT_ASSERT_EQUAL ((int)pm[1].rm_so, 6);
+ CPPUNIT_ASSERT_EQUAL ((int)pm[1].rm_eo, 11);
}
- void testStarMatch()
+ void testStarMatch ()
{
- int ret = regex->compile("hello world!*", REG_EXTENDED);
+ int ret = regex->compile ("hello world!*", REG_EXTENDED);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
regmatch_t pm;
- ret = regex->exec("hello world!!!", 1, &pm, 0);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ ret = regex->exec ("hello world!!!", 1, &pm, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
- ret = regex->exec("hell0 world!!!", 1, &pm, 0);
- CPPUNIT_ASSERT(ret);
+ ret = regex->exec ("hell0 world!!!", 1, &pm, 0);
+ CPPUNIT_ASSERT (ret);
- ret = regex->exec("hello world", 1, &pm, 0);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ ret = regex->exec ("hello world", 1, &pm, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
}
- void testPlusMatch()
+ void testPlusMatch ()
{
- int ret = regex->compile("hello world!+", REG_EXTENDED);
+ int ret = regex->compile ("hello world!+", REG_EXTENDED);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
regmatch_t pm;
- ret = regex->exec("hello world!!!", 1, &pm, 0);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ ret = regex->exec ("hello world!!!", 1, &pm, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
- ret = regex->exec("hell0 world!!!", 1, &pm, 0);
- CPPUNIT_ASSERT(ret);
+ ret = regex->exec ("hell0 world!!!", 1, &pm, 0);
+ CPPUNIT_ASSERT (ret);
- ret = regex->exec("hello world", 1, &pm, 0);
- CPPUNIT_ASSERT(ret);
+ ret = regex->exec ("hello world", 1, &pm, 0);
+ CPPUNIT_ASSERT (ret);
}
- void testIsCompiled()
+ void testIsCompiled ()
{
- CPPUNIT_ASSERT_EQUAL(regex->isCompiled(), 0);
+ CPPUNIT_ASSERT_EQUAL (regex->isCompiled (), 0);
- regex->compile("test", REG_EXTENDED);
+ regex->compile ("test", REG_EXTENDED);
- CPPUNIT_ASSERT(regex->isCompiled());
+ CPPUNIT_ASSERT (regex->isCompiled ());
}
- void testClone()
+ void testClone ()
{
Regex cloned;
regmatch_t pm;
- regex->compile("test", REG_EXTENDED);
+ regex->compile ("test", REG_EXTENDED);
- cloned.clone(*regex);
+ cloned.clone (*regex);
- int ret = regex->exec("test", 1, &pm, 0);
- int retCloned = cloned.exec("test", 1, &pm, 0);
+ int ret = regex->exec ("test", 1, &pm, 0);
+ int retCloned = cloned.exec ("test", 1, &pm, 0);
- CPPUNIT_ASSERT_EQUAL(ret, retCloned);
+ CPPUNIT_ASSERT_EQUAL (ret, retCloned);
}
- void testFree()
+ void testFree ()
{
regmatch_t pm;
- regex->compile("test", REG_EXTENDED);
+ regex->compile ("test", REG_EXTENDED);
- regex->free();
+ regex->free ();
- int ret = regex->exec("test", 1, &pm, 0);
+ int ret = regex->exec ("test", 1, &pm, 0);
- CPPUNIT_ASSERT(ret);
+ CPPUNIT_ASSERT (ret);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestRegex );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestRegex );
diff --git a/myserver/tests/test_safetime.cpp b/myserver/tests/test_safetime.cpp
index 449fbc6..4b981b9 100644
--- a/myserver/tests/test_safetime.cpp
+++ b/myserver/tests/test_safetime.cpp
@@ -30,69 +30,69 @@ using namespace std;
class TestSafetime : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestSafetime );
- CPPUNIT_TEST( testLocalTime );
- CPPUNIT_TEST( testGmTime );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestSafetime );
+ CPPUNIT_TEST ( testLocalTime );
+ CPPUNIT_TEST ( testGmTime );
+ CPPUNIT_TEST_SUITE_END ();
public:
- void setUp()
+ void setUp ()
{
- myserver_safetime_init();
+ myserver_safetime_init ();
}
- void tearDown()
+ void tearDown ()
{
- myserver_safetime_destroy();
+ myserver_safetime_destroy ();
}
- void testLocalTime()
+ void testLocalTime ()
{
tm res;
time_t timep = 10;
- tm *outRes = myserver_localtime(&timep, &res);
-
- CPPUNIT_ASSERT(outRes);
- CPPUNIT_ASSERT_EQUAL(res.tm_sec, outRes->tm_sec);
- CPPUNIT_ASSERT_EQUAL(res.tm_min, outRes->tm_min);
- CPPUNIT_ASSERT_EQUAL(res.tm_hour, outRes->tm_hour);
- CPPUNIT_ASSERT_EQUAL(res.tm_mday, outRes->tm_mday);
- CPPUNIT_ASSERT_EQUAL(res.tm_mon, outRes->tm_mon);
- CPPUNIT_ASSERT_EQUAL(res.tm_year, outRes->tm_year);
- CPPUNIT_ASSERT_EQUAL(res.tm_wday, outRes->tm_wday);
- CPPUNIT_ASSERT_EQUAL(res.tm_yday, outRes->tm_yday);
- CPPUNIT_ASSERT_EQUAL(res.tm_isdst, outRes->tm_isdst);
-
-
- CPPUNIT_ASSERT_EQUAL(res.tm_sec, 10);
- CPPUNIT_ASSERT_EQUAL(res.tm_min, 0);
- CPPUNIT_ASSERT_EQUAL(res.tm_year, 70);
+ tm *outRes = myserver_localtime (&timep, &res);
+
+ CPPUNIT_ASSERT (outRes);
+ CPPUNIT_ASSERT_EQUAL (res.tm_sec, outRes->tm_sec);
+ CPPUNIT_ASSERT_EQUAL (res.tm_min, outRes->tm_min);
+ CPPUNIT_ASSERT_EQUAL (res.tm_hour, outRes->tm_hour);
+ CPPUNIT_ASSERT_EQUAL (res.tm_mday, outRes->tm_mday);
+ CPPUNIT_ASSERT_EQUAL (res.tm_mon, outRes->tm_mon);
+ CPPUNIT_ASSERT_EQUAL (res.tm_year, outRes->tm_year);
+ CPPUNIT_ASSERT_EQUAL (res.tm_wday, outRes->tm_wday);
+ CPPUNIT_ASSERT_EQUAL (res.tm_yday, outRes->tm_yday);
+ CPPUNIT_ASSERT_EQUAL (res.tm_isdst, outRes->tm_isdst);
+
+
+ CPPUNIT_ASSERT_EQUAL (res.tm_sec, 10);
+ CPPUNIT_ASSERT_EQUAL (res.tm_min, 0);
+ CPPUNIT_ASSERT_EQUAL (res.tm_year, 70);
}
- void testGmTime()
+ void testGmTime ()
{
tm res;
time_t timep = 10;
- tm *outRes = myserver_gmtime(&timep, &res);
-
- CPPUNIT_ASSERT(outRes);
- CPPUNIT_ASSERT_EQUAL(res.tm_sec, outRes->tm_sec);
- CPPUNIT_ASSERT_EQUAL(res.tm_min, outRes->tm_min);
- CPPUNIT_ASSERT_EQUAL(res.tm_hour, outRes->tm_hour);
- CPPUNIT_ASSERT_EQUAL(res.tm_mday, outRes->tm_mday);
- CPPUNIT_ASSERT_EQUAL(res.tm_mon, outRes->tm_mon);
- CPPUNIT_ASSERT_EQUAL(res.tm_year, outRes->tm_year);
- CPPUNIT_ASSERT_EQUAL(res.tm_wday, outRes->tm_wday);
- CPPUNIT_ASSERT_EQUAL(res.tm_yday, outRes->tm_yday);
- CPPUNIT_ASSERT_EQUAL(res.tm_isdst, outRes->tm_isdst);
-
-
- CPPUNIT_ASSERT_EQUAL(res.tm_sec, 10);
- CPPUNIT_ASSERT_EQUAL(res.tm_min, 0);
- CPPUNIT_ASSERT_EQUAL(res.tm_hour, 0);
- CPPUNIT_ASSERT_EQUAL(res.tm_year, 70);
+ tm *outRes = myserver_gmtime (&timep, &res);
+
+ CPPUNIT_ASSERT (outRes);
+ CPPUNIT_ASSERT_EQUAL (res.tm_sec, outRes->tm_sec);
+ CPPUNIT_ASSERT_EQUAL (res.tm_min, outRes->tm_min);
+ CPPUNIT_ASSERT_EQUAL (res.tm_hour, outRes->tm_hour);
+ CPPUNIT_ASSERT_EQUAL (res.tm_mday, outRes->tm_mday);
+ CPPUNIT_ASSERT_EQUAL (res.tm_mon, outRes->tm_mon);
+ CPPUNIT_ASSERT_EQUAL (res.tm_year, outRes->tm_year);
+ CPPUNIT_ASSERT_EQUAL (res.tm_wday, outRes->tm_wday);
+ CPPUNIT_ASSERT_EQUAL (res.tm_yday, outRes->tm_yday);
+ CPPUNIT_ASSERT_EQUAL (res.tm_isdst, outRes->tm_isdst);
+
+
+ CPPUNIT_ASSERT_EQUAL (res.tm_sec, 10);
+ CPPUNIT_ASSERT_EQUAL (res.tm_min, 0);
+ CPPUNIT_ASSERT_EQUAL (res.tm_hour, 0);
+ CPPUNIT_ASSERT_EQUAL (res.tm_year, 70);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestSafetime );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestSafetime );
diff --git a/myserver/tests/test_security_cache.cpp
b/myserver/tests/test_security_cache.cpp
index 54e5e7c..9123f2f 100644
--- a/myserver/tests/test_security_cache.cpp
+++ b/myserver/tests/test_security_cache.cpp
@@ -69,18 +69,18 @@ public:
void testGetSecurityFile ()
{
- string file("foo/bar/not/exist/in/reality");
+ string file ("foo/bar/not/exist/in/reality");
string out;
- CPPUNIT_ASSERT(secCache->getSecurityFile (file, file, out));
+ CPPUNIT_ASSERT (secCache->getSecurityFile (file, file, out));
}
void testGetParser ()
{
- string dir("foo/bar/not/exist/in/reality");
- string file("baz");
- CPPUNIT_ASSERT_EQUAL(secCache->getParser (dir, dir, false),
(XmlParser*)NULL);
+ string dir ("foo/bar/not/exist/in/reality");
+ string file ("baz");
+ CPPUNIT_ASSERT_EQUAL (secCache->getParser (dir, dir, false),
(XmlParser*)NULL);
}
diff --git a/myserver/tests/test_security_domain.cpp
b/myserver/tests/test_security_domain.cpp
index a6cc9de..d0c9e94 100644
--- a/myserver/tests/test_security_domain.cpp
+++ b/myserver/tests/test_security_domain.cpp
@@ -32,36 +32,36 @@ using namespace std;
class TestSecurityDomain : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestSecurityDomain );
- CPPUNIT_TEST( testGetValue );
- CPPUNIT_TEST( testGetName );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestSecurityDomain );
+ CPPUNIT_TEST ( testGetValue );
+ CPPUNIT_TEST ( testGetName );
+ CPPUNIT_TEST_SUITE_END ();
SecurityDomain* securityDomain;
public:
- void setUp()
+ void setUp ()
{
- securityDomain = new SecurityDomain();
+ securityDomain = new SecurityDomain ();
}
- void tearDown()
+ void tearDown ()
{
delete securityDomain;
}
- void testGetName()
+ void testGetName ()
{
- string val("value");
- CPPUNIT_ASSERT_EQUAL(securityDomain->getName().compare(""), 0);
+ string val ("value");
+ CPPUNIT_ASSERT_EQUAL (securityDomain->getName ().compare (""), 0);
}
- void testGetValue()
+ void testGetValue ()
{
- string val("value");
- CPPUNIT_ASSERT_EQUAL(securityDomain->getValue(val), (string*)NULL);
+ string val ("value");
+ CPPUNIT_ASSERT_EQUAL (securityDomain->getValue (val), (string*)NULL);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestSecurityDomain );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestSecurityDomain );
diff --git a/myserver/tests/test_security_manager.cpp
b/myserver/tests/test_security_manager.cpp
index ae65e93..3673087 100644
--- a/myserver/tests/test_security_manager.cpp
+++ b/myserver/tests/test_security_manager.cpp
@@ -33,32 +33,32 @@ using namespace std;
class TestSecurityManager : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestSecurityManager );
- CPPUNIT_TEST( testGetPermissionMask );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestSecurityManager );
+ CPPUNIT_TEST ( testGetPermissionMask );
+ CPPUNIT_TEST_SUITE_END ();
AuthMethodFactory authMethodFactory;
ValidatorFactory validatorFactory;
SecurityManager* securityManager;
public:
- void setUp()
+ void setUp ()
{
- securityManager = new SecurityManager(&validatorFactory,
&authMethodFactory);
+ securityManager = new SecurityManager (&validatorFactory,
&authMethodFactory);
}
- void tearDown()
+ void tearDown ()
{
delete securityManager;
}
- void testGetPermissionMask()
+ void testGetPermissionMask ()
{
SecurityToken secToken;
- string xml("xml");
- CPPUNIT_ASSERT_EQUAL(securityManager->getPermissionMask(&secToken,
(list<SecurityDomain*>*)NULL, xml, xml), 0);
- CPPUNIT_ASSERT_EQUAL(securityManager->getPermissionMask(&secToken,
(SecurityDomain**)NULL, xml, xml), 0);
+ string xml ("xml");
+ CPPUNIT_ASSERT_EQUAL (securityManager->getPermissionMask (&secToken,
(list<SecurityDomain*>*)NULL, xml, xml), 0);
+ CPPUNIT_ASSERT_EQUAL (securityManager->getPermissionMask (&secToken,
(SecurityDomain**)NULL, xml, xml), 0);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestSecurityManager );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestSecurityManager );
diff --git a/myserver/tests/test_security_token.cpp
b/myserver/tests/test_security_token.cpp
index da5d635..3e1b6c1 100644
--- a/myserver/tests/test_security_token.cpp
+++ b/myserver/tests/test_security_token.cpp
@@ -35,7 +35,7 @@ using namespace std;
class TestSecurityToken : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestSecurityToken );
+ CPPUNIT_TEST_SUITE ( TestSecurityToken );
CPPUNIT_TEST ( testUser);
CPPUNIT_TEST ( testPassword);
CPPUNIT_TEST ( testValues );
@@ -49,29 +49,29 @@ class TestSecurityToken : public CppUnit::TestFixture
CPPUNIT_TEST ( testAuthenticated );
CPPUNIT_TEST ( testServer );
CPPUNIT_TEST ( testVhost );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE_END ();
SecurityToken* securityToken;
public:
- void setUp()
+ void setUp ()
{
- securityToken = new SecurityToken();
+ securityToken = new SecurityToken ();
}
- void tearDown()
+ void tearDown ()
{
delete securityToken;
}
- void testUser()
+ void testUser ()
{
string user ("foo");
securityToken->setUser (user);
CPPUNIT_ASSERT_EQUAL (securityToken->getUser ().compare (user), 0);
}
- void testPassword()
+ void testPassword ()
{
string password ("foo");
securityToken->setPassword (password);
@@ -160,4 +160,4 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestSecurityToken );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestSecurityToken );
diff --git a/myserver/tests/test_semaphore.cpp
b/myserver/tests/test_semaphore.cpp
index da0090b..22c5e53 100644
--- a/myserver/tests/test_semaphore.cpp
+++ b/myserver/tests/test_semaphore.cpp
@@ -32,74 +32,74 @@ using namespace std;
class TestSemaphore : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestSemaphore );
- CPPUNIT_TEST( testUnlockLock );
- CPPUNIT_TEST( testConstructor );
- CPPUNIT_TEST( testIsInitialized );
- CPPUNIT_TEST( testGetHandle );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestSemaphore );
+ CPPUNIT_TEST ( testUnlockLock );
+ CPPUNIT_TEST ( testConstructor );
+ CPPUNIT_TEST ( testIsInitialized );
+ CPPUNIT_TEST ( testGetHandle );
+ CPPUNIT_TEST_SUITE_END ();
Semaphore *sem;
public:
- void setUp()
+ void setUp ()
{
}
- void tearDown()
+ void tearDown ()
{
}
- void testGetHandle()
+ void testGetHandle ()
{
- sem = new Semaphore(0);
+ sem = new Semaphore (0);
- CPPUNIT_ASSERT(sem->getHandle());
+ CPPUNIT_ASSERT (sem->getHandle ());
delete sem;
}
- void testUnlockLock()
+ void testUnlockLock ()
{
- sem = new Semaphore(0);
+ sem = new Semaphore (0);
- sem->unlock();
+ sem->unlock ();
- sem->lock();
+ sem->lock ();
- for(int i = 0; i < 10; i++)
- sem->unlock();
+ for (int i = 0; i < 10; i++)
+ sem->unlock ();
- for(int i = 0; i < 10; i++)
- sem->lock();
+ for (int i = 0; i < 10; i++)
+ sem->lock ();
delete sem;
}
- void testIsInitialized()
+ void testIsInitialized ()
{
- sem = new Semaphore(0);
+ sem = new Semaphore (0);
- CPPUNIT_ASSERT(sem->isInitialized());
+ CPPUNIT_ASSERT (sem->isInitialized ());
- sem->destroy();
+ sem->destroy ();
- CPPUNIT_ASSERT_EQUAL(sem->isInitialized(), 0);
+ CPPUNIT_ASSERT_EQUAL (sem->isInitialized (), 0);
delete sem;
}
- void testConstructor()
+ void testConstructor ()
{
- sem = new Semaphore(10);
+ sem = new Semaphore (10);
- for(int i = 0; i < 10; i++)
- sem->lock();
+ for (int i = 0; i < 10; i++)
+ sem->lock ();
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestSemaphore );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestSemaphore );
diff --git a/myserver/tests/test_socket.cpp b/myserver/tests/test_socket.cpp
index 38b6282..e77b05e 100644
--- a/myserver/tests/test_socket.cpp
+++ b/myserver/tests/test_socket.cpp
@@ -35,26 +35,26 @@ extern "C"
using namespace std;
-static DEFINE_THREAD(testRecvClient, pParam);
+static DEFINE_THREAD (testRecvClient, pParam);
class TestSocket : public CppUnit::TestFixture
{
Socket *obj;
ThreadID tid;
- CPPUNIT_TEST_SUITE( TestSocket );
+ CPPUNIT_TEST_SUITE ( TestSocket );
- CPPUNIT_TEST( testGethostname );
- CPPUNIT_TEST( testRecv );
- CPPUNIT_TEST( testGetLocalIPsList );
+ CPPUNIT_TEST ( testGethostname );
+ CPPUNIT_TEST ( testRecv );
+ CPPUNIT_TEST ( testGetLocalIPsList );
- CPPUNIT_TEST_SUITE_END( );
+ CPPUNIT_TEST_SUITE_END ( );
public:
void setUp ( )
{
- CPPUNIT_ASSERT_EQUAL( Socket::startupSocketLib ( ), 0 );
+ CPPUNIT_ASSERT_EQUAL ( Socket::startupSocketLib ( ), 0 );
obj = new Socket;
}
@@ -77,7 +77,7 @@ public:
int status = obj->gethostname ( host, len );
- CPPUNIT_ASSERT_EQUAL( status, 0 );
+ CPPUNIT_ASSERT_EQUAL ( status, 0 );
}
void testRecv ( )
@@ -95,11 +95,11 @@ public:
socklen_t sockInLen = sizeof ( sockaddr_in );
- CPPUNIT_ASSERT( obj->socket ( AF_INET, SOCK_STREAM, 0 ) != -1 );
+ CPPUNIT_ASSERT ( obj->socket ( AF_INET, SOCK_STREAM, 0 ) != -1 );
- CPPUNIT_ASSERT( obj->setsockopt ( SOL_SOCKET, SO_REUSEADDR,
+ CPPUNIT_ASSERT ( obj->setsockopt ( SOL_SOCKET, SO_REUSEADDR,
(const char*) &optvalReuseAddr,
- sizeof(optvalReuseAddr) ) != -1 );
+ sizeof (optvalReuseAddr) ) != -1 );
// If the port is used by another program, try a few others.
if ( ( status = obj->bind ( &sockIn, sockInLen ) ) != 0 )
@@ -111,20 +111,20 @@ public:
break;
}
- CPPUNIT_ASSERT( status != -1 );
+ CPPUNIT_ASSERT ( status != -1 );
- CPPUNIT_ASSERT( obj->listen ( 1 ) != -1 );
+ CPPUNIT_ASSERT ( obj->listen ( 1 ) != -1 );
- CPPUNIT_ASSERT_EQUAL( Thread::create ( &tid, testRecvClient, &port ), 0 );
+ CPPUNIT_ASSERT_EQUAL ( Thread::create ( &tid, testRecvClient, &port ), 0 );
Socket s = obj->accept ( &sockIn, &sockInLen );
status = int ( s.getHandle ( ) );
if ( status < 0 )
- CPPUNIT_ASSERT( status != -1 );
+ CPPUNIT_ASSERT ( status != -1 );
- CPPUNIT_ASSERT( s.bytesToRead ( ) >= 0 );
+ CPPUNIT_ASSERT ( s.bytesToRead ( ) >= 0 );
int bufLen = 8;
char buf[bufLen];
@@ -134,35 +134,35 @@ public:
s.send ("a", 1, 0);
- CPPUNIT_ASSERT( !strcmp (buf, "ehlo"));
- CPPUNIT_ASSERT( status >= 0 || status == -2 );
+ CPPUNIT_ASSERT ( !strcmp (buf, "ehlo"));
+ CPPUNIT_ASSERT ( status >= 0 || status == -2 );
Thread::join ( tid );
- CPPUNIT_ASSERT( obj->close ( ) != -1 );
+ CPPUNIT_ASSERT ( obj->close ( ) != -1 );
}
void testGetLocalIPsList ( )
{
int status = obj->socket ( AF_INET, SOCK_STREAM, 0 );
- CPPUNIT_ASSERT( status != -1 );
+ CPPUNIT_ASSERT ( status != -1 );
string out;
status = obj->getLocalIPsList ( out );
- CPPUNIT_ASSERT( status != -1 );
+ CPPUNIT_ASSERT ( status != -1 );
status = obj->close ( );
- CPPUNIT_ASSERT( status != -1 );
+ CPPUNIT_ASSERT ( status != -1 );
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestSocket );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestSocket );
-static DEFINE_THREAD(testRecvClient, pParam)
+static DEFINE_THREAD (testRecvClient, pParam)
{
Socket *obj2 = new Socket;
@@ -171,23 +171,23 @@ static DEFINE_THREAD(testRecvClient, pParam)
int port = *((int*)pParam);
int status;
- CPPUNIT_ASSERT( obj2->socket ( AF_INET, SOCK_STREAM, 0 ) != -1 );
+ CPPUNIT_ASSERT ( obj2->socket ( AF_INET, SOCK_STREAM, 0 ) != -1 );
- CPPUNIT_ASSERT( obj2->connect ( host, port ) != -1 );
+ CPPUNIT_ASSERT ( obj2->connect ( host, port ) != -1 );
int bufLen = 8;
char buf[bufLen];
memset ( buf, 0, bufLen );
strcpy ( buf, "ehlo" );
- CPPUNIT_ASSERT( obj2->send ( buf, strlen ( buf ), 0 ) != -1 );
+ CPPUNIT_ASSERT ( obj2->send ( buf, strlen ( buf ), 0 ) != -1 );
/* To sync. */
- CPPUNIT_ASSERT( obj2->recv ( buf, bufLen, 0 ) != -1 );
+ CPPUNIT_ASSERT ( obj2->recv ( buf, bufLen, 0 ) != -1 );
- CPPUNIT_ASSERT( obj2->shutdown ( SD_BOTH ) != -1 );
+ CPPUNIT_ASSERT ( obj2->shutdown ( SD_BOTH ) != -1 );
- CPPUNIT_ASSERT( obj2->close ( ) != -1 );
+ CPPUNIT_ASSERT ( obj2->close ( ) != -1 );
delete obj2;
obj2 = NULL;
diff --git a/myserver/tests/test_socket_pair.cpp
b/myserver/tests/test_socket_pair.cpp
index 7c198fe..97f7245 100644
--- a/myserver/tests/test_socket_pair.cpp
+++ b/myserver/tests/test_socket_pair.cpp
@@ -25,19 +25,19 @@
class TestSocketPair : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestSocketPair );
- CPPUNIT_TEST( testCreateClose );
- CPPUNIT_TEST( testInverted );
- CPPUNIT_TEST( testWriteRead );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestSocketPair );
+ CPPUNIT_TEST ( testCreateClose );
+ CPPUNIT_TEST ( testInverted );
+ CPPUNIT_TEST ( testWriteRead );
+ CPPUNIT_TEST_SUITE_END ();
public:
- void setUp()
+ void setUp ()
{
}
- void tearDown()
+ void tearDown ()
{
}
@@ -81,18 +81,18 @@ public:
ret = writeSock.write (inBuffer, strlen (inBuffer) + 1, &nbw);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
ret = readSock.read (outBuffer, 256, &nbr);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
- CPPUNIT_ASSERT_EQUAL(strcmp (inBuffer, outBuffer), 0);
+ CPPUNIT_ASSERT_EQUAL (strcmp (inBuffer, outBuffer), 0);
writeSock.close ();
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestSocketPair );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestSocketPair );
diff --git a/myserver/tests/test_ssl_socket.cpp
b/myserver/tests/test_ssl_socket.cpp
index a93bc3a..5a7cf13 100644
--- a/myserver/tests/test_ssl_socket.cpp
+++ b/myserver/tests/test_ssl_socket.cpp
@@ -87,15 +87,15 @@
FX3J22wtVUi4Ve/XftYt6RJKd764o5WTdh/Z+RUbtusXnj3ygpI/G7fTzuPUj9uF\n\
3K2VTrZpJnbMs7+i3w/ziC/cqWRVK6Rcq3bLzTXrig==\n\
-----END CERTIFICATE-----\n";
-static DEFINE_THREAD(testSslRecvClient, pParam);
+static DEFINE_THREAD (testSslRecvClient, pParam);
class TestSslSocket : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestSslSocket );
+ CPPUNIT_TEST_SUITE ( TestSslSocket );
- CPPUNIT_TEST( testRecv );
+ CPPUNIT_TEST ( testRecv );
- CPPUNIT_TEST_SUITE_END( );
+ CPPUNIT_TEST_SUITE_END ( );
public:
@@ -139,13 +139,13 @@ public:
socklen_t sockInLen = sizeof ( sockaddr_in );
- CPPUNIT_ASSERT( obj->socket ( AF_INET, SOCK_STREAM, 0 ) != -1 );
+ CPPUNIT_ASSERT ( obj->socket ( AF_INET, SOCK_STREAM, 0 ) != -1 );
- CPPUNIT_ASSERT( obj->setsockopt ( SOL_SOCKET, SO_REUSEADDR,
+ CPPUNIT_ASSERT ( obj->setsockopt ( SOL_SOCKET, SO_REUSEADDR,
(const char*) &optvalReuseAddr,
- sizeof(optvalReuseAddr) ) != -1 );
+ sizeof (optvalReuseAddr) ) != -1 );
- ctx = SSL_CTX_new ( SSLv23_server_method() );
+ ctx = SSL_CTX_new ( SSLv23_server_method () );
if ( SSL_CTX_use_certificate_file ( ctx, TESTSERVERPEM, SSL_FILETYPE_PEM )
!= 1 )
{
@@ -167,11 +167,11 @@ public:
}
while ((status = obj->bind (&sockIn, sockInLen)) != 0 && port < 28000);
- CPPUNIT_ASSERT( status != -1 );
+ CPPUNIT_ASSERT ( status != -1 );
- CPPUNIT_ASSERT( obj->listen ( 1 ) != -1 );
+ CPPUNIT_ASSERT ( obj->listen ( 1 ) != -1 );
- CPPUNIT_ASSERT_EQUAL( Thread::create ( &tid, testSslRecvClient, &port ), 0
);
+ CPPUNIT_ASSERT_EQUAL ( Thread::create ( &tid, testSslRecvClient, &port ),
0 );
Socket s = obj->accept ( &sockIn, &sockInLen );
sslObj = new SslSocket (&s);
@@ -189,15 +189,15 @@ public:
char buf[32] = {0};
- ret = sslObj->recv ( buf, sizeof(buf), 0 );
+ ret = sslObj->recv ( buf, sizeof (buf), 0 );
sslObj->send ( "a", 1, 0);
- CPPUNIT_ASSERT(ret != -1 );
+ CPPUNIT_ASSERT (ret != -1 );
- CPPUNIT_ASSERT( sslObj->close ( ) != -1 );
+ CPPUNIT_ASSERT ( sslObj->close ( ) != -1 );
- CPPUNIT_ASSERT( obj->close ( ) != -1 );
+ CPPUNIT_ASSERT ( obj->close ( ) != -1 );
SSL_CTX_free ( ctx );
@@ -206,9 +206,9 @@ public:
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestSslSocket );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestSslSocket );
-static DEFINE_THREAD(testSslRecvClient, pParam)
+static DEFINE_THREAD (testSslRecvClient, pParam)
{
Socket *obj2 = new Socket;
SslSocket *sslObj2 = NULL;
@@ -224,22 +224,22 @@ static DEFINE_THREAD(testSslRecvClient, pParam)
int sockInLen = sizeof ( struct sockaddr_in );
- CPPUNIT_ASSERT( obj2->socket ( AF_INET, SOCK_STREAM, 0 ) != -1 );
+ CPPUNIT_ASSERT ( obj2->socket ( AF_INET, SOCK_STREAM, 0 ) != -1 );
sslObj2 = new SslSocket ( obj2 );
- CPPUNIT_ASSERT( sslObj2->connect ( &sockIn, sockInLen ) != -1 );
+ CPPUNIT_ASSERT ( sslObj2->connect ( &sockIn, sockInLen ) != -1 );
char buf[] = "Works?\n";
- int ret = sslObj2->send ( buf, strlen(buf), 0 );
+ int ret = sslObj2->send ( buf, strlen (buf), 0 );
sslObj2->recv ( buf, 1, 0 );
- CPPUNIT_ASSERT(ret != -1 );
+ CPPUNIT_ASSERT (ret != -1 );
- CPPUNIT_ASSERT( sslObj2->close ( ) != -1 );
+ CPPUNIT_ASSERT ( sslObj2->close ( ) != -1 );
delete obj2;
delete sslObj2;
diff --git a/myserver/tests/test_thread.cpp b/myserver/tests/test_thread.cpp
index 5d78cbd..193c04d 100644
--- a/myserver/tests/test_thread.cpp
+++ b/myserver/tests/test_thread.cpp
@@ -26,7 +26,7 @@
#include <iostream>
using namespace std;
-static DEFINE_THREAD(test_thread,pParam)
+static DEFINE_THREAD (test_thread,pParam)
{
int *arg = (int*) pParam;
@@ -35,13 +35,13 @@ static DEFINE_THREAD(test_thread,pParam)
return NULL;
}
-static DEFINE_THREAD(test_terminate_thread, pParam)
+static DEFINE_THREAD (test_terminate_thread, pParam)
{
int *arg = (int*) pParam;
*arg = 0;
- Thread::terminate();
+ Thread::terminate ();
//Should never be here.
*arg = 1;
@@ -51,50 +51,50 @@ static DEFINE_THREAD(test_terminate_thread, pParam)
class TestThread : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestThread );
- CPPUNIT_TEST( testThreadCreate );
- CPPUNIT_TEST( testThreadTerminate );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestThread );
+ CPPUNIT_TEST ( testThreadCreate );
+ CPPUNIT_TEST ( testThreadTerminate );
+ CPPUNIT_TEST_SUITE_END ();
public:
- void setUp()
+ void setUp ()
{
}
- void tearDown()
+ void tearDown ()
{
}
- void testThreadCreate()
+ void testThreadCreate ()
{
ThreadID tid;
int data = 5;
int expected = data * data;
- int res = Thread::create(&tid, test_thread, &data);
- Thread::join(tid);
+ int res = Thread::create (&tid, test_thread, &data);
+ Thread::join (tid);
- CPPUNIT_ASSERT_EQUAL(res, 0);
- CPPUNIT_ASSERT_EQUAL(data, expected);
+ CPPUNIT_ASSERT_EQUAL (res, 0);
+ CPPUNIT_ASSERT_EQUAL (data, expected);
}
- void testThreadTerminate()
+ void testThreadTerminate ()
{
ThreadID tid;
int data = 1;
- int res = Thread::create(&tid, test_terminate_thread, &data);
- Thread::join(tid);
+ int res = Thread::create (&tid, test_terminate_thread, &data);
+ Thread::join (tid);
- CPPUNIT_ASSERT_EQUAL(res, 0);
- CPPUNIT_ASSERT_EQUAL(data, 0);
+ CPPUNIT_ASSERT_EQUAL (res, 0);
+ CPPUNIT_ASSERT_EQUAL (data, 0);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestThread );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestThread );
diff --git a/myserver/tests/test_unix_socket.cpp
b/myserver/tests/test_unix_socket.cpp
index 05327d4..10f67dc 100644
--- a/myserver/tests/test_unix_socket.cpp
+++ b/myserver/tests/test_unix_socket.cpp
@@ -48,7 +48,7 @@ void* test_unix_socket_server (void* pParam)
return NULL;
char buffer [256];
- if (client.recv(buffer, 256, 0, MYSERVER_SEC (1)) == 0)
+ if (client.recv (buffer, 256, 0, MYSERVER_SEC (1)) == 0)
{
client.close ();
return NULL;
@@ -65,10 +65,10 @@ void* test_unix_socket_server (void* pParam)
class TestUnixSocket : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestUnixSocket );
- CPPUNIT_TEST( testBind );
- CPPUNIT_TEST( testClient );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestUnixSocket );
+ CPPUNIT_TEST ( testBind );
+ CPPUNIT_TEST ( testClient );
+ CPPUNIT_TEST_SUITE_END ();
UnixSocket *sock;
public:
@@ -87,27 +87,27 @@ public:
{
int ret;
string path;
- FilesUtility::temporaryFileName(0, path);
+ FilesUtility::temporaryFileName (0, path);
CPPUNIT_ASSERT (sock->socket ());
//FIXME: find a better place inside FilesUtility.
struct stat F_Stats;
- ret = stat(path.c_str (), &F_Stats);
+ ret = stat (path.c_str (), &F_Stats);
CPPUNIT_ASSERT (ret);
/////////////////////////////////////////////////
CPPUNIT_ASSERT_EQUAL (sock->bind (path.c_str ()), 0);
- ret = stat(path.c_str (), &F_Stats);
+ ret = stat (path.c_str (), &F_Stats);
CPPUNIT_ASSERT_EQUAL (ret, 0);
CPPUNIT_ASSERT_EQUAL (sock->shutdown (), 0);
CPPUNIT_ASSERT_EQUAL (sock->close (), 0);
- ret = stat(path.c_str (), &F_Stats);
+ ret = stat (path.c_str (), &F_Stats);
CPPUNIT_ASSERT (ret);
}
@@ -142,6 +142,6 @@ public:
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestUnixSocket );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestUnixSocket );
#endif
diff --git a/myserver/tests/test_url.cpp b/myserver/tests/test_url.cpp
index 3129888..8074f7a 100644
--- a/myserver/tests/test_url.cpp
+++ b/myserver/tests/test_url.cpp
@@ -30,12 +30,12 @@ using namespace std;
class TestUrl : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestUrl );
- CPPUNIT_TEST( testUrl );
- CPPUNIT_TEST( testUrlWithCredentials );
- CPPUNIT_TEST( testUrlWithQuery );
- CPPUNIT_TEST( testUrlWithoutPort );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestUrl );
+ CPPUNIT_TEST ( testUrl );
+ CPPUNIT_TEST ( testUrlWithCredentials );
+ CPPUNIT_TEST ( testUrlWithQuery );
+ CPPUNIT_TEST ( testUrlWithoutPort );
+ CPPUNIT_TEST_SUITE_END ();
public:
void setUp ( )
@@ -101,4 +101,4 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestUrl );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestUrl );
diff --git a/myserver/tests/test_utility.cpp b/myserver/tests/test_utility.cpp
index ff22f77..aeea97c 100644
--- a/myserver/tests/test_utility.cpp
+++ b/myserver/tests/test_utility.cpp
@@ -30,69 +30,69 @@ using namespace std;
class TestUtility : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestUtility );
- CPPUNIT_TEST( testGetTicks );
- CPPUNIT_TEST( testCWD );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestUtility );
+ CPPUNIT_TEST ( testGetTicks );
+ CPPUNIT_TEST ( testCWD );
+ CPPUNIT_TEST_SUITE_END ();
public:
- void setUp()
+ void setUp ()
{
}
- void tearDown()
+ void tearDown ()
{
}
- void testGetTicks()
+ void testGetTicks ()
{
u_long ticks = getTicks ();
- Thread::wait(25000);
+ Thread::wait (25000);
u_long ticks2 = getTicks ();
- CPPUNIT_ASSERT(ticks2 > ticks);
+ CPPUNIT_ASSERT (ticks2 > ticks);
}
- void testGetCPUCount()
+ void testGetCPUCount ()
{
- CPPUNIT_ASSERT(getCPUCount() > 0);
+ CPPUNIT_ASSERT (getCPUCount () > 0);
}
- void testCWD()
+ void testCWD ()
{
char *buffer;
unsigned int bufferLen;
- setcwdBuffer();
+ setcwdBuffer ();
- bufferLen = getdefaultwdlen();
- CPPUNIT_ASSERT(bufferLen > 0);
+ bufferLen = getdefaultwdlen ();
+ CPPUNIT_ASSERT (bufferLen > 0);
buffer = new char[bufferLen + 1];
- getdefaultwd(buffer, bufferLen);
+ getdefaultwd (buffer, bufferLen);
- CPPUNIT_ASSERT( strlen(buffer) > 0 );
- CPPUNIT_ASSERT(strlen(buffer) <= bufferLen);
+ CPPUNIT_ASSERT ( strlen (buffer) > 0 );
+ CPPUNIT_ASSERT (strlen (buffer) <= bufferLen);
string strBuff;
- int ret = getdefaultwd(strBuff);
+ int ret = getdefaultwd (strBuff);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
- CPPUNIT_ASSERT(strBuff.length() > 0);
+ CPPUNIT_ASSERT (strBuff.length () > 0);
- freecwdBuffer();
+ freecwdBuffer ();
delete [] buffer;
}
@@ -100,4 +100,4 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestUtility );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestUtility );
diff --git a/myserver/tests/test_validator.cpp
b/myserver/tests/test_validator.cpp
index 5c93e09..6fc4d38 100644
--- a/myserver/tests/test_validator.cpp
+++ b/myserver/tests/test_validator.cpp
@@ -15,20 +15,20 @@ using namespace std;
class TestValidator : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestValidator );
- CPPUNIT_TEST( testGetPermissionMask );
- CPPUNIT_TEST( testGetPermissionMaskImpl );
- CPPUNIT_TEST( testGetValue );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestValidator );
+ CPPUNIT_TEST ( testGetPermissionMask );
+ CPPUNIT_TEST ( testGetPermissionMaskImpl );
+ CPPUNIT_TEST ( testGetValue );
+ CPPUNIT_TEST_SUITE_END ();
Validator* validator;
public:
- void setUp()
+ void setUp ()
{
validator = new Validator ();
}
- void tearDown()
+ void tearDown ()
{
delete validator;
}
@@ -58,4 +58,4 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestValidator );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestValidator );
diff --git a/myserver/tests/test_validator_factory.cpp
b/myserver/tests/test_validator_factory.cpp
index 37a9c66..56aedf2 100644
--- a/myserver/tests/test_validator_factory.cpp
+++ b/myserver/tests/test_validator_factory.cpp
@@ -17,55 +17,55 @@ using namespace std;
class TestValidatorFactory : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestValidatorFactory );
- CPPUNIT_TEST( testGetValidator );
- CPPUNIT_TEST( testAddValidator );
- CPPUNIT_TEST( testIsValidatorPresent );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestValidatorFactory );
+ CPPUNIT_TEST ( testGetValidator );
+ CPPUNIT_TEST ( testAddValidator );
+ CPPUNIT_TEST ( testIsValidatorPresent );
+ CPPUNIT_TEST_SUITE_END ();
ValidatorFactory* factory;
public:
- void setUp()
+ void setUp ()
{
- factory = new ValidatorFactory();
+ factory = new ValidatorFactory ();
}
- void tearDown()
+ void tearDown ()
{
delete factory;
}
- void testGetValidator()
+ void testGetValidator ()
{
- string val("foo");
- CPPUNIT_ASSERT_EQUAL(factory->getValidator(val), (Validator*)NULL);
+ string val ("foo");
+ CPPUNIT_ASSERT_EQUAL (factory->getValidator (val), (Validator*)NULL);
}
- void testAddValidator()
+ void testAddValidator ()
{
- string val("bar");
+ string val ("bar");
Validator *validator = new Validator;
- Validator* old = factory->addValidator(val, validator);
+ Validator* old = factory->addValidator (val, validator);
- CPPUNIT_ASSERT_EQUAL(old, (Validator*)NULL);
- CPPUNIT_ASSERT(factory->getValidator(val));
+ CPPUNIT_ASSERT_EQUAL (old, (Validator*)NULL);
+ CPPUNIT_ASSERT (factory->getValidator (val));
}
- void testIsValidatorPresent()
+ void testIsValidatorPresent ()
{
- string val("bar");
+ string val ("bar");
Validator *validator = new Validator;
- CPPUNIT_ASSERT_EQUAL(factory->isValidatorPresent(val), false);
+ CPPUNIT_ASSERT_EQUAL (factory->isValidatorPresent (val), false);
- factory->addValidator(val, validator);
+ factory->addValidator (val, validator);
- CPPUNIT_ASSERT_EQUAL(factory->isValidatorPresent(val), true);
+ CPPUNIT_ASSERT_EQUAL (factory->isValidatorPresent (val), true);
}
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestValidatorFactory );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestValidatorFactory );
diff --git a/myserver/tests/test_xml.cpp b/myserver/tests/test_xml.cpp
index 311ddaf..1ba2dbe 100644
--- a/myserver/tests/test_xml.cpp
+++ b/myserver/tests/test_xml.cpp
@@ -30,14 +30,14 @@ using namespace std;
class TestXml : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestXml );
- CPPUNIT_TEST( testOpenMemBuf );
- CPPUNIT_TEST( testXPath );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestXml );
+ CPPUNIT_TEST ( testOpenMemBuf );
+ CPPUNIT_TEST ( testXPath );
+ CPPUNIT_TEST_SUITE_END ();
- MemBuf* getXmlMemBuf()
+ MemBuf* getXmlMemBuf ()
{
- MemBuf* memBuf = new MemBuf();
+ MemBuf* memBuf = new MemBuf ();
*memBuf << "<?xml version=\"1.0\"?>"
<< "<ROOT>"
@@ -52,50 +52,50 @@ class TestXml : public CppUnit::TestFixture
public:
- void setUp()
+ void setUp ()
{
}
- void tearDown()
+ void tearDown ()
{
}
- void testOpenMemBuf()
+ void testOpenMemBuf ()
{
- MemBuf* memBuf = getXmlMemBuf();
+ MemBuf* memBuf = getXmlMemBuf ();
- XmlParser *xml = new XmlParser();
- int ret = xml->openMemBuf(*memBuf);
+ XmlParser *xml = new XmlParser ();
+ int ret = xml->openMemBuf (*memBuf);
- CPPUNIT_ASSERT_EQUAL(ret, 0);
+ CPPUNIT_ASSERT_EQUAL (ret, 0);
delete memBuf;
delete xml;
}
- void testXPath()
+ void testXPath ()
{
- MemBuf* memBuf = getXmlMemBuf();
+ MemBuf* memBuf = getXmlMemBuf ();
- XmlParser *xml = new XmlParser();
- xml->openMemBuf(*memBuf, true);
+ XmlParser *xml = new XmlParser ();
+ xml->openMemBuf (*memBuf, true);
- XmlXPathResult* xpathRes =
xml->evaluateXpath("/ROOT/NODE/address@hidden'a']/text()");
+ XmlXPathResult* xpathRes = xml->evaluateXpath
("/ROOT/NODE/address@hidden'a']/text ()");
- CPPUNIT_ASSERT(xpathRes);
+ CPPUNIT_ASSERT (xpathRes);
- xmlXPathObjectPtr obj = xpathRes->getObject();
+ xmlXPathObjectPtr obj = xpathRes->getObject ();
- xmlNodeSetPtr nodes = xpathRes->getNodeSet();
+ xmlNodeSetPtr nodes = xpathRes->getNodeSet ();
- CPPUNIT_ASSERT(obj);
+ CPPUNIT_ASSERT (obj);
- CPPUNIT_ASSERT_EQUAL(nodes->nodeNr, 1);
+ CPPUNIT_ASSERT_EQUAL (nodes->nodeNr, 1);
- CPPUNIT_ASSERT(!strcmp((const char*)nodes->nodeTab[0]->content, "a"));
+ CPPUNIT_ASSERT (!strcmp ((const char*)nodes->nodeTab[0]->content, "a"));
delete xpathRes;
delete memBuf;
@@ -105,4 +105,4 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestXml );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestXml );
diff --git a/myserver/tests/test_xml_validator.cpp
b/myserver/tests/test_xml_validator.cpp
index 7ea1ef8..f9c8fe9 100644
--- a/myserver/tests/test_xml_validator.cpp
+++ b/myserver/tests/test_xml_validator.cpp
@@ -15,49 +15,49 @@ using namespace std;
class TestXmlValidator : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE( TestXmlValidator );
- CPPUNIT_TEST( testGetPermissionMask );
- CPPUNIT_TEST( testGetPermissionMaskImpl );
- CPPUNIT_TEST( testGetValue );
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE ( TestXmlValidator );
+ CPPUNIT_TEST ( testGetPermissionMask );
+ CPPUNIT_TEST ( testGetPermissionMaskImpl );
+ CPPUNIT_TEST ( testGetValue );
+ CPPUNIT_TEST_SUITE_END ();
XmlValidator* xmlValidator;
public:
- void setUp()
+ void setUp ()
{
- xmlValidator = new XmlValidator();
+ xmlValidator = new XmlValidator ();
}
- void tearDown()
+ void tearDown ()
{
delete xmlValidator;
}
- void testGetValue()
+ void testGetValue ()
{
- string val("value");
+ string val ("value");
HashMap<string, SecurityDomain*> hashedDomains;
- CPPUNIT_ASSERT_EQUAL(xmlValidator->getValue(&hashedDomains, val),
(string*)NULL);
+ CPPUNIT_ASSERT_EQUAL (xmlValidator->getValue (&hashedDomains, val),
(string*)NULL);
}
- void testGetPermissionMaskImpl()
+ void testGetPermissionMaskImpl ()
{
- string val("value");
+ string val ("value");
SecurityToken secToken;
secToken.setResource (&val);
secToken.setResource (&val);
secToken.setDirectory (&val);
secToken.setSysDirectory (&val);
- CPPUNIT_ASSERT_EQUAL(xmlValidator->getPermissionMaskImpl(&secToken, NULL,
NULL), 0);
+ CPPUNIT_ASSERT_EQUAL (xmlValidator->getPermissionMaskImpl (&secToken,
NULL, NULL), 0);
}
- void testGetPermissionMask()
+ void testGetPermissionMask ()
{
SecurityToken secToken;
- string val("value");
+ string val ("value");
secToken.setResource (&val);
secToken.setDirectory (&val);
secToken.setSysDirectory (&val);
@@ -68,4 +68,4 @@ public:
};
-CPPUNIT_TEST_SUITE_REGISTRATION( TestXmlValidator );
+CPPUNIT_TEST_SUITE_REGISTRATION ( TestXmlValidator );
commit c4edd6f156174c55fd6ccaa9a9b9049f76d9b7ef
Author: Giuseppe Scrivano <address@hidden>
Date: Thu Oct 1 22:24:37 2009 +0200
Fix indentation
diff --git a/myserver/src/base/file/files_utility.cpp
b/myserver/src/base/file/files_utility.cpp
index ad641c3..ec754c3 100644
--- a/myserver/src/base/file/files_utility.cpp
+++ b/myserver/src/base/file/files_utility.cpp
@@ -81,55 +81,55 @@ int FilesUtility::getPathRecursionLevel (const char* path)
int temp;
#endif
while (*lpath != 0)
- {
- /* ".." decreases the recursion level. */
- if ((*lpath == '\\') || (*lpath == '/'))
- {
- lpath++;
- continue;
- }
+ {
+ /* ".." decreases the recursion level. */
+ if ((*lpath == '\\') || (*lpath == '/'))
+ {
+ lpath++;
+ continue;
+ }
- if (*lpath=='.')
- {
- lpath++;
+ if (*lpath=='.')
+ {
+ lpath++;
#ifdef WIN32
- temp = 0;
- while (*lpath == '.')
- {
- lpath++;
- temp++;
- }
- if ((*lpath == '\\') || (*lpath == '/') || (*lpath == 0))
- rec -= temp;
- else
- {
- lpath++;
- while ((*lpath != '\\') && (*lpath != '/') && (*lpath != 0))
+ temp = 0;
+ while (*lpath == '.')
+ {
+ lpath++;
+ temp++;
+ }
+ if ((*lpath == '\\') || (*lpath == '/') || (*lpath == 0))
+ rec -= temp;
+ else
+ {
lpath++;
- rec++;
- }
+ while ((*lpath != '\\') && (*lpath != '/') && (*lpath != 0))
+ lpath++;
+ rec++;
+ }
#else
- if (*lpath == '.')
- {
- lpath++;
- if ((*lpath == '\\') || (*lpath == '/') || (*lpath == 0))
- rec--;
- else
- {
- while ((*lpath != '\\') && (*lpath != '/') && (*lpath != 0))
- lpath++;
- rec++;
- }
- }
+ if (*lpath == '.')
+ {
+ lpath++;
+ if ((*lpath == '\\') || (*lpath == '/') || (*lpath == 0))
+ rec--;
+ else
+ {
+ while ((*lpath != '\\') && (*lpath != '/') && (*lpath != 0))
+ lpath++;
+ rec++;
+ }
+ }
#endif
- }
- else
- {
- while( (*lpath != '\\') && (*lpath != '/') && (*lpath != 0))
- lpath++;
- rec++;
- }
- }
+ }
+ else
+ {
+ while( (*lpath != '\\') && (*lpath != '/') && (*lpath != 0))
+ lpath++;
+ rec++;
+ }
+ }
return rec;
}
@@ -167,7 +167,8 @@ int FilesUtility::copyFile (const char* src, const char*
dest, int overwrite)
if (srcFile.openFile (src, File::READ))
return -1;
- if (destFile.openFile (dest, File::WRITE | (overwrite ?
File::FILE_CREATE_ALWAYS : 0)))
+ if (destFile.openFile (dest, File::WRITE
+ | (overwrite ? File::FILE_CREATE_ALWAYS : 0)))
{
srcFile.close ();
return -1;
-----------------------------------------------------------------------
Summary of changes:
myserver/include/base/base64/mime_utils.h | 24 +-
myserver/include/base/dynamic_lib/dynamiclib.h | 14 +-
myserver/include/base/file/file.h | 40 +-
myserver/include/base/file/files_utility.h | 98 +-
myserver/include/base/files_cache/cached_file.h | 12 +-
.../include/base/files_cache/cached_file_buffer.h | 24 +-
myserver/include/base/hash_map/hash_map.h | 158 ++--
myserver/include/base/home_dir/home_dir.h | 10 +-
myserver/include/base/md5/md5.h | 10 +-
myserver/include/base/mem_buff/mem_buff.h | 90 +-
myserver/include/base/multicast/multicast.h | 16 +-
myserver/include/base/pipe/pipe.h | 22 +-
myserver/include/base/process/process.h | 22 +-
.../include/base/process/process_server_manager.h | 38 +-
myserver/include/base/regex/myserver_regex.h | 28 +-
myserver/include/base/safetime/safetime.h | 8 +-
myserver/include/base/socket/socket.h | 76 +-
myserver/include/base/socket/ssl_socket.h | 28 +-
myserver/include/base/ssl/ssl.h | 26 +-
myserver/include/base/string/stringutils.h | 2 +-
myserver/include/base/sync/event.h | 12 +-
myserver/include/base/sync/mutex.h | 16 +-
myserver/include/base/sync/read_write_lock.h | 12 +-
myserver/include/base/sync/recursive_mutex.h | 6 +-
myserver/include/base/sync/semaphore.h | 16 +-
myserver/include/base/thread/thread.h | 16 +-
myserver/include/base/unix_socket/unix_socket.h | 4 +-
myserver/include/base/xml/xml_parser.h | 84 +-
.../include/conf/main/xml_main_configuration.h | 4 +-
myserver/include/conf/mime/mime_manager.h | 2 +-
myserver/include/conf/security/auth_method.h | 2 +-
myserver/include/conf/security/security_domain.h | 2 +-
myserver/include/conf/security/security_manager.h | 4 +-
myserver/include/conf/security/security_token.h | 4 +-
myserver/include/conf/security/xml_validator.h | 4 +-
myserver/include/conf/vhost/ip.h | 30 +-
myserver/include/conf/vhost/vhost.h | 12 +-
myserver/include/connection/connection.h | 2 +-
.../connections_scheduler/connections_scheduler.h | 54 +-
myserver/include/filter/filter.h | 30 +-
myserver/include/filter/filters_chain.h | 46 +-
myserver/include/filter/filters_factory.h | 20 +-
myserver/include/filter/gzip/gzip_decompress.h | 38 +-
myserver/include/filter/memory_stream.h | 18 +-
myserver/include/filter/stream.h | 14 +-
myserver/include/http_handler/http_dir/http_dir.h | 14 +-
.../include/http_handler/http_file/http_file.h | 4 +-
myserver/include/http_handler/isapi/isapi.h | 26 +-
myserver/include/http_handler/mscgi/mscgi.h | 10 +-
.../include/http_handler/mscgi/mscgi_manager.h | 32 +-
myserver/include/http_handler/scgi/scgi.h | 24 +-
myserver/include/http_handler/wincgi/wincgi.h | 6 +-
myserver/include/plugin/plugin_info.h | 69 +-
myserver/include/protocol/control/control_header.h | 22 +-
myserver/include/protocol/ftp/ftp_common.h | 12 +-
myserver/include/protocol/ftp/ftp_lexer.h | 308 +++---
myserver/include/protocol/ftp/ftp_parser.h | 14 +-
myserver/include/protocol/http/dyn_http_command.h | 10 +-
.../protocol/http/dyn_http_command_manager.h | 18 +-
myserver/include/protocol/http/dyn_http_manager.h | 6 +-
myserver/include/protocol/http/env/env.h | 6 +-
myserver/include/protocol/http/http.h | 94 +-
myserver/include/protocol/http/http_data_handler.h | 10 +-
myserver/include/protocol/http/http_data_read.h | 6 +-
myserver/include/protocol/http/http_errors.h | 10 +-
myserver/include/protocol/http/http_header.h | 6 +-
myserver/include/protocol/http/http_request.h | 36 +-
myserver/include/protocol/http/http_response.h | 30 +-
.../include/protocol/http/http_thread_context.h | 4 +-
myserver/include/protocol/https/https.h | 32 +-
myserver/include/protocol/protocol.h | 2 +-
myserver/include/protocol/protocol_buffer.h | 6 +-
myserver/include/protocol/protocols_manager.h | 14 +-
myserver/include/server/clients_thread.h | 14 +-
myserver/include/server/server.h | 136 ++--
myserver/src/base/base64/mime_utils.cpp | 128 ++--
myserver/src/base/bitvec/bitvec.cpp | 4 +-
myserver/src/base/file/file.cpp | 36 +-
myserver/src/base/file/files_utility.cpp | 147 ++--
myserver/src/base/files_cache/cached_file.cpp | 10 +-
.../src/base/files_cache/cached_file_buffer.cpp | 4 +-
.../src/base/files_cache/cached_file_factory.cpp | 6 +-
myserver/src/base/find_data/find_data.cpp | 6 +-
myserver/src/base/hash_map/hash_map.cpp | 1098 ++++++++++----------
myserver/src/base/home_dir/home_dir.cpp | 6 +-
myserver/src/base/md5/md5.cpp | 194 ++--
myserver/src/base/mem_buff/mem_buff.cpp | 260 +++---
myserver/src/base/multicast/multicast.cpp | 52 +-
myserver/src/base/pipe/pipe.cpp | 16 +-
myserver/src/base/process/fork_server.cpp | 10 +-
myserver/src/base/process/process.cpp | 20 +-
.../src/base/process/process_server_manager.cpp | 142 ++--
myserver/src/base/safetime/safetime.cpp | 32 +-
myserver/src/base/socket/socket.cpp | 292 +++---
myserver/src/base/socket/ssl_socket.cpp | 114 +-
myserver/src/base/socket_pair/socket_pair.cpp | 10 +-
myserver/src/base/ssl/ssl.cpp | 4 +-
myserver/src/base/string/stringutils.cpp | 52 +-
myserver/src/base/sync/event.cpp | 90 +-
myserver/src/base/sync/mutex.cpp | 52 +-
myserver/src/base/sync/read_write_lock.cpp | 26 +-
myserver/src/base/sync/recursive_mutex.cpp | 22 +-
myserver/src/base/sync/semaphore.cpp | 44 +-
myserver/src/base/unix_socket/unix_socket.cpp | 2 +-
myserver/src/base/utility.cpp | 50 +-
myserver/src/base/xml/xml_parser.cpp | 10 +-
myserver/src/conf/main/main_configuration.cpp | 2 +-
myserver/src/conf/mime/mime_manager.cpp | 24 +-
myserver/src/conf/security/auth_domain.cpp | 2 +-
myserver/src/conf/security/auth_method.cpp | 2 +-
myserver/src/conf/security/auth_method_factory.cpp | 4 +-
myserver/src/conf/security/security_cache.cpp | 64 +-
myserver/src/conf/security/validator.cpp | 2 +-
myserver/src/conf/security/validator_factory.cpp | 4 +-
myserver/src/conf/security/xml_validator.cpp | 12 +-
myserver/src/conf/vhost/ip.cpp | 72 +-
myserver/src/conf/vhost/vhost.cpp | 28 +-
myserver/src/conf/vhost/vhost_manager.cpp | 212 ++--
myserver/src/conf/xml_conf.cpp | 10 +-
myserver/src/connection/connection.cpp | 12 +-
.../connections_scheduler.cpp | 76 +-
.../src/connections_scheduler/listen_threads.cpp | 32 +-
myserver/src/filter/filter.cpp | 24 +-
myserver/src/filter/filters_chain.cpp | 160 ++--
myserver/src/filter/filters_factory.cpp | 66 +-
myserver/src/filter/gzip/gzip.cpp | 10 +-
myserver/src/filter/gzip/gzip_decompress.cpp | 24 +-
myserver/src/filter/memory_stream.cpp | 42 +-
myserver/src/http_handler/cgi/cgi.cpp | 64 +-
myserver/src/http_handler/fastcgi/fastcgi.cpp | 264 +++---
myserver/src/http_handler/http_dir/http_dir.cpp | 236 +++---
myserver/src/http_handler/http_file/http_file.cpp | 74 +-
myserver/src/http_handler/isapi/isapi.cpp | 606 ++++++------
myserver/src/http_handler/mscgi/mscgi.cpp | 16 +-
myserver/src/http_handler/mscgi/mscgi_manager.cpp | 100 +-
myserver/src/http_handler/proxy/proxy.cpp | 40 +-
myserver/src/http_handler/scgi/scgi.cpp | 178 ++--
myserver/src/http_handler/wincgi/wincgi.cpp | 118 ++--
myserver/src/log/log_manager.cpp | 2 +-
myserver/src/log/stream/log_stream_factory.cpp | 2 +-
myserver/src/myserver.cpp | 88 +-
myserver/src/plugin/plugin.cpp | 4 +-
myserver/src/plugin/plugin_info.cpp | 189 ++--
myserver/src/plugin/plugins_manager.cpp | 6 +-
myserver/src/protocol/control/control_header.cpp | 100 +-
myserver/src/protocol/control/control_protocol.cpp | 140 ++--
myserver/src/protocol/ftp/ftp.cpp | 6 +-
myserver/src/protocol/ftp/ftp_lexer.cpp | 176 ++--
myserver/src/protocol/ftp/ftp_parser.cpp | 86 +-
myserver/src/protocol/http/dyn_http_command.cpp | 6 +-
.../src/protocol/http/dyn_http_command_manager.cpp | 12 +-
myserver/src/protocol/http/dyn_http_manager.cpp | 4 +-
myserver/src/protocol/http/env/env.cpp | 100 +-
myserver/src/protocol/http/http.cpp | 6 +-
myserver/src/protocol/http/http_data_handler.cpp | 2 +-
myserver/src/protocol/http/http_data_read.cpp | 108 +-
myserver/src/protocol/http/http_errors.cpp | 2 +-
myserver/src/protocol/http/http_headers.cpp | 154 ++--
myserver/src/protocol/http/http_request.cpp | 158 ++--
myserver/src/protocol/http/http_response.cpp | 10 +-
myserver/src/protocol/http/http_thread_context.cpp | 2 +-
myserver/src/protocol/https/https.cpp | 16 +-
myserver/src/protocol/protocol_buffer.cpp | 6 +-
myserver/src/protocol/protocols_manager.cpp | 2 +-
myserver/src/server/clients_thread.cpp | 46 +-
myserver/src/server/server.cpp | 72 +-
myserver/tests/main.cpp | 12 +-
myserver/tests/test_auth_domain.cpp | 20 +-
myserver/tests/test_base64.cpp | 28 +-
myserver/tests/test_cached_file.cpp | 62 +-
myserver/tests/test_cached_file_buffer.cpp | 46 +-
myserver/tests/test_cached_file_factory.cpp | 62 +-
myserver/tests/test_connection.cpp | 160 ++--
myserver/tests/test_connections_scheduler.cpp | 124 ++--
myserver/tests/test_file.cpp | 2 +-
myserver/tests/test_files_utility.cpp | 116 +-
myserver/tests/test_filter_chain.cpp | 132 ++--
myserver/tests/test_fork_server.cpp | 18 +-
myserver/tests/test_gzip.cpp | 20 +-
myserver/tests/test_hashmap.cpp | 108 +-
myserver/tests/test_homedir.cpp | 40 +-
myserver/tests/test_http_req_security_domain.cpp | 14 +-
myserver/tests/test_http_request.cpp | 110 +-
myserver/tests/test_http_response.cpp | 68 +-
myserver/tests/test_ip.cpp | 50 +-
myserver/tests/test_md5.cpp | 24 +-
myserver/tests/test_mem_buff.cpp | 136 ++--
myserver/tests/test_mem_stream.cpp | 72 +-
myserver/tests/test_mime_manager.cpp | 14 +-
myserver/tests/test_multicast.cpp | 56 +-
myserver/tests/test_mutex.cpp | 48 +-
myserver/tests/test_nodetree.cpp | 14 +-
myserver/tests/test_pipe.cpp | 82 +-
myserver/tests/test_plugin_info.cpp | 158 ++--
myserver/tests/test_recursive_mutex.cpp | 28 +-
myserver/tests/test_regex.cpp | 104 +-
myserver/tests/test_safetime.cpp | 92 +-
myserver/tests/test_security_cache.cpp | 10 +-
myserver/tests/test_security_domain.cpp | 28 +-
myserver/tests/test_security_manager.cpp | 22 +-
myserver/tests/test_security_token.cpp | 16 +-
myserver/tests/test_semaphore.cpp | 58 +-
myserver/tests/test_socket.cpp | 60 +-
myserver/tests/test_socket_pair.cpp | 22 +-
myserver/tests/test_ssl_socket.cpp | 44 +-
myserver/tests/test_thread.cpp | 40 +-
myserver/tests/test_unix_socket.cpp | 20 +-
myserver/tests/test_url.cpp | 14 +-
myserver/tests/test_utility.cpp | 46 +-
myserver/tests/test_validator.cpp | 16 +-
myserver/tests/test_validator_factory.cpp | 44 +-
myserver/tests/test_xml.cpp | 50 +-
myserver/tests/test_xml_validator.cpp | 34 +-
213 files changed, 5868 insertions(+), 5879 deletions(-)
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. 4f6abb2f1e5758d098be50b84b744dbf622451c3,
Giuseppe Scrivano <=