| … | |
… | |
| 546 | u32 digest_nid; |
546 | u32 digest_nid; |
| 547 | |
547 | |
| 548 | const u8 curflags () const |
548 | const u8 curflags () const |
| 549 | { |
549 | { |
| 550 | return 0x80 |
550 | return 0x80 |
| 551 | | 0x02 |
|
|
| 552 | #if PROTOCOL_MAJOR != 2 |
|
|
| 553 | #error hi |
|
|
| 554 | #endif |
|
|
| 555 | | (ENABLE_COMPRESSION ? 0x01 : 0x00); |
551 | | (ENABLE_COMPRESSION ? 0x01 : 0x00); |
| 556 | } |
552 | } |
| 557 | |
553 | |
| 558 | void setup (ptype type, int dst) |
554 | void setup (ptype type, int dst) |
| 559 | { |
555 | { |
| … | |
… | |
| 727 | { |
723 | { |
| 728 | double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.25; |
724 | double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.25; |
| 729 | |
725 | |
| 730 | if (retry_int < 3600 * 8) |
726 | if (retry_int < 3600 * 8) |
| 731 | retry_cnt++; |
727 | retry_cnt++; |
| 732 | |
|
|
| 733 | if (connectmode == conf_node::C_ONDEMAND |
|
|
| 734 | && retry_int > ::conf.keepalive) |
|
|
| 735 | retry_int = ::conf.keepalive; |
|
|
| 736 | |
728 | |
| 737 | ts = NOW + retry_int; |
729 | ts = NOW + retry_int; |
| 738 | |
730 | |
| 739 | if (conf->hostname) |
731 | if (conf->hostname) |
| 740 | { |
732 | { |
