Changed "hm.h" to "zhm.h" and bug fixes.

1 files changed, 202 insertions, 191 deletions

diff --git a/zhm/zhm_server.c b/zhm/zhm_server.c
index 65cdc09..a4a6da9 100644
--- a/zhm/zhm_server.c
+++ b/zhm/zhm_server.c
@@ -11,7 +11,7 @@
  *      "mit-copyright.h". 
  */
 
-#include "hm.h"
+#include "zhm.h"
 
 #ifndef lint
 #ifndef SABER
@@ -23,227 +23,238 @@ int serv_loop = 0;
 extern u_short cli_port;
 extern struct sockaddr_in serv_sin, from;
 extern int timeout_type, hmdebug, nservchang, booting, nserv, no_server;
-extern int deactivated;
+extern int deactivated, rebootflag;
 extern char **serv_list, **cur_serv_list;
 extern char cur_serv[], prim_serv[];
+extern void die_gracefully();
+extern char *strcpy();
+extern unsigned long inet_addr();
 
 /* Argument is whether we are actually booting, or just attaching
-   after a server switch */
+ * after a server switch */
 send_boot_notice(op)
-     char *op;
+char *op;
 {
-      ZNotice_t notice;
-      Code_t ret;
-
-      /* Set up server notice */
-      notice.z_kind = HMCTL;
-      notice.z_port = cli_port;
-      notice.z_class = ZEPHYR_CTL_CLASS;
-      notice.z_class_inst = ZEPHYR_CTL_HM;
-      notice.z_opcode = op;
-      notice.z_sender = "HM";
-      notice.z_recipient = "";
-      notice.z_default_format = 0;
-      notice.z_message_len = 0;
-      
-      /* Notify server that this host is here */
-      if ((ret = ZSetDestAddr(&serv_sin)) != ZERR_NONE) {
-	    Zperr(ret);
-	    com_err("hm", ret, "setting destination");
-      }
-      if ((ret = ZSendNotice(&notice, ZNOAUTH)) != ZERR_NONE) {
-	    Zperr(ret);
-	    com_err("hm", ret, "sending startup notice");
-      }
-      timeout_type = BOOTING;
-      (void)alarm(SERV_TIMEOUT);
+     ZNotice_t notice;
+     Code_t ret;
+  
+     /* Set up server notice */
+     notice.z_kind = HMCTL;
+     notice.z_port = cli_port;
+     notice.z_class = ZEPHYR_CTL_CLASS;
+     notice.z_class_inst = ZEPHYR_CTL_HM;
+     notice.z_opcode = op;
+     notice.z_sender = "HM";
+     notice.z_recipient = "";
+     notice.z_default_format = 0;
+     notice.z_message_len = 0;
+  
+     /* Notify server that this host is here */
+     if ((ret = ZSetDestAddr(&serv_sin)) != ZERR_NONE) {
+	  Zperr(ret);
+	  com_err("hm", ret, "setting destination");
+     }
+     if ((ret = ZSendNotice(&notice, ZNOAUTH)) != ZERR_NONE) {
+	  Zperr(ret);
+	  com_err("hm", ret, "sending startup notice");
+     }
+     timeout_type = BOOTING;
+     (void)alarm(SERV_TIMEOUT);
 }
 
 /* Argument is whether we are detaching or really going down */
 send_flush_notice(op)
-     char *op;
+char *op;
 {
-      ZNotice_t notice;
-      Code_t ret;
-
-      /* Set up server notice */
-      notice.z_kind = HMCTL;
-      notice.z_port = cli_port;
-      notice.z_class = ZEPHYR_CTL_CLASS;
-      notice.z_class_inst = ZEPHYR_CTL_HM;
-      notice.z_opcode = op;
-      notice.z_sender = "HM";
-      notice.z_recipient = "";
-      notice.z_default_format = 0;
-      notice.z_message_len = 0;
+     ZNotice_t notice;
+     Code_t ret;
+     
+     /* Set up server notice */
+     notice.z_kind = HMCTL;
+     notice.z_port = cli_port;
+     notice.z_class = ZEPHYR_CTL_CLASS;
+     notice.z_class_inst = ZEPHYR_CTL_HM;
+     notice.z_opcode = op;
+     notice.z_sender = "HM";
+     notice.z_recipient = "";
+     notice.z_default_format = 0;
+     notice.z_message_len = 0;
 
-      /* Tell server to lose us */
-      if ((ret = ZSetDestAddr(&serv_sin)) != ZERR_NONE) {
-	    Zperr(ret);
-	    com_err("hm", ret, "setting destination");
-      }
-      if ((ret = ZSendNotice(&notice, ZNOAUTH)) != ZERR_NONE) {
-	    Zperr(ret);
-	    com_err("hm", ret, "sending flush notice");
-      }
+     /* Tell server to lose us */
+     if ((ret = ZSetDestAddr(&serv_sin)) != ZERR_NONE) {
+	  Zperr(ret);
+	  com_err("hm", ret, "setting destination");
+     }
+     if ((ret = ZSendNotice(&notice, ZNOAUTH)) != ZERR_NONE) {
+	  Zperr(ret);
+	  com_err("hm", ret, "sending flush notice");
+     }
 }
 
 find_next_server(sugg_serv)
-     char *sugg_serv;
+char *sugg_serv;
 {
-      struct hostent *hp;
-      int done = 0;
-      char **parse = serv_list;
-
-      if (sugg_serv) {
-	    do {
-		  if (!strcmp(*parse, sugg_serv))
+     struct hostent *hp;
+     int done = 0;
+     char **parse = serv_list;
+  
+     if (sugg_serv) {
+	  do {
+	       if (!strcmp(*parse, sugg_serv))
 		    done = 1;
-	    } while ((done == 0) && (*++parse != NULL));
-      }
-      if (done) {
-	    if (hmdebug)
-	      syslog(LOG_DEBUG, "Suggested server: %s\n", sugg_serv);
-	    hp = gethostbyname(sugg_serv);
-	    DPR2 ("Server = %s\n", sugg_serv);
-	    (void)strcpy(cur_serv, sugg_serv);
-      } else {		  
-	    if ((++serv_loop > 3) && (strcmp(cur_serv, prim_serv))) {
-		  serv_loop = 0;
-		  hp = gethostbyname(prim_serv);
-		  DPR2 ("Server = %s\n", prim_serv);
-		  (void)strcpy(cur_serv, prim_serv);
-	    } else
-	      do {
-		    if (*++cur_serv_list == NULL)
-		      cur_serv_list = serv_list;
-		    if (strcmp(*cur_serv_list, cur_serv)) {
-			  hp = gethostbyname(*cur_serv_list);
-			  DPR2 ("Server = %s\n", *cur_serv_list);
-			  (void)strcpy(cur_serv, *cur_serv_list);
-			  done = 1;
-		    }
-	      } while (done == 0);
-      }
-      bcopy(hp->h_addr, &serv_sin.sin_addr, hp->h_length);
-      nservchang++;
+	  } while ((done == 0) && (*++parse != NULL));
+     }
+     if (done) {
+	  if (hmdebug)
+	       syslog(LOG_DEBUG, "Suggested server: %s\n", sugg_serv);
+	  hp = gethostbyname(sugg_serv);
+	  DPR2 ("Server = %s\n", sugg_serv);
+	  (void)strcpy(cur_serv, sugg_serv);
+     } else {		  
+	  if ((++serv_loop > 3) && (strcmp(cur_serv, prim_serv))) {
+	       serv_loop = 0;
+	       hp = gethostbyname(prim_serv);
+	       DPR2 ("Server = %s\n", prim_serv);
+	       (void)strcpy(cur_serv, prim_serv);
+	  } else
+	  do {
+	       if (*++cur_serv_list == NULL) {
+		    /* Exit if we are rebooting, and cannot find a server */
+		    if (rebootflag)
+			 die_gracefully();
+		    cur_serv_list = serv_list;
+	       }
+	       if (strcmp(*cur_serv_list, cur_serv)) {
+		    hp = gethostbyname(*cur_serv_list);
+		    DPR2 ("Server = %s\n", *cur_serv_list);
+		    (void)strcpy(cur_serv, *cur_serv_list);
+		    done = 1;
+	       }
+	  } while (done == 0);
+     }
+     bcopy(hp->h_addr, (char *)&serv_sin.sin_addr, hp->h_length);
+     nservchang++;
 }
 
 server_manager(notice)
-     ZNotice_t *notice;
+ZNotice_t *notice;
 {
-      if ((bcmp(&serv_sin.sin_addr, &from.sin_addr, 4) != 0) ||
-	  (serv_sin.sin_port != from.sin_port)) {
-	    syslog (LOG_INFO, "Bad notice from port %u.", notice->z_port);
-      } else {
-	    /* This is our server, handle the notice */
-	    booting = 0;
-	    DPR ("A notice came in from the server.\n");
-	    nserv++;
-	    switch(notice->z_kind) {
-		case HMCTL:
-		  hm_control(notice);
-		  break;
-		case SERVNAK:
-		case SERVACK:
-		  send_back(notice);
-		  break;
-		default:
-		  syslog (LOG_INFO, "Bad notice kind!?");
-		  break;
-	    }
-      }
+     if ((bcmp((char *)&serv_sin.sin_addr, (char *)&from.sin_addr, 4) != 0) ||
+	 (serv_sin.sin_port != from.sin_port)) {
+	  syslog (LOG_INFO, "Bad notice from port %u.", notice->z_port);
+     } else {
+	  /* This is our server, handle the notice */
+	  booting = 0;
+	  DPR ("A notice came in from the server.\n");
+	  nserv++;
+	  switch(notice->z_kind) {
+	  case HMCTL:
+	       hm_control(notice);
+	       break;
+	  case SERVNAK:
+	  case SERVACK:
+	       send_back(notice);
+	       break;
+	  default:
+	       syslog (LOG_INFO, "Bad notice kind!?");
+	       break;
+	  }
+     }
 }
 
 hm_control(notice)
-     ZNotice_t *notice;
+ZNotice_t *notice;
 {
-      Code_t ret;
-      struct hostent *hp;
-      char suggested_server[64];
-      long addr;
-
-      DPR("Control message!\n");
-      if (!strcmp(notice->z_opcode, SERVER_SHUTDOWN)) {
-	      if (notice->z_message_len) {
-		      addr = inet_addr(notice->z_message);
-		      if ((hp = gethostbyaddr(&addr,
-					      4,
-					      AF_INET)) != NULL) {
-			      (void)strcpy(suggested_server, hp->h_name);
-			      new_server(suggested_server);
-		      } else
-			      new_server(NULL);
-	      }
-	      else
-		      new_server(NULL);
-      } else if (!strcmp(notice->z_opcode, SERVER_PING)) {
-	    if (no_server)
-	      (void)alarm(0);
-	    notice->z_kind = HMACK;
-	    if ((ret = ZSetDestAddr(&serv_sin)) != ZERR_NONE) {
-		  Zperr(ret);
-		  com_err("hm", ret, "setting destination");
-	    }
-	    if ((ret = ZSendRawNotice(notice)) != ZERR_NONE) {
-		  Zperr(ret);
-		  com_err("hm", ret, "sending ACK");
-	    }
-	    if (no_server) {
-		  no_server = 0;
-		  retransmit_queue(&serv_sin);
-	    }
-      } else
-	syslog (LOG_INFO, "Bad control message.");
+     Code_t ret;
+     struct hostent *hp;
+     char suggested_server[64];
+     unsigned long addr;
+     
+     DPR("Control message!\n");
+     if (!strcmp(notice->z_opcode, SERVER_SHUTDOWN)) {
+	  if (notice->z_message_len) {
+	       addr = inet_addr(notice->z_message);
+	       if ((hp = gethostbyaddr(&addr,
+				       4,
+				       AF_INET)) != NULL) {
+		    (void)strcpy(suggested_server, hp->h_name);
+		    new_server(suggested_server);
+	       } else
+		    new_server((char *)NULL);
+	  }
+	  else
+	       new_server((char *)NULL);
+     } else if (!strcmp(notice->z_opcode, SERVER_PING)) {
+	  if (no_server)
+	       (void)alarm(0);
+	  notice->z_kind = HMACK;
+	  if ((ret = ZSetDestAddr(&serv_sin)) != ZERR_NONE) {
+	       Zperr(ret);
+	       com_err("hm", ret, "setting destination");
+	  }
+	  if ((ret = ZSendRawNotice(notice)) != ZERR_NONE) {
+	       Zperr(ret);
+	       com_err("hm", ret, "sending ACK");
+	  }
+	  if (no_server) {
+	       no_server = 0;
+	       retransmit_queue(&serv_sin);
+	  }
+     } else
+	  syslog (LOG_INFO, "Bad control message.");
 }
 
 send_back(notice)
-     ZNotice_t *notice;
+ZNotice_t *notice;
 {
-      ZNotice_Kind_t kind;
-      struct sockaddr_in repl;
-      Code_t ret;
-
-      if (no_server)
-	(void)alarm(0);
-      if (!strcmp(notice->z_opcode, HM_BOOT) ||
-	  !strcmp(notice->z_opcode, HM_ATTACH)) {
-	    /* ignore message, just an ack from boot */
-      } else {
-	    if (remove_notice_from_queue(notice, &kind,
-					 &repl) != ZERR_NONE) {
-		  syslog (LOG_INFO, "Hey! This packet isn't in my queue!");
-	    } else {
-		  /* check if client wants an ACK, and send it */
-		  if (kind == ACKED) {
-			DPR2 ("Client ACK port: %u\n", ntohs(repl.sin_port));
-			if ((ret = ZSetDestAddr(&repl)) != ZERR_NONE) {
-			      Zperr(ret);
-			      com_err("hm", ret, "setting destination");
-			}
-			if ((ret = ZSendRawNotice(notice)) != ZERR_NONE) {
-			      Zperr(ret);
-			      com_err("hm", ret, "sending ACK");
-			}
-		  }
-	    }
-      }
-      if (no_server) {
-	    no_server = 0;
-	    retransmit_queue(&serv_sin);
-      }
+     ZNotice_Kind_t kind;
+     struct sockaddr_in repl;
+     Code_t ret;
+  
+     if (no_server)
+	  (void)alarm(0);
+     if (!strcmp(notice->z_opcode, HM_BOOT) ||
+	 !strcmp(notice->z_opcode, HM_ATTACH)) {
+	  /* ignore message, just an ack from boot, but exit if we
+	   * are rebooting.
+	   */
+	  if (rebootflag)
+	       die_gracefully();
+     } else {
+	  if (remove_notice_from_queue(notice, &kind,
+				       &repl) != ZERR_NONE) {
+	       syslog (LOG_INFO, "Hey! This packet isn't in my queue!");
+	  } else {
+	       /* check if client wants an ACK, and send it */
+	       if (kind == ACKED) {
+		    DPR2 ("Client ACK port: %u\n", ntohs(repl.sin_port));
+		    if ((ret = ZSetDestAddr(&repl)) != ZERR_NONE) {
+			 Zperr(ret);
+			 com_err("hm", ret, "setting destination");
+		    }
+		    if ((ret = ZSendRawNotice(notice)) != ZERR_NONE) {
+			 Zperr(ret);
+			 com_err("hm", ret, "sending ACK");
+		    }
+	       }
+	  }
+     }
+     if (no_server) {
+	  no_server = 0;
+	  retransmit_queue(&serv_sin);
+     }
 }
 
 new_server(sugg_serv)
-     char *sugg_serv;
+char *sugg_serv;
 {
-      no_server = 1;
-      syslog (LOG_INFO, "Server went down, finding new server.");
-      send_flush_notice(HM_DETACH);
-      find_next_server(sugg_serv);
-      if (booting) {
-	    send_boot_notice(HM_BOOT);
-	    deactivated = 0;
-      } else
-	send_boot_notice(HM_ATTACH);
+     no_server = 1;
+     syslog (LOG_INFO, "Server went down, finding new server.");
+     send_flush_notice(HM_DETACH);
+     find_next_server(sugg_serv);
+     if (booting) {
+	  send_boot_notice(HM_BOOT);
+	  deactivated = 0;
+     } else
+	  send_boot_notice(HM_ATTACH);
 }