The signature of handling control input has changed.

sctplab · Jan 27, 2018 · 230fb8f · 230fb8f
1 parent 094f2de
commit 230fb8f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/netinet/sctp_usrreq.c b/netinet/sctp_usrreq.c
@@ -415,7 +415,11 @@ void
 #else
 void *
 #endif
+#if defined(__APPLE__) && !defined(APPLE_LEOPARD) && !defined(APPLE_SNOWLEOPARD) && !defined(APPLE_LION) && !defined(APPLE_MOUNTAINLION) && !defined(APPLE_ELCAPITAN)
+sctp_ctlinput(int cmd, struct sockaddr *sa, void *vip, struct ifnet *ifp SCTP_UNUSED)
+#else
 sctp_ctlinput(int cmd, struct sockaddr *sa, void *vip)
+#endif
 {
 #if defined(__FreeBSD__)
 	struct ip *outer_ip;

diff --git a/netinet/sctp_var.h b/netinet/sctp_var.h
@@ -419,7 +419,11 @@ void sctp_input __P((struct mbuf *, int));
 #endif
 void sctp_pathmtu_adjustment __P((struct sctp_tcb *, uint16_t));
 #else
+#if defined(__APPLE__) && !defined(APPLE_LEOPARD) && !defined(APPLE_SNOWLEOPARD) && !defined(APPLE_LION) && !defined(APPLE_MOUNTAINLION) && !defined(APPLE_ELCAPITAN)
+void sctp_ctlinput(int, struct sockaddr *, void *, struct ifnet * SCTP_UNUSED);
+#else
 void sctp_ctlinput(int, struct sockaddr *, void *);
+#endif
 int sctp_ctloutput(struct socket *, struct sockopt *);
 #ifdef INET
 void sctp_input_with_port(struct mbuf *, int, uint16_t);

diff --git a/netinet6/sctp6_usrreq.c b/netinet6/sctp6_usrreq.c
@@ -424,8 +424,12 @@ sctp6_notify(struct sctp_inpcb *inp,
 	}
 }
 
+#if defined(__APPLE__) && !defined(APPLE_LEOPARD) && !defined(APPLE_SNOWLEOPARD) && !defined(APPLE_LION) && !defined(APPLE_MOUNTAINLION) && !defined(APPLE_ELCAPITAN)
 void
+sctp6_ctlinput(int cmd, struct sockaddr *pktdst, void *d, struct ifnet *ifp SCTP_UNUSED)
+#else
 sctp6_ctlinput(int cmd, struct sockaddr *pktdst, void *d)
+#endif
 {
 	struct ip6ctlparam *ip6cp;
 	struct sctp_inpcb *inp;

diff --git a/netinet6/sctp6_var.h b/netinet6/sctp6_var.h
@@ -76,8 +76,12 @@ void sctp6_ctlinput __P((int, struct sockaddr *, void *));
 #else
 int sctp6_output(struct sctp_inpcb *, struct mbuf *, struct sockaddr *,
                  struct mbuf *, struct proc *);
+#if defined(__APPLE__) && !defined(APPLE_LEOPARD) && !defined(APPLE_SNOWLEOPARD) && !defined(APPLE_LION) && !defined(APPLE_MOUNTAINLION) && !defined(APPLE_ELCAPITAN)
+void sctp6_ctlinput(int, struct sockaddr *, void *, struct ifnet * SCTP_UNUSED);
+#else
 void sctp6_ctlinput(int, struct sockaddr *, void *);
 #endif
+#endif
 #if !(defined(__FreeBSD__) || defined(__APPLE__))
 extern void in6_sin_2_v4mapsin6(struct sockaddr_in *, struct sockaddr_in6 *);
 extern void in6_sin6_2_sin(struct sockaddr_in *, struct sockaddr_in6 *);