First pass at porting John's "accept" changes to

allow an in-kernel webserver (or similar) to accept
and handle incoming connections using netgraph without ever leaving the
kernel. (allows incoming tunnel requests to be
handled totally within the kernel for example)

Needs work, but shouldn't break existing functionality.

Submitted by:	John Polstra <jdp@polstra.com>
MFC after:	2 weeks

1 files changed, 17 insertions, 0 deletions

diff --git a/sys/netgraph/ng_ksocket.h b/sys/netgraph/ng_ksocket.h
index fd6a579..efb65aa 100644
--- a/sys/netgraph/ng_ksocket.h
+++ b/sys/netgraph/ng_ksocket.h
@@ -43,6 +43,8 @@
 #ifndef _NETGRAPH_KSOCKET_H_
 #define _NETGRAPH_KSOCKET_H_
 
+#include <sys/socket.h>
+
 /* Node type name and magic cookie */
 #define NG_KSOCKET_NODE_TYPE	"ksocket"
 #define NGM_KSOCKET_COOKIE	942710669
@@ -69,6 +71,21 @@ struct ng_ksocket_sockopt {
 	}							\
 }
 
+/* For NGM_KSOCKET_ACCEPT control message responses */
+struct ng_ksocket_accept {
+	u_int32_t	nodeid;		/* node ID of connected ksocket */
+	struct sockaddr	addr;		/* peer's address (variable length) */
+};
+
+/* Keep this in sync with the above structure definition */
+#define	NGM_KSOCKET_ACCEPT_INFO {					\
+	{								\
+	  { "nodeid",		&ng_parse_hint32_type		  },	\
+	  { "addr",		&ng_ksocket_generic_sockaddr_type },	\
+	  { NULL }							\
+	}								\
+}
+
 /* Netgraph commands */
 enum {
 	NGM_KSOCKET_BIND = 1,