diff options
Diffstat (limited to 'zhm')
| -rw-r--r-- | zhm/queue.c | 2 | ||||
| -rw-r--r-- | zhm/zhm.c | 8 | ||||
| -rw-r--r-- | zhm/zhm.h | 18 | ||||
| -rw-r--r-- | zhm/zhm_client.c | 6 | ||||
| -rw-r--r-- | zhm/zhm_server.c | 11 |
5 files changed, 18 insertions, 27 deletions
diff --git a/zhm/queue.c b/zhm/queue.c index c44a19a..993e131 100644 --- a/zhm/queue.c +++ b/zhm/queue.c @@ -33,8 +33,6 @@ static int retransmits_enabled = 0; static Queue *find_notice_in_queue(ZNotice_t *notice); static void queue_timeout(void *arg); -extern void new_server(char *); - int rexmit_times[] = { 2, 2, 4, 4, 8, -1 }; #ifdef DEBUG @@ -51,12 +51,6 @@ static void detach(void); static void send_stats(ZNotice_t *, struct sockaddr_in *); static char *strsave(const char *); -extern void send_flush_notice(char *); -extern void server_manager(ZNotice_t *); -extern void send_boot_notice(char *); -extern void find_next_server(char *); -extern int optind; - static RETSIGTYPE deactivate(int ignored) { @@ -258,10 +252,10 @@ main(int argc, static void choose_server(void) { +#ifdef HAVE_HESIOD int i = 0; char **clust_info, **cpp; -#ifdef HAVE_HESIOD if (use_hesiod) { /* Free up any previously used resources */ @@ -63,12 +63,26 @@ void retransmit_queue(struct sockaddr_in *); void disable_queue_retransmits(void); int queue_len(void); -struct sockaddr_in serv_sin; +/* zhm.c */ +extern void new_server(char *sugg_serv); +extern void send_boot_notice(char *); +extern void send_flush_notice(char *); + +/* zhm_server.c */ +extern void find_next_server(char *); +extern void server_manager(ZNotice_t *); + +extern u_short cli_port; +extern char **serv_list; +extern char cur_serv[], prim_serv[]; +extern struct sockaddr_in cli_sin, serv_sin, from; +extern int no_server, deactivated, noflushflag, rebootflag; +extern int timeout_type, hmdebug, nservchang, booting, nclt, nserv, numserv; extern int rexmit_times[]; #ifdef HAVE_ETEXT extern int etext; -#define adjust_size(size) size -= (unsigned int) &etext; +#define adjust_size(size) size -= (unsigned long) &etext; #else /* Pick a var that tends to be near the start of data section. */ extern char **environ; diff --git a/zhm/zhm_client.c b/zhm/zhm_client.c index 0c5b68e..36c81ed 100644 --- a/zhm/zhm_client.c +++ b/zhm/zhm_client.c @@ -18,12 +18,6 @@ static const char rcsid_hm_client_c[] = "$Id$"; #endif /* SABER */ #endif /* lint */ -extern int no_server, nclt, deactivated, noflushflag; -extern struct sockaddr_in cli_sin, serv_sin, from; - -extern void send_flush_notice(char *); -extern void new_server(char *sugg_serv); - void transmission_tower(ZNotice_t *notice, char *packet, int pak_len) diff --git a/zhm/zhm_server.c b/zhm/zhm_server.c index ecfa5f3..0209054 100644 --- a/zhm/zhm_server.c +++ b/zhm/zhm_server.c @@ -26,18 +26,9 @@ static int serv_rexmit_times[] = { 5, 10, 20, 40 }; static int serv_timeouts = 0; 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, rebootflag; -extern int numserv; -extern char **serv_list; -extern char cur_serv[], prim_serv[]; -extern void die_gracefully(void); void hm_control(ZNotice_t *); void send_back(ZNotice_t *); -void new_server(char *); /* Argument is whether we are actually booting, or just attaching * after a server switch */ @@ -104,7 +95,7 @@ send_flush_notice(char *op) void find_next_server(char *sugg_serv) { - struct hostent *hp; + struct hostent *hp = 0; int done = 0; char **parse = serv_list; char *new_serv; |