Merge branch 'concurrent_tcp' into socks5-tcp

.gitignore

@@ -101,5 +101,6 @@ tutorial/sockets/step4
 tutorial/sockets/step5
 tutorial/sockets/.dirstamp
 examples/.dirstamp
+examples/socks5proxy
 examples/webapp
 build/

Makefile.am

@@ -200,6 +200,7 @@ endif
 
 if DILL_SOCKETS
 noinst_PROGRAMS += \
+    examples/socks5proxy \
     examples/webapp
 endif
 

examples/socks5proxy.c

@@ -0,0 +1,154 @@
+/*
+
+  Copyright (c) 2018 Joseph deBlaquiere
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom
+  the Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+  IN THE SOFTWARE.
+
+*/
+
+#include "assert.h"
+#include "../libdill.h"
+#include <stdio.h>
+#include <string.h>
+
+static char *auth_user = NULL;
+static char *auth_pass = NULL;
+
+int auth_fn(const char *user, const char* pass) {
+    if(auth_user) {
+        if(!user) return 0;
+        if(strcmp(user, auth_user) != 0) return 0;
+    }
+    if(auth_pass) {
+        if(!pass) return 0;
+        if(strcmp(pass, auth_pass) != 0) return 0;
+    }
+    return 1;
+}
+
+// forwards input to output. return on error (connection closed)
+coroutine void forward(int in_s, int out_s, int ch) {
+    while (1) {
+        uint8_t d[1];
+        int err = brecv(in_s, d, 1, -1);
+        if (err) break ;
+        err = bsend(out_s, d, 1, -1);
+        if(err) break;
+    }
+    chdone(ch);
+    return;
+}
+
+coroutine void do_proxy(int s) {
+    int err;
+    if((!auth_user) || (!auth_pass)){
+        err = socks5_proxy_auth(s, NULL, -1);
+    } else {
+        err = socks5_proxy_auth(s, auth_fn, -1);
+    }
+    if(err) goto in_close;
+
+    struct ipaddr addr;
+    int cmd = socks5_proxy_recvcommand(s, &addr, -1);
+    if(cmd != SOCKS5_CONNECT) goto in_close;
+
+    char addr_str[IPADDR_MAXSTRLEN];
+    ipaddr_str(&addr, addr_str);
+
+    int s_rem = tcp_connect(&addr, -1);
+    if(s_rem < 0) goto in_close;
+
+    err = ipaddr_remote(&addr, "0.0.0.0", 0, IPADDR_IPV4, -1);
+    if(err) goto in_close;
+
+    err = socks5_proxy_sendreply(s, SOCKS5_SUCCESS, &addr, -1);
+    if(err) goto in_close;
+
+    // channels for outboud, inbound to signal done (to close connection)
+    int och[2], ich[2];
+    err = chmake(och);
+    if(err) goto both_close;
+    err = chmake(ich);
+    if(err) goto both_close;
+
+    int ob = go(forward(s, s_rem, och[1]));
+    if(ob < 0) goto both_close;
+    int ib = go(forward(s_rem, s, ich[1]));
+    if(ib < 0) goto both_close;
+
+    struct chclause cc[] = {{CHRECV, och[0], &err, 1},
+                            {CHRECV, ich[0], &err, 1}};
+    // wait for message in channel - one side closed
+    int c = choose(cc, 2, -1);
+    switch(c) {
+        // one side closed, close the other
+        case 0:
+            err = bundle_wait(ob, -1);
+            if(err) break;
+            msleep(now()+100);
+            hclose(ib);
+            bundle_wait(ib, -1);
+            break;
+        case 1:
+            err = bundle_wait(ib, -1);
+            if(err) break;
+            msleep(now()+100);
+            hclose(ob);
+            bundle_wait(ob, -1);
+            break;
+        case -1:
+            // error
+            break;
+        default:
+            // unexpected answer
+            assert(0);
+    }
+
+both_close:
+    tcp_close(s_rem, -1);
+in_close:
+    tcp_close(s, -1);
+
+    return;
+}
+
+int main(int argc, char** argv) {
+    if (argc >=3) {
+        // set up auth
+        auth_user = argv[1];
+        auth_pass = argv[2];
+    }
+
+    int workers = bundle();
+    struct ipaddr addr;
+    int rc = ipaddr_local(&addr, NULL, 1080, 0);
+    assert(rc == 0);
+    int ls = tcp_listen(&addr, 10);
+    assert(ls >= 0);
+    printf("SOCKS5 proxy listening on :1080\n");
+    while(1) {
+        struct ipaddr caddr;
+        int s = tcp_accept(ls, &caddr, -1);
+        char caddr_str[IPADDR_MAXSTRLEN];
+        ipaddr_str(&caddr, caddr_str);
+        assert(s >= 0);
+        rc = bundle_go(workers, do_proxy(s));
+        assert(rc == 0);
+    }
+}

tutorial/sockets/step5.c

@@ -128,7 +128,7 @@ int main(int argc, char *argv[]) {
         char name[256];
         char value[256];
         rc = http_recvfield(s, name, sizeof(name), value, sizeof(value), -1);
-        if(rc == -1 && errno == EPIPE) break;
+        if(rc == -1 && ((errno == EPIPE) || (ECONNRESET))) break;
         assert(rc == 0);
         fprintf(stderr, "%s: %s\n", name, value);
     }
@@ -140,7 +140,7 @@ int main(int argc, char *argv[]) {
     while(1) {
         unsigned char c;
         rc = brecv(s, &c, 1, -1);
-        if(rc == -1 && errno == EPIPE) break;
+        if(rc == -1 && ((errno == EPIPE) || (ECONNRESET))) break;
         fprintf(stdout, "%c", c);
     }
     fprintf(stderr, "\n");