}
/* sort message by sequence number into list */
- list_for_each_entry_reverse(loop_msg, &msg_list, list)
+ list_for_each_entry_reverse(loop_msg, &msg_list, list) {
if (loop_msg->seqnum < msg->seqnum)
break;
+ if (loop_msg->seqnum == msg->seqnum) {
+ dbg("ignoring duplicate message seq %llu", msg->seqnum);
+ return;
+ }
+ }
+
/* store timestamp of queuing */
sysinfo(&info);
msg->queue_time = info.uptime;
/* run msg queue manager */
run_msg_q = 1;
- return ;
+ return;
}
/* forks event and removes event from run queue when finished */
static void user_sighandler(void)
{
int sig;
+
while(1) {
int rc = read(pipefds[0], &sig, sizeof(sig));
if (rc < 0)
}
}
-int main(int argc, char *argv[], char *envp[])
+static int init_udevsend_socket(void)
{
- struct sysinfo info;
- int maxsockplus;
struct sockaddr_un saddr;
socklen_t addrlen;
- int retval, fd;
const int feature_on = 1;
+ int retval;
+
+ memset(&saddr, 0x00, sizeof(saddr));
+ saddr.sun_family = AF_LOCAL;
+ /* use abstract namespace for socket path */
+ strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
+ addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+
+ udevsendsock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+ if (udevsendsock == -1) {
+ dbg("error getting socket, %s", strerror(errno));
+ return -1;
+ }
+
+ /* the bind takes care of ensuring only one copy running */
+ retval = bind(udevsendsock, (struct sockaddr *) &saddr, addrlen);
+ if (retval < 0) {
+ dbg("bind failed, %s", strerror(errno));
+ close(udevsendsock);
+ return -1;
+ }
+
+ /* enable receiving of the sender credentials */
+ setsockopt(udevsendsock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
+
+ return 0;
+}
+
+int main(int argc, char *argv[], char *envp[])
+{
+ struct sysinfo info;
+ int maxsockplus;
+ int retval;
+ int fd;
struct sigaction act;
fd_set readfds;
+ const char *udevd_expected_seqnum;
logging_init("udevd");
dbg("version %s", UDEV_VERSION);
/* Set fds to dev/null */
fd = open( "/dev/null", O_RDWR );
- if ( fd < 0 ) {
+ if (fd >= 0) {
+ dup2(fd, 0);
+ dup2(fd, 1);
+ dup2(fd, 2);
+ if (fd > 2)
+ close(fd);
+ } else
dbg("error opening /dev/null %s", strerror(errno));
- goto exit;
- }
- dup2(fd, 0);
- dup2(fd, 1);
- dup2(fd, 2);
- if (fd > 2)
- close(fd);
/* become session leader */
setsid();
goto exit;
}
retval = fcntl(pipefds[0], F_SETFD, FD_CLOEXEC);
- if (retval < 0) {
+ if (retval < 0)
dbg("error fcntl on read pipe: %s", strerror(errno));
- goto exit;
- }
retval = fcntl(pipefds[1], F_SETFL, O_NONBLOCK);
if (retval < 0) {
goto exit;
}
retval = fcntl(pipefds[1], F_SETFD, FD_CLOEXEC);
- if (retval < 0) {
+ if (retval < 0)
dbg("error fcntl on write pipe: %s", strerror(errno));
- goto exit;
- }
/* set signal handlers */
act.sa_handler = (void (*) (int))sig_handler;
sigaction(SIGALRM, &act, NULL);
sigaction(SIGCHLD, &act, NULL);
- memset(&saddr, 0x00, sizeof(saddr));
- saddr.sun_family = AF_LOCAL;
- /* use abstract namespace for socket path */
- strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
- addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+ if (init_udevsend_socket() < 0) {
+ if (errno == EADDRINUSE)
+ dbg("another udevd running, exit");
+ else
+ dbg("error initialising udevsend socket: %s", strerror(errno));
- udevsendsock = socket(AF_LOCAL, SOCK_DGRAM, 0);
- if (udevsendsock == -1) {
- dbg("error getting socket, exit");
goto exit;
}
- /* the bind takes care of ensuring only one copy running */
- retval = bind(udevsendsock, (struct sockaddr *) &saddr, addrlen);
- if (retval < 0) {
- dbg("bind failed, exit");
- close(udevsendsock);
- goto exit;
- }
-
- /* enable receiving of the sender credentials */
- setsockopt(udevsendsock, SOL_SOCKET, SO_PASSCRED, &feature_on, sizeof(feature_on));
-
/* possible override of udev binary, used for testing */
udev_bin = getenv("UDEV_BIN");
if (udev_bin != NULL)
else
udev_bin = UDEV_BIN;
- /* handle special startup timeout*/
+ /* possible set of expected_seqnum number */
+ udevd_expected_seqnum = getenv("UDEVD_EXPECTED_SEQNUM");
+ if (udevd_expected_seqnum != NULL) {
+ expected_seqnum = strtoull(udevd_expected_seqnum, NULL, 10);
+ dbg("initialize expected_seqnum to %llu", expected_seqnum);
+ }
+
+ /* get current time to provide shorter startup timeout */
sysinfo(&info);
startup_time = info.uptime;