1 files changed, 55 insertions, 52 deletions

diff --git a/main.c b/main.c
index 7c9df58..3c3a4fb 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);
@@ -130,40 +130,21 @@ void set_tox_username(Tox *tox)
 
     gethostname(hostname, 1024);
     hostname[1023] = '\0';
-# if 0
-    memset(&hints, 0, sizeof hints);
-    hints.ai_family = AF_UNSPEC; /*either IPV4 or IPV6*/
-    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_flags = AI_CANONNAME;
-
-    if ((gai_result = getaddrinfo(hostname, "ftp", &hints, &info)) != 0) 
-    {
-            fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(gai_result));
-            exit(1);
-    }
-
-    for(p = info; p != NULL; p = p->ai_next) 
-    {
-            printf("hostname: %s\n", p->ai_canonname);
-    }
-# endif
 
     tox_set_name(tox, hostname, strlen(hostname));
-
-//    freeaddrinfo(info);
 }
-// get sockaddr, IPv4 or IPv6:
-/* From Beej */
+
+/* Get sockaddr, IPv4 or IPv6 */
 void *get_in_addr(struct sockaddr *sa)
 {
-    if (sa->sa_family == AF_INET) {
+    if (sa->sa_family == AF_INET) 
+    {
         return &(((struct sockaddr_in*)sa)->sin_addr);
     }
 
     return &(((struct sockaddr_in6*)sa)->sin6_addr);
 }
 
-/* From Beej */
 int get_client_socket(char *hostname, int port)
 {
     int sockfd, numbytes;  
@@ -179,13 +160,27 @@ int get_client_socket(char *hostname, int port)
     hints.ai_family = AF_INET;
     hints.ai_socktype = SOCK_STREAM;
 
-    if ((rv = getaddrinfo(hostname, port_str, &hints, &servinfo)) != 0) {
-        fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(rv));
-        return -1;
+    if ((rv = getaddrinfo(hostname, port_str, &hints, &servinfo)) != 0) 
+    {
+        /* Add a special case for "localhost" when name resolution is broken */
+        if(!strncmp("localhost", hostname, 256))
+        {
+            const char localhostname[] = "127.0.0.1";
+            if ((rv = getaddrinfo(localhostname, port_str, &hints, &servinfo)) != 0) {
+                fprintf(stderr, "getaddrinfo failed for 127.0.0.1: %s\n", gai_strerror(rv));
+                return -1;
+            }
+        }
+        else
+        {
+            fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(rv));
+            return -1;
+        }
     }
 
     // loop through all the results and connect to the first we can
-    for(p = servinfo; p != NULL; p = p->ai_next) {
+    for(p = servinfo; p != NULL; p = p->ai_next) 
+    {
         if (p->ai_family != AF_INET && p->ai_family != AF_INET6)
                     continue;
 
@@ -209,8 +204,7 @@ int get_client_socket(char *hostname, int port)
         return -1;
     }
 
-    inet_ntop(p->ai_family, get_in_addr((struct sockaddr *)p->ai_addr),
-            s, sizeof s);
+    inet_ntop(p->ai_family, get_in_addr((struct sockaddr *)p->ai_addr), s, sizeof s);
     fprintf(stderr, "connecting to %s\n", s);
 
     freeaddrinfo(servinfo); // all done with this structure
@@ -229,6 +223,7 @@ int get_client_socket(char *hostname, int port)
 int send_frame(protocol_frame *frame, uint8_t *data)
 {
     int rv = -1;
+    int try = 0;
     int i;
 
     data[0] = PROTOCOL_MAGIC_HIGH;
@@ -240,10 +235,12 @@ int send_frame(protocol_frame *frame, uint8_t *data)
     data[6] = BYTE2(frame->data_length);
     data[7] = BYTE1(frame->data_length);
 
-    for(i = 0; i < 17;)
+    for(i = 0; i < 65;) /* 1.27 seconds per packet max */
     {
         int j;
 
+        try++;
+
         rv = tox_send_lossless_packet(
                 tox,
                 frame->friendnumber,
@@ -273,7 +270,7 @@ int send_frame(protocol_frame *frame, uint8_t *data)
 
     if(i > 0 && rv >= 0)
     {
-        fprintf(stderr, "Packet succeeded at try %d\n", i+1);
+        fprintf(stderr, "Packet succeeded at try %d\n", try);
     }
 
     return rv;
@@ -337,10 +334,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)
@@ -380,6 +377,12 @@ int handle_client_tcp_frame(protocol_frame *rcvd_frame)
         return -1;
     }
 
+    if(tun->friendnumber != rcvd_frame->friendnumber)
+    {
+        fprintf(stderr, "Friend #%d tried to send packet to a tunnel which belongs to #%d\n", rcvd_frame->friendnumber, tun->friendnumber);
+        return -1;
+    }
+
     while(offset < rcvd_frame->data_length)
     {
         int sent_bytes;
@@ -388,7 +391,7 @@ int handle_client_tcp_frame(protocol_frame *rcvd_frame)
                 tun->sockfd, 
                 rcvd_frame->data + offset,
                 rcvd_frame->data_length - offset,
-                0
+                MSG_NOSIGNAL
         );
 
         if(sent_bytes < 0)
@@ -403,11 +406,6 @@ int handle_client_tcp_frame(protocol_frame *rcvd_frame)
     return 0;
 }
 
-int handle_server_tcp_fin_frame(protocol_frame *rcvd_frame)
-{
-
-}
-
 /* Handle close-tunnel frame received from the client */
 int handle_client_tcp_fin_frame(protocol_frame *rcvd_frame)
 {
@@ -520,9 +518,9 @@ int parse_lossless_packet(void *sender_uc, const uint8_t *data, uint32_t len)
     frame->packet_type =                INT16_AT(data, 2);
     frame->connid =                     INT16_AT(data, 4);
     frame->data_length =                INT16_AT(data, 6);
-    frame->data = data + PROTOCOL_BUFFER_OFFSET;
+    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)
     {
@@ -652,12 +650,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));
@@ -674,7 +673,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)
@@ -738,7 +737,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));
@@ -750,7 +749,6 @@ int do_server_loop()
 
                     tunnel_delete(tun);
                                         
-                    /* TODO remove tunnel? resume connection? */
                     continue;
                 }
                 else
@@ -787,7 +785,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)
         {
@@ -806,8 +804,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 */
@@ -868,7 +870,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)
         {
@@ -888,9 +890,10 @@ int main(int argc, char *argv[])
         }
 
         tox_get_address(tox, tox_id);
+        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();