4 files changed, 104 insertions, 32 deletions

diff --git a/client.c b/client.c
index 4cf6b7b..3395757 100644
--- a/client.c
+++ b/client.c
@@ -103,17 +103,20 @@ int handle_acktunnel_frame(protocol_frame *rcvd_frame)
     /* Mark that we can accept() another connection */
     client_tunnel.sockfd = -1;
 
-    printf("New tunnel ID: %d\n", tun->connid);
+//    printf("New tunnel ID: %d\n", tun->connid);
 
-    if(client_local_port_mode)
+    if(client_local_port_mode || client_pipe_mode)
     {
         update_select_nfds(tun->sockfd);
         FD_SET(tun->sockfd, &client_master_fdset);
-        fprintf(stderr, "Accepted a new connection on port %d\n", local_port);
+        if(client_local_port_mode)
+        {
+            fprintf(stderr, "Accepted a new connection on port %d\n", local_port);
+        }
     }
     else
     {
-        fprintf(stderr, "This tunnel mode is not supported yet");
+        fprintf(stderr, "This tunnel mode is not supported yet\n");
         exit(1);
     }
 }
@@ -136,20 +139,33 @@ int handle_server_tcp_frame(protocol_frame *rcvd_frame)
     while(offset < rcvd_frame->data_length)
     {
         int sent_bytes;
+        int write_sockfd;
+
+        if(client_pipe_mode)
+        {
+            sent_bytes = write(
+                    1, /* STDOUT */
+                    rcvd_frame->data + offset,
+                    rcvd_frame->data_length - offset
+            );
+        }
+        else
+        {
+            sent_bytes = send(
+                    tun->sockfd, 
+                    rcvd_frame->data + offset,
+                    rcvd_frame->data_length - offset,
+                    MSG_NOSIGNAL
+            );
+        }
 
-        sent_bytes = send(
-                tun->sockfd, 
-                rcvd_frame->data + offset,
-                rcvd_frame->data_length - offset,
-                MSG_NOSIGNAL
-        );
 
         if(sent_bytes < 0)
         {
             char data[PROTOCOL_BUFFER_OFFSET];
             protocol_frame frame_st, *frame;
 
-            fprintf(stderr, "Could not write to socket %d: %s\n", tun->sockfd, strerror(errno));
+            fprintf(stderr, "Could not write to socket %d: %s\n", write_sockfd, strerror(errno));
 
             frame = &frame_st;
             memset(frame, 0, sizeof(protocol_frame));
@@ -166,7 +182,7 @@ int handle_server_tcp_frame(protocol_frame *rcvd_frame)
         offset += sent_bytes;
     }
 
-    printf("Got %d bytes from server - wrote to fd %d\n", rcvd_frame->data_length, tun->sockfd);
+//    printf("Got %d bytes from server - wrote to fd %d\n", rcvd_frame->data_length, tun->sockfd);
 
     return 0;
 }
@@ -213,7 +229,7 @@ int do_client_loop(char *tox_id_str)
         exit(1);
     }
 
-    if(!ping_mode) /* TODO handle pipe mode */
+    if(!ping_mode && !client_pipe_mode)
     {
         local_bind();
         signal(SIGPIPE, SIG_IGN);
@@ -277,6 +293,10 @@ int do_client_loop(char *tox_id_str)
                 {
                     state = CLIENT_STATE_SEND_PING;
                 }
+                else if(client_pipe_mode)
+                {
+                    state = CLIENT_STATE_SETUP_PIPE;
+                }
                 else
                 {
                     state = CLIENT_STATE_BIND_PORT;
@@ -315,6 +335,14 @@ int do_client_loop(char *tox_id_str)
                     state = CLIENT_STATE_FORWARDING;
                 }
                 break;
+            case CLIENT_STATE_SETUP_PIPE:
+                send_tunnel_request_packet(
+                        remote_host,
+                        remote_port,
+                        friendnumber
+                );
+                state = CLIENT_STATE_FORWARDING;
+                break;
             case CLIENT_STATE_REQUEST_TUNNEL:
                 send_tunnel_request_packet(
                         remote_host,
@@ -324,6 +352,12 @@ int do_client_loop(char *tox_id_str)
                 state = CLIENT_STATE_WAIT_FOR_ACKTUNNEL;
                 break;
             case CLIENT_STATE_WAIT_FOR_ACKTUNNEL:
+                client_tunnel.sockfd = 0;
+                send_tunnel_request_packet(
+                        remote_host,
+                        remote_port,
+                        friendnumber
+                );
                 break;
             case CLIENT_STATE_FORWARDING:
                 {
@@ -336,7 +370,8 @@ int do_client_loop(char *tox_id_str)
                     fds = client_master_fdset;
                     
                     /* Handle accepting new connections */
-                    if(client_tunnel.sockfd <= 0) /* Don't accept if we're already waiting to establish a tunnel */
+                    if(!client_pipe_mode &&
+                        client_tunnel.sockfd <= 0) /* Don't accept if we're already waiting to establish a tunnel */
                     {
                         accept_fd = accept(bind_sockfd, NULL, NULL);
                         if(accept_fd != -1)
@@ -359,9 +394,20 @@ int do_client_loop(char *tox_id_str)
                     {
                         if(FD_ISSET(tun->sockfd, &fds))
                         {
-                            int nbytes = recv(tun->sockfd, 
-                                    tox_packet_buf + PROTOCOL_BUFFER_OFFSET, 
-                                    READ_BUFFER_SIZE, 0);
+                            int nbytes;
+                            if(client_local_port_mode)
+                            {
+                                nbytes = recv(tun->sockfd, 
+                                        tox_packet_buf + PROTOCOL_BUFFER_OFFSET, 
+                                        READ_BUFFER_SIZE, 0);
+                            }
+                            else
+                            {
+                                nbytes = read(tun->sockfd,
+                                        tox_packet_buf + PROTOCOL_BUFFER_OFFSET, 
+                                        READ_BUFFER_SIZE
+                                );
+                            }
 
                             /* Check if connection closed */
                             if(nbytes == 0)
@@ -392,7 +438,7 @@ int do_client_loop(char *tox_id_str)
                                 frame->data_length = nbytes;
                                 send_frame(frame, tox_packet_buf);
 
-                                printf("Wrote %d bytes from sock %d to tunnel %d\n", nbytes, tun->sockfd, tun->connid);
+//                                printf("Wrote %d bytes from sock %d to tunnel %d\n", nbytes, tun->sockfd, tun->connid);
                             }
                         }
                     }
diff --git a/client.h b/client.h
index d22c161..1ac5008 100644
--- a/client.h
+++ b/client.h
@@ -12,6 +12,7 @@
 #define CLIENT_STATE_FORWARDING 10
 #define CLIENT_STATE_SHUTDOWN 11
 #define CLIENT_STATE_BIND_PORT 12
+#define CLIENT_STATE_SETUP_PIPE 13
 
 int handle_pong_frame(protocol_frame *rcvd_frame);
 int handle_acktunnel_frame(protocol_frame *rcvd_frame);
diff --git a/main.c b/main.c
index 8cef6ce..9d3d495 100644
--- a/main.c
+++ b/main.c
@@ -94,7 +94,7 @@ tunnel *tunnel_create(int sockfd, int connid, uint32_t friendnumber)
 
 void tunnel_delete(tunnel *t)
 {
-    printf("Deleting tunnel #%d\n", t->connid);
+    fprintf(stderr, "Deleting tunnel #%d\n", t->connid);
     if(t->sockfd)
     {
         close(t->sockfd);
@@ -331,10 +331,10 @@ int handle_request_tunnel_frame(protocol_frame *rcvd_frame)
     strncpy(hostname, rcvd_frame->data, rcvd_frame->data_length);
     hostname[rcvd_frame->data_length] = '\0';
 
-    printf("Got a request to forward data from %s:%d\n", hostname, port);
+    fprintf(stderr, "Got a request to forward data from %s:%d\n", hostname, port);
 
     tunnel_id = get_random_tunnel_id();
-    printf("Tunnel ID: %d\n", tunnel_id);
+    fprintf(stderr, "Tunnel ID: %d\n", tunnel_id);
     /* TODO make connection */
     sockfd = get_client_socket(hostname, port);
     if(sockfd > 0)
@@ -509,7 +509,7 @@ int parse_lossless_packet(void *sender_uc, const uint8_t *data, uint32_t len)
     frame->data_length =                INT16_AT(data, 6);
     frame->data = (uint8_t *)(data + PROTOCOL_BUFFER_OFFSET);
     frame->friendnumber = *((uint32_t*)sender_uc);
-    printf("Got protocol frame magic 0x%x type 0x%x from friend %d\n", frame->magic, frame->packet_type, frame->friendnumber);
+    fprintf(stderr, "Got protocol frame magic 0x%x type 0x%x from friend %d\n", frame->magic, frame->packet_type, frame->friendnumber);
 
     if(len < frame->data_length + PROTOCOL_BUFFER_OFFSET)
     {
@@ -639,13 +639,13 @@ void accept_friend_request(Tox *tox, const uint8_t *public_key, const uint8_t *d
     int32_t friendnumber;
     int32_t *friendnumber_ptr = NULL;
 
-    printf("Got friend request\n");
+    fprintf(stderr, "Got friend request\n");
 
     friendnumber = tox_add_friend_norequest(tox, public_key);
 
     memset(tox_printable_id, '\0', sizeof(tox_printable_id));
     id_to_string(tox_printable_id, public_key);
-    printf("Accepted friend request from %s as %d\n", tox_printable_id, friendnumber);
+    fprintf(stderr, "Accepted friend request from %s as %d\n", tox_printable_id, friendnumber);
 
     /* TODO: this is not freed right now, we're leaking 4 bytes per contact (OMG!) */
     friendnumber_ptr = malloc(sizeof(int32_t));
@@ -662,7 +662,7 @@ void accept_friend_request(Tox *tox, const uint8_t *public_key, const uint8_t *d
 
 void cleanup(int status, void *tmp)
 {
-    printf("kthxbye\n");
+    fprintf(stderr, "kthxbye\n");
     fflush(stdout);
     tox_kill(tox);
     if(client_socket)
@@ -726,7 +726,7 @@ int do_server_loop()
                     char data[PROTOCOL_BUFFER_OFFSET];
                     protocol_frame frame_st, *frame;
 
-                    printf("conn closed!\n");
+                    fprintf(stderr, "conn closed!\n");
 
                     frame = &frame_st;
                     memset(frame, 0, sizeof(protocol_frame));
@@ -738,7 +738,6 @@ int do_server_loop()
 
                     tunnel_delete(tun);
                                         
-                    /* TODO remove tunnel? resume connection? */
                     continue;
                 }
                 else
@@ -775,7 +774,7 @@ int main(int argc, char *argv[])
     unsigned char tox_printable_id[TOX_FRIEND_ADDRESS_SIZE * 2 + 1];
     int oc;
 
-    while ((oc = getopt(argc, argv, "L:pi:C:")) != -1)
+    while ((oc = getopt(argc, argv, "L:pi:C:P:")) != -1)
     {
         switch(oc)
         {
@@ -794,8 +793,12 @@ int main(int argc, char *argv[])
                 /* Pipe forwarding */
                 client_mode = 1;
                 client_pipe_mode = 1;
-                remote_port = atoi(optarg);
-                fprintf(stderr, "Forwarding remote port %d\n", remote_port);
+                if(parse_pipe_port_forward(optarg, &remote_host, &remote_port) < 0)
+                {
+                    fprintf(stderr, "Invalid value for -P option - use something like -P 127.0.0.1:22\n");
+                    exit(1);
+                }
+                fprintf(stderr, "Forwarding remote port %d to stdin/out\n", remote_port);
                 break;
             case 'p':
                 /* Ping */
@@ -843,7 +846,7 @@ int main(int argc, char *argv[])
         tox_get_address(tox, tox_id);
         id_to_string(tox_printable_id, tox_id);
         tox_printable_id[TOX_FRIEND_ADDRESS_SIZE * 2] = '\0';
-        printf("Generated Tox ID: %s\n", tox_printable_id);
+        fprintf(stderr, "Generated Tox ID: %s\n", tox_printable_id);
 
         if(!remote_tox_id)
         {
@@ -866,7 +869,7 @@ int main(int argc, char *argv[])
         memset(tox_printable_id, '\0', sizeof(tox_printable_id));
         id_to_string(tox_printable_id, tox_id);
         tox_printable_id[TOX_FRIEND_ADDRESS_SIZE * 2] = '\0';
-        printf("Using Tox ID: %s\n", tox_printable_id);
+        fprintf(stderr, "Using Tox ID: %s\n", tox_printable_id);
 
         tox_callback_friend_request(tox, accept_friend_request, NULL);
         do_server_loop();
diff --git a/util.c b/util.c
index 86d316d..b523236 100644
--- a/util.c
+++ b/util.c
@@ -81,6 +81,7 @@ int string_to_id(char_t *w, char_t *a)
     return 1;
 }
 
+/* Parse the -L parameter */
 /* 0 = success */
 int parse_local_port_forward(char *string, int *local_port, char **hostname, int *remote_port)
 {
@@ -104,6 +105,27 @@ int parse_local_port_forward(char *string, int *local_port, char **hostname, int
     return 0;
 }
 
+/* Parse the -P parameter */
+/* 0 = success */
+int parse_pipe_port_forward(char *string, char **hostname, int *remote_port)
+{
+    char *host;
+    char *rport;
+    
+    host = strtok(string, ":");
+    rport = strtok(NULL, ":");
+
+    if(!host || !rport)
+    {
+        return -1;
+    }
+
+    *hostname = host;
+    *remote_port = atoi(rport);
+
+    return 0;
+}
+
 void* file_raw(char *path, uint32_t *size)
 {
     FILE *file;