diff options
| author | Glenn L McGrath <bug1@ihug.co.nz> | 2003-12-20 01:47:18 +0000 |
|---|---|---|
| committer | Glenn L McGrath <bug1@ihug.co.nz> | 2003-12-20 01:47:18 +0000 |
| commit | ffccf6eb5de311a3db8c3d7f7496e2f0cad69a23 (patch) | |
| tree | 859f5849c30de6cb69bf6336af6d2228402f2395 /networking/telnet.c | |
| parent | 03d8091859f45a6bb5e3aadc110b279e789399f2 (diff) | |
| download | busybox-w32-ffccf6eb5de311a3db8c3d7f7496e2f0cad69a23.tar.gz busybox-w32-ffccf6eb5de311a3db8c3d7f7496e2f0cad69a23.tar.bz2 busybox-w32-ffccf6eb5de311a3db8c3d7f7496e2f0cad69a23.zip | |
Change interface to bb_lookup_host, dont try and set port inside this
function as there is no gracefull way of handling failures.
Rename bb_getport to bb_lookup_port, allow a default port to be
specified so it always returns a correct value.
Modify ftpgetput/rdate/wget to use the new interface.
wget/rdate now use etc/services with a falback default value.
Diffstat (limited to 'networking/telnet.c')
| -rw-r--r-- | networking/telnet.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/networking/telnet.c b/networking/telnet.c index 92ddfaebf..110c9d151 100644 --- a/networking/telnet.c +++ b/networking/telnet.c | |||
| @@ -570,8 +570,6 @@ static void cookmode(void) | |||
| 570 | 570 | ||
| 571 | extern int telnet_main(int argc, char** argv) | 571 | extern int telnet_main(int argc, char** argv) |
| 572 | { | 572 | { |
| 573 | char *host; | ||
| 574 | char *port; | ||
| 575 | int len; | 573 | int len; |
| 576 | struct sockaddr_in s_in; | 574 | struct sockaddr_in s_in; |
| 577 | #ifdef USE_POLL | 575 | #ifdef USE_POLL |
| @@ -597,12 +595,12 @@ extern int telnet_main(int argc, char** argv) | |||
| 597 | G.termios_raw = G.termios_def; | 595 | G.termios_raw = G.termios_def; |
| 598 | cfmakeraw(&G.termios_raw); | 596 | cfmakeraw(&G.termios_raw); |
| 599 | 597 | ||
| 600 | if (argc < 2) bb_show_usage(); | 598 | if (argc < 2) |
| 601 | port = (argc > 2)? argv[2] : "23"; | 599 | bb_show_usage(); |
| 602 | 600 | ||
| 603 | host = argv[1]; | 601 | bb_lookup_host(&s_in, argv[1]); |
| 602 | s_in.sin_port = bb_lookup_port((argc == 3) ? argv[2] : "telnet", 23); | ||
| 604 | 603 | ||
| 605 | bb_lookup_host(&s_in, host, port); | ||
| 606 | G.netfd = xconnect(&s_in); | 604 | G.netfd = xconnect(&s_in); |
| 607 | 605 | ||
| 608 | setsockopt(G.netfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof one); | 606 | setsockopt(G.netfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof one); |