From a63a8b428f91456d28f69c1fb8da3b15638232d8 Mon Sep 17 00:00:00 2001 From: deuce <> Date: Mon, 24 Dec 2007 23:27:01 +0000 Subject: [PATCH] Revert last change... That was WRONG. --- src/sbbs3/ftpsrvr.c | 4 +--- src/sbbs3/mailsrvr.c | 5 +---- src/sbbs3/services.c | 6 ++---- src/sbbs3/websrvr.c | 4 +--- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/sbbs3/ftpsrvr.c b/src/sbbs3/ftpsrvr.c index b662ccd5f6..df6d6d9f26 100644 --- a/src/sbbs3/ftpsrvr.c +++ b/src/sbbs3/ftpsrvr.c @@ -106,7 +106,6 @@ char* genvpath(int lib, int dir, char* str); typedef struct { SOCKET socket; SOCKADDR_IN client_addr; - socklen_t client_addr_len; } ftp_t; @@ -2426,7 +2425,7 @@ static void ctrl_thread(void* arg) host=NULL; else host=gethostbyaddr ((char *)&ftp.client_addr.sin_addr - ,ftp.client_addr_len,AF_INET); + ,sizeof(ftp.client_addr.sin_addr),AF_INET); if(host!=NULL && host->h_name!=NULL) host_name=host->h_name; @@ -4900,7 +4899,6 @@ void DLLCALL ftp_server(void* arg) ftp->socket=client_socket; ftp->client_addr=client_addr; - ftp->client_addr_len=client_addr_len; _beginthread (ctrl_thread, 0, ftp); served++; diff --git a/src/sbbs3/mailsrvr.c b/src/sbbs3/mailsrvr.c index db6e2089a8..6107f59fd5 100644 --- a/src/sbbs3/mailsrvr.c +++ b/src/sbbs3/mailsrvr.c @@ -108,7 +108,6 @@ struct mailproc { typedef struct { SOCKET socket; SOCKADDR_IN client_addr; - socklen_t client_addr_len; } smtp_t,pop3_t; static int lprintf(int level, char *fmt, ...) @@ -710,7 +709,7 @@ static void pop3_thread(void* arg) host=NULL; else host=gethostbyaddr((char *)&pop3.client_addr.sin_addr - ,pop3.client_addr_len,AF_INET); + ,sizeof(pop3.client_addr.sin_addr),AF_INET); if(host!=NULL && host->h_name!=NULL) SAFECOPY(host_name,host->h_name); @@ -4495,7 +4494,6 @@ void DLLCALL mail_server(void* arg) smtp->socket=client_socket; smtp->client_addr=client_addr; - smtp->client_addr_len=client_addr_len; _beginthread (smtp_thread, 0, smtp); served++; } @@ -4564,7 +4562,6 @@ void DLLCALL mail_server(void* arg) pop3->socket=client_socket; pop3->client_addr=client_addr; - pop3->client_addr_len=client_addr_len; _beginthread (pop3_thread, 0, pop3); served++; diff --git a/src/sbbs3/services.c b/src/sbbs3/services.c index 1a0dce74c9..089ccc0a5f 100644 --- a/src/sbbs3/services.c +++ b/src/sbbs3/services.c @@ -99,7 +99,6 @@ typedef struct { typedef struct { SOCKET socket; SOCKADDR_IN addr; - socklen_t addr_len; time_t logintime; user_t user; client_t* client; @@ -1019,7 +1018,7 @@ static void js_service_thread(void* arg) host=NULL; else host=gethostbyaddr((char *)&service_client.addr.sin_addr - ,service_client.addr_len,AF_INET); + ,sizeof(service_client.addr.sin_addr),AF_INET); if(host!=NULL && host->h_name!=NULL) host_name=host->h_name; @@ -1339,7 +1338,7 @@ static void native_service_thread(void* arg) host=NULL; else host=gethostbyaddr((char *)&service_client.addr.sin_addr - ,service_client.addr_len,AF_INET); + ,sizeof(service_client.addr.sin_addr),AF_INET); if(host!=NULL && host->h_name!=NULL) host_name=host->h_name; @@ -2098,7 +2097,6 @@ void DLLCALL services_thread(void* arg) memset(client,0,sizeof(service_client_t)); client->socket=client_socket; client->addr=client_addr; - client->addr_len=client_addr_len; client->service=&service[i]; client->service->clients++; /* this should be mutually exclusive */ client->udp_buf=udp_buf; diff --git a/src/sbbs3/websrvr.c b/src/sbbs3/websrvr.c index 97f0e69c26..1baf950493 100644 --- a/src/sbbs3/websrvr.c +++ b/src/sbbs3/websrvr.c @@ -228,7 +228,6 @@ typedef struct { typedef struct { SOCKET socket; SOCKADDR_IN addr; - socklen_t addr_len; http_request_t req; char host_ip[64]; char host_name[128]; /* Resolved remote host */ @@ -4815,7 +4814,7 @@ void http_session_thread(void* arg) host=NULL; else host=gethostbyaddr ((char *)&session.addr.sin_addr - ,session.addr_len,AF_INET); + ,sizeof(session.addr.sin_addr),AF_INET); if(host!=NULL && host->h_name!=NULL) host_name=host->h_name; @@ -5586,7 +5585,6 @@ void DLLCALL web_server(void* arg) SAFECOPY(session->host_ip,host_ip); session->addr=client_addr; - session->addr_len=client_addr_len; session->socket=client_socket; session->js_branch.auto_terminate=TRUE; session->js_branch.terminated=&terminate_server; -- GitLab