d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug handling the debug level when displaying control messages

Browse Source 
in their ASCII forms at debug levels >= 3.
This commit is contained in:
Archie Cobbs 2000-04-28 18:41:21 +00:00
parent 0beebe3a2e
commit 1816e452a6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=59732
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/libnetgraph/debug.c
View File

@ -171,7 +171,8 @@ _NgDebugSockaddr(const struct sockaddr_ng *sg)
sg->sg_family, sg->sg_len, sg->sg_data);
}
#define ARGS_BUFSIZE 1024
#define ARGS_BUFSIZE 2048
#define RECURSIVE_DEBUG_ADJUST 4
/*
* Display a negraph message
@ -182,11 +183,7 @@ _NgDebugMsg(const struct ng_mesg *msg, const char *path)
u_char buf[2 * sizeof(struct ng_mesg) + ARGS_BUFSIZE];
struct ng_mesg *const req = (struct ng_mesg *)buf;
struct ng_mesg *const bin = (struct ng_mesg *)req->data;
int arglen, debugSave, csock = -1;
/* Lower debugging to avoid infinite recursion */
debugSave = _gNgDebugLevel;
_gNgDebugLevel -= 4;
int arglen, csock = -1;
/* Display header stuff */
NGLOGX("NG_MESG :");
@ -217,12 +214,22 @@ _NgDebugMsg(const struct ng_mesg *msg, const char *path)
memcpy(bin, msg, sizeof(*msg) + arglen);
bin->header.arglen = arglen;
/* Lower debugging to avoid infinite recursion */
_gNgDebugLevel -= RECURSIVE_DEBUG_ADJUST;
/* Ask the node to translate the binary message to ASCII for us */
if (NgSendMsg(csock, path, NGM_GENERIC_COOKIE,
NGM_BINARY2ASCII, bin, sizeof(*bin) + bin->header.arglen) < 0)
NGM_BINARY2ASCII, bin, sizeof(*bin) + bin->header.arglen) < 0) {
_gNgDebugLevel += RECURSIVE_DEBUG_ADJUST;
goto fail;
if (NgRecvMsg(csock, req, sizeof(buf), NULL) < 0)
}
if (NgRecvMsg(csock, req, sizeof(buf), NULL) < 0) {
_gNgDebugLevel += RECURSIVE_DEBUG_ADJUST;
goto fail;
}
/* Restore debugging level */
_gNgDebugLevel += RECURSIVE_DEBUG_ADJUST;
/* Display command string and arguments */
NGLOGX(" cmd %s (%d)", bin->header.cmdstr, bin->header.cmd);
@ -240,7 +247,6 @@ _NgDebugMsg(const struct ng_mesg *msg, const char *path)
done:
if (csock != -1)
(void)close(csock);
_gNgDebugLevel = debugSave;
}
/*