diff --git a/Changes b/Changes index 9e6e05b..1ac0614 100644 --- a/Changes +++ b/Changes @@ -251,7 +251,7 @@ = A master receiving a stray heartbeat sends a unicast HB back, which should cause the rogue to die due to the tie-breaker code. = Keep probing the master for late heartbeats. - = Drop BGP as soon as we become master with the minumum required peers. + = Drop BGP as soon as we become master with the minimum required peers. = Any PING seen from a master forces an election (rather than just where basetime is zero). = A slave which receives a LASTSEEN message (presumably a restarted diff --git a/Docs/manual.html b/Docs/manual.html index 060c470..d77a667 100644 --- a/Docs/manual.html +++ b/Docs/manual.html @@ -369,7 +369,7 @@ from the master.
  • cluster_master_min_adv (int)
    -Determines the minumum number of up to date slaves required before the +Determines the minimum number of up to date slaves required before the master will drop routes (default: 1).
  • diff --git a/Docs/manual/manual.xml b/Docs/manual/manual.xml index f2597c5..400131d 100644 --- a/Docs/manual/manual.xml +++ b/Docs/manual/manual.xml @@ -641,7 +641,7 @@ set boolean true cluster_master_min_adv (int) - Determines the minumum number of up to date slaves + Determines the minimum number of up to date slaves required before the master will drop routes (default: 1). diff --git a/Docs/startup-config.5 b/Docs/startup-config.5 index 4f1500a..8deaeec 100644 --- a/Docs/startup-config.5 +++ b/Docs/startup-config.5 @@ -216,7 +216,7 @@ Interval in tenths of a second between cluster heartbeat/pings. Cluster heartbeat timeout in tenths of a second. A new master will be elected when this interval has been passed without seeing a heartbeat from the master. .IP "\fBcluster_master_min_adv\fR (int)" 4 .IX Item "cluster_master_min_adv (int)" -Determines the minumum number of up to date slaves required before the master will drop routes (default: 1). +Determines the minimum number of up to date slaves required before the master will drop routes (default: 1). .IP "\fBdebug\fR (int)" 4 .IX Item "debug (int)" Set the level of debugging messages written to the log file. The value should diff --git a/Docs/startup-config.5.pod b/Docs/startup-config.5.pod index 46a96c4..4360c70 100644 --- a/Docs/startup-config.5.pod +++ b/Docs/startup-config.5.pod @@ -102,7 +102,7 @@ Cluster heartbeat timeout in tenths of a second. A new master will be elected wh =item B (int) -Determines the minumum number of up to date slaves required before the master will drop routes (default: 1). +Determines the minimum number of up to date slaves required before the master will drop routes (default: 1). =item B (int) diff --git a/l2tpns.c b/l2tpns.c index 152c8ec..6b8944c 100644 --- a/l2tpns.c +++ b/l2tpns.c @@ -2170,7 +2170,7 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e if(bundle[b].num_of_links == 0) { bundleclear(b); - LOG(3, s, session[s].tunnel, "MPPP: Kill bundle: %d (No remaing member links)\n",b); + LOG(3, s, session[s].tunnel, "MPPP: Kill bundle: %d (No remaining member links)\n",b); } else { @@ -5713,8 +5713,8 @@ int sessionsetup(sessionidt s, tunnelidt t) cluster_send_bundle(session[s].bundle); else { - LOG(0, s, t, "MPPP: Mismaching mssf option with other sessions in bundle\n"); - sessionshutdown(s, "Mismaching mssf option.", CDN_NONE, TERM_SERVICE_UNAVAILABLE); + LOG(0, s, t, "MPPP: Mismatching mssf option with other sessions in bundle\n"); + sessionshutdown(s, "Mismatching mssf option.", CDN_NONE, TERM_SERVICE_UNAVAILABLE); return 0; } } diff --git a/l2tpns.h b/l2tpns.h index 69a91c2..b07aca7 100644 --- a/l2tpns.h +++ b/l2tpns.h @@ -61,7 +61,7 @@ #define MP_END 0x40 // This value is used when (e)nd bit is set in MP header #define MP_BOTH_BITS 0xC0 // This value is used when both bits (begin and end) are set in MP header -#define MINFRAGLEN 64 // Minumum fragment length +#define MINFRAGLEN 64 // minimum fragment length #define MAXFRAGLEN 1496 // Maximum length for Multilink fragment (The multilink may contain only one link) #define MAXFRAGNUM 512 // Maximum number of Multilink fragment in a bundle (must be in the form of 2^X) // it's not expected to have a space for more than 10 unassembled packets = 10 * MAXBUNDLESES @@ -374,7 +374,7 @@ typedef struct uint16_t re_frame_len; // The reassembled frame length uint16_t re_frame_begin_index, re_frame_end_index; // reassembled frame begin index, end index respectively uint16_t start_index, end_index; // start and end sequence numbers available on the fragments array respectively - uint32_t M; // Minumum frame sequence number received over all bundle members + uint32_t M; // minimum frame sequence number received over all bundle members uint32_t start_seq; // Last received frame sequence number (bearing B bit) } fragmentationt;