| … | |
… | |
| 463 | #if ENABLE_COMPRESSION |
463 | #if ENABLE_COMPRESSION |
| 464 | f |= FEATURE_COMPRESSION; |
464 | f |= FEATURE_COMPRESSION; |
| 465 | #endif |
465 | #endif |
| 466 | #if ENABLE_ROHC |
466 | #if ENABLE_ROHC |
| 467 | f |= FEATURE_ROHC; |
467 | f |= FEATURE_ROHC; |
|
|
468 | #endif |
|
|
469 | #if ENABLE_BRIDGING |
|
|
470 | f |= FEATURE_BRIDGING; |
| 468 | #endif |
471 | #endif |
| 469 | return f; |
472 | return f; |
| 470 | } |
473 | } |
| 471 | }; |
474 | }; |
| 472 | |
475 | |
| … | |
… | |
| 623 | // mask out protocols we cannot establish |
626 | // mask out protocols we cannot establish |
| 624 | if (!conf->udp_port) protocol &= ~PROT_UDPv4; |
627 | if (!conf->udp_port) protocol &= ~PROT_UDPv4; |
| 625 | if (!conf->tcp_port) protocol &= ~PROT_TCPv4; |
628 | if (!conf->tcp_port) protocol &= ~PROT_TCPv4; |
| 626 | if (!conf->dns_port) protocol &= ~PROT_DNSv4; |
629 | if (!conf->dns_port) protocol &= ~PROT_DNSv4; |
| 627 | |
630 | |
|
|
631 | if (protocol |
|
|
632 | && (!conf->can_direct (THISNODE) |
|
|
633 | || !THISNODE->can_direct (conf))) |
|
|
634 | { |
|
|
635 | slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); |
|
|
636 | protocol = 0; |
|
|
637 | } |
|
|
638 | |
| 628 | si.set (conf, protocol); |
639 | si.set (conf, protocol); |
| 629 | } |
640 | } |
| 630 | |
641 | |
| 631 | // ensure sockinfo is valid, forward if necessary |
642 | // ensure sockinfo is valid, forward if necessary |
| 632 | const sockinfo & |
643 | const sockinfo & |
