Author: tuexen
Date: Fri Mar 8 01:00:05 2013
New Revision: 248008
URL: http://svnweb.freebsd.org/changeset/base/248008
Log:
MFC r243516:
Remove unused function.
Modified:
stable/8/sys/netinet/sctp_peeloff.c
stable/8/sys/netinet/sctp_peeloff.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/netinet/ (props changed)
Modified: stable/8/sys/netinet/sctp_peeloff.c
==============================================================================
--- stable/8/sys/netinet/sctp_peeloff.c Fri Mar 8 00:58:07 2013
(r248007)
+++ stable/8/sys/netinet/sctp_peeloff.c Fri Mar 8 01:00:05 2013
(r248008)
@@ -151,103 +151,3 @@ sctp_do_peeloff(struct socket *head, str
return (0);
}
-
-
-struct socket *
-sctp_get_peeloff(struct socket *head, sctp_assoc_t assoc_id, int *error)
-{
- struct socket *newso;
- struct sctp_inpcb *inp, *n_inp;
- struct sctp_tcb *stcb;
-
- SCTPDBG(SCTP_DEBUG_PEEL1, "SCTP peel-off called\n");
- inp = (struct sctp_inpcb *)head->so_pcb;
- if (inp == NULL) {
- SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_PEELOFF,
EFAULT);
- *error = EFAULT;
- return (NULL);
- }
- stcb = sctp_findassociation_ep_asocid(inp, assoc_id, 1);
- if (stcb == NULL) {
- SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_PEELOFF,
ENOTCONN);
- *error = ENOTCONN;
- return (NULL);
- }
- atomic_add_int(&stcb->asoc.refcnt, 1);
- SCTP_TCB_UNLOCK(stcb);
- CURVNET_SET(head->so_vnet);
- newso = sonewconn(head, SS_ISCONNECTED
- );
- CURVNET_RESTORE();
- if (newso == NULL) {
- SCTPDBG(SCTP_DEBUG_PEEL1, "sctp_peeloff:sonewconn failed\n");
- SCTP_LTRACE_ERR_RET(NULL, stcb, NULL, SCTP_FROM_SCTP_PEELOFF,
ENOMEM);
- *error = ENOMEM;
- atomic_subtract_int(&stcb->asoc.refcnt, 1);
- return (NULL);
-
- }
- SCTP_TCB_LOCK(stcb);
- atomic_subtract_int(&stcb->asoc.refcnt, 1);
- n_inp = (struct sctp_inpcb *)newso->so_pcb;
- SOCK_LOCK(head);
- n_inp->sctp_flags = (SCTP_PCB_FLAGS_UDPTYPE |
- SCTP_PCB_FLAGS_CONNECTED |
- SCTP_PCB_FLAGS_IN_TCPPOOL | /* Turn on Blocking IO */
- (SCTP_PCB_COPY_FLAGS & inp->sctp_flags));
- n_inp->sctp_features = inp->sctp_features;
- n_inp->sctp_frag_point = inp->sctp_frag_point;
- n_inp->sctp_cmt_on_off = inp->sctp_cmt_on_off;
- n_inp->sctp_ecn_enable = inp->sctp_ecn_enable;
- n_inp->partial_delivery_point = inp->partial_delivery_point;
- n_inp->sctp_context = inp->sctp_context;
- n_inp->local_strreset_support = inp->local_strreset_support;
- n_inp->inp_starting_point_for_iterator = NULL;
-
- /* copy in the authentication parameters from the original endpoint */
- if (n_inp->sctp_ep.local_hmacs)
- sctp_free_hmaclist(n_inp->sctp_ep.local_hmacs);
- n_inp->sctp_ep.local_hmacs =
- sctp_copy_hmaclist(inp->sctp_ep.local_hmacs);
- if (n_inp->sctp_ep.local_auth_chunks)
- sctp_free_chunklist(n_inp->sctp_ep.local_auth_chunks);
- n_inp->sctp_ep.local_auth_chunks =
- sctp_copy_chunklist(inp->sctp_ep.local_auth_chunks);
- (void)sctp_copy_skeylist(&inp->sctp_ep.shared_keys,
- &n_inp->sctp_ep.shared_keys);
-
- n_inp->sctp_socket = newso;
- if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_AUTOCLOSE)) {
- sctp_feature_off(n_inp, SCTP_PCB_FLAGS_AUTOCLOSE);
- n_inp->sctp_ep.auto_close_time = 0;
- sctp_timer_stop(SCTP_TIMER_TYPE_AUTOCLOSE, n_inp, stcb, NULL,
- SCTP_FROM_SCTP_PEELOFF + SCTP_LOC_1);
- }
- /* Turn off any non-blocking semantic. */
- SCTP_CLEAR_SO_NBIO(newso);
- newso->so_state |= SS_ISCONNECTED;
- /* We remove it right away */
-
-#ifdef SCTP_LOCK_LOGGING
- if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LOCK_LOGGING_ENABLE) {
- sctp_log_lock(inp, (struct sctp_tcb *)NULL, SCTP_LOG_LOCK_SOCK);
- }
-#endif
- TAILQ_REMOVE(&head->so_comp, newso, so_list);
- head->so_qlen--;
- SOCK_UNLOCK(head);
- /*
- * Now we must move it from one hash table to another and get the
- * stcb in the right place.
- */
- sctp_move_pcb_and_assoc(inp, n_inp, stcb);
- atomic_add_int(&stcb->asoc.refcnt, 1);
- SCTP_TCB_UNLOCK(stcb);
- /*
- * And now the final hack. We move data in the pending side i.e.
- * head to the new socket buffer. Let the GRUBBING begin :-0
- */
- sctp_pull_off_control_to_new_inp(inp, n_inp, stcb, SBL_WAIT);
- atomic_subtract_int(&stcb->asoc.refcnt, 1);
- return (newso);
-}
Modified: stable/8/sys/netinet/sctp_peeloff.h
==============================================================================
--- stable/8/sys/netinet/sctp_peeloff.h Fri Mar 8 00:58:07 2013
(r248007)
+++ stable/8/sys/netinet/sctp_peeloff.h Fri Mar 8 01:00:05 2013
(r248008)
@@ -35,18 +35,9 @@ __FBSDID("$FreeBSD$");
#ifndef _NETINET_SCTP_PEELOFF_H_
#define _NETINET_SCTP_PEELOFF_H_
-
-
-
-
#if defined(_KERNEL)
-
int sctp_can_peel_off(struct socket *, sctp_assoc_t);
int sctp_do_peeloff(struct socket *, struct socket *, sctp_assoc_t);
-struct socket *sctp_get_peeloff(struct socket *, sctp_assoc_t, int *);
-
-
#endif /* _KERNEL */
-
-#endif
+#endif /* _NETINET_SCTP_PEELOFF_H_ */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
