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

- Make sure the message token returned by NgSendMsg() is non-negative

Browse Source 
- Have NgSendAsciiMsg() return the same token as NgSendMsg()
- Document that NgSendMsg() and NgSendAsciiMsg() return the token
- Add MLINKS for the functions defined in netgraph(3)
This commit is contained in:
Archie Cobbs 2000-06-21 23:01:07 +00:00
parent e5516847ea
commit 33c22c64e9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=61922
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libnetgraph/Makefile
View File

@ -12,4 +12,16 @@ INCS= netgraph.h
CFLAGS+= -Wall
MLINKS+= netgraph.3 NgMkSockNode.3
MLINKS+= netgraph.3 NgNameNode.3
MLINKS+= netgraph.3 NgSendMsg.3
MLINKS+= netgraph.3 NgSendAsciiMsg.3
MLINKS+= netgraph.3 NgSendMsgReply.3
MLINKS+= netgraph.3 NgRecvMsg.3
MLINKS+= netgraph.3 NgRecvAsciiMsg.3
MLINKS+= netgraph.3 NgSendData.3
MLINKS+= netgraph.3 NgRecvData.3
MLINKS+= netgraph.3 NgSetDebug.3
MLINKS+= netgraph.3 NgSetErrLog.3
.include <bsd.lib.mk>

15
lib/libnetgraph/msg.c
View File

@ -70,7 +70,9 @@ NgSendMsg(int cs, const char *path,
memset(&msg, 0, sizeof(msg));
msg.header.version = NG_VERSION;
msg.header.typecookie = cookie;
msg.header.token = ++gMsgId;
if (++gMsgId < 0)
gMsgId = 1;
msg.header.token = gMsgId;
msg.header.flags = NGF_ORIG;
msg.header.cmd = cmd;
snprintf(msg.header.cmdstr, NG_CMDSTRLEN + 1, "cmd%d", cmd);
@ -78,7 +80,7 @@ NgSendMsg(int cs, const char *path,
/* Deliver message */
if (NgDeliverMsg(cs, path, &msg, args, arglen) < 0)
return (-1);
return(gMsgId);
return (gMsgId);
}
/*
@ -137,8 +139,13 @@ NgSendAsciiMsg(int cs, const char *path, const char *fmt, ...)
return (-1);
/* Now send binary version */
return NgDeliverMsg(cs,
path, binary, binary->data, binary->header.arglen);
if (++gMsgId < 0)
gMsgId = 1;
binary->header.token = gMsgId;
if (NgDeliverMsg(cs,
path, binary, binary->data, binary->header.arglen) < 0)
return (-1);
return (gMsgId);
}
/*

5
lib/libnetgraph/netgraph.3
View File

@ -124,6 +124,8 @@ The
.Fa cmd ,
and argument data are defined by the header file corresponding
to the type of the node being addressed.
The unique, non-negative token value chosen for use in the message
header is returned. This value is typically used to associate replies.
.Pp
Use
.Fn NgSendMsgReply
@ -147,6 +149,9 @@ string to the node in a
control message. The node returns a binary version of the
message, which is then sent back to the node just as with
.Fn NgSendMsg .
As with
.Fn NgSendMsg ,
the message token value is returned.
Note that
.Tn ASCII
conversion may not be supported by all node types.