| 10286034 |
1 | --- redir-2.2/redir-old.c Wed Dec 15 12:51:37 1999 |
| 2 | +++ redir-2.2/redir.c Thu Aug 8 14:55:29 2002 |
| 3 | @@ -57,6 +57,11 @@ |
| 4 | * |
| 5 | * - harald <harald.holzer@eunet.at> |
| 6 | */ |
| 7 | + |
| 8 | +/* 020808 fixed bug with ftp passive connections. |
| 9 | + * |
| 10 | + * - Harmer <harmer@nasa.as> |
| 11 | + */ |
| 12 | |
| 13 | #define VERSION "2.2" |
| 14 | |
| 15 | @@ -90,6 +95,7 @@ |
| 16 | unsigned char linger_opt = 0; |
| 17 | char * bind_addr = NULL; |
| 18 | struct sockaddr_in addr_out; |
| 19 | +struct sockaddr_in target; |
| 20 | int timeout = 0; |
| 21 | int ftp = 0; |
| 22 | int transproxy = 0; |
| 23 | @@ -420,8 +426,7 @@ |
| 24 | } |
| 25 | newsession.sin_port = htons(rport); |
| 26 | newsession.sin_family = AF_INET; |
| 27 | - newsession.sin_addr.s_addr = remip[0] | (remip[1] << 8) |
| 28 | - | (remip[2] << 16) | (remip[3] << 24); |
| 29 | + newsession.sin_addr = target.sin_addr; |
| 30 | |
| 31 | debug1("ftpdata server ip: %s\n", inet_ntoa(newsession.sin_addr)); |
| 32 | debug1("ftpdata server port: %d\n", rport); |
| 33 | @@ -839,7 +844,6 @@ |
| 34 | main(int argc, char *argv[]) |
| 35 | { |
| 36 | |
| 37 | - struct sockaddr_in target; |
| 38 | char *target_addr; |
| 39 | int target_port; |
| 40 | char *local_addr; |
| 41 | --- redir-2.2/redir-old.c Wed Dec 15 12:51:37 1999 |
| 42 | +++ redir-2.2/redir.c Thu Aug 8 14:55:29 2002 |
| 43 | @@ -57,6 +57,11 @@ |
| 44 | * |
| 45 | * - harald <harald.holzer@eunet.at> |
| 46 | */ |
| 47 | + |
| 48 | +/* 020808 fixed bug with ftp passive connections. |
| 49 | + * |
| 50 | + * - Harmer <harmer@nasa.as> |
| 51 | + */ |
| 52 | |
| 53 | #define VERSION "2.2" |
| 54 | |
| 55 | @@ -90,6 +95,7 @@ |
| 56 | unsigned char linger_opt = 0; |
| 57 | char * bind_addr = NULL; |
| 58 | struct sockaddr_in addr_out; |
| 59 | +struct sockaddr_in target; |
| 60 | int timeout = 0; |
| 61 | int ftp = 0; |
| 62 | int transproxy = 0; |
| 63 | @@ -420,8 +426,7 @@ |
| 64 | } |
| 65 | newsession.sin_port = htons(rport); |
| 66 | newsession.sin_family = AF_INET; |
| 67 | - newsession.sin_addr.s_addr = remip[0] | (remip[1] << 8) |
| 68 | - | (remip[2] << 16) | (remip[3] << 24); |
| 69 | + newsession.sin_addr = target.sin_addr; |
| 70 | |
| 71 | debug1("ftpdata server ip: %s\n", inet_ntoa(newsession.sin_addr)); |
| 72 | debug1("ftpdata server port: %d\n", rport); |
| 73 | @@ -839,7 +844,6 @@ |
| 74 | main(int argc, char *argv[]) |
| 75 | { |
| 76 | |
| 77 | - struct sockaddr_in target; |
| 78 | char *target_addr; |
| 79 | int target_port; |
| 80 | char *local_addr; |
projects / packages / redir.git / blame