X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_packet.c;h=725789de721b0461829fed5342f5a70fdc1d5c67;hb=17bc5220c332fdd083fd47fc600010f85171adc7;hp=5171a4f43a5f36494b39b03a5b9a09196d913bb6;hpb=c2b9c06062d36bde859b630b99a08c7b7428e721;p=tinc

diff --git a/src/net_packet.c b/src/net_packet.c
index 5171a4f4..725789de 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_packet.c,v 1.1.2.1 2002/02/18 16:25:16 guus Exp $
+    $Id: net_packet.c,v 1.1.2.5 2002/02/26 23:26:41 guus Exp $
 */
 
 #include "config.h"
@@ -185,6 +185,7 @@ void send_udppacket(node_t *n, vpn_packet_t *inpkt)
   vpn_packet_t *pkt[] = {&pkt1, &pkt2, &pkt1, &pkt2};
   int nextpkt = 0;
   vpn_packet_t *outpkt;
+  int origlen;
   int outlen, outpad;
   long int complen = MTU + 12;
   EVP_CIPHER_CTX ctx;
@@ -210,6 +211,8 @@ cp
       return;
     }
 
+  origlen = inpkt->len;
+
   /* Compress the packet */
 
   if(n->compression)
@@ -255,12 +258,14 @@ cp
 
   /* Send the packet */
 
-  if((sendto(udp_socket, (char *)&inpkt->seqno, inpkt->len, 0, &(n->address.sa), sizeof(sockaddr_t))) < 0)
+  if((sendto(udp_socket[0], (char *)&inpkt->seqno, inpkt->len, 0, &(n->address.sa), SALEN(n->address.sa))) < 0)
     {
       syslog(LOG_ERR, _("Error sending packet to %s (%s): %s"),
              n->name, n->hostname, strerror(errno));
       return;
     }
+  
+  inpkt->len = origlen;
 cp
 }
 
@@ -344,7 +349,7 @@ cp
 cp
 }
 
-void handle_incoming_vpn_data(void)
+void handle_incoming_vpn_data(int sock)
 {
   vpn_packet_t pkt;
   int x, l = sizeof(x);
@@ -353,10 +358,10 @@ void handle_incoming_vpn_data(void)
   socklen_t fromlen = sizeof(from);
   node_t *n;
 cp
-  if(getsockopt(udp_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
+  if(getsockopt(sock, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
     {
       syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%s"),
-             __FILE__, __LINE__, udp_socket, strerror(errno));
+             __FILE__, __LINE__, sock, strerror(errno));
       return;
     }
   if(x)
@@ -365,7 +370,7 @@ cp
       return;
     }
 
-  if((pkt.len = recvfrom(udp_socket, (char *)&pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen)) <= 0)
+  if((pkt.len = recvfrom(sock, (char *)&pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen)) <= 0)
     {
       syslog(LOG_ERR, _("Receiving packet failed: %s"), strerror(errno));
       return;