CVS commit: src/sys

["Tyler R. Retzlaff" <rtr%netbsd.org@localhost>]

Module Name:    src
Committed By:   rtr
Date:           Wed Jul  9 04:54:04 UTC 2014

Modified Files:
        src/sys/compat/svr4: svr4_stream.c
        src/sys/kern: uipc_syscalls.c uipc_usrreq.c
        src/sys/net: if_gre.c link_proto.c raw_usrreq.c rtsock.c
        src/sys/netatalk: ddp_usrreq.c
        src/sys/netbt: hci_socket.c l2cap.h l2cap_socket.c l2cap_upper.c
            rfcomm.h rfcomm_dlc.c rfcomm_session.c rfcomm_socket.c
            rfcomm_upper.c sco.h sco_socket.c sco_upper.c
        src/sys/netinet: raw_ip.c tcp_usrreq.c udp_usrreq.c
        src/sys/netinet6: raw_ip6.c udp6_usrreq.c
        src/sys/netipsec: keysock.c
        src/sys/netmpls: mpls_proto.c
        src/sys/netnatm: natm.c
        src/sys/rump/net/lib/libsockin: sockin.c
        src/sys/sys: param.h protosw.h socketvar.h

Log Message:
* split PRU_PEERADDR and PRU_SOCKADDR function out of pr_generic()
  usrreq switches and put into separate functions
  xxx_{peer,sock}addr(struct socket *, struct mbuf *).

    - KASSERT(solocked(so)) always in new functions even if request
      is not implemented

    - KASSERT(pcb != NULL) and KASSERT(nam) if the request is
      implemented and not for tcp.

* for tcp roll #ifdef KPROF and #ifdef DEBUG code from tcp_usrreq() into
  easier to cut & paste functions tcp_debug_capture() and
tcp_debug_trace()

    - functions provided by rmind
    - remaining use of PRU_{PEER,SOCK}ADDR #define to be removed in a
      future commit.

* rename netbt functions to permit consistency of pru function names
  (as has been done with other requests already split out).

    - l2cap_{peer,sock}addr()  -> l2cap_{peer,sock}_addr_pcb()
    - rfcomm_{peer,sock}addr() -> rfcomm_{peer,sock}_addr_pcb()
    - sco_{peer,sock}addr()    -> sco_{peer,sock}_addr_pcb()

* split/refactor do_sys_getsockname(lwp, fd, which, nam) into
  two functions do_sys_get{peer,sock}name(fd, nam).

    - move PRU_PEERADDR handling into do_sys_getpeername() from
      do_sys_getsockname()
    - have svr4_stream directly call do_sys_get{sock,peer}name()
      respectively instead of providing `which' & fix a DPRINTF string
      that incorrectly wrote "getpeername" when it meant "getsockname"
    - fix sys_getpeername() and sys_getsockname() to call
      do_sys_get{sock,peer}name() without `which' and `lwp' & adjust
      comments
    - bump kernel version for removal of lwp & which parameters from
      do_sys_getsockname()

note: future cleanup to remove struct mbuf * abuse in
xxx_{peer,sock}name()
still to come, not done in this commit since it is easier to do post
split.

patch reviewed by rmind

welcome to 6.99.47


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/compat/svr4/svr4_stream.c
cvs rdiff -u -r1.170 -r1.171 src/sys/kern/uipc_syscalls.c
cvs rdiff -u -r1.157 -r1.158 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.156 -r1.157 src/sys/net/if_gre.c
cvs rdiff -u -r1.14 -r1.15 src/sys/net/link_proto.c
cvs rdiff -u -r1.41 -r1.42 src/sys/net/raw_usrreq.c
cvs rdiff -u -r1.153 -r1.154 src/sys/net/rtsock.c
cvs rdiff -u -r1.51 -r1.52 src/sys/netatalk/ddp_usrreq.c
cvs rdiff -u -r1.30 -r1.31 src/sys/netbt/hci_socket.c
cvs rdiff -u -r1.13 -r1.14 src/sys/netbt/l2cap.h src/sys/netbt/l2cap_upper.c
cvs rdiff -u -r1.21 -r1.22 src/sys/netbt/l2cap_socket.c
cvs rdiff -u -r1.12 -r1.13 src/sys/netbt/rfcomm.h
cvs rdiff -u -r1.7 -r1.8 src/sys/netbt/rfcomm_dlc.c
cvs rdiff -u -r1.19 -r1.20 src/sys/netbt/rfcomm_session.c
cvs rdiff -u -r1.22 -r1.23 src/sys/netbt/rfcomm_socket.c
cvs rdiff -u -r1.15 -r1.16 src/sys/netbt/rfcomm_upper.c
cvs rdiff -u -r1.6 -r1.7 src/sys/netbt/sco.h
cvs rdiff -u -r1.23 -r1.24 src/sys/netbt/sco_socket.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netbt/sco_upper.c
cvs rdiff -u -r1.131 -r1.132 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.184 -r1.185 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.206 -r1.207 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.125 -r1.126 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.105 -r1.106 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.33 -r1.34 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.13 -r1.14 src/sys/netmpls/mpls_proto.c
cvs rdiff -u -r1.35 -r1.36 src/sys/netnatm/natm.c
cvs rdiff -u -r1.46 -r1.47 src/sys/rump/net/lib/libsockin/sockin.c
cvs rdiff -u -r1.456 -r1.457 src/sys/sys/param.h
cvs rdiff -u -r1.50 -r1.51 src/sys/sys/protosw.h
cvs rdiff -u -r1.133 -r1.134 src/sys/sys/socketvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.