diff options
| -rw-r--r-- | sys/netinet/ip_output.c | 44 |
1 files changed, 9 insertions, 35 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index ee3f634ca8f..00c2e21957c 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.238 2013/04/11 12:06:25 mpi Exp $ */ +/* $OpenBSD: ip_output.c,v 1.239 2013/04/24 12:34:15 mpi Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -916,10 +916,7 @@ sendorfree: * as indicated by a non-zero in_addr at the start of the options. */ struct mbuf * -ip_insertoptions(m, opt, phlen) - struct mbuf *m; - struct mbuf *opt; - int *phlen; +ip_insertoptions(struct mbuf *m, struct mbuf *opt, int *phlen) { struct ipoption *p = mtod(opt, struct ipoption *); struct mbuf *n; @@ -962,8 +959,7 @@ ip_insertoptions(m, opt, phlen) * omitting those not copied during fragmentation. */ int -ip_optcopy(ip, jp) - struct ip *ip, *jp; +ip_optcopy(struct ip *ip, struct ip *jp) { u_char *cp, *dp; int opt, optlen, cnt; @@ -1007,11 +1003,8 @@ ip_optcopy(ip, jp) * IP socket option processing. */ int -ip_ctloutput(op, so, level, optname, mp) - int op; - struct socket *so; - int level, optname; - struct mbuf **mp; +ip_ctloutput(int op, struct socket *so, int level, int optname, + struct mbuf **mp) { struct inpcb *inp = sotoinpcb(so); struct mbuf *m = *mp; @@ -1032,12 +1025,7 @@ ip_ctloutput(op, so, level, optname, mp) case PRCO_SETOPT: switch (optname) { case IP_OPTIONS: -#ifdef notyet - case IP_RETOPTS: - return (ip_pcbopts(optname, &inp->inp_options, m)); -#else return (ip_pcbopts(&inp->inp_options, m)); -#endif case IP_TOS: case IP_TTL: @@ -1633,14 +1621,7 @@ ip_ctloutput(op, so, level, optname, mp) * with destination address if source routed. */ int -#ifdef notyet -ip_pcbopts(optname, pcbopt, m) - int optname; -#else -ip_pcbopts(pcbopt, m) -#endif - struct mbuf **pcbopt; - struct mbuf *m; +ip_pcbopts(struct mbuf **pcbopt, struct mbuf *m) { int cnt, optlen; u_char *cp; @@ -2007,10 +1988,7 @@ ip_setmoptions(int optname, struct ip_moptions **imop, struct mbuf *m, * Return the IP multicast options in response to user getsockopt(). */ int -ip_getmoptions(optname, imo, mp) - int optname; - struct ip_moptions *imo; - struct mbuf **mp; +ip_getmoptions(int optname, struct ip_moptions *imo, struct mbuf **mp) { u_char *ttl; u_char *loop; @@ -2056,8 +2034,7 @@ ip_getmoptions(optname, imo, mp) * Discard the IP multicast options. */ void -ip_freemoptions(imo) - struct ip_moptions *imo; +ip_freemoptions(struct ip_moptions *imo) { int i; @@ -2076,10 +2053,7 @@ ip_freemoptions(imo) * pointer that might NOT be &loif -- easier than replicating that code here. */ void -ip_mloopback(ifp, m, dst) - struct ifnet *ifp; - struct mbuf *m; - struct sockaddr_in *dst; +ip_mloopback(struct ifnet *ifp, struct mbuf *m, struct sockaddr_in *dst) { struct ip *ip; struct mbuf *copym; |