mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-25 11:37:56 +00:00
Code Issues Releases Activity

Further cleanup protosw.h:

Browse Source 
- Remove unused typedefs to avoid confusion and ease in merging
  ip6protosw with protosw.
- Correct a few comments.
- Remove most of a comment about usrreq. [1]
- Use tabs instead of spaces for consistency.

Submitted by:	rwatson [1]
Reviewed by:	rwatson
MFC after:	3 weeks
This commit is contained in:
Bjoern A. Zeeb 2009-01-06 11:02:17 +00:00
parent 67c6f956b1
commit cb6ff36d3a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=186809
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/sys/protosw.h
View File

@ -66,9 +66,7 @@ struct sockopt;
/* USE THESE FOR YOUR PROTOTYPES ! */
typedef void pr_input_t (struct mbuf *, int);
typedef int pr_input6_t (struct mbuf **, int*, int); /* XXX FIX THIS */
typedef void pr_in_input_t (struct mbuf *, int, int); /* XXX FIX THIS */
typedef int pr_output_t (struct mbuf *, struct socket *);
typedef int pr_in_output_t (struct mbuf *, struct socket *, struct sockaddr *);
typedef void pr_ctlinput_t (int, struct sockaddr *, void *);
typedef int pr_ctloutput_t (struct socket *, struct sockopt *);
typedef void pr_init_t (void);
@ -76,9 +74,6 @@ typedef void pr_fasttimo_t (void);
typedef void pr_slowtimo_t (void);
typedef void pr_drain_t (void);
typedef int pr_usrreq_t(struct socket *, int, struct mbuf *,
struct mbuf *, struct mbuf *, struct thread *);
struct protosw {
short pr_type; /* socket type used for */
struct domain *pr_domain; /* domain protocol a member of */
@ -95,7 +90,7 @@ struct protosw {
pr_slowtimo_t *pr_slowtimo; /* slow timeout (500ms) */
pr_drain_t *pr_drain; /* flush any excess space possible */
struct pr_usrreqs *pr_usrreqs; /* supersedes pr_usrreq() */
struct pr_usrreqs *pr_usrreqs; /* user-protocol hook */
};
/*#endif*/
@ -131,17 +126,6 @@ struct protosw {
* We now provide individual function pointers which protocols can implement,
* which offers a number of benefits (such as type checking for arguments).
* These older constants are still present in order to support TCP debugging.
*
* The arguments to usrreq were:
* (*protosw[].pr_usrreq)(up, req, m, nam, opt);
* where up is a (struct socket *), req is one of these requests,
* m is an optional mbuf chain containing a message,
* nam is an optional mbuf chain containing an address,
* and opt is a pointer to a socketopt structure or nil.
* The protocol is responsible for disposal of the mbuf chain m,
* the caller is responsible for any space held by nam and opt.
* A non-zero return from usrreq gives an
* UNIX error number which should be passed to higher level software.
*/
#define PRU_ATTACH 0 /* attach protocol to up */
#define PRU_DETACH 1 /* detach protocol from up */
@ -170,8 +154,8 @@ struct protosw {
#define PRU_SEND_EOF 22 /* send and close */
#define PRU_SOSETLABEL 23 /* MAC label change */
#define PRU_CLOSE 24 /* socket close */
#define PRU_FLUSH 25 /* flush the socket */
#define PRU_NREQ 25
#define PRU_FLUSH 25 /* flush the socket */
#define PRU_NREQ 25
#ifdef PRUREQUESTS
const char *prurequests[] = {
@ -181,7 +165,7 @@ const char *prurequests[] = {
"SENSE", "RCVOOB", "SENDOOB", "SOCKADDR",
"PEERADDR", "CONNECT2", "FASTTIMO", "SLOWTIMO",
"PROTORCV", "PROTOSEND", "SEND_EOF", "SOSETLABEL",
"CLOSE", "FLUSH",
"CLOSE", "FLUSH",
};
#endif
@ -327,7 +311,7 @@ char *prcrequests[] = {
* The protocol is responsible for disposal of the mbuf chain *optval
* if supplied,
* the caller is responsible for any space held by *optval, when returned.
* A non-zero return from usrreq gives an
* A non-zero return from ctloutput gives an
* UNIX error number which should be passed to higher level software.
*/
#define PRCO_GETOPT 0