… | |
… | |
744 | && connectmode != conf_node::C_DISABLED |
744 | && connectmode != conf_node::C_DISABLED |
745 | && NOW > w.at) |
745 | && NOW > w.at) |
746 | { |
746 | { |
747 | double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; |
747 | double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; |
748 | |
748 | |
749 | if (retry_int < 3600 * 8) |
749 | if (retry_int < conf->max_retry) |
750 | retry_cnt++; |
750 | retry_cnt++; |
|
|
751 | else |
|
|
752 | retry_int = conf->max_retry; |
751 | |
753 | |
752 | w.start (NOW + retry_int); |
754 | w.start (NOW + retry_int); |
753 | |
755 | |
754 | reset_si (); |
756 | reset_si (); |
755 | |
757 | |
… | |
… | |
783 | } |
785 | } |
784 | |
786 | |
785 | delete ictx; ictx = 0; |
787 | delete ictx; ictx = 0; |
786 | delete octx; octx = 0; |
788 | delete octx; octx = 0; |
787 | |
789 | |
788 | si.host= 0; |
790 | si.host = 0; |
789 | |
791 | |
790 | last_activity = 0; |
792 | last_activity = 0; |
791 | retry_cnt = 0; |
793 | retry_cnt = 0; |
792 | |
794 | |
793 | rekey.stop (); |
795 | rekey.stop (); |