Unified · Split
| @@ -2,7 +2,7 @@ implement Ftpfs; · 1 unmodified line | ||
| 2 | 2 | |
| 3 | 3 | include "sys.m"; |
| 4 | 4 | sys: Sys; |
| 5 | − FD, Connection, Dir: import Sys; | |
| 5 | + FD, Dir: import Sys; | |
| 6 | 6 | |
| 7 | 7 | include "draw.m"; |
| 8 | 8 | |
| @@ -23,6 +23,10 @@ include "styx.m"; · 14 unmodified lines | ||
| 23 | 23 | styx: Styx; |
| 24 | 24 | Tmsg, Rmsg: import styx; |
| 25 | 25 | |
| 26 | +include "dial.m"; | |
| 27 | + dial: Dial; | |
| 28 | + Connection: import dial; | |
| 29 | + | |
| 26 | 30 | include "factotum.m"; |
| 27 | 31 | |
| 28 | 32 | Ftpfs: module |
| @@ -107,7 +111,7 @@ File: adt · 78 unmodified lines | ||
| 107 | 111 | createtmp: fn(f: self ref File): ref FD; |
| 108 | 112 | }; |
| 109 | 113 | |
| 110 | −ftp: Connection; | |
| 114 | +ftp: ref Connection; | |
| 111 | 115 | dfid: ref FD; |
| 112 | 116 | dfidiob: ref Iobuf; |
| 113 | 117 | buffresidue: int = 0; |
| @@ -700,7 +704,7 @@ getfullreply(echo: int): (int, int, string) · 586 unmodified lines | ||
| 700 | 704 | |
| 701 | 705 | getreply(echo: int): (int, string) |
| 702 | 706 | { |
| 703 | − (c, code, s) := getfullreply(echo); | |
| 707 | + (c, nil, s) := getfullreply(echo); | |
| 704 | 708 | return (c, s); |
| 705 | 709 | } |
| 706 | 710 | |
| @@ -767,15 +771,15 @@ third(cmd: string): ref FD · 60 unmodified lines | ||
| 767 | 771 | { |
| 768 | 772 | acquire(); |
| 769 | 773 | for (;;) { |
| 770 | − (n, data) := sys->dial(firewall, nil); | |
| 771 | − if (n < 0) { | |
| 774 | + data := dial->dial(firewall, nil); | |
| 775 | + if(data == nil) { | |
| 772 | 776 | if (debug) |
| 773 | 777 | sys->print("dial %s failed: %r\n", firewall); |
| 774 | 778 | break; |
| 775 | 779 | } |
| 776 | 780 | t := sys->sprint("\n%s!*\n\n%s\n%s\n1\n-1\n-1\n", proxyhost, myhost, myname); |
| 777 | 781 | b := array of byte t; |
| 778 | − n = sys->write(data.dfd, b, len b); | |
| 782 | + n := sys->write(data.dfd, b, len b); | |
| 779 | 783 | if (n < 0) { |
| 780 | 784 | if (debug) |
| 781 | 785 | sys->print("firewall write failed: %r\n"); |
| @@ -872,8 +876,8 @@ passive(cmd: string): ref FD · 90 unmodified lines | ||
| 872 | 876 | a := dataport(l); |
| 873 | 877 | if (debug) |
| 874 | 878 | sys->print("data dial %s\n", a); |
| 875 | − (s, d) := sys->dial(a, nil); | |
| 876 | − if (s < 0) | |
| 879 | + d := dial->dial(a, nil); | |
| 880 | + if(d == nil) | |
| 877 | 881 | return nil; |
| 878 | 882 | acquire(); |
| 879 | 883 | r = sendrequest(cmd, 0); |
| @@ -919,14 +923,14 @@ activate(cmd: string): ref FD · 39 unmodified lines | ||
| 919 | 923 | { |
| 920 | 924 | r: int; |
| 921 | 925 | |
| 922 | − listenport, dataport: Connection; | |
| 926 | + listenport, dataport: ref Connection; | |
| 923 | 927 | m: string; |
| 924 | 928 | |
| 925 | − (r, listenport) = sys->announce("tcp!" + net + "!0"); | |
| 926 | − if (r < 0) | |
| 929 | + listenport = dial->announce("tcp!" + net + "!0"); | |
| 930 | + if(listenport == nil) | |
| 927 | 931 | return nil; |
| 928 | 932 | (x1, x2) := getnet(listenport.dir); |
| 929 | − (x3, x4) := sys->tokenize(x1, "."); | |
| 933 | + (nil, x4) := sys->tokenize(x1, "."); | |
| 930 | 934 | t := sys->sprint("PORT %s,%d,%d", commas(x4), int x2 / 256, int x2&255); |
| 931 | 935 | acquire(); |
| 932 | 936 | r = sendrequest(t, 0); |
| @@ -948,8 +952,8 @@ activate(cmd: string): ref FD · 15 unmodified lines | ||
| 948 | 952 | release(); |
| 949 | 953 | if (r != Extra) |
| 950 | 954 | return nil; |
| 951 | − (r, dataport) = sys->listen(listenport); | |
| 952 | − if (r < 0) { | |
| 955 | + dataport = dial->listen(listenport); | |
| 956 | + if(dataport == nil) { | |
| 953 | 957 | sys->fprint(stderr, "activate: listen failed: %r\n"); |
| 954 | 958 | return nil; |
| 955 | 959 | } |
| @@ -1488,8 +1492,8 @@ init(nil: ref Draw->Context, args: list of string) · 532 unmodified lines | ||
| 1488 | 1492 | rv: int; |
| 1489 | 1493 | code: int; |
| 1490 | 1494 | |
| 1491 | − if (sys == nil) | |
| 1492 | − sys = load Sys Sys->PATH; | |
| 1495 | + sys = load Sys Sys->PATH; | |
| 1496 | + dial = load Dial Dial->PATH; | |
| 1493 | 1497 | stdin = sys->fildes(0); |
| 1494 | 1498 | stderr = sys->fildes(2); |
| 1495 | 1499 | |
| @@ -1549,8 +1553,8 @@ init(nil: ref Draw->Context, args: list of string) · 53 unmodified lines | ||
| 1549 | 1553 | if (proxy) { |
| 1550 | 1554 | if (!quiet) |
| 1551 | 1555 | sys->print("dial firewall service %s\n", firewall); |
| 1552 | − (rv, ftp) = sys->dial(firewall, nil); | |
| 1553 | − if (rv < 0) { | |
| 1556 | + ftp = dial->dial(firewall, nil); | |
| 1557 | + if(ftp == nil) { | |
| 1554 | 1558 | sys->print("dial %s failed: %r\n", firewall); |
| 1555 | 1559 | exit; |
| 1556 | 1560 | } |
| @@ -1593,13 +1597,13 @@ init(nil: ref Draw->Context, args: list of string) · 36 unmodified lines | ||
| 1593 | 1597 | sys->print("proxyhost %s\n", proxyhost); |
| 1594 | 1598 | } else { |
| 1595 | 1599 | d := "tcp!" + hostname + "!ftp"; |
| 1596 | − (rv, ftp) = sys->dial(d, nil); | |
| 1597 | − if (debug) | |
| 1598 | − sys->print("localdir %s\n", ftp.dir); | |
| 1599 | − if (rv < 0) { | |
| 1600 | + ftp = dial->dial(d, nil); | |
| 1601 | + if(ftp == nil) { | |
| 1600 | 1602 | sys->print("dial %s failed: %r\n", d); |
| 1601 | 1603 | exit; |
| 1602 | 1604 | } |
| 1605 | + if(debug) | |
| 1606 | + sys->print("localdir %s\n", ftp.dir); | |
| 1603 | 1607 | dfid = ftp.dfd; |
| 1604 | 1608 | } |
| 1605 | 1609 | dfidiob = bufio->fopen(dfid, sys->OREAD); |
Binary file not shown.