[PATCH] udevsnd : clean up message creation logic a bit.
This commit is contained in:
parent
33db4b8da0
commit
71c077fb0a
30
udevsend.c
30
udevsend.c
|
@ -61,26 +61,17 @@ static inline char *get_seqnum(void)
|
||||||
return seqnum;
|
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)
|
char *devpath, char *subsystem, int seqnum)
|
||||||
{
|
{
|
||||||
struct hotplug_msg *pmsg;
|
msg->mtype = HOTPLUGMSGTYPE;
|
||||||
|
msg->seqnum = seqnum;
|
||||||
pmsg = malloc(sizeof(struct hotplug_msg));
|
strncpy(msg->action, action, 8);
|
||||||
pmsg->mtype = HOTPLUGMSGTYPE;
|
strncpy(msg->devpath, devpath, 128);
|
||||||
pmsg->seqnum = seqnum;
|
strncpy(msg->subsystem, subsystem, 16);
|
||||||
strncpy(pmsg->action, action, 8);
|
|
||||||
strncpy(pmsg->devpath, devpath, 128);
|
|
||||||
strncpy(pmsg->subsystem, subsystem, 16);
|
|
||||||
*ppmsg = pmsg;
|
|
||||||
return sizeof(struct hotplug_msg);
|
return sizeof(struct hotplug_msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void free_hotplugmsg(struct hotplug_msg *pmsg)
|
|
||||||
{
|
|
||||||
free(pmsg);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int start_daemon(void)
|
static int start_daemon(void)
|
||||||
{
|
{
|
||||||
pid_t pid;
|
pid_t pid;
|
||||||
|
@ -118,8 +109,8 @@ int main(int argc, char* argv[])
|
||||||
{
|
{
|
||||||
int msgid;
|
int msgid;
|
||||||
key_t key;
|
key_t key;
|
||||||
struct msqid_ds msg_queue;
|
struct msqid_ds msg_queue;
|
||||||
struct msgbuf *pmsg;
|
struct hotplug_msg message;
|
||||||
char *action;
|
char *action;
|
||||||
char *devpath;
|
char *devpath;
|
||||||
char *subsystem;
|
char *subsystem;
|
||||||
|
@ -157,7 +148,7 @@ int main(int argc, char* argv[])
|
||||||
|
|
||||||
/* create ipc message queue or get id of our existing one */
|
/* create ipc message queue or get id of our existing one */
|
||||||
key = ftok(DEFAULT_UDEVD_EXEC, IPC_KEY_ID);
|
key = ftok(DEFAULT_UDEVD_EXEC, IPC_KEY_ID);
|
||||||
size = build_hotplugmsg( (struct hotplug_msg**) &pmsg, action, devpath, subsystem, seq);
|
size = build_hotplugmsg(&message, action, devpath, subsystem, seq);
|
||||||
msgid = msgget(key, IPC_CREAT);
|
msgid = msgget(key, IPC_CREAT);
|
||||||
if (msgid == -1) {
|
if (msgid == -1) {
|
||||||
dbg("error open ipc queue");
|
dbg("error open ipc queue");
|
||||||
|
@ -165,8 +156,7 @@ int main(int argc, char* argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
/* send ipc message to the daemon */
|
/* send ipc message to the daemon */
|
||||||
retval = msgsnd(msgid, pmsg, size, 0);
|
retval = msgsnd(msgid, &message, size, 0);
|
||||||
free_hotplugmsg( (struct hotplug_msg*) pmsg);
|
|
||||||
if (retval == -1) {
|
if (retval == -1) {
|
||||||
dbg("error sending ipc message");
|
dbg("error sending ipc message");
|
||||||
goto exit;
|
goto exit;
|
||||||
|
|
Loading…
Reference in New Issue