#include <afsconfig.h>
#include <afs/param.h>
+#include <roken.h>
+
+#include <afs/opr.h>
-# include <sys/types.h>
-# include <errno.h>
-# include <signal.h>
-# include <string.h>
#ifdef AFS_NT40_ENV
# include <WINNT/syscfg.h>
#else
-# include <sys/socket.h>
-# include <sys/file.h>
-# include <netdb.h>
-# include <sys/stat.h>
-# include <netinet/in.h>
-# include <sys/time.h>
# include <net/if.h>
-# include <sys/ioctl.h>
-# include <unistd.h>
#endif
-# include <fcntl.h>
#if !defined(AFS_AIX_ENV) && !defined(AFS_NT40_ENV)
# include <sys/syscall.h>
#endif
#define IPPORT_USERRESERVED 5000
# endif
-#if defined(HAVE_LINUX_ERRQUEUE_H) && defined(ADAPT_PMTU)
-#include <linux/types.h>
-#include <linux/errqueue.h>
-#ifndef IP_MTU
-#define IP_MTU 14
-#endif
+#if defined(AFS_LINUX22_ENV) && defined(AFS_RXERRQ_ENV)
+# include <linux/types.h>
+# include <linux/errqueue.h>
+# if defined(AFS_ADAPT_PMTU) && !defined(IP_MTU)
+# define IP_MTU 14
+# endif
#endif
-#ifndef AFS_NT40_ENV
-# include <sys/time.h>
-#endif
#include "rx.h"
#include "rx_atomic.h"
#include "rx_globals.h"
#include "rx_stats.h"
+#include "rx_peer.h"
+#include "rx_packet.h"
+#include "rx_internal.h"
+
#ifdef AFS_PTHREAD_ENV
/*
struct sockaddr_in taddr;
char *name = "rxi_GetUDPSocket: ";
#ifdef AFS_LINUX22_ENV
-#if defined(ADAPT_PMTU)
- int pmtu=IP_PMTUDISC_WANT;
- int recverr=1;
-#else
- int pmtu=IP_PMTUDISC_DONT;
-#endif
+# if defined(AFS_ADAPT_PMTU)
+ int pmtu = IP_PMTUDISC_WANT;
+# else
+ int pmtu = IP_PMTUDISC_DONT;
+# endif
#endif
#if !defined(AFS_NT40_ENV)
goto error;
}
#endif
- socketFd = socket(AF_INET, SOCK_DGRAM, 0);
+ socketFd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
- if (socketFd < 0) {
+ if (socketFd == OSI_NULLSOCKET) {
+#ifdef AFS_NT40_ENV
+ fprintf(stderr, "socket() failed with error %u\n", WSAGetLastError());
+#else
perror("socket");
+#endif
goto error;
}
taddr.sin_addr.s_addr = ahost;
taddr.sin_family = AF_INET;
taddr.sin_port = (u_short) port;
+ memset(&taddr.sin_zero, 0, sizeof(taddr.sin_zero));
#ifdef STRUCT_SOCKADDR_HAS_SA_LEN
taddr.sin_len = sizeof(struct sockaddr_in);
#endif
if (binds)
rxi_Delay(10);
code = bind(socketFd, (struct sockaddr *)&taddr, sizeof(taddr));
- if (!code)
- break;
+ break;
}
if (code) {
- perror("bind");
(osi_Msg "%sbind failed\n", name);
goto error;
}
#ifdef AFS_LINUX22_ENV
setsockopt(socketFd, SOL_IP, IP_MTU_DISCOVER, &pmtu, sizeof(pmtu));
-#if defined(ADAPT_PMTU)
- setsockopt(socketFd, SOL_IP, IP_RECVERR, &recverr, sizeof(recverr));
#endif
+#ifdef AFS_RXERRQ_ENV
+ {
+ int recverr = 1;
+ setsockopt(socketFd, SOL_IP, IP_RECVERR, &recverr, sizeof(recverr));
+ }
#endif
if (rxi_Listen(socketFd) < 0) {
goto error;
error:
#ifdef AFS_NT40_ENV
- if (socketFd >= 0)
+ if (socketFd != OSI_NULLSOCKET)
closesocket(socketFd);
#else
- if (socketFd >= 0)
+ if (socketFd != OSI_NULLSOCKET)
close(socketFd);
#endif
va_end(ap);
fflush(stderr);
fflush(stdout);
- afs_abort();
+ opr_abort();
}
/*
#endif
#ifdef AFS_NT40_ENV
-extern int rxinit_status;
+extern rx_atomic_t rxinit_status;
void
rxi_InitMorePackets(void) {
int npackets, ncbufs;
LOCK_IF_INIT;
if (Inited) {
- if (Inited < 2 && rxinit_status == 0) {
+ if (Inited < 2 && !rx_atomic_test_bit(&rxinit_status, 0)) {
/* We couldn't initialize more packets earlier.
* Do it now. */
rxi_InitMorePackets();
* and we therefore do not have any mutex locks initialized. As a
* result we cannot call rxi_MorePackets() without crashing.
*/
- if (rxinit_status)
+ if (rx_atomic_test_bit(&rxinit_status, 0))
return;
rxi_InitMorePackets();
memset(myNetMTUs, 0, sizeof(myNetMTUs));
memset(myNetMasks, 0, sizeof(myNetMasks));
UNLOCK_IF;
- s = socket(AF_INET, SOCK_DGRAM, 0);
- if (s < 0)
+ s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ if (s == OSI_NULLSOCKET)
return;
-
#ifdef AFS_AIX41_ENV
ifc.ifc_len = sizeof(buf);
ifc.ifc_buf = buf;
fudge_netmask(rxi_NetAddrs[rxi_numNetAddrs]);
#ifdef SIOCGIFNETMASK
res = ioctl(s, SIOCGIFNETMASK, ifr);
- if ((res == 0)) {
+ if (res == 0) {
a = (struct sockaddr_in *)&ifr->ifr_addr;
myNetMasks[rxi_numNetAddrs] = ntohl(a->sin_addr.s_addr);
/* fprintf(stderr, "if %s subnetmask=0x%x\n",
afs_uint32 ppaddr;
u_short rxmtu;
int ix;
-#if defined(ADAPT_PMTU) && defined(IP_MTU)
+#ifdef AFS_ADAPT_PMTU
int sock;
struct sockaddr_in addr;
#endif
-
-
LOCK_IF_INIT;
if (!Inited) {
UNLOCK_IF_INIT;
UNLOCK_IF_INIT;
}
-#ifdef ADAPT_MTU
/* try to second-guess IP, and identify which link is most likely to
* be used for traffic to/from this host. */
ppaddr = ntohl(pp->host);
pp->ifMTU = 0;
- pp->timeout.sec = 2;
- pp->rateFlag = 2; /* start timing after two full packets */
+ rx_rto_setPeerTimeoutSecs(pp, 2);
/* I don't initialize these, because I presume they are bzero'd...
* pp->burstSize pp->burst pp->burstWait.sec pp->burstWait.usec
- * pp->timeout.usec */
+ */
LOCK_IF;
for (ix = 0; ix < rxi_numNetAddrs; ++ix) {
if ((rxi_NetAddrs[ix] & myNetMasks[ix]) == (ppaddr & myNetMasks[ix])) {
#ifdef IFF_POINTOPOINT
if (myNetFlags[ix] & IFF_POINTOPOINT)
- pp->timeout.sec = 4;
+ rx_rto_setPeerTimeoutSecs(pp, 4);
#endif /* IFF_POINTOPOINT */
+
rxmtu = myNetMTUs[ix] - RX_IPUDP_SIZE;
if (rxmtu < RX_MIN_PACKET_SIZE)
rxmtu = RX_MIN_PACKET_SIZE;
}
UNLOCK_IF;
if (!pp->ifMTU) { /* not local */
- pp->timeout.sec = 3;
+ rx_rto_setPeerTimeoutSecs(pp, 3);
pp->ifMTU = MIN(rx_MyMaxSendSize, RX_REMOTE_PACKET_SIZE);
}
-#else /* ADAPT_MTU */
- pp->rateFlag = 2; /* start timing after two full packets */
- pp->timeout.sec = 2;
- pp->ifMTU = MIN(rx_MyMaxSendSize, OLD_MAX_PACKET_SIZE);
-#endif /* ADAPT_MTU */
-#if defined(ADAPT_PMTU) && defined(IP_MTU)
+#ifdef AFS_ADAPT_PMTU
sock=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
- if (sock >= 0) {
- addr.sin_family = AF_INET;
- addr.sin_addr.s_addr = pp->host;
- addr.sin_port = pp->port;
- if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0) {
- int mtu=0;
- socklen_t s = sizeof(mtu);
- if (getsockopt(sock, SOL_IP, IP_MTU, &mtu, &s)== 0) {
- pp->ifMTU = MIN(mtu - RX_IPUDP_SIZE, pp->ifMTU);
- }
- }
- close(sock);
+ if (sock != OSI_NULLSOCKET) {
+ addr.sin_family = AF_INET;
+ addr.sin_addr.s_addr = pp->host;
+ addr.sin_port = pp->port;
+ memset(&addr.sin_zero, 0, sizeof(addr.sin_zero));
+ if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0) {
+ int mtu=0;
+ socklen_t s = sizeof(mtu);
+ if (getsockopt(sock, SOL_IP, IP_MTU, &mtu, &s)== 0) {
+ pp->ifMTU = MIN(mtu - RX_IPUDP_SIZE, pp->ifMTU);
+ }
+ }
+# ifdef AFS_NT40_ENV
+ closesocket(sock);
+# else
+ close(sock);
+# endif
}
#endif
pp->ifMTU = rxi_AdjustIfMTU(pp->ifMTU);
/* Override max MTU. If rx_SetNoJumbo is called, it must be
called before calling rx_SetMaxMTU since SetNoJumbo clobbers rx_maxReceiveSize */
-void
+int
rx_SetMaxMTU(int mtu)
{
+ if (mtu < RX_MIN_PACKET_SIZE || mtu > RX_MAX_PACKET_DATA_SIZE)
+ return EINVAL;
+
rx_MyMaxSendSize = rx_maxReceiveSizeUser = rx_maxReceiveSize = mtu;
+
+ return 0;
}
-#if defined(ADAPT_PMTU)
+#ifdef AFS_RXERRQ_ENV
int
rxi_HandleSocketError(int socket)
{
- int ret=0;
-#if defined(HAVE_LINUX_ERRQUEUE_H)
struct msghdr msg;
struct cmsghdr *cmsg;
struct sock_extended_err *err;
code = recvmsg(socket, &msg, MSG_ERRQUEUE|MSG_DONTWAIT|MSG_TRUNC);
if (code < 0 || !(msg.msg_flags & MSG_ERRQUEUE))
- goto out;
+ return 0;
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
- if ((char *)cmsg - controlmsgbuf > msg.msg_controllen - CMSG_SPACE(0) ||
- (char *)cmsg - controlmsgbuf > msg.msg_controllen - CMSG_SPACE(cmsg->cmsg_len) ||
- cmsg->cmsg_len == 0) {
- cmsg = 0;
- break;
+ if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_RECVERR) {
+ err = (struct sock_extended_err *)CMSG_DATA(cmsg);
+ rxi_ProcessNetError(err, addr.sin_addr.s_addr, addr.sin_port);
}
- if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_RECVERR)
- break;
- }
- if (!cmsg)
- goto out;
- ret=1;
- err =(struct sock_extended_err *) CMSG_DATA(cmsg);
-
- if (err->ee_errno == EMSGSIZE && err->ee_info >= 68) {
- rxi_SetPeerMtu(NULL, addr.sin_addr.s_addr, addr.sin_port,
- err->ee_info - RX_IPUDP_SIZE);
}
- /* other DEST_UNREACH's and TIME_EXCEEDED should be dealt with too */
-out:
-#endif
- return ret;
+ return 1;
}
#endif
git://git.openafs.org / openafs.git / blobdiff