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

- Unwind NG_SEND_MSG_PATH() macro and merge it with already unwinded

Browse Source 
version under TRACE_MESSAGES.
- Pass NG_WAITOK flag to ng_package_data() in unwinded macro.
This commit is contained in:
Gleb Smirnoff 2005-05-17 12:18:13 +00:00
parent ff17c7a727
commit 24ac2f1c5e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=146317
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
sys/netgraph/ng_socket.c
View File

@ -211,6 +211,7 @@ ngc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
struct sockaddr_ng *const sap = (struct sockaddr_ng *) addr;
struct ng_mesg *msg;
struct mbuf *m0;
item_p item;
char *path = NULL;
int len, error = 0;
@ -306,36 +307,33 @@ ngc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
}
}
if ((item = ng_package_msg(msg, M_WAITOK)) == NULL) {
error = ENOMEM;
#ifdef TRACE_MESSAGES
do {
item_p item;
if ((item = ng_package_msg(msg, M_WAITOK)) == NULL) {
(msg) = NULL;
(error) = ENOMEM;
printf("ng_package_msg: err=%d\n", error);
break;
}
if ((error = ng_address_path((pcbp->sockdata->node), (item),
(path), 0)) == 0) {
printf("[%x]:<---------[socket]: c=<%d>cmd=%x(%s) f=%x #%d (%s)\n",
item->el_dest->nd_ID,
msg->header.typecookie,
msg->header.cmd,
msg->header.cmdstr,
msg->header.flags,
msg->header.token,
item->el_dest->nd_type->name);
SAVE_LINE(item);
(error) = ng_snd_item((item), 0);
} else
printf("ng_address_path: errx=%d\n", error);
(msg) = NULL;
} while (0);
#else
/* The callee will free the msg when done. The path is our business. */
NG_SEND_MSG_PATH(error, pcbp->sockdata->node, msg, path, 0);
printf("ng_package_msg: err=%d\n", error);
#endif
goto release;
}
if ((error = ng_address_path((pcbp->sockdata->node), item,
path, 0)) != 0) {
#ifdef TRACE_MESSAGES
printf("ng_address_path: errx=%d\n", error);
#endif
goto release;
}
#ifdef TRACE_MESSAGES
printf("[%x]:<---------[socket]: c=<%d>cmd=%x(%s) f=%x #%d (%s)\n",
item->el_dest->nd_ID,
msg->header.typecookie,
msg->header.cmd,
msg->header.cmdstr,
msg->header.flags,
msg->header.token,
item->el_dest->nd_type->name);
#endif
SAVE_LINE(item);
error = ng_snd_item(item, NG_NOFLAGS);
release:
if (path != NULL)