listen_socket[sock].priority = origpriority;
switch(sa->sa.sa_family) {
-#if defined(IPPROTO_IP) && defined(IP_TOS)
+#if defined(IP_TOS)
case AF_INET:
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Setting IPv4 outgoing packet priority to %d", origpriority);
break;
#endif
-#if defined(IPPROTO_IPV6) & defined(IPV6_TCLASS)
+#if defined(IPV6_TCLASS)
case AF_INET6:
logger(DEBUG_TRAFFIC, LOG_DEBUG, "Setting IPv6 outgoing packet priority to %d", origpriority);
if(type == SPTPS_HANDSHAKE || tcponly || (!direct && !relay_supported) || (type != PKT_PROBE && (len - SPTPS_DATAGRAM_OVERHEAD) > relay->minmtu)) {
if(type != SPTPS_HANDSHAKE && (to->nexthop->connection->options >> 24) >= 7) {
- char buf[len + sizeof(to->id) + sizeof from->id];
+ char buf[len + sizeof(to->id) + sizeof(from->id)];
char *buf_ptr = buf;
memcpy(buf_ptr, &to->id, sizeof(to->id));
- buf_ptr += sizeof to->id;
+ buf_ptr += sizeof(to->id);
memcpy(buf_ptr, &from->id, sizeof(from->id));
- buf_ptr += sizeof from->id;
+ buf_ptr += sizeof(from->id);
memcpy(buf_ptr, data, len);
logger(DEBUG_TRAFFIC, LOG_INFO, "Sending packet from %s (%s) to %s (%s) via %s (%s) (TCP)", from->name, from->hostname, to->name, to->hostname, to->nexthop->name, to->nexthop->hostname);
return send_sptps_tcppacket(to->nexthop->connection, buf, sizeof(buf));
size_t overhead = 0;
if(relay_supported) {
- overhead += sizeof(to->id) + sizeof from->id;
+ overhead += sizeof(to->id) + sizeof(from->id);
}
char buf[len + overhead];
/* Inform the recipient that this packet was sent directly. */
node_id_t nullid = {};
memcpy(buf_ptr, &nullid, sizeof(nullid));
- buf_ptr += sizeof nullid;
+ buf_ptr += sizeof(nullid);
} else {
memcpy(buf_ptr, &to->id, sizeof(to->id));
- buf_ptr += sizeof to->id;
+ buf_ptr += sizeof(to->id);
}
memcpy(buf_ptr, &from->id, sizeof(from->id));
- buf_ptr += sizeof from->id;
+ buf_ptr += sizeof(from->id);
}