Don't overwrite the first " when installing a service.

[tinc] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index cac24ee..8f47f23 100644 (file)
--- 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.35 2003/07/22 20:55:20 guus Exp $
+    $Id: net_packet.c,v 1.1.2.39 2003/08/22 11:18:42 guus Exp $
 */
 
 #include "system.h"
@@ -306,14 +306,12 @@ static void send_udppacket(node_t *n, vpn_packet_t *inpkt)
                priority = origpriority;
                ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Setting outgoing packet priority to %d"), priority);
                if(setsockopt(listen_socket[sock].udp, SOL_IP, IP_TOS, &priority, sizeof(priority)))    /* SO_PRIORITY doesn't seem to work */
-                       logger(LOG_ERR, _("System call `%s' failed: %s"), "setsockopt",
-                                  strerror(errno));
+                       logger(LOG_ERR, _("System call `%s' failed: %s"), "setsockopt", strerror(errno));
        }
 #endif
 
        if((sendto(listen_socket[sock].udp, (char *) &inpkt->seqno, inpkt->len, 0, &(n->address.sa), SALEN(n->address.sa))) < 0) {
-               logger(LOG_ERR, _("Error sending packet to %s (%s): %s"), n->name,
-                          n->hostname, strerror(errno));
+               logger(LOG_ERR, _("Error sending packet to %s (%s): %s"), n->name, n->hostname, strerror(errno));
                return;
        }
 
@@ -323,7 +321,7 @@ static void send_udppacket(node_t *n, vpn_packet_t *inpkt)
 /*
   send a packet to the given vpn ip.
 */
-void send_packet(node_t *n, vpn_packet_t *packet)
+void send_packet(const node_t *n, vpn_packet_t *packet)
 {
        node_t *via;
 
@@ -358,7 +356,7 @@ void send_packet(node_t *n, vpn_packet_t *packet)
 
 /* Broadcast a packet using the minimum spanning tree */
 
-void broadcast_packet(node_t *from, vpn_packet_t *packet)
+void broadcast_packet(const node_t *from, vpn_packet_t *packet)
 {
        avl_node_t *node;
        connection_t *c;
@@ -394,7 +392,6 @@ void flush_queue(node_t *n)
 void handle_incoming_vpn_data(int sock)
 {
        vpn_packet_t pkt;
-       int x, l = sizeof(x);
        char *hostname;
        sockaddr_t from;
        socklen_t fromlen = sizeof(from);
@@ -402,18 +399,6 @@ void handle_incoming_vpn_data(int sock)
 
        cp();
 
-       if(getsockopt(sock, SOL_SOCKET, SO_ERROR, &x, &l) < 0) {
-               logger(LOG_ERR, _("This is a bug: %s:%d: %d:%s"),
-                          __FILE__, __LINE__, sock, strerror(errno));
-               cp_trace();
-               exit(1);
-       }
-
-       if(x) {
-               logger(LOG_ERR, _("Incoming data socket error: %s"), strerror(x));
-               return;
-       }
-
        pkt.len = recvfrom(sock, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen);
 
        if(pkt.len <= 0) {