summaryrefslogtreecommitdiff
path: root/server/zserver.h
diff options
context:
space:
mode:
authorGravatar Karl Ramm <kcr@1ts.org>2013-01-19 19:43:37 -0500
committerGravatar Karl Ramm <kcr@1ts.org>2013-03-16 23:57:54 -0700
commit9e361ec4b0fbf61fc743bae78ab1b6e30c4a2742 (patch)
treef00a4a69a9c942c8c593dbc2049212265be55f2c /server/zserver.h
parentc88af26f7f05d532ab46ab8b2ff22e20d05fa13d (diff)
rearrange so that most of the server code can be linked without main.c
Move global variables and one function out of main.c so that the rest of the server can be linked with a test harness.
Diffstat (limited to 'server/zserver.h')
-rw-r--r--server/zserver.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/server/zserver.h b/server/zserver.h
index f0f4fda..c694489 100644
--- a/server/zserver.h
+++ b/server/zserver.h
@@ -286,6 +286,7 @@ char *strsave(const char *str);
unsigned long hash (const char *);
void dump_quote(char *p, FILE *fp);
void notice_extract_address(ZNotice_t *notice, struct sockaddr_in *addr);
+int packets_waiting(void);
/* found in dispatch.c */
void handle_packet(void);
@@ -396,8 +397,7 @@ int opstaff_check(char *);
/* global identifiers */
-/* found in main.c */
-int packets_waiting(void);
+/* found in global.c */
extern struct sockaddr_in srv_addr; /* server socket address */
extern unsigned short hm_port; /* host manager receiver port */
extern unsigned short hm_srv_port; /* host manager server sending port */
@@ -418,7 +418,6 @@ extern krb5_ccache Z_krb5_ccache;
#endif
#ifdef HAVE_KRB4
extern char srvtab_file[];
-extern char my_realm[];
#endif
extern char acl_dir[];
extern char subs_file[];
@@ -427,6 +426,8 @@ extern u_long npackets; /* num of packets processed */
extern time_t uptime; /* time we started */
extern struct in_addr my_addr; /* my inet address */
extern struct timeval t_local; /* current time */
+extern char *bdump_version;
+extern int bdump_auth_proto;
/* found in bdump.c */
extern int bdumping; /* are we processing a bdump packet? */