Spelling fixes.

diff --git a/proto/rip/config.Y b/proto/rip/config.Y
index a8e65e34c10fa750e2e299c42a810188d4bc56f3..f9307e4cdf977e86be154d296c58ec1cd4e27c0a 100644 (file)
--- a/proto/rip/config.Y
+++ b/proto/rip/config.Y
@@ -27,34 +27,34 @@ CF_DECLS
 CF_KEYWORDS(RIP, INFINITY, METRIC, PORT, PERIOD, GARBAGETIME, PASSWORDS,
            MODE, BROADCAST, QUIET, NOLISTEN, VERSION1, 
            AUTHENTICATION, NONE, PLAINTEXT, MD5,
-           HONOUR, NEVER, NEIGHBOUR, ALWAYS,
+           HONOR, NEVER, NEIGHBOR, ALWAYS,
            RIP_METRIC, RIP_TAG)
 
 %type <i> rip_mode rip_auth
 
 CF_GRAMMAR
 
-CF_ADDTO(proto, RIP_CFG '}')
+CF_ADDTO(proto, rip_cfg '}')
 
-RIP_CFG_start: proto_start RIP {
+rip_cfg_start: proto_start RIP {
      RIP_CFG = proto_config_new(&proto_rip, sizeof(struct rip_proto_config));
      rip_init_config(RIP_CFG);
    }
  ;
 
-RIP_CFG:
-   RIP_CFG_start proto_name '{'
- | RIP_CFG proto_item ';'
- | RIP_CFG INFINITY expr ';'   { RIP_CFG->infinity = $3; }
- | RIP_CFG PORT expr ';'       { RIP_CFG->port = $3; }
- | RIP_CFG PERIOD expr ';'     { RIP_CFG->period = $3; }
- | RIP_CFG GARBAGETIME expr ';' { RIP_CFG->garbage_time = $3; }
- | RIP_CFG AUTHENTICATION rip_auth ';' {RIP_CFG->authtype = $3; }
- | RIP_CFG PASSWORDS '{' password_list '}' {RIP_CFG->passwords = $4; }
- | RIP_CFG HONOUR ALWAYS ';'    { RIP_CFG->honour = HO_ALWAYS; }
- | RIP_CFG HONOUR NEIGHBOUR ';'    { RIP_CFG->honour = HO_NEIGHBOUR; }
- | RIP_CFG HONOUR NEVER ';'    { RIP_CFG->honour = HO_NEVER; }
- | RIP_CFG rip_iface_list ';'
+rip_cfg:
+   rip_cfg_start proto_name '{'
+ | rip_cfg proto_item ';'
+ | rip_cfg INFINITY expr ';'   { RIP_CFG->infinity = $3; }
+ | rip_cfg PORT expr ';'       { RIP_CFG->port = $3; }
+ | rip_cfg PERIOD expr ';'     { RIP_CFG->period = $3; }
+ | rip_cfg GARBAGETIME expr ';' { RIP_CFG->garbage_time = $3; }
+ | rip_cfg AUTHENTICATION rip_auth ';' {RIP_CFG->authtype = $3; }
+ | rip_cfg PASSWORDS '{' password_list '}' {RIP_CFG->passwords = $4; }
+ | rip_cfg HONOR ALWAYS ';'    { RIP_CFG->honor = HO_ALWAYS; }
+ | rip_cfg HONOR NEIGHBOR ';'    { RIP_CFG->honor = HO_NEIGHBOR; }
+ | rip_cfg HONOR NEVER ';'    { RIP_CFG->honor = HO_NEVER; }
+ | rip_cfg rip_iface_list ';'
  ;
 
 rip_auth:

diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index f9a4483536ddf571cb89dbfa89d8bcf7191bd44c..0a1bdbc644f189fe768395e34233905abdb27d06 100644 (file)
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -31,7 +31,7 @@
  * from two concurrent sends to one destination. Each &rip_interface has
  * at most one &rip_connection.
  *
- * We are not going to honour requests for sending part of
+ * We are not going to honor requests for sending part of
  * routing table. That would need to turn split horizon off,
  * etc.  
  *
@@ -332,12 +332,12 @@ rip_process_packet( struct proto *p, struct rip_packet *packet, int num, ip_addr
 
   switch( packet->heading.command ) {
   case RIPCMD_REQUEST: DBG( "Asked to send my routing table\n" ); 
-         if (P_CF->honour == HO_NEVER) {
+         if (P_CF->honor == HO_NEVER) {
            log( L_REMOTE "They asked me to send routing table, but I was told not to do it" );
            return 0;
          }
-         if ((P_CF->honour == HO_NEIGHBOUR) && (!neigh_find( p, &whotoldme, 0 ))) {
-           log( L_REMOTE "They asked me to send routing table, but he is not my neighbour" );
+         if ((P_CF->honor == HO_NEIGHBOR) && (!neigh_find( p, &whotoldme, 0 ))) {
+           log( L_REMOTE "They asked me to send routing table, but he is not my neighbor" );
            return 0;
          }
          rip_sendto( p, whotoldme, port, HEAD(P->interfaces) ); /* no broadcast */
@@ -353,7 +353,7 @@ rip_process_packet( struct proto *p, struct rip_packet *packet, int num, ip_addr
          }
 
          if (!neigh_find( p, &whotoldme, 0 )) {
-           log( L_REMOTE "%I send me routing info but he is not my neighbour", whotoldme );
+           log( L_REMOTE "%I send me routing info but he is not my neighbor", whotoldme );
 #if 0
            return 0;
 #else

diff --git a/proto/rip/rip.h b/proto/rip/rip.h
index 90f9beb1048fa915fee491678206990809093be7..7c7b000f29a8d6dad5c36fbd154c5139c81a14dc 100644 (file)
--- a/proto/rip/rip.h
+++ b/proto/rip/rip.h
@@ -133,9 +133,9 @@ struct rip_proto_config {
 #define AT_NONE 0
 #define AT_PLAINTEXT 2
 #define AT_MD5 3
-  int honour;
+  int honor;
 #define HO_NEVER 0
-#define HO_NEIGHBOUR 1
+#define HO_NEIGHBOR 1
 #define HO_ALWAYS 2
 };