xnu-1228.tar.gz

[apple/xnu.git] / bsd / net / raw_usrreq.c

diff --git a/bsd/net/raw_usrreq.c b/bsd/net/raw_usrreq.c
index d10b1ff946f6efd896ec44f6a35b046cb7bcb6a4..4128af9f5b246bd2de1d99cb0845ce64bfb9b42a 100644 (file)
--- a/bsd/net/raw_usrreq.c
+++ b/bsd/net/raw_usrreq.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -81,18 +81,14 @@ lck_grp_attr_t      *raw_mtx_grp_attr;
  * Initialize raw connection block q.
  */
 void
  * Initialize raw connection block q.
  */
 void

-raw_init()
+raw_init(void)

 {
        raw_mtx_grp_attr = lck_grp_attr_alloc_init();
 
 {
        raw_mtx_grp_attr = lck_grp_attr_alloc_init();
 

-       lck_grp_attr_setdefault(raw_mtx_grp_attr);
-

        raw_mtx_grp = lck_grp_alloc_init("rawcb", raw_mtx_grp_attr);
 
        raw_mtx_attr = lck_attr_alloc_init();
 
        raw_mtx_grp = lck_grp_alloc_init("rawcb", raw_mtx_grp_attr);
 
        raw_mtx_attr = lck_attr_alloc_init();
 

-       lck_attr_setdefault(raw_mtx_attr);
-

        if ((raw_mtx = lck_mtx_alloc_init(raw_mtx_grp, raw_mtx_attr)) == NULL) {
                printf("raw_init: can't alloc raw_mtx\n");
                return;
        if ((raw_mtx = lck_mtx_alloc_init(raw_mtx_grp, raw_mtx_attr)) == NULL) {
                printf("raw_init: can't alloc raw_mtx\n");
                return;


@@ -110,14 +106,12 @@ raw_init()
  * Raw protocol interface.
  */
 void
  * Raw protocol interface.
  */
 void

-raw_input(m0, proto, src, dst)
-       struct mbuf *m0;
-       register struct sockproto *proto;
-       struct sockaddr *src, *dst;
+raw_input(struct mbuf *m0, struct sockproto *proto, struct sockaddr *src,
+         struct sockaddr *dst)

 {
 {

-       register struct rawcb *rp;
-       register struct mbuf *m = m0;
-       register int sockets = 0;
+       struct rawcb *rp;
+       struct mbuf *m = m0;
+       int sockets = 0;

        struct socket *last;
        int error;
 
        struct socket *last;
        int error;
 


@@ -125,7 +119,7 @@ raw_input(m0, proto, src, dst)
 //####LD socket we'll find and need to append to is unlocked.
 //####LD calls from the output (locked) path need to make sure the socket is not locked when
 //####LD we call in raw_input
 //####LD socket we'll find and need to append to is unlocked.
 //####LD calls from the output (locked) path need to make sure the socket is not locked when
 //####LD we call in raw_input

-       last = 0;
+       last = NULL;

        lck_mtx_lock(raw_mtx);
        LIST_FOREACH(rp, &rawcb_list, list) {
                if (rp->rcb_proto.sp_family != proto->sp_family)
        lck_mtx_lock(raw_mtx);
        LIST_FOREACH(rp, &rawcb_list, list) {
                if (rp->rcb_proto.sp_family != proto->sp_family)


@@ -177,10 +171,7 @@ raw_input(m0, proto, src, dst)
 
 /*ARGSUSED*/
 void
 
 /*ARGSUSED*/
 void

-raw_ctlinput(cmd, arg, dummy)
-       int cmd;
-       struct sockaddr *arg;
-       void *dummy;
+raw_ctlinput(int cmd, __unused struct sockaddr *arg, __unused void *dummy)

 {
 
        if (cmd < 0 || cmd > PRC_NCMDS)
 {
 
        if (cmd < 0 || cmd > PRC_NCMDS)


@@ -211,33 +202,25 @@ raw_uabort(struct socket *so)
 /* pru_accept is EOPNOTSUPP */
 
 static int
 /* pru_accept is EOPNOTSUPP */
 
 static int

-raw_uattach(struct socket *so, int proto, struct proc *p)
+raw_uattach(struct socket *so, int proto, __unused struct proc *p)

 {
        struct rawcb *rp = sotorawcb(so);
 {
        struct rawcb *rp = sotorawcb(so);

-#ifndef __APPLE__
-       int error;
-#endif

 
        if (rp == 0)
                return EINVAL;
 
        if (rp == 0)
                return EINVAL;

-#ifdef __APPLE__

                if ((so->so_state & SS_PRIV) == 0)
                        return (EPERM);
                if ((so->so_state & SS_PRIV) == 0)
                        return (EPERM);

-#else
-       if (p && (error = suser(p)) != 0)
-               return error;
-#endif

        return raw_attach(so, proto);
 }
 
 static int
        return raw_attach(so, proto);
 }
 
 static int

-raw_ubind(struct socket *so, struct sockaddr *nam, struct proc *p)
+raw_ubind(__unused struct socket *so, __unused struct sockaddr *nam, __unused struct proc *p)

 {
        return EINVAL;
 }
 
 static int
 {
        return EINVAL;
 }
 
 static int

-raw_uconnect(struct socket *so, struct sockaddr *nam, struct proc *p)
+raw_uconnect(__unused struct socket *so, __unused struct sockaddr *nam, __unused struct proc *p)

 {
        return EINVAL;
 }
 {
        return EINVAL;
 }


@@ -299,7 +282,7 @@ raw_upeeraddr(struct socket *so, struct sockaddr **nam)
 
 static int
 raw_usend(struct socket *so, int flags, struct mbuf *m,
 
 static int
 raw_usend(struct socket *so, int flags, struct mbuf *m,

-         struct sockaddr *nam, struct mbuf *control, struct proc *p)
+         struct sockaddr *nam, struct mbuf *control, __unused struct proc *p)

 {
        int error;
        struct rawcb *rp = sotorawcb(so);
 {
        int error;
        struct rawcb *rp = sotorawcb(so);


@@ -338,7 +321,7 @@ raw_usend(struct socket *so, int flags, struct mbuf *m,
        error = (*so->so_proto->pr_output)(m, so);
        m = NULL;
        if (nam)
        error = (*so->so_proto->pr_output)(m, so);
        m = NULL;
        if (nam)

-               rp->rcb_faddr = 0;
+               rp->rcb_faddr = NULL;

 release:
        if (m != NULL)
                m_freem(m);
 release:
        if (m != NULL)
                m_freem(m);