diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2004-07-20 12:05:00 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2004-07-20 12:05:00 +0000 |
| commit | 62aab2227c2e1aca8e9b807bc203a1d6ecb14daf (patch) | |
| tree | d93c18c66b00d60d4dd5d8c1c895c987331c083c /svr-session.c | |
| parent | 9c676d0ddd4f5cc5ff271653fc1d8acf92c0d69f (diff) | |
switching to global vars
--HG--
extra : convert_revision : 800073097767c2ac153ab834cbcf0121cb765118
Diffstat (limited to 'svr-session.c')
| -rw-r--r-- | svr-session.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svr-session.c b/svr-session.c index d3094ea..927a1c1 100644 --- a/svr-session.c +++ b/svr-session.c @@ -39,10 +39,11 @@ #include "service.h" #include "auth.h" #include "tcpfwd-remote.h" +#include "runopts.h" static void svr_remoteclosed(); -struct serversession svr_ses; +struct serversession svr_ses; /* GLOBAL */ static const packettype svr_packettypes[] = { /* TYPE, AUTHREQUIRED, FUNCTION */ @@ -69,15 +70,14 @@ static const struct ChanType *svr_chantypes[] = { NULL /* Null termination is mandatory. */ }; -void svr_session(int sock, runopts *opts, int childpipe, - struct sockaddr* remoteaddr) { +void svr_session(int sock, int childpipe, struct sockaddr* remoteaddr) { fd_set readfd, writefd; struct timeval timeout; int val; crypto_init(); - common_session_init(sock, opts); + common_session_init(sock); ses.remoteaddr = remoteaddr; ses.remotehost = getaddrhostname(remoteaddr); @@ -227,7 +227,7 @@ void svr_dropbear_log(int priority, const char* format, va_list param) { vsnprintf(printbuf, sizeof(printbuf), format, param); #ifndef DISABLE_SYSLOG - if (usingsyslog) { + if (svr_opts.usingsyslog) { syslog(priority, "%s", printbuf); } #endif @@ -238,7 +238,7 @@ void svr_dropbear_log(int priority, const char* format, va_list param) { havetrace = 1; #endif - if (!usingsyslog || havetrace) + if (!svr_opts.usingsyslog || havetrace) { timesec = time(NULL); if (strftime(datestr, sizeof(datestr), "%b %d %H:%M:%S", |