X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=58f3e02fbedba61472c062e890b7f9d9f262d1c8;hp=ebcaeb3652f98db1024229ed81692c4ad8b7ad6d;hb=d0ba34ccae02d07051bc3f7012a6c116cfb3b653;hpb=aeccaca829842910b4a5c8a5fa61e1738492bea6

diff --git a/src/net.c b/src/net.c
index ebcaeb36..58f3e02f 100644
--- a/src/net.c
+++ b/src/net.c
@@ -93,12 +93,14 @@ int xsend(conn_list_t *cl, void *packet)
   real_packet_t rp;
 cp
   do_encrypt((vpn_packet_t*)packet, &rp, cl->key);
-  rp.from = myself->vpn_ip;
+  rp.from = htonl(myself->vpn_ip);
+  rp.data.len = htons(rp.data.len);
+  rp.len = htons(rp.len);
 
   if(debug_lvl > 3)
-    syslog(LOG_ERR, "Sent %d bytes to %lx", rp.len, cl->vpn_ip);
+    syslog(LOG_ERR, "Sent %d bytes to %lx", ntohs(rp.len), cl->vpn_ip);
 
-  if((r = send(cl->socket, (char*)&rp, rp.len, 0)) < 0)
+  if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
     {
       syslog(LOG_ERR, "Error sending data: %m");
       return -1;
@@ -256,8 +258,14 @@ cp
 */
 int send_packet(ip_t to, vpn_packet_t *packet)
 {
+  config_t const *cfg;
   conn_list_t *cl;
 cp
+  if(!(cfg = get_config_val(proxymode)))		/* In case we are in proxy mode, just send everything to our uplink. */
+    cl = conn_list;
+  else
+    cl = lookup_conn(to);
+
   if((cl = lookup_conn(to)) == NULL)
     {
       if(debug_lvl > 2)
@@ -771,6 +779,11 @@ cp
       return -1;
     }
   total_socket_in += lenin;
+
+  rp.data.len = ntohs(rp.data.len);
+  rp.len = ntohs(rp.len);
+  rp.from = ntohl(rp.from);
+
   if(rp.len >= 0)
     {
       f = lookup_conn(rp.from);
@@ -923,7 +936,7 @@ cp
 int handle_incoming_meta_data(conn_list_t *cl)
 {
   int x, l = sizeof(x);
-  int request, oldlen, p, i;
+  int request, oldlen, i;
   int lenin = 0;
 cp
   if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)