X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_packet.c;h=44214df4f0e60d6412419bf88cbc303a61b37d6b;hb=172763f4af4340ac2c2549e8fbb7490f5f995d47;hp=345175eafdd3d0d95b2246bc60b493131c0059bc;hpb=a31e1f03c4eff16403178695d971a0838996ba2e;p=tinc diff --git a/src/net_packet.c b/src/net_packet.c index 345175ea..44214df4 100644 --- a/src/net_packet.c +++ b/src/net_packet.c @@ -499,7 +499,7 @@ static void send_sptps_packet(node_t *n, vpn_packet_t *origpkt) { uint8_t type = 0; int offset = 0; - if(!(DATA(origpkt)[12] | DATA(origpkt)[13])) { + if((!(DATA(origpkt)[12] | DATA(origpkt)[13])) && (n->sptps.outstate)) { sptps_send_record(&n->sptps, PKT_PROBE, (char *)DATA(origpkt), origpkt->len); return; } @@ -722,7 +722,7 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) { #if defined(IPPROTO_IP) && defined(IP_TOS) case AF_INET: logger(DEBUG_TRAFFIC, LOG_DEBUG, "Setting IPv4 outgoing packet priority to %d", origpriority); - if(setsockopt(listen_socket[sock].udp.fd, IPPROTO_IP, IP_TOS, &origpriority, sizeof origpriority)) /* SO_PRIORITY doesn't seem to work */ + if(setsockopt(listen_socket[sock].udp.fd, IPPROTO_IP, IP_TOS, (void *)&origpriority, sizeof origpriority)) /* SO_PRIORITY doesn't seem to work */ logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "setsockopt", sockstrerror(sockerrno)); break; #endif