eliminate socketaddr and options

[unix-history] / usr / src / lib / libc / net / rcmd.c

diff --git a/usr/src/lib/libc/net/rcmd.c b/usr/src/lib/libc/net/rcmd.c
index 51a3352..afd3af2 100644 (file)
--- a/usr/src/lib/libc/net/rcmd.c
+++ b/usr/src/lib/libc/net/rcmd.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)rcmd.c     4.3 %G%";
+static char sccsid[] = "@(#)rcmd.c     4.5 %G%";

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -13,7 +13,6 @@ static char sccsid[] = "@(#)rcmd.c    4.3 %G%";
 
 extern errno;
 char   *index(), *sprintf();
 
 extern errno;
 char   *index(), *sprintf();

-int    rcmdoptions;

 
 rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
        char **ahost;
 
 rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
        char **ahost;


@@ -24,7 +23,6 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
        int s, timo = 1;
        struct sockaddr_in sin, sin2, from;
        char c;
        int s, timo = 1;
        struct sockaddr_in sin, sin2, from;
        char c;

-       short port;

        int lport = IPPORT_RESERVED - 1;
        struct hostent *hp;
 
        int lport = IPPORT_RESERVED - 1;
        struct hostent *hp;
 


@@ -35,12 +33,12 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
        }
        *ahost = hp->h_name;
 retry:
        }
        *ahost = hp->h_name;
 retry:

-       s = rresvport(rcmdoptions|SO_KEEPALIVE, &lport);
+       s = rresvport(&lport);

        if (s < 0)
                return (-1);
        sin.sin_family = hp->h_addrtype;
        bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length);
        if (s < 0)
                return (-1);
        sin.sin_family = hp->h_addrtype;
        bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length);

-       sin.sin_port = htons((u_short)rport);
+       sin.sin_port = rport;

        if (connect(s, (caddr_t)&sin, sizeof (sin), 0) < 0) {
                if (errno == EADDRINUSE) {
                        close(s);
        if (connect(s, (caddr_t)&sin, sizeof (sin), 0) < 0) {
                if (errno == EADDRINUSE) {
                        close(s);


@@ -59,26 +57,24 @@ retry:
        lport--;
        if (fd2p == 0) {
                write(s, "", 1);
        lport--;
        if (fd2p == 0) {
                write(s, "", 1);

-               port = 0;
+               lport = 0;

        } else {
                char num[8];
        } else {
                char num[8];

-               int s2 = rresvport(rcmdoptions|SO_ACCEPTCONN, &lport), s3;
+               int s2 = rresvport(&lport), s3;

 
                if (s2 < 0) {
                        (void) close(s);
                        return (-1);
                }
                listen(s2, 1);
 
                if (s2 < 0) {
                        (void) close(s);
                        return (-1);
                }
                listen(s2, 1);

-               socketaddr(s2, &sin2);
-               port = htons((u_short)sin2.sin_port);
-               (void) sprintf(num, "%d", port);
+               (void) sprintf(num, "%d", lport);

                (void) write(s, num, strlen(num)+1);
                { int len = sizeof (from);
                  s3 = accept(s2, &from, &len, 0);
                  close(s2);
                  if (s3 < 0) {
                        perror("accept");
                (void) write(s, num, strlen(num)+1);
                { int len = sizeof (from);
                  s3 = accept(s2, &from, &len, 0);
                  close(s2);
                  if (s3 < 0) {
                        perror("accept");

-                       port = 0;
+                       lport = 0;

                        goto bad;
                  }
                }
                        goto bad;
                  }
                }


@@ -108,22 +104,22 @@ retry:
        }
        return (s);
 bad2:
        }
        return (s);
 bad2:

-       if (port)
+       if (lport)

                (void) close(*fd2p);
 bad:
        (void) close(s);
        return (-1);
 }
 
                (void) close(*fd2p);
 bad:
        (void) close(s);
        return (-1);
 }
 

-rresvport(options, alport)
-       int options, *alport;
+rresvport(alport)
+       int *alport;

 {
        struct sockaddr_in sin;
        int s;
 
        sin.sin_family = AF_INET;
        sin.sin_addr.s_addr = 0;
 {
        struct sockaddr_in sin;
        int s;
 
        sin.sin_family = AF_INET;
        sin.sin_addr.s_addr = 0;

-       s = socket(0, SOCK_STREAM, 0, 0);
+       s = socket(AF_INET, SOCK_STREAM, 0, 0);

        if (s < 0)
                return (-1);
        for (;;) {
        if (s < 0)
                return (-1);
        for (;;) {