d/freebsd-nq
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
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 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> .include <bsd.lib.mk>

13
lib/libnetgraph/msg.c
View File

@ -70,7 +70,9 @@ NgSendMsg(int cs, const char *path,
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));
msg.header.version = NG_VERSION; msg.header.version = NG_VERSION;
msg.header.typecookie = cookie; msg.header.typecookie = cookie;
msg.header.token = ++gMsgId; if (++gMsgId < 0)
gMsgId = 1;
msg.header.token = gMsgId;
msg.header.flags = NGF_ORIG; msg.header.flags = NGF_ORIG;
msg.header.cmd = cmd; msg.header.cmd = cmd;
snprintf(msg.header.cmdstr, NG_CMDSTRLEN + 1, "cmd%d", cmd); snprintf(msg.header.cmdstr, NG_CMDSTRLEN + 1, "cmd%d", cmd);
@ -137,8 +139,13 @@ NgSendAsciiMsg(int cs, const char *path, const char *fmt, ...)
return (-1); return (-1);
/* Now send binary version */ /* Now send binary version */
return NgDeliverMsg(cs, if (++gMsgId < 0)
path, binary, binary->data, binary->header.arglen); 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 , .Fa cmd ,
and argument data are defined by the header file corresponding and argument data are defined by the header file corresponding
to the type of the node being addressed. 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 .Pp
Use Use
.Fn NgSendMsgReply .Fn NgSendMsgReply
@ -147,6 +149,9 @@ string to the node in a
control message. The node returns a binary version of the control message. The node returns a binary version of the
message, which is then sent back to the node just as with message, which is then sent back to the node just as with
.Fn NgSendMsg . .Fn NgSendMsg .
As with
.Fn NgSendMsg ,
the message token value is returned.
Note that Note that
.Tn ASCII .Tn ASCII
conversion may not be supported by all node types. conversion may not be supported by all node types.