return seqnum;
}
-static int build_hotplugmsg(struct hotplug_msg **ppmsg, char *action,
+static int build_hotplugmsg(struct hotplug_msg *msg, char *action,
char *devpath, char *subsystem, int seqnum)
{
- struct hotplug_msg *pmsg;
-
- pmsg = malloc(sizeof(struct hotplug_msg));
- pmsg->mtype = HOTPLUGMSGTYPE;
- pmsg->seqnum = seqnum;
- strncpy(pmsg->action, action, 8);
- strncpy(pmsg->devpath, devpath, 128);
- strncpy(pmsg->subsystem, subsystem, 16);
- *ppmsg = pmsg;
+ memset(msg, 0x00, sizeof(msg));
+ msg->mtype = HOTPLUGMSGTYPE;
+ msg->seqnum = seqnum;
+ strncpy(msg->action, action, 8);
+ strncpy(msg->devpath, devpath, 128);
+ strncpy(msg->subsystem, subsystem, 16);
return sizeof(struct hotplug_msg);
}
-static void free_hotplugmsg(struct hotplug_msg *pmsg)
-{
- free(pmsg);
-}
-
static int start_daemon(void)
{
pid_t pid;
switch (child_pid) {
case 0:
/* daemon */
- execl(DEFAULT_UDEVD_EXEC, NULL);
+ setsid();
+ execl(UDEVD_EXEC, "udevd", NULL);
dbg("exec of daemon failed");
exit(1);
case -1:
dbg("fork of helper failed");
return -1;
default:
- wait(0);
+ wait(NULL);
}
return 0;
}
{
int msgid;
key_t key;
- struct msqid_ds msg_queue;
- struct msgbuf *pmsg;
+ struct msqid_ds msg_queue;
+ struct hotplug_msg message;
char *action;
char *devpath;
char *subsystem;
seq = atoi(seqnum);
/* create ipc message queue or get id of our existing one */
- key = ftok(DEFAULT_UDEVD_EXEC, IPC_KEY_ID);
- size = build_hotplugmsg( (struct hotplug_msg**) &pmsg, action, devpath, subsystem, seq);
+ key = ftok(UDEVD_EXEC, IPC_KEY_ID);
+ size = build_hotplugmsg(&message, action, devpath, subsystem, seq);
msgid = msgget(key, IPC_CREAT);
if (msgid == -1) {
dbg("error open ipc queue");
}
/* send ipc message to the daemon */
- retval = msgsnd(msgid, pmsg, size, 0);
- free_hotplugmsg( (struct hotplug_msg*) pmsg);
+ retval = msgsnd(msgid, &message, size, 0);
if (retval == -1) {
dbg("error sending ipc message");
goto exit;
/* get state of ipc queue */
tspec.tv_sec = 0;
tspec.tv_nsec = 10000000; /* 10 millisec */
- loop = 20;
+ loop = 30;
while (loop--) {
retval = msgctl(msgid, IPC_STAT, &msg_queue);
if (retval == -1) {