changeset 614:1fc22e8efd26

Some cleanup work, preparation for SOCKS 5.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 20 May 2014 06:51:52 +0300
parents 2cd71b7c1e8e
children 399ce077b2a0
files network.c network.h
diffstat 2 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/network.c	Tue May 20 06:50:12 2014 +0300
+++ b/network.c	Tue May 20 06:51:52 2014 +0300
@@ -6,6 +6,12 @@
 #include "network.h"
 #include <errno.h>
 
+enum
+{
+    NN_SOCKS5_AUTH_NONE = 0,
+    NN_SOCKS5_AUTH_USER = 2,
+};
+
 struct nn_socks4_t
 {
     uint8_t version;
@@ -294,7 +300,7 @@
         struct nn_socks4_res_t *sockres;
         struct nn_socks4_t *socksh;
         size_t bufsiz;
-        char *ptr, *buf;
+        uint8_t *ptr, *buf;
 
         nn_conn_msg(conn, "Initializing SOCKS 4/a proxy negotiation.\n");
 
@@ -317,12 +323,12 @@
         socksh->addr    = (conn->proxy.type == NN_PROXY_SOCKS4A) ?  htonl(0x00000032) : conn->addr.s_addr;
         ptr += sizeof(struct nn_socks4_t);
 
-        strcpy(ptr, conn->proxy.userid);
+        strcpy((char *) ptr, conn->proxy.userid);
 
         if (conn->proxy.type == NN_PROXY_SOCKS4A)
         {
             ptr += strlen(conn->proxy.userid) + 1;
-            strcpy(ptr, conn->host);
+            strcpy((char *)ptr, conn->host);
         }
 
         // Send request
--- a/network.h	Tue May 20 06:50:12 2014 +0300
+++ b/network.h	Tue May 20 06:51:52 2014 +0300
@@ -52,9 +52,8 @@
 
 enum
 {
-    NN_PROXY_AUTH_NONE = 0,
-//    NN_PROXY_AUTH_GSSAPI = 1,     // Not supported
-    NN_PROXY_AUTH_USER = 2,
+    NN_PROXY_AUTH_NONE,
+    NN_PROXY_AUTH_USER,
 };
 
 enum