diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Modules/tcp.c | 69 | ||||
| -rw-r--r-- | Src/Modules/tcp.h | 5 |
3 files changed, 57 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog index 5d9256c9c..22e8c32d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2001-09-09 Clint Adams <clint@zsh.org> - * 1576x: Src/Modules/tcp.c: + * 15769: Src/Modules/tcp.c, Src/Modules/tcp.h: + add -a (accept) for ztcp. + + * 15768: Src/Modules/tcp.c: take service names in lieu of numbers, and stuff fd numbers into $REPLY instead of printing them. diff --git a/Src/Modules/tcp.c b/Src/Modules/tcp.c index e3e60fcc2..e3bec75c5 100644 --- a/Src/Modules/tcp.c +++ b/Src/Modules/tcp.c @@ -257,6 +257,7 @@ zts_alloc(int ztflags) } else { ztcp_tail->next = sess; + ztcp_tail = sess; } return sess; } @@ -328,7 +329,6 @@ tcp_cleanup(void) { prev = sess; tcp_close(sess); - zts_delete(sess); } } @@ -338,7 +338,7 @@ tcp_close(Tcp_session sess) { int err; - if (sess->fd != -1) + if (sess && sess->fd != -1) { err = close(sess->fd); if (err) @@ -346,9 +346,11 @@ tcp_close(Tcp_session sess) zwarn("connection close failed: %e", NULL, errno); return -1; } + zts_delete(sess); return 0; } + zts_delete(sess); return -1; } @@ -381,7 +383,7 @@ tcp_connect(Tcp_session sess, char *addrp, struct hostent *zhost, int d_port) static int bin_ztcp(char *nam, char **args, char *ops, int func) { - int herrno, err=1, destport, force=0, verbose=0, len, rfd; + int herrno, err=1, destport, force=0, verbose=0, len; char **addrp, *desthost, *localname, *remotename; struct hostent *zthost = NULL, *ztpeer = NULL; struct servent *srv; @@ -409,7 +411,6 @@ bin_ztcp(char *nam, char **args, char *ops, int func) return 1; } tcp_close(sess); - zts_delete(sess); return 0; } else @@ -435,7 +436,7 @@ bin_ztcp(char *nam, char **args, char *ops, int func) if (!lport) { zwarnnam(nam, "bad service name or port number", NULL, 0); return 1; } - sess = tcp_socket(PF_INET, SOCK_STREAM, 0, ZTCP_INBOUND); + sess = tcp_socket(PF_INET, SOCK_STREAM, 0, ZTCP_LISTEN); if (!sess) { zwarnnam(nam, "unable to allocate a TCP session slot", NULL, 0); @@ -469,21 +470,52 @@ bin_ztcp(char *nam, char **args, char *ops, int func) return 1; } - if ((rfd = accept(sess->fd, (struct sockaddr *)&sess->peer.in, &len)) == -1) + /* move the fd since no one will want to read from it */ + sess->fd = movefd(sess->fd); + + setiparam("REPLY", sess->fd); + + if(verbose) + fprintf(shout, "%d listener is on fd %d\n", ntohs(sess->sock.in.sin_port), sess->fd); + + return 0; + + } + else if (ops['a']) + { + int lfd, rfd; + + if (!args[0]) { + zwarnnam(nam, "-a requires an argument", NULL, 0); + return 1; + } + + lfd = atoi(args[0]); + + if (!lfd) { + zwarnnam(nam, "invalid numerical argument", NULL, 0); + return 1; + } + + sess = zts_byfd(lfd); + if (!sess) { + zwarnnam(nam, "fd is not registered as a tcp connection", NULL, 0); + return 1; + } + + if (!(sess->flags & ZTCP_LISTEN)) { - zwarnnam(nam, "could not accept connection: %e", NULL, errno); - tcp_close(sess); + zwarnnam(nam, "tcp connection not a listener", NULL, 0); return 1; } - /* move the fd since it doesn't seem to be closing well */ - sess->fd = movefd(sess->fd); + sess = zts_alloc(ZTCP_INBOUND); - err = close(sess->fd); - if (err) + if ((rfd = accept(lfd, (struct sockaddr *)&sess->peer.in, &len)) == -1) { - zwarn("listener close failed: %e", NULL, errno); - return -1; + zwarnnam(nam, "could not accept connection: %e", NULL, errno); + tcp_close(sess); + return 1; } sess->fd = rfd; @@ -492,10 +524,9 @@ bin_ztcp(char *nam, char **args, char *ops, int func) if(verbose) fprintf(shout, "%d is on fd %d\n", ntohs(sess->peer.in.sin_port), sess->fd); - return 0; - } - else { + else + { if (!args[0]) { for(sess = zts_head(); sess != NULL; sess = zts_next(sess)) @@ -512,7 +543,7 @@ bin_ztcp(char *nam, char **args, char *ops, int func) remotename = ztpeer->h_name; else remotename = ztrdup(inet_ntoa(sess->sock.in.sin_addr)); - fprintf(shout, "%s:%d %s %s:%d is on fd %d%s\n", localname, ntohs(sess->sock.in.sin_port), (sess->flags & ZTCP_INBOUND) ? "<-" : "->", remotename, ntohs(sess->peer.in.sin_port), sess->fd, (sess->flags & ZTCP_ZFTP) ? " ZFTP" : ""); + fprintf(shout, "%s:%d %s %s:%d is on fd %d%s\n", localname, ntohs(sess->sock.in.sin_port), (sess->flags & ZTCP_LISTEN) ? "-<" : (sess->flags & ZTCP_INBOUND) ? "<-" : "->", remotename, ntohs(sess->peer.in.sin_port), sess->fd, (sess->flags & ZTCP_ZFTP) ? " ZFTP" : ""); } } return 0; @@ -582,7 +613,7 @@ bin_ztcp(char *nam, char **args, char *ops, int func) } static struct builtin bintab[] = { - BUILTIN("ztcp", 0, bin_ztcp, 0, 2, 0, "cflv", NULL), + BUILTIN("ztcp", 0, bin_ztcp, 0, 2, 0, "acflv", NULL), }; /* The load/unload routines required by the zsh library interface */ diff --git a/Src/Modules/tcp.h b/Src/Modules/tcp.h index 9b674dd76..05684977f 100644 --- a/Src/Modules/tcp.h +++ b/Src/Modules/tcp.h @@ -72,8 +72,9 @@ union tcp_sockaddr { typedef struct tcp_session *Tcp_session; -#define ZTCP_INBOUND 1 -#define ZTCP_ZFTP 16 +#define ZTCP_LISTEN 1 +#define ZTCP_INBOUND 2 +#define ZTCP_ZFTP 16 struct tcp_session { int fd; /* file descriptor */ |