d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let rwhod use libulog.

Browse Source 
I am not planning on providing a mechanism tot stat() the database files
directly. The disadvantage of this, is that rwhod will now be a little
bit more heavy than it used to be. It normally used to fstat() the file
descriptor to see whether the file had changed, but this is now
impossible to implement, meaning we have to parse the entire utmp file
each 180 seconds.

This is probably not an issue on modern 16-way servers, but if it turns
out to be a problem, we'll think of something.
This commit is contained in:
Ed Schouten 2009-12-27 21:14:55 +00:00
parent a118f94c12
commit 41477e05db
2 changed files with 30 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/rwhod/Makefile
View File

@ -7,4 +7,7 @@ MAN= rwhod.8
# XXX breaks on Alpha due to alignment constraints # XXX breaks on Alpha due to alignment constraints
#WARNS?= 4 #WARNS?= 4
DPADD= ${LIBULOG}
LDADD= -lulog
.include <bsd.prog.mk> .include <bsd.prog.mk>

89
usr.sbin/rwhod/rwhod.c
View File

@ -67,8 +67,9 @@ __FBSDID("$FreeBSD$");
#include <string.h> #include <string.h>
#include <syslog.h> #include <syslog.h>
#include <timeconv.h> #include <timeconv.h>
#define _ULOG_POSIX_NAMES
#include <ulog.h>
#include <unistd.h> #include <unistd.h>
#include <utmp.h>
#include <pwd.h> #include <pwd.h>
#include <grp.h> #include <grp.h>
@ -146,7 +147,7 @@ struct neighbor {
struct neighbor *neighbors; struct neighbor *neighbors;
struct whod mywd; struct whod mywd;
struct servent *sp; struct servent *sp;
int s, utmpf; int s;
#define WHDRSIZE (int)(sizeof(mywd) - sizeof(mywd.wd_we)) #define WHDRSIZE (int)(sizeof(mywd) - sizeof(mywd.wd_we))
@ -231,11 +232,6 @@ main(int argc, char *argv[])
*cp = '\0'; *cp = '\0';
strncpy(mywd.wd_hostname, myname, sizeof(mywd.wd_hostname) - 1); strncpy(mywd.wd_hostname, myname, sizeof(mywd.wd_hostname) - 1);
mywd.wd_hostname[sizeof(mywd.wd_hostname) - 1] = '\0'; mywd.wd_hostname[sizeof(mywd.wd_hostname) - 1] = '\0';
utmpf = open(_PATH_UTMP, O_RDONLY|O_CREAT, 0644);
if (utmpf < 0) {
syslog(LOG_ERR, "%s: %m", _PATH_UTMP);
exit(1);
}
getboottime(0); getboottime(0);
if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
syslog(LOG_ERR, "socket: %m"); syslog(LOG_ERR, "socket: %m");
@ -383,73 +379,43 @@ verify(name, maxlen)
return (size > 0); return (size > 0);
} }
int utmptime;
int utmpent;
int utmpsize = 0;
struct utmp *utmp;
int alarmcount;
void void
onalrm(signo) onalrm(int signo __unused)
int signo __unused;
{ {
register struct neighbor *np; struct neighbor *np;
register struct whoent *we = mywd.wd_we, *wlast; struct whoent *we = mywd.wd_we, *wend;
register int i;
struct stat stb; struct stat stb;
struct utmpx *ut;
static int alarmcount = 0;
double avenrun[3]; double avenrun[3];
time_t now; time_t now;
int cc; int i, cc;
now = time(NULL); now = time(NULL);
if (alarmcount % 10 == 0) if (alarmcount % 10 == 0)
getboottime(0); getboottime(0);
alarmcount++; alarmcount++;
(void) fstat(utmpf, &stb); wend = &mywd.wd_we[1024 / sizeof(struct whoent)];
if ((stb.st_mtime != utmptime) || (stb.st_size > utmpsize)) { setutxent();
utmptime = stb.st_mtime; while ((ut = getutxent()) != NULL && we < wend) {
if (stb.st_size > utmpsize) { if (ut->ut_type != USER_PROCESS)
utmpsize = stb.st_size + 10 * sizeof(struct utmp); continue;
utmp = (struct utmp *)reallocf(utmp, utmpsize); strncpy(we->we_utmp.out_line, ut->ut_line,
if (utmp == NULL) { sizeof(we->we_utmp.out_line));
syslog(LOG_WARNING, "malloc failed"); strncpy(we->we_utmp.out_name, ut->ut_user,
utmpsize = 0; sizeof(we->we_utmp.out_name));
goto done; we->we_utmp.out_time =
} htonl(_time_to_time32(ut->ut_tv.tv_sec));
} we++;
(void) lseek(utmpf, (off_t)0, L_SET);
cc = read(utmpf, (char *)utmp, stb.st_size);
if (cc < 0) {
syslog(LOG_ERR, "read(%s): %m", _PATH_UTMP);
goto done;
}
wlast = &mywd.wd_we[1024 / sizeof(struct whoent) - 1];
utmpent = cc / sizeof(struct utmp);
for (i = 0; i < utmpent; i++)
if (utmp[i].ut_name[0]) {
memcpy(we->we_utmp.out_line, utmp[i].ut_line,
sizeof(utmp[i].ut_line));
memcpy(we->we_utmp.out_name, utmp[i].ut_name,
sizeof(utmp[i].ut_name));
we->we_utmp.out_time = htonl(utmp[i].ut_time);
if (we >= wlast)
break;
we++;
}
utmpent = we - mywd.wd_we;
} }
endutxent();
/* if (chdir(_PATH_DEV)) {
* The test on utmpent looks silly---after all, if no one is
* logged on, why worry about efficiency?---but is useful on
* (e.g.) compute servers.
*/
if (utmpent && chdir(_PATH_DEV)) {
syslog(LOG_ERR, "chdir(%s): %m", _PATH_DEV); syslog(LOG_ERR, "chdir(%s): %m", _PATH_DEV);
exit(1); exit(1);
} }
we = mywd.wd_we; wend = we;
for (i = 0; i < utmpent; i++) { for (we = mywd.wd_we; we < wend; we++) {
if (stat(we->we_utmp.out_line, &stb) >= 0) if (stat(we->we_utmp.out_line, &stb) >= 0)
we->we_idle = htonl(now - stb.st_atime); we->we_idle = htonl(now - stb.st_atime);
we++; we++;
@ -457,7 +423,7 @@ onalrm(signo)
(void)getloadavg(avenrun, sizeof(avenrun)/sizeof(avenrun[0])); (void)getloadavg(avenrun, sizeof(avenrun)/sizeof(avenrun[0]));
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
mywd.wd_loadav[i] = htonl((u_long)(avenrun[i] * 100)); mywd.wd_loadav[i] = htonl((u_long)(avenrun[i] * 100));
cc = (char *)we - (char *)&mywd; cc = (char *)wend - (char *)&mywd;
mywd.wd_sendtime = htonl(_time_to_time32(time(NULL))); mywd.wd_sendtime = htonl(_time_to_time32(time(NULL)));
mywd.wd_vers = WHODVERSION; mywd.wd_vers = WHODVERSION;
mywd.wd_type = WHODTYPE_STATUS; mywd.wd_type = WHODTYPE_STATUS;
@ -485,11 +451,10 @@ onalrm(signo)
} else (void) sendto(s, (char *)&mywd, cc, 0, } else (void) sendto(s, (char *)&mywd, cc, 0,
np->n_addr, np->n_addrlen); np->n_addr, np->n_addrlen);
} }
if (utmpent && chdir(_PATH_RWHODIR)) { if (chdir(_PATH_RWHODIR)) {
syslog(LOG_ERR, "chdir(%s): %m", _PATH_RWHODIR); syslog(LOG_ERR, "chdir(%s): %m", _PATH_RWHODIR);
exit(1); exit(1);
} }
done:
(void) alarm(AL_INTERVAL); (void) alarm(AL_INTERVAL);
} }