Fixed a tonne of spelling mistakes.
This commit is contained in:
parent
a34db10d65
commit
391a408eee
@ -1,8 +1,8 @@
|
|||||||
/* $Id: buffer.c,v 1.21 2002-05-23 18:22:48 rjkaes Exp $
|
/* $Id: buffer.c,v 1.22 2002-05-24 04:45:32 rjkaes Exp $
|
||||||
*
|
*
|
||||||
* The buffer used in each connection is a linked list of lines. As the lines
|
* The buffer used in each connection is a linked list of lines. As the lines
|
||||||
* are read in and written out the buffer expands and contracts. Basically,
|
* are read in and written out the buffer expands and contracts. Basically,
|
||||||
* by using this method we can increase the buffer size dynamicly. However,
|
* by using this method we can increase the buffer size dynamically. However,
|
||||||
* we have a hard limit of 64 KB for the size of the buffer. The buffer can be
|
* we have a hard limit of 64 KB for the size of the buffer. The buffer can be
|
||||||
* thought of as a queue were we act on both the head and tail. The various
|
* thought of as a queue were we act on both the head and tail. The various
|
||||||
* functions act on each end (the names are taken from what Perl uses to act on
|
* functions act on each end (the names are taken from what Perl uses to act on
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* $Id: conns.c,v 1.11 2002-05-23 18:23:29 rjkaes Exp $
|
/* $Id: conns.c,v 1.12 2002-05-24 04:45:32 rjkaes Exp $
|
||||||
*
|
*
|
||||||
* Create and free the connection structure. One day there could be
|
* Create and free the connection structure. One day there could be
|
||||||
* other connnection related tasks put here, but for now the header
|
* other connection related tasks put here, but for now the header
|
||||||
* file and this file are only used for create/free functions and the
|
* file and this file are only used for create/free functions and the
|
||||||
* connection structure definition.
|
* connection structure definition.
|
||||||
*
|
*
|
||||||
@ -34,7 +34,7 @@ initialize_conn(int client_fd, const char* ipaddr, const char* string_addr)
|
|||||||
assert(client_fd >= 0);
|
assert(client_fd >= 0);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Allocate the memory for all the internal componets
|
* Allocate the memory for all the internal components
|
||||||
*/
|
*/
|
||||||
cbuffer = new_buffer();
|
cbuffer = new_buffer();
|
||||||
sbuffer = new_buffer();
|
sbuffer = new_buffer();
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $Id: dnsclient.c,v 1.1 2002-05-23 04:40:06 rjkaes Exp $
|
/* $Id: dnsclient.c,v 1.2 2002-05-24 04:45:32 rjkaes Exp $
|
||||||
*
|
*
|
||||||
* Create the dnsserver child process, and then include functions to
|
* Create the dnsserver child process, and then include functions to
|
||||||
* retrieve IP addresses or host names. These functions are required
|
* retrieve IP addresses or host names. These functions are required
|
||||||
@ -40,7 +40,7 @@ static char* unix_socket_loc;
|
|||||||
/*
|
/*
|
||||||
* Fork a copy of the "dnsserver" program. Two arguments are used
|
* Fork a copy of the "dnsserver" program. Two arguments are used
|
||||||
* by this function: 'dnsserver_location' is the complete path to the
|
* by this function: 'dnsserver_location' is the complete path to the
|
||||||
* dnsserver execuatable; 'path' is the absolute path used by the
|
* dnsserver executable; 'path' is the absolute path used by the
|
||||||
* Unix socket.
|
* Unix socket.
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $Id: hashmap.c,v 1.10 2002-05-23 18:20:27 rjkaes Exp $
|
/* $Id: hashmap.c,v 1.11 2002-05-24 04:45:32 rjkaes Exp $
|
||||||
*
|
*
|
||||||
* A hashmap implementation. The keys are case-insensitive NULL terminated
|
* A hashmap implementation. The keys are case-insensitive NULL terminated
|
||||||
* strings, and the data is arbitrary lumps of data. Copies of both the
|
* strings, and the data is arbitrary lumps of data. Copies of both the
|
||||||
@ -310,7 +310,7 @@ hashmap_find(hashmap_t map, const char* key)
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Loop through all the keys and look for the first occurance
|
* Loop through all the keys and look for the first occurrence
|
||||||
* of a particular key.
|
* of a particular key.
|
||||||
*/
|
*/
|
||||||
for (i = 0; i < map->size; i++) {
|
for (i = 0; i < map->size; i++) {
|
||||||
@ -372,7 +372,7 @@ hashmap_return_entry(hashmap_t map, hashmap_iter iter,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Searches for _any_ occurrances of "key" within the hashmap.
|
* Searches for _any_ occurrences of "key" within the hashmap.
|
||||||
*
|
*
|
||||||
* Returns: negative upon an error
|
* Returns: negative upon an error
|
||||||
* zero if no key is found
|
* zero if no key is found
|
||||||
@ -394,7 +394,7 @@ hashmap_search(hashmap_t map, const char *key)
|
|||||||
|
|
||||||
ptr = map->buckets[hash];
|
ptr = map->buckets[hash];
|
||||||
|
|
||||||
/* Okay, there is an entry here, now see if it's the one we want */
|
/* All right, there is an entry here, now see if it's the one we want */
|
||||||
while (ptr) {
|
while (ptr) {
|
||||||
if (strcasecmp(ptr->key, key) == 0)
|
if (strcasecmp(ptr->key, key) == 0)
|
||||||
++count;
|
++count;
|
||||||
|
10
src/reqs.c
10
src/reqs.c
@ -1,4 +1,4 @@
|
|||||||
/* $Id: reqs.c,v 1.74 2002-05-23 18:24:46 rjkaes Exp $
|
/* $Id: reqs.c,v 1.75 2002-05-24 04:45:32 rjkaes Exp $
|
||||||
*
|
*
|
||||||
* This is where all the work in tinyproxy is actually done. Incoming
|
* This is where all the work in tinyproxy is actually done. Incoming
|
||||||
* connections have a new thread created for them. The thread then
|
* connections have a new thread created for them. The thread then
|
||||||
@ -276,7 +276,7 @@ establish_http_connection(struct conn_s *connptr, struct request_s *request)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* These two defines are for the SSL tunnelling.
|
* These two defines are for the SSL tunneling.
|
||||||
*/
|
*/
|
||||||
#define SSL_CONNECTION_RESPONSE "HTTP/1.0 200 Connection established"
|
#define SSL_CONNECTION_RESPONSE "HTTP/1.0 200 Connection established"
|
||||||
#define PROXY_AGENT "Proxy-agent: " PACKAGE "/" VERSION
|
#define PROXY_AGENT "Proxy-agent: " PACKAGE "/" VERSION
|
||||||
@ -309,7 +309,7 @@ process_request(struct conn_s *connptr)
|
|||||||
|
|
||||||
size_t request_len;
|
size_t request_len;
|
||||||
|
|
||||||
/* NULL out all the fields so free's don't cause segfaults. */
|
/* NULL out all the fields so frees don't cause segfaults. */
|
||||||
request = safecalloc(1, sizeof(struct request_s));
|
request = safecalloc(1, sizeof(struct request_s));
|
||||||
if (!request)
|
if (!request)
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -899,7 +899,7 @@ process_server_headers(struct conn_s *connptr)
|
|||||||
goto ERROR_EXIT;
|
goto ERROR_EXIT;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Okay, output all the remaining headers to the client.
|
* All right, output all the remaining headers to the client.
|
||||||
*/
|
*/
|
||||||
iter = hashmap_first(hashofheaders);
|
iter = hashmap_first(hashofheaders);
|
||||||
if (iter >= 0) {
|
if (iter >= 0) {
|
||||||
@ -990,7 +990,7 @@ relay_connection(struct conn_s *connptr)
|
|||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
/*
|
/*
|
||||||
* Okay, something was actually selected so mark it.
|
* All right, something was actually selected so mark it.
|
||||||
*/
|
*/
|
||||||
last_access = time(NULL);
|
last_access = time(NULL);
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $Id: stats.c,v 1.8 2002-05-23 18:20:27 rjkaes Exp $
|
/* $Id: stats.c,v 1.9 2002-05-24 04:45:32 rjkaes Exp $
|
||||||
*
|
*
|
||||||
* This module handles the statistics for tinyproxy. There are only two
|
* This module handles the statistics for tinyproxy. There are only two
|
||||||
* public API functions. The reason for the functions, rather than just a
|
* public API functions. The reason for the functions, rather than just a
|
||||||
@ -47,7 +47,7 @@ pthread_mutex_t stats_mutex = PTHREAD_MUTEX_INITIALIZER;
|
|||||||
#define UNLOCK() pthread_mutex_unlock(&stats_mutex)
|
#define UNLOCK() pthread_mutex_unlock(&stats_mutex)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialise the statistics information to zero.
|
* Initialize the statistics information to zero.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
init_stats(void)
|
init_stats(void)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $Id: text.c,v 1.1 2002-05-23 04:42:30 rjkaes Exp $
|
/* $Id: text.c,v 1.2 2002-05-24 04:45:32 rjkaes Exp $
|
||||||
*
|
*
|
||||||
* The functions included here are useful for text manipulation. They
|
* The functions included here are useful for text manipulation. They
|
||||||
* replace or augment the standard C string library. These functions
|
* replace or augment the standard C string library. These functions
|
||||||
@ -71,7 +71,7 @@ strlcat(char *dst, const char *src, size_t size)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Removes any new-line or carriage-return characters from the end of the
|
* Removes any new-line or carriage-return characters from the end of the
|
||||||
* string. This function is named afrer the same function in Perl.
|
* string. This function is named after the same function in Perl.
|
||||||
* "length" should be the number of characters in the buffer, not including
|
* "length" should be the number of characters in the buffer, not including
|
||||||
* the trailing NULL.
|
* the trailing NULL.
|
||||||
*
|
*
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $Id: thread.c,v 1.30 2002-05-23 18:20:27 rjkaes Exp $
|
/* $Id: thread.c,v 1.31 2002-05-24 04:45:32 rjkaes Exp $
|
||||||
*
|
*
|
||||||
* Handles the creation/destruction of the various threads required for
|
* Handles the creation/destruction of the various threads required for
|
||||||
* processing incoming connections.
|
* processing incoming connections.
|
||||||
@ -59,7 +59,7 @@ int accept_lock_ret = pthread_mutex_unlock(&mlock); \
|
|||||||
assert(accept_lock_ret == 0); \
|
assert(accept_lock_ret == 0); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
/* Used to override the default statck size. */
|
/* Used to override the default stack size. */
|
||||||
static pthread_attr_t thread_attr;
|
static pthread_attr_t thread_attr;
|
||||||
|
|
||||||
static struct thread_config_s {
|
static struct thread_config_s {
|
||||||
@ -135,7 +135,7 @@ thread_main(void *arg)
|
|||||||
struct thread_s *ptr;
|
struct thread_s *ptr;
|
||||||
|
|
||||||
#ifdef HAVE_PTHREAD_CANCEL
|
#ifdef HAVE_PTHREAD_CANCEL
|
||||||
/* Set the cancelation type to immediate. */
|
/* Set the cancellation type to immediate. */
|
||||||
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
|
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* $Id: tinyproxy.c,v 1.30 2002-05-23 18:27:01 rjkaes Exp $
|
/* $Id: tinyproxy.c,v 1.31 2002-05-24 04:45:32 rjkaes Exp $
|
||||||
*
|
*
|
||||||
* The initialise routine. Basically sets up all the initial stuff (logfile,
|
* The initialize routine. Basically sets up all the initial stuff (logfile,
|
||||||
* listening socket, config options, etc.) and then sits there and loops
|
* listening socket, config options, etc.) and then sits there and loops
|
||||||
* over the new connections until the daemon is closed. Also has additional
|
* over the new connections until the daemon is closed. Also has additional
|
||||||
* functions to handle the "user friendly" aspects of a program (usage,
|
* functions to handle the "user friendly" aspects of a program (usage,
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $Id: utils.c,v 1.30 2002-05-23 18:28:12 rjkaes Exp $
|
/* $Id: utils.c,v 1.31 2002-05-24 04:45:32 rjkaes Exp $
|
||||||
*
|
*
|
||||||
* Misc. routines which are used by the various functions to handle strings
|
* Misc. routines which are used by the various functions to handle strings
|
||||||
* and memory allocation and pretty much anything else we can think of. Also,
|
* and memory allocation and pretty much anything else we can think of. Also,
|
||||||
@ -216,7 +216,7 @@ create_file_safely(const char *filename)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* On systems whcih don't support ftruncate() the best we can
|
* On systems which don't support ftruncate() the best we can
|
||||||
* do is to close the file and reopen it in create mode, which
|
* do is to close the file and reopen it in create mode, which
|
||||||
* unfortunately leads to a race condition, however "systems
|
* unfortunately leads to a race condition, however "systems
|
||||||
* which don't support ftruncate()" is pretty much SCO only,
|
* which don't support ftruncate()" is pretty much SCO only,
|
||||||
|
10
src/vector.c
10
src/vector.c
@ -1,6 +1,6 @@
|
|||||||
/* $Id: vector.c,v 1.5 2002-05-23 18:20:27 rjkaes Exp $
|
/* $Id: vector.c,v 1.6 2002-05-24 04:45:32 rjkaes Exp $
|
||||||
*
|
*
|
||||||
* A vector implementation. The vector can be of an arbritrary length, and
|
* A vector implementation. The vector can be of an arbitrary length, and
|
||||||
* the data for each entry is an lump of data (the size is stored in the
|
* the data for each entry is an lump of data (the size is stored in the
|
||||||
* vector.)
|
* vector.)
|
||||||
*
|
*
|
||||||
@ -31,7 +31,7 @@
|
|||||||
* stored in struct vectorentry_s (the data and the length), and the
|
* stored in struct vectorentry_s (the data and the length), and the
|
||||||
* "vector" structure is implemented as a linked-list. The struct
|
* "vector" structure is implemented as a linked-list. The struct
|
||||||
* vector_s stores a pointer to the first vector (vector[0]) and a
|
* vector_s stores a pointer to the first vector (vector[0]) and a
|
||||||
* count of the number of enteries (or how long the vector is.)
|
* count of the number of entries (or how long the vector is.)
|
||||||
*/
|
*/
|
||||||
struct vectorentry_s {
|
struct vectorentry_s {
|
||||||
void *data;
|
void *data;
|
||||||
@ -69,7 +69,7 @@ vector_create(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Deletes an vector. All the enteries when this function is run.
|
* Deletes an vector. All the entries when this function is run.
|
||||||
*
|
*
|
||||||
* Returns: 0 on success
|
* Returns: 0 on success
|
||||||
* negative if a NULL vector is supplied
|
* negative if a NULL vector is supplied
|
||||||
@ -173,7 +173,7 @@ vector_getentry(vector_t vector, size_t pos, void **data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Returns the number of enteries (or the length) of the vector.
|
* Returns the number of entries (or the length) of the vector.
|
||||||
*
|
*
|
||||||
* Returns: negative if vector is not valid
|
* Returns: negative if vector is not valid
|
||||||
* positive length of vector otherwise
|
* positive length of vector otherwise
|
||||||
|
Loading…
Reference in New Issue
Block a user