1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
|
From 9bbfbdd01b64f75393928d62159682fb83a756b9 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Wed, 16 Dec 2009 22:02:02 +0200
Subject: [PATCH] Fix incorrect types
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
src/desproxy.h | 9 ++++++---
src/socket2socket.c | 3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/desproxy.h b/src/desproxy.h
index d3768df..290cd1b 100644
--- a/src/desproxy.h
+++ b/src/desproxy.h
@@ -81,8 +81,11 @@ char *dns_server;
char *local_port;
char username[256], password[256];
-unsigned char string[256], console_line[256], HTTP_return_code[4];
-unsigned char buffer[BUFFER_SIZE], client_socket_is_free[MAX_CONNECTIONS];
+char console_line[256];
+char HTTP_return_code[4];
+char string[256];
+char buffer[BUFFER_SIZE];
+unsigned char client_socket_is_free[MAX_CONNECTIONS];
fd_set mask, rmask;
@@ -95,7 +98,7 @@ struct sockaddr_in remote;
struct termios old_tty;
-int client_length;
+unsigned int client_length;
int server_length;
int proxy_length;
int remote_length;
diff --git a/src/socket2socket.c b/src/socket2socket.c
index 7944a0a..12eb433 100644
--- a/src/socket2socket.c
+++ b/src/socket2socket.c
@@ -37,7 +37,8 @@ int
main (int argc, char **argv)
{
- int request_socket, addrlen;
+ socklen_t addrlen;
+ int request_socket;
int index, count;
struct sockaddr_in server;
struct sockaddr_in remote;
--
1.6.5
|