projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove ip_ctlinput, do all the work in higher level ctlinput's
[unix-history]
/
usr
/
src
/
sys
/
netinet
/
udp_usrreq.c
diff --git
a/usr/src/sys/netinet/udp_usrreq.c
b/usr/src/sys/netinet/udp_usrreq.c
index
ba53ed4
..
4ad6191
100644
(file)
--- a/
usr/src/sys/netinet/udp_usrreq.c
+++ b/
usr/src/sys/netinet/udp_usrreq.c
@@
-1,4
+1,4
@@
-/* udp_usrreq.c 6.
9 84/09/05
*/
+/* udp_usrreq.c 6.
13 85/05/27
*/
#include "param.h"
#include "dir.h"
#include "param.h"
#include "dir.h"
@@
-32,7
+32,7
@@
udp_init()
udb.inp_next = udb.inp_prev = &udb;
}
udb.inp_next = udb.inp_prev = &udb;
}
-int udpcksum =
0
;
+int udpcksum =
1
;
struct sockaddr_in udp_in = { AF_INET };
udp_input(m0)
struct sockaddr_in udp_in = { AF_INET };
udp_input(m0)
@@
-76,7
+76,7
@@
udp_input(m0)
if (udpcksum && ui->ui_sum) {
ui->ui_next = ui->ui_prev = 0;
ui->ui_x1 = 0;
if (udpcksum && ui->ui_sum) {
ui->ui_next = ui->ui_prev = 0;
ui->ui_x1 = 0;
- ui->ui_len =
htons((u_short)len)
;
+ ui->ui_len =
ui->ui_ulen
;
if (ui->ui_sum = in_cksum(m, len + sizeof (struct ip))) {
udpstat.udps_badsum++;
m_freem(m);
if (ui->ui_sum = in_cksum(m, len + sizeof (struct ip))) {
udpstat.udps_badsum++;
m_freem(m);
@@
-92,7
+92,7
@@
udp_input(m0)
INPLOOKUP_WILDCARD);
if (inp == 0) {
/* don't send ICMP response for broadcast packet */
INPLOOKUP_WILDCARD);
if (inp == 0) {
/* don't send ICMP response for broadcast packet */
- if (in_
lnaof(ui->ui_dst) == INADDR_ANY
)
+ if (in_
broadcast(ui->ui_dst)
)
goto bad;
icmp_error((struct ip *)ui, ICMP_UNREACH, ICMP_UNREACH_PORT);
return;
goto bad;
icmp_error((struct ip *)ui, ICMP_UNREACH, ICMP_UNREACH_PORT);
return;
@@
-169,7
+169,7
@@
udp_output(inp, m0)
*/
for (m = m0; m; m = m->m_next)
len += m->m_len;
*/
for (m = m0; m; m = m->m_next)
len += m->m_len;
-
m = m_get(
M_DONTWAIT, MT_HEADER);
+
MGET(m,
M_DONTWAIT, MT_HEADER);
if (m == 0) {
m_freem(m0);
return (ENOBUFS);
if (m == 0) {
m_freem(m0);
return (ENOBUFS);
@@
-197,8
+197,10
@@
udp_output(inp, m0)
* Stuff checksum and output datagram.
*/
ui->ui_sum = 0;
* Stuff checksum and output datagram.
*/
ui->ui_sum = 0;
- if ((ui->ui_sum = in_cksum(m, sizeof (struct udpiphdr) + len)) == 0)
+ if (udpcksum) {
+ if ((ui->ui_sum = in_cksum(m, sizeof (struct udpiphdr) + len)) == 0)
ui->ui_sum = -1;
ui->ui_sum = -1;
+ }
((struct ip *)ui)->ip_len = sizeof (struct udpiphdr) + len;
((struct ip *)ui)->ip_ttl = MAXTTL;
so = inp->inp_socket;
((struct ip *)ui)->ip_len = sizeof (struct udpiphdr) + len;
((struct ip *)ui)->ip_ttl = MAXTTL;
so = inp->inp_socket;
@@
-223,6
+225,9
@@
udp_output(inp, m0)
so->so_options & SO_BROADCAST));
}
so->so_options & SO_BROADCAST));
}
+int udp_sendspace = 2048; /* really max datagram size */
+int udp_recvspace = 4 * (1024+sizeof(struct sockaddr_in)); /* 4 1K dgrams */
+
/*ARGSUSED*/
udp_usrreq(so, req, m, nam, rights)
struct socket *so;
/*ARGSUSED*/
udp_usrreq(so, req, m, nam, rights)
struct socket *so;
@@
-232,6
+237,9
@@
udp_usrreq(so, req, m, nam, rights)
struct inpcb *inp = sotoinpcb(so);
int error = 0;
struct inpcb *inp = sotoinpcb(so);
int error = 0;
+ if (req == PRU_CONTROL)
+ return (in_control(so, (int)m, (caddr_t)nam,
+ (struct ifnet *)rights));
if (rights && rights->m_len) {
error = EINVAL;
goto release;
if (rights && rights->m_len) {
error = EINVAL;
goto release;
@@
-250,7
+258,7
@@
udp_usrreq(so, req, m, nam, rights)
error = in_pcballoc(so, &udb);
if (error)
break;
error = in_pcballoc(so, &udb);
if (error)
break;
- error = soreserve(so,
2048, 2048
);
+ error = soreserve(so,
udp_sendspace, udp_recvspace
);
if (error)
break;
break;
if (error)
break;
break;
@@
-331,8
+339,8
@@
udp_usrreq(so, req, m, nam, rights)
m = NULL;
if (nam) {
in_pcbdisconnect(inp);
m = NULL;
if (nam) {
in_pcbdisconnect(inp);
- splx(s);
inp->inp_laddr = laddr;
inp->inp_laddr = laddr;
+ splx(s);
}
}
break;
}
}
break;
@@
-365,7
+373,6
@@
udp_usrreq(so, req, m, nam, rights)
error = EOPNOTSUPP;
break;
error = EOPNOTSUPP;
break;
- case PRU_CONTROL:
case PRU_RCVD:
case PRU_RCVOOB:
return (EOPNOTSUPP); /* do not free mbuf's */
case PRU_RCVD:
case PRU_RCVOOB:
return (EOPNOTSUPP); /* do not free mbuf's */