#include <sys/ioctl.h>
#include <unistd.h>
#include <syslog.h>
+#include <stdarg.h>
+#include <signal.h>
#include <errno.h>
#ifdef HAVE_LIBWRAP
#include <arpa/inet.h>
#define PIDFILE_DIR "/var/run"
#endif
-#define PROGNAME "acceptor"
+char progname[] = "acceptor";
+char name_port[40]; /* for signal handler */
#ifdef HAVE_LIBWRAP
/* needed because libwrap declares these as externs */
int deny_severity = LOG_WARNING;
#endif
-void usage(char *myname)
+void usage(char *progname)
{
fprintf(stderr, "usage: %s [-N nal_id] [-p] [-l] port\n\n"
" -l\tKeep stdin/stdout open\n"
- " -p\tAllow connections from non-privileged ports\n", myname);
+ " -p\tAllow connections from non-privileged ports\n", progname);
exit (1);
}
-char *pidfile_name(char *name, int port)
+void errlog(int level, const char *fmt, ...)
+{
+ va_list arg;
+ FILE *out;
+
+ switch (level) {
+ case LOG_DEBUG:
+ case LOG_INFO:
+ case LOG_NOTICE:
+ out = stdout;
+ break;
+ default:
+ out = stderr;
+ break;
+ }
+ va_start(arg, fmt);
+ fprintf(out, "%s: ", name_port);
+ vfprintf(out, fmt, arg);
+ va_end(arg);
+ va_start(arg, fmt);
+ vsyslog(level, fmt, arg);
+ va_end(arg);
+}
+
+char *pidfile_name(char *name_port)
{
static char pidfile[1024];
- snprintf(pidfile, sizeof(pidfile), "%s/%s-%d.pid",
- PIDFILE_DIR, name, port);
+ snprintf(pidfile, sizeof(pidfile), "%s/%s.pid", PIDFILE_DIR, name_port);
return pidfile;
}
-void pidfile_create(char *name, int port)
+int pidfile_create(char *name_port)
{
- char *pidfile = pidfile_name(name, port);
- FILE *fp;
-
- if ((fp = fopen(pidfile, "w"))) {
- fprintf(fp, "%d\n", getpid());
- fclose(fp);
+ char *pidfile = pidfile_name(name_port);
+ int fd, rc;
+
+ if ((fd = open(pidfile, O_CREAT | O_WRONLY)) >= 0) {
+ char pid[16];
+ int size = snprintf(pid, sizeof(pid), "%u\n", getpid());
+ if (write(fd, pid, size) != size) {
+ /* hard error or short write */
+ rc = errno ? : EIO;
+ } else {
+ rc = 0;
+ }
+ close(fd);
} else {
- syslog(LOG_DAEMON|LOG_ERR, "%s: %s\n", pidfile,strerror(errno));
+ rc = errno;
}
+
+ if (rc)
+ errlog(LOG_ERR, " error creating %s: %s\n",
+ pidfile, strerror(rc));
+
+ return rc;
}
-int pidfile_cleanup(char *name, int port)
+int pidfile_cleanup(char *name_port)
{
- char *pidfile = pidfile_name(name, port);
+ char *pidfile = pidfile_name(name_port);
int rc;
rc = unlink(pidfile);
if (rc && errno != -ENOENT)
fprintf(stderr, "%s: error removing %s: %s\n",
- PROGNAME, pidfile, strerror(errno));
+ progname, pidfile, strerror(errno));
+ errlog(LOG_NOTICE, "exiting\n");
return errno;
}
-int pidfile_exists(char *name, int port)
+int pidfile_exists(char *name_port)
{
- char *pidfile = pidfile_name(name, port);
+ char *pidfile = pidfile_name(name_port);
FILE *fpid;
int pid, rc;
- snprintf(pidfile, sizeof(pidfile), "%s/%s-%d.pid",
- PIDFILE_DIR, name, port);
-
fpid = fopen(pidfile, "r+");
if (fpid == NULL) {
if (errno == ENOENT)
return 0;
fprintf(stderr, "%s: error opening %s: %s.\n",
- PROGNAME, pidfile, strerror(errno));
+ progname, pidfile, strerror(errno));
return (1);
}
fclose(fpid);
if (rc != 1) {
fprintf(stderr,"%s: %s didn't contain a valid pid, removing.\n",
- PROGNAME, pidfile);
+ progname, pidfile);
goto stale;
}
if (kill(pid, 0) == 0) {
fprintf(stderr, "%s: %s exists, acceptor pid %d running.\n",
- PROGNAME, pidfile, pid);
+ progname, pidfile, pid);
return (1);
}
fprintf(stderr, "%s: stale %s exists, pid %d doesn't, removing.\n",
- PROGNAME, pidfile, pid);
+ progname, pidfile, pid);
stale:
- pidfile_cleanup(name, port);
+ pidfile_cleanup(name_port);
return (0);
}
-void
-show_connection (int fd, __u32 net_ip)
+void handler(int sig)
+{
+ exit(sig);
+}
+
+void atexit_handler(void)
+{
+ pidfile_cleanup(name_port);
+}
+
+void show_connection(int fd, __u32 net_ip)
{
static long last_time;
static __u32 host_ip;
else
snprintf(host, sizeof(host), "%s", h->h_name);
- syslog(LOG_DAEMON | LOG_INFO, "Accepted host: %s\n", host);
+ syslog(LOG_INFO, "accepted host: %s\n", host);
}
int main(int argc, char **argv)
port = atol(argv[optind++]);
- if (pidfile_exists(PROGNAME, port))
+ snprintf(name_port, sizeof(name_port) - 1, "%s-%d", progname, port);
+ if (pidfile_exists(name_port))
return(EEXIST);
+ openlog(name_port, LOG_PID, LOG_DAEMON);
memset(&srvaddr, 0, sizeof(srvaddr));
srvaddr.sin_family = AF_INET;
fd = socket(PF_INET, SOCK_STREAM, 0);
if (fd < 0) {
rc = errno;
- perror("opening socket");
+ errlog(LOG_ERR, "error opening socket: %s\n", strerror(errno));
return(rc);
}
o = 1;
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &o, sizeof(o))) {
rc = errno;
- perror("Cannot set REUSEADDR socket opt");
+ errlog(LOG_ERR, "cannot set REUSEADDR socket opt: %s\n",
+ strerror(errno));
return(rc);
}
rc = bind(fd, (struct sockaddr *)&srvaddr, sizeof(srvaddr));
if (rc == -1) {
rc = errno;
- perror("bind: ");
+ errlog(LOG_ERR, "error binding to socket: %s\n",
+ strerror(errno));
return(rc);
}
perror("listen: ");
return(rc);
}
- fprintf(stderr, "listening on port %d\n", port);
+ printf("listening on port %d\n", port);
pfd = open("/dev/portals", O_RDWR);
if (pfd < 0) {
rc = errno;
- perror("opening portals device");
+ errlog(LOG_ERR, "opening portals device: %s\n",strerror(errno));
return(rc);
}
rc = daemon(0, noclose);
if (rc < 0) {
rc = errno;
- perror("daemon(): ");
+ errlog(LOG_ERR, "error daemonizing: %s\n", strerror(errno));
return(rc);
}
- openlog(PROGNAME, LOG_PID, LOG_DAEMON);
- syslog(LOG_DAEMON | LOG_INFO, "started, listening on port %d\n", port);
- pidfile_create(PROGNAME, port);
+ signal(SIGHUP, SIG_IGN);
+ signal(SIGINT, handler);
+ signal(SIGQUIT, handler);
+ signal(SIGTERM, handler);
+
+ errlog(LOG_NOTICE, "started, listening on port %d\n", port);
+ if (pidfile_create(name_port) == 0)
+ atexit(atexit_handler);
while (1) {
struct sockaddr_in clntaddr;
char addrstr[INET_ADDRSTRLEN];
cfd = accept(fd, (struct sockaddr *)&clntaddr, &len);
- if ( cfd < 0 ) {
- perror("accept");
- pidfile_cleanup(PROGNAME, port);
- return(0);
- continue;
+ if (cfd < 0) {
+ errlog(LOG_ERR, "error accepting connection: %s\n",
+ strerror(errno));
+ break;
+ //continue;
}
+ inet_ntop(AF_INET, &clntaddr.sin_addr, addrstr,INET_ADDRSTRLEN);
#ifdef HAVE_LIBWRAP
/* libwrap access control */
request_init(&request, RQ_DAEMON, "lustre", RQ_FILE, cfd, 0);
sock_host(&request);
if (!hosts_access(&request)) {
- inet_ntop(AF_INET, &clntaddr.sin_addr,
- addrstr, INET_ADDRSTRLEN);
- syslog(LOG_DAEMON | LOG_WARNING,
- "Unauthorized access from %s:%hd\n",
+ errlog(LOG_WARNING, "unauthorized access from %s:%hd\n",
addrstr, ntohs(clntaddr.sin_port));
close (cfd);
continue;
}
#endif
- if (require_privports && ntohs(clntaddr.sin_port) >= IPPORT_RESERVED) {
- inet_ntop(AF_INET, &clntaddr.sin_addr,
- addrstr, INET_ADDRSTRLEN);
- syslog(LOG_DAEMON | LOG_ERR,
- "Closing non-privileged connection from %s:%d\n",
+ if (require_privports &&
+ ntohs(clntaddr.sin_port) >= IPPORT_RESERVED) {
+ errlog(LOG_ERR,
+ "closing non-privileged connection from %s:%d\n",
addrstr, ntohs(clntaddr.sin_port));
rc = close(cfd);
if (rc)
data.ioc_plen1 = sizeof(pcfg);
if (ioctl(pfd, IOC_PORTAL_NAL_CMD, &data) < 0) {
- perror("ioctl failed");
+ errlog(LOG_ERR, "portals ioctl failed for %s: %s\n",
+ addrstr, strerror(errno));
} else {
- printf("client registered\n");
+ errlog(LOG_DEBUG, "client %s registered\n", addrstr);
}
rc = close(cfd);
if (rc)
- perror ("close failed");
+ perror("close failed");
}
closelog();
- pidfile_cleanup(PROGNAME, port);
return (0);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff