diff options
-rw-r--r-- | server/class.c | 3 | ||||
-rw-r--r-- | server/dispatch.c | 2 | ||||
-rw-r--r-- | server/server.c | 7 | ||||
-rw-r--r-- | server/subscr.c | 22 | ||||
-rw-r--r-- | server/timer.c | 4 |
5 files changed, 26 insertions, 12 deletions
diff --git a/server/class.c b/server/class.c index 4020ea0..5d6394e 100644 --- a/server/class.c +++ b/server/class.c @@ -329,6 +329,8 @@ char *class; return(NULLZACLT); } +#ifdef notdef +/* currently not used */ /* * restrict class by associating it with the acl structure acl. * return ZERR_NONE if no error, or ZSRV_NOCLASS if there is no such @@ -357,6 +359,7 @@ ZAcl_t *acl; /* fell off the end, no match */ return(ZSRV_NOCLASS); } +#endif notdef /* * restrict class by registering it and associating it with the acl diff --git a/server/dispatch.c b/server/dispatch.c index 2242dc7..6c409d0 100644 --- a/server/dispatch.c +++ b/server/dispatch.c @@ -147,7 +147,7 @@ struct sockaddr_in *who; clt_ack(notice, who, AUTH_FAILED); return; } - if ((clientlist = subscr_match_list(notice, acl))) { + if ((clientlist = subscr_match_list(notice))) { for (ptr = clientlist->q_forw; ptr != clientlist; ptr = ptr->q_forw) { diff --git a/server/server.c b/server/server.c index 2d04ffe..5d4479c 100644 --- a/server/server.c +++ b/server/server.c @@ -21,6 +21,9 @@ static char rcsid_server_s_c[] = "$Header$"; #include "zserver.h" #include <sys/socket.h> /* for AF_INET */ +#ifdef lint +#include <sys/uio.h> +#endif lint #include <netdb.h> /* for gethostbyname */ /* @@ -66,7 +69,9 @@ static void srv_alive(), srv_nack_cancel(), srv_rexmit(), srv_nack_release(); static void recover_clt(), kill_clt(), server_lost(); static void send_stats(); +#ifdef notdef static Code_t server_register(); +#endif notdef static struct in_addr *get_server_addrs(); ZNotAcked_t *srv_nacklist; /* not acked list for server-server @@ -288,6 +293,7 @@ struct sockaddr_in *who; return; } +#ifdef notdef /* * Register a new server (one not in our list). This MUST be authenticated. */ @@ -342,6 +348,7 @@ struct sockaddr_in *who; srv_states[(int) otherservers[nservers].zs_state])); return(0); } +#endif notdef /* * Recover a host whose client has stopped responding. diff --git a/server/subscr.c b/server/subscr.c index 2ec9e51..3f2ef87 100644 --- a/server/subscr.c +++ b/server/subscr.c @@ -38,9 +38,8 @@ static char rcsid_subscr_s_c[] = "$Header$"; * Code_t subscr_cancel_host(addr) * struct in_addr *addr; * - * ZClientList_t *subscr_match_list(notice, acl) + * ZClientList_t *subscr_match_list(notice) * ZNotice_t *notice; - * ZAcl_t *acl; * * void subscr_free_list(list) * ZClientList_t *list; @@ -50,9 +49,9 @@ static char rcsid_subscr_s_c[] = "$Header$"; * int auth; * struct sockaddr_in *who; * - * Code_t subscr_send_subs(client, version) + * Code_t subscr_send_subs(client, vers) * ZClient_t *client; - * char *version; + * char *vers; */ #include "zserver.h" @@ -291,6 +290,8 @@ register ZClient_t *client; return; } +#ifdef notdef +/* not used for the moment */ /* * Cancel all the subscriptions for clients at this addr. */ @@ -312,6 +313,7 @@ struct in_addr *addr; (void) subscr_cancel_client(clt->zclt_client); return(ZERR_NONE); } +#endif notdef /* * Here is the bulk of the work in the subscription manager. @@ -321,9 +323,8 @@ struct in_addr *addr; */ ZClientList_t * -subscr_match_list(notice, acl) +subscr_match_list(notice) ZNotice_t *notice; -ZAcl_t *acl; { register ZClientList_t *hits, *clients, *majik, *clients2, *hit2; register char *cp; @@ -375,7 +376,7 @@ ZAcl_t *acl; for (clients2 = clients->q_forw; clients2 != clients; clients2 = clients2->q_forw) - if (cl_match(notice, clients2->zclt_client, acl)) { + if (cl_match(notice, clients2->zclt_client)) { if (!clt_unique(clients2->zclt_client, hits)) continue; /* we hit */ @@ -692,9 +693,9 @@ struct sockaddr_in *who; /*ARGSUSED*/ Code_t -subscr_send_subs(client, version) +subscr_send_subs(client, vers) ZClient_t *client; -char *version; +char *vers; { register int i = 0; register ZSubscr_t *sub; @@ -790,10 +791,9 @@ ZClientList_t *clist; */ static int -cl_match(notice, client, acl) +cl_match(notice, client) register ZNotice_t *notice; register ZClient_t *client; -ZAcl_t *acl; { register ZSubscr_t *subs; int relation; diff --git a/server/timer.c b/server/timer.c index 5f3db4c..b343c46 100644 --- a/server/timer.c +++ b/server/timer.c @@ -97,6 +97,9 @@ timer timer_set_rel (time_rel, proc, arg) return(new_t); } +#ifdef notdef +/* currently unused */ + /* * timer_set_abs (time_abs, proc, arg) * time_abs: alarm time, absolute @@ -123,6 +126,7 @@ timer timer_set_abs (time_abs, proc, arg) add_timer(new_t); return(new_t); } +#endif notdef /* * timer_reset |