can't reconnect after some errors

SCCS-vsn: usr.bin/ftp/ftp.c 5.10
SCCS-vsn: usr.bin/telnet/telnet.c 5.5

diff --git a/usr/src/usr.bin/ftp/ftp.c b/usr/src/usr.bin/ftp/ftp.c
index c06cc90..3d0402a 100644 (file)
--- a/usr/src/usr.bin/ftp/ftp.c
+++ b/usr/src/usr.bin/ftp/ftp.c
@@ -89,6 +89,13 @@ hookup(host, port)
                             (caddr_t)&hisctladdr.sin_addr, hp->h_length);
                        fprintf(stdout, "Trying %s...\n",
                                inet_ntoa(hisctladdr.sin_addr));
                             (caddr_t)&hisctladdr.sin_addr, hp->h_length);
                        fprintf(stdout, "Trying %s...\n",
                                inet_ntoa(hisctladdr.sin_addr));

+                       (void) close(s);
+                       s = socket(hisctladdr.sin_family, SOCK_STREAM, 0);
+                       if (s < 0) {
+                               perror("ftp: socket");
+                               code = -1;
+                               return (0);
+                       }

                        continue;
                }
                perror("ftp: connect");
                        continue;
                }
                perror("ftp: connect");

diff --git a/usr/src/usr.bin/telnet/telnet.c b/usr/src/usr.bin/telnet/telnet.c
index ff74833..707aeaa 100644 (file)
--- a/usr/src/usr.bin/telnet/telnet.c
+++ b/usr/src/usr.bin/telnet/telnet.c
@@ -234,6 +234,12 @@ tn(argc, argv)
                                host->h_length);
                        fprintf(stderr, "Trying %s...\n",
                                inet_ntoa(sin.sin_addr));
                                host->h_length);
                        fprintf(stderr, "Trying %s...\n",
                                inet_ntoa(sin.sin_addr));

+                       (void) close(net);
+                       net = socket(AF_INET, SOCK_STREAM, 0);
+                       if (net < 0) {
+                               perror("telnet: socket");
+                               return;
+                       }

                        continue;
                }
                perror("telnet: connect");
                        continue;
                }
                perror("telnet: connect");