diff options
| author | djm <> | 2005-05-19 08:40:59 +0000 |
|---|---|---|
| committer | djm <> | 2005-05-19 08:40:59 +0000 |
| commit | 947c7cbd07e8b5a4e7a6dc717314407764e5e1fb (patch) | |
| tree | e79b7e127174da4ddc0ecdbd17c8e3996da03854 /src | |
| parent | 4790a6a69840b39a7006d7fc70bb4421240bb90b (diff) | |
| download | openbsd-947c7cbd07e8b5a4e7a6dc717314407764e5e1fb.tar.gz openbsd-947c7cbd07e8b5a4e7a6dc717314407764e5e1fb.tar.bz2 openbsd-947c7cbd07e8b5a4e7a6dc717314407764e5e1fb.zip | |
fix SOCKS5 code for case where data comes in the same packet as the response;
ok dtucker@ markus@
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/nc/socks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr.bin/nc/socks.c b/src/usr.bin/nc/socks.c index 31721ccd24..c665ea731a 100644 --- a/src/usr.bin/nc/socks.c +++ b/src/usr.bin/nc/socks.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: socks.c,v 1.11 2005/05/19 04:29:46 djm Exp $ */ | 1 | /* $OpenBSD: socks.c,v 1.12 2005/05/19 08:40:59 djm Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. | 4 | * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. |
| @@ -163,7 +163,7 @@ socks_connect(const char *host, const char *port, | |||
| 163 | errx(1, "short write, %d (expected 10)", cnt); | 163 | errx(1, "short write, %d (expected 10)", cnt); |
| 164 | 164 | ||
| 165 | /* XXX Handle short reads better */ | 165 | /* XXX Handle short reads better */ |
| 166 | cnt = read(proxyfd, buf, sizeof buf); | 166 | cnt = read(proxyfd, buf, 10); |
| 167 | if (cnt == -1) | 167 | if (cnt == -1) |
| 168 | err(1, "read failed"); | 168 | err(1, "read failed"); |
| 169 | if (cnt != 10) | 169 | if (cnt != 10) |
