D42691.1789844444.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D42691.1789844444.diff
View Options

	diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c
	--- a/sys/netgraph/ng_socket.c
	+++ b/sys/netgraph/ng_socket.c
	@@ -523,6 +523,9 @@
	if (NG_NODE_HAS_NAME(node))
	bcopy(NG_NODE_NAME(node), sg->sg_data,
	strlen(NG_NODE_NAME(node)));
	+ else
	+ snprintf(sg->sg_data, sizeof(sg->sg_data), "[%x]",
	+ ng_node2ID(node));
	mtx_unlock(&pcbp->sockdata->mtx);

	sg->sg_len = sg_len;
	diff --git a/tests/sys/netgraph/socket.c b/tests/sys/netgraph/socket.c
	--- a/tests/sys/netgraph/socket.c
	+++ b/tests/sys/netgraph/socket.c
	@@ -42,13 +42,12 @@
	char name[NG_NODESIZ] = NAME;
	int cs;

	-#if 0
	- /* Unnamed node. */
	+ /* Unnamed node returns its ID as name. */
	ATF_REQUIRE(NgMkSockNode(NULL, &cs, NULL) == 0);
	ATF_REQUIRE(getsockname(cs, (struct sockaddr *)&sg, &len) == 0);
	+ ATF_REQUIRE(strspn(sg.sg_data, "[0123456789abcdef]") >= 3 &&
	+ sg.sg_data[strspn(sg.sg_data, "[0123456789abcdef]")] == '\0');
	close(cs);
	- /* Unnamed node doesn't return any name/ID now. */
	-#endif

	/* Named node. */
	ATF_REQUIRE(NgMkSockNode(name, &cs, NULL) == 0);