switch (pid) {
case 0:
/* child */
- if (uevent_netlink_sock > 0)
- close(uevent_netlink_sock);
+ close(uevent_netlink_sock);
+ close(udevd_sock);
if (inotify_fd > 0)
close(inotify_fd);
- close(udevd_sock);
close(signal_pipe[READ_END]);
close(signal_pipe[WRITE_END]);
logging_close();
retval = bind(udevd_sock, (struct sockaddr *) &saddr, addrlen);
if (retval < 0) {
err("bind failed, %s", strerror(errno));
- close(udevd_sock);
return -1;
}
/* set receive buffersize */
setsockopt(uevent_netlink_sock, SOL_SOCKET, SO_RCVBUFFORCE, &buffersize, sizeof(buffersize));
- retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl,
- sizeof(struct sockaddr_nl));
+ retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl, sizeof(struct sockaddr_nl));
if (retval < 0) {
err("bind failed, %s", strerror(errno));
close(uevent_netlink_sock);
uevent_netlink_sock = -1;
return -1;
}
-
return 0;
}
int main(int argc, char *argv[], char *envp[])
{
int retval;
- int devnull;
+ int fd;
struct sigaction act;
fd_set readfds;
const char *value;
int uevent_netlink_active = 0;
int daemonize = 0;
int i;
-
- /* set std fd's to /dev/null, if the kernel forks us, we don't have them at all */
- devnull = open("/dev/null", O_RDWR);
- if (devnull >= 0) {
- if (devnull != STDIN_FILENO)
- dup2(devnull, STDIN_FILENO);
- if (devnull != STDOUT_FILENO)
- dup2(devnull, STDOUT_FILENO);
- if (devnull != STDERR_FILENO)
- dup2(devnull, STDERR_FILENO);
- if (devnull > STDERR_FILENO)
- close(devnull);
+ int rc = 0;
+
+ /* redirect std fd's, if the kernel forks us, we don't have them at all */
+ fd = open("/dev/null", O_RDWR);
+ if (fd >= 0) {
+ if (fd != STDIN_FILENO)
+ dup2(fd, STDIN_FILENO);
+ if (fd != STDOUT_FILENO)
+ dup2(fd, STDOUT_FILENO);
+ if (fd != STDERR_FILENO)
+ dup2(fd, STDERR_FILENO);
+ if (fd > STDERR_FILENO)
+ close(fd);
}
logging_init("udevd");
- if (devnull < 0)
+ if (fd < 0)
err("fatal, could not open /dev/null");
udev_init_config();
goto exit;
}
+ /* parse commandline options */
for (i = 1 ; i < argc; i++) {
char *arg = argv[i];
if (strcmp(arg, "--daemon") == 0 || strcmp(arg, "-d") == 0) {
}
}
+ /* init sockets to receive events */
+ if (init_udevd_socket() < 0) {
+ if (errno == EADDRINUSE) {
+ dbg("another udevd running, exit");
+ rc = 1;
+ } else {
+ dbg("error initializing udevd socket: %s", strerror(errno));
+ rc = 2;
+ }
+ goto exit;
+ }
+
+ if (init_uevent_netlink_sock() < 0) {
+ err("uevent socket not available");
+ rc = 3;
+ goto exit;
+ }
+
+ /* parse the rules and keep it in memory */
+ udev_rules_init(&rules, 1);
+
if (daemonize) {
pid_t pid;
pid = fork();
switch (pid) {
case 0:
- dbg("damonized fork running");
+ dbg("daemonized fork running");
break;
case -1:
err("fork of daemon failed");
+ rc = 4;
goto exit;
default:
- logging_close();
- exit(0);
+ dbg("child [%u] running, parent exits", pid);
+ goto exit;
}
}
+ /* set scheduling priority for the daemon */
+ setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY);
+
+ chdir("/");
+ umask(077);
+
/* become session leader */
sid = setsid();
dbg("our session is %d", sid);
- chdir("/");
- umask(umask(077) | 022);
-
- /* set a reasonable scheduling priority for the daemon */
- setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY);
+ /* OOM_DISABLE == -17 */
+ fd = open("/proc/self/oom_adj", O_RDWR);
+ if (fd < 0)
+ err("error disabling OOM");
+ else {
+ write(fd, "-17", 3);
+ close(fd);
+ }
/* setup signal handler pipe */
retval = pipe(signal_pipe);
sigaction(SIGCHLD, &act, NULL);
sigaction(SIGHUP, &act, NULL);
- /* parse the rules and keep it in memory */
- udev_rules_init(&rules, 0, 1);
-
- if (init_udevd_socket() < 0) {
- if (errno == EADDRINUSE)
- dbg("another udevd running, exit");
- else
- dbg("error initializing udevd socket: %s", strerror(errno));
-
- goto exit;
- }
-
- if (init_uevent_netlink_sock() < 0)
- err("uevent socket not available");
-
/* watch rules directory */
inotify_fd = inotify_init();
if (inotify_fd > 0)
FD_ZERO(&readfds);
FD_SET(signal_pipe[READ_END], &readfds);
FD_SET(udevd_sock, &readfds);
- if (uevent_netlink_sock > 0)
- FD_SET(uevent_netlink_sock, &readfds);
+ FD_SET(uevent_netlink_sock, &readfds);
if (inotify_fd > 0)
FD_SET(inotify_fd, &readfds);
}
/* get kernel netlink message */
- if ((uevent_netlink_sock > 0) && FD_ISSET(uevent_netlink_sock, &readfds)) {
+ if (FD_ISSET(uevent_netlink_sock, &readfds)) {
msg = get_netlink_msg();
if (msg) {
msg_queue_insert(msg);
if (reload_config) {
reload_config = 0;
udev_rules_close(&rules);
- udev_rules_init(&rules, 0, 1);
+ udev_rules_init(&rules, 1);
}
/* forked child have returned */
logging_close();
- return 0;
+ return rc;
}