X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevsend.c;h=bdc69d0508e4c3ce786e895a65a6d66dd5e5980e;hp=2b92e659e2f2a09010f8ffaf96acf6264436d123;hb=0cd4ac473a51577e33e700beccb3479e5565d661;hpb=3b47c7394d042b8a3fcf426920a926d4ffedacad

diff --git a/udevsend.c b/udevsend.c
index 2b92e659e..bdc69d050 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -146,7 +146,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
 	strcpy(usend_msg.magic, UDEV_MAGIC);
-	usend_msg.type = UDEVD_UEVENT;
+	usend_msg.type = UDEVD_UEVENT_UDEVSEND;
 
 	/* copy all keys to send buffer */
 	for (i = 0; envp[i]; i++) {
@@ -185,7 +185,7 @@ int main(int argc, char *argv[], char *envp[])
 	dbg("usend_msg_len=%i", usend_msg_len);
 
 	/* If we can't send, try to start daemon and resend message */
-	loop = SEND_WAIT_MAX_SECONDS * SEND_WAIT_LOOP_PER_SECOND;
+	loop = UDEVSEND_WAIT_MAX_SECONDS * UDEVSEND_WAIT_LOOP_PER_SECOND;
 	while (--loop) {
 		retval = sendto(sock, &usend_msg, usend_msg_len, 0, (struct sockaddr *)&saddr, addrlen);
 		if (retval != -1) {
@@ -208,8 +208,8 @@ int main(int argc, char *argv[], char *envp[])
 			dbg("udevd daemon started");
 			started_daemon = 1;
 		} else {
-			dbg("retry to connect %d", SEND_WAIT_MAX_SECONDS * SEND_WAIT_LOOP_PER_SECOND - loop);
-			usleep(1000 * 1000 / SEND_WAIT_LOOP_PER_SECOND);
+			dbg("retry to connect %d", UDEVSEND_WAIT_MAX_SECONDS * UDEVSEND_WAIT_LOOP_PER_SECOND - loop);
+			usleep(1000 * 1000 / UDEVSEND_WAIT_LOOP_PER_SECOND);
 		}
 	}