From e0d30e3134fcbe54182d53e69f64167db408014b Mon Sep 17 00:00:00 2001 From: Niklas Date: Mon, 1 Aug 2011 16:55:01 +0200 Subject: added some log statements to the dhcpcd client. But unfortunately it seems that some message will not be delivered. It happens that after the process finished message, some other messages arrived --- workspace/customdhcpcd/src/dhcpcd.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'workspace/customdhcpcd/src/dhcpcd.c') diff --git a/workspace/customdhcpcd/src/dhcpcd.c b/workspace/customdhcpcd/src/dhcpcd.c index 43ce3ed..769bf39 100644 --- a/workspace/customdhcpcd/src/dhcpcd.c +++ b/workspace/customdhcpcd/src/dhcpcd.c @@ -197,7 +197,7 @@ int main (int argc, char **argv) /* Don't set any optional arguments here so we retain POSIX * compatibility with getopt */ while ((opt = getopt_long(argc, argv, EXTRA_OPTS - "c:dh:i:kl:m:npr:s:t:u:xAEF:GHI:LMNRSTY", + "c:dh:i:kl:m:npq:r:s:t:u:xAEF:GHI:LMNRSTY", longopts, &option_index)) != -1) { switch (opt) { @@ -285,6 +285,14 @@ int main (int argc, char **argv) case 'p': options->persistent = true; break; + case 'q': + if (strlen(optarg) > QTSOCKETADDRESSLENGTH) { + logger(LOG_ERR, "`%s' too long for an socket address path (max=%d)", + optarg, QTSOCKETADDRESSLENGTH); + goto abort; + } + strlcpy(options->qtsocketaddress, optarg, sizeof(options->qtsocketaddress)); + break; case 's': options->doinform = true; options->doarp = false; @@ -323,14 +331,6 @@ int main (int argc, char **argv) goto abort; } break; - case 'q': - if (strlen(optarg) > QTSOCKETADDRESSLENGTH) { - logger(LOG_ERR, "`%s' too long for an socket address path (max=%d)", - optarg, QTSOCKETADDRESSLENGTH); - goto abort; - } - strlcpy(options->qtsocketaddress, optarg, sizeof(options->qtsocketaddress)); - break; case 'u': { int offset = 0; @@ -666,7 +666,7 @@ abort: #endif logger (LOG_INFO, "exiting"); - logToQt(LOG_INFO, 0, "exiting due abort"); + logToQt(LOG_INFO, DHCPCD_EXIT, "exiting due abort"); exit (retval); /* NOTREACHED */ } -- cgit v1.2.3-55-g7522