From: Art Cancro Date: Sun, 15 Aug 2010 06:19:04 +0000 (+0000) Subject: * Renamed ig_tcp_server() to webcit_tcp_server() X-Git-Tag: v8.01~904 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=b186a2bf735d7ca8ba59d42c3dddbf47edf41ac2 * Renamed ig_tcp_server() to webcit_tcp_server() * Renamed ig_uds_server() to webcit_uds_server() --- diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c index a32285b7d..4901917b1 100644 --- a/webcit/tcp_sockets.c +++ b/webcit/tcp_sockets.c @@ -499,7 +499,7 @@ int ClientGetLine(ParsedHttpHdrs *Hdr, StrBuf *Target) * port_number port number to bind * queue_len number of incoming connections to allow in the queue */ -int ig_tcp_server(char *ip_addr, int port_number, int queue_len) +int webcit_tcp_server(char *ip_addr, int port_number, int queue_len) { struct protoent *p; struct sockaddr_in6 sin; @@ -562,7 +562,7 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len) * sockpath - file name of the unix domain socket * queue_len - Number of incoming connections to allow in the queue */ -int ig_uds_server(char *sockpath, int queue_len) +int webcit_uds_server(char *sockpath, int queue_len) { struct sockaddr_un addr; int s; diff --git a/webcit/webserver.c b/webcit/webserver.c index e34f579c4..443622ee4 100644 --- a/webcit/webserver.c +++ b/webcit/webserver.c @@ -31,8 +31,8 @@ extern pthread_mutex_t SessionListMutex; extern pthread_key_t MyConKey; extern void *housekeeping_loop(void); -extern int ig_tcp_server(char *ip_addr, int port_number, int queue_len); -extern int ig_uds_server(char *sockpath, int queue_len); +extern int webcit_tcp_server(char *ip_addr, int port_number, int queue_len); +extern int webcit_uds_server(char *sockpath, int queue_len); extern void graceful_shutdown_watcher(int signum); extern void graceful_shutdown(int signum); extern void start_daemon(char *pid_file); @@ -304,17 +304,17 @@ int main(int argc, char **argv) /* * Bind the server to our favorite port. - * There is no need to check for errors, because ig_tcp_server() + * There is no need to check for errors, because webcit_tcp_server() * exits if it doesn't succeed. */ if (!IsEmptyStr(uds_listen_path)) { lprintf(2, "Attempting to create listener socket at %s...\n", uds_listen_path); - msock = ig_uds_server(uds_listen_path, LISTEN_QUEUE_LENGTH); + msock = webcit_uds_server(uds_listen_path, LISTEN_QUEUE_LENGTH); } else { lprintf(2, "Attempting to bind to port %d...\n", http_port); - msock = ig_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH); + msock = webcit_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH); } if (msock < 0) {