| … | |
… | |
| 845 | } |
845 | } |
| 846 | |
846 | |
| 847 | inline void |
847 | inline void |
| 848 | connection::establish_connection_cb (ev::timer &w, int revents) |
848 | connection::establish_connection_cb (ev::timer &w, int revents) |
| 849 | { |
849 | { |
| 850 | if (!ictx |
850 | if (!(ictx && octx) |
| 851 | && conf != THISNODE |
851 | && conf != THISNODE |
| 852 | && connectmode != conf_node::C_NEVER |
852 | && connectmode != conf_node::C_NEVER |
| 853 | && connectmode != conf_node::C_DISABLED |
853 | && connectmode != conf_node::C_DISABLED |
| 854 | && !w.is_active ()) |
854 | && !w.is_active ()) |
| 855 | { |
855 | { |
| … | |
… | |
| 1013 | void |
1013 | void |
| 1014 | connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) |
1014 | connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) |
| 1015 | { |
1015 | { |
| 1016 | last_activity = ev_now (); |
1016 | last_activity = ev_now (); |
| 1017 | |
1017 | |
| 1018 | slog (L_NOISE, "%s >> received packet type %d from %d to %d.", |
1018 | slog (L_NOISE, "%s >> received packet type %d from %d to %d.", |
| 1019 | conf->nodename, pkt->typ (), pkt->src (), pkt->dst ()); |
1019 | conf->nodename, pkt->typ (), pkt->src (), pkt->dst ()); |
| 1020 | |
1020 | |
| 1021 | if (connectmode == conf_node::C_DISABLED) |
1021 | if (connectmode == conf_node::C_DISABLED) |
| 1022 | return; |
1022 | return; |
| 1023 | |
1023 | |
