Module Name: src
Committed By: riz
Date: Mon May 28 00:13:19 UTC 2012
Modified Files:
src/sbin/iscsid: Makefile iscsid_globals.h iscsid_main.c
Log Message:
Make the debugging printouts actually work when setting the debug level,
and allow the level to be set numerically from the command line.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sbin/iscsid/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sbin/iscsid/iscsid_globals.h \
src/sbin/iscsid/iscsid_main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/iscsid/Makefile
diff -u src/sbin/iscsid/Makefile:1.3 src/sbin/iscsid/Makefile:1.4
--- src/sbin/iscsid/Makefile:1.3 Sun May 27 20:05:04 2012
+++ src/sbin/iscsid/Makefile Mon May 28 00:13:19 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/05/27 20:05:04 christos Exp $
+# $NetBSD: Makefile,v 1.4 2012/05/28 00:13:19 riz Exp $
PROG= iscsid
@@ -13,8 +13,6 @@ MAN= iscsid.8
WARNS= 4
-# CPPFLAGS+= -DISCSI_DEBUG
-
LDADD = -lpthread -lisns
INCSDIR= /usr/include
Index: src/sbin/iscsid/iscsid_globals.h
diff -u src/sbin/iscsid/iscsid_globals.h:1.6 src/sbin/iscsid/iscsid_globals.h:1.7
--- src/sbin/iscsid/iscsid_globals.h:1.6 Sun May 27 22:03:16 2012
+++ src/sbin/iscsid/iscsid_globals.h Mon May 28 00:13:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_globals.h,v 1.6 2012/05/27 22:03:16 riz Exp $ */
+/* $NetBSD: iscsid_globals.h,v 1.7 2012/05/28 00:13:19 riz Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -379,20 +379,12 @@ iscsid_set_node_name_req_t node_name;
/* Debugging stuff */
-#ifdef ISCSI_DEBUG
-int debug_level; /* How much info to display */
+extern int debug_level; /* How much info to display */
#define DEBOUT(x) printf x
#define DEB(lev,x) {if (debug_level >= lev) printf x ;}
-#else
-
-#define DEBOUT(x)
-#define DEB(lev,x)
-
-#endif
-
/* Session list protection shortcuts */
#if 0
Index: src/sbin/iscsid/iscsid_main.c
diff -u src/sbin/iscsid/iscsid_main.c:1.6 src/sbin/iscsid/iscsid_main.c:1.7
--- src/sbin/iscsid/iscsid_main.c:1.6 Sun May 27 22:03:16 2012
+++ src/sbin/iscsid/iscsid_main.c Mon May 28 00:13:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_main.c,v 1.6 2012/05/27 22:03:16 riz Exp $ */
+/* $NetBSD: iscsid_main.c,v 1.7 2012/05/28 00:13:19 riz Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -37,6 +37,7 @@
#include <sys/sysctl.h>
#include <ctype.h>
+#include <err.h>
#include <fcntl.h>
#define DEVICE "/dev/iscsi0"
@@ -71,7 +72,7 @@ static uint8_t rsp_buf[RSP_BUFFER_SIZE];
static void __dead
usage(void)
{
- fprintf(stderr, "Usage: %s [-d]\n", getprogname());
+ fprintf(stderr, "Usage: %s [-d <lvl>] [-n]\n", getprogname());
exit(EXIT_FAILURE);
}
@@ -484,7 +485,6 @@ exit_daemon(void)
dereg_all_isns_servers();
#endif
- close(client_sock);
printf("iSCSI Daemon Exits\n");
exit(0);
}
@@ -512,25 +512,29 @@ main(int argc, char **argv)
iscsid_request_t *req;
iscsid_response_t *rsp;
struct timeval seltout = { 2, 0 }; /* 2 second poll interval */
+ char *p;
- client_sock = init_daemon();
- if (client_sock < 0)
- exit(1);
-
- printf("iSCSI Daemon loaded\n");
-
- while ((c = getopt(argc, argv, "dn")) != -1)
+ while ((c = getopt(argc, argv, "d:n")) != -1)
switch (c) {
case 'n':
nothreads++;
break;
case 'd':
- debug_level++;
+ debug_level=(int)strtol(optarg, &p, 10);
+ if (*p)
+ errx(EXIT_FAILURE, "illegal debug level -- %s",
+ optarg);
break;
default:
usage();
}
+ client_sock = init_daemon();
+ if (client_sock < 0)
+ exit(1);
+
+ printf("iSCSI Daemon loaded\n");
+
if (!debug_level)
daemon(0, 1);
@@ -579,7 +583,7 @@ main(int argc, char **argv)
perror("Receiving from socket");
break;
}
- DEB(99, ("Request %d, parlen %d\n",
+ DEB(98, ("Request %d, parlen %d\n",
req->request, req->parameter_length));
len += req->parameter_length;
@@ -625,7 +629,7 @@ main(int argc, char **argv)
if (rsp == NULL)
break;
- DEB(99, ("Sending reply: status %d, len %d\n",
+ DEB(98, ("Sending reply: status %d, len %d\n",
rsp->status, rsp->parameter_length));
/* send the response */
