#include "h/types.h"
#include "h/time.h"
#include "h/stat.h"
+#if defined(AFS_AIX_ENV) || defined(AFS_AUX_ENV) || defined(AFS_SUN5_ENV)
+#include "h/systm.h"
+#endif
#ifdef AFS_OSF_ENV
#include <net/net_globals.h>
#endif /* AFS_OSF_ENV */
#include "rx/rx_kernel.h"
#include "rx/rx_clock.h"
#include "rx/rx_queue.h"
+#include "rx/rx_internal.h"
#include "rx/rx.h"
#include "rx/rx_globals.h"
#include "afs/lock.h"
#endif /* AFS_OSF_ENV */
#else /* KERNEL */
# include <sys/types.h>
-#ifndef AFS_NT40_ENV
+#ifdef AFS_NT40_ENV
+# include <winsock2.h>
+#else /* !AFS_NT40_ENV */
# include <sys/socket.h>
# include <sys/file.h>
# include <netdb.h>
# include <netinet/in.h>
# include <sys/stat.h>
# include <sys/time.h>
-#endif
-#ifdef HAVE_STRING_H
+#endif /* !AFS_NT40_ENV */
#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
# include "rx_user.h"
# include "rx_clock.h"
# include "rx_queue.h"
+# include "rx_internal.h"
# include "rx.h"
# include "rx_globals.h"
#endif /* KERNEL */
afs_int32 error;
register struct rx_connection *conn = call->conn;
queue_Remove(rp);
+ rp->flags &= ~RX_PKTFLAG_RQ;
/* RXS_CheckPacket called to undo RXS_PreparePacket's
* work. It may reduce the length of the packet by up
}
call->rnext++;
cp = call->currentPacket = rp;
+ call->currentPacket->flags |= RX_PKTFLAG_CP;
call->curvec = 1; /* 0th vec is always header */
/* begin at the beginning [ more or less ], continue
* on until the end, then stop. */
RX_CALL_REFCOUNT_DELAY);
rxi_SendAck(call, 0, 0, RX_ACK_DELAY, 0);
} else {
- struct clock when;
- clock_GetTime(&when);
+ struct clock when, now;
+ clock_GetTime(&now);
+ when = now;
/* Delay to consolidate ack packets */
clock_Add(&when, &rx_hardAckDelay);
if (!call->delayedAckEvent
RX_CALL_REFCOUNT_DELAY);
CALL_HOLD(call, RX_CALL_REFCOUNT_DELAY);
call->delayedAckEvent =
- rxevent_Post(&when,
+ rxevent_PostNow(&when, &now,
rxi_SendDelayedAck, call,
0);
}
if (!call->nLeft) {
/* out of packet. Get another one. */
+ call->currentPacket->flags &= ~RX_PKTFLAG_CP;
rxi_FreePacket(cp);
cp = call->currentPacket = (struct rx_packet *)0;
} else if (!call->curlen) {
if (++call->curvec >= cp->niovecs) {
/* current packet is exhausted, get ready for another */
/* don't worry about curvec and stuff, they get set somewhere else */
+ call->currentPacket->flags &= ~RX_PKTFLAG_CP;
rxi_FreePacket(cp);
cp = call->currentPacket = (struct rx_packet *)0;
call->nLeft = 0;
call->curpos = tcurpos + nbytes;
call->curlen = tcurlen - nbytes;
call->nLeft = tnLeft - nbytes;
+
+ if (!call->nLeft) {
+ /* out of packet. Get another one. */
+ NETPRI;
+ MUTEX_ENTER(&call->lock);
+ rxi_FreePacket(call->currentPacket);
+ call->currentPacket = (struct rx_packet *)0;
+ MUTEX_EXIT(&call->lock);
+ USERPRI;
+ }
return nbytes;
}
*/
tcurlen = call->curlen;
tnLeft = call->nLeft;
- if (!call->error && tcurlen > sizeof(afs_int32)
- && tnLeft > sizeof(afs_int32)) {
+ if (!call->error && tcurlen >= sizeof(afs_int32)
+ && tnLeft >= sizeof(afs_int32)) {
tcurpos = call->curpos;
- if (!((long)tcurpos & (sizeof(afs_int32) - 1))) {
- *value = *((afs_int32 *) (tcurpos));
- } else {
- memcpy((char *)value, tcurpos, sizeof(afs_int32));
- }
+ memcpy((char *)value, tcurpos, sizeof(afs_int32));
call->curpos = tcurpos + sizeof(afs_int32);
- call->curlen = tcurlen - sizeof(afs_int32);
- call->nLeft = tnLeft - sizeof(afs_int32);
+ call->curlen = (u_short)(tcurlen - sizeof(afs_int32));
+ call->nLeft = (u_short)(tnLeft - sizeof(afs_int32));
+ if (!call->nLeft && call->currentPacket != NULL) {
+ /* out of packet. Get another one. */
+ NETPRI;
+ MUTEX_ENTER(&call->lock);
+ rxi_FreePacket(call->currentPacket);
+ call->currentPacket = (struct rx_packet *)0;
+ MUTEX_EXIT(&call->lock);
+ USERPRI;
+ }
return sizeof(afs_int32);
}
afs_int32 error;
register struct rx_connection *conn = call->conn;
queue_Remove(rp);
+ rp->flags &= ~RX_PKTFLAG_RQ;
/* RXS_CheckPacket called to undo RXS_PreparePacket's
* work. It may reduce the length of the packet by up
}
call->rnext++;
curp = call->currentPacket = rp;
+ call->currentPacket->flags |= RX_PKTFLAG_CP;
call->curvec = 1; /* 0th vec is always header */
cur_iov = &curp->wirevec[1];
/* begin at the beginning [ more or less ], continue
if (!call->nLeft) {
/* out of packet. Get another one. */
+ curp->flags &= ~RX_PKTFLAG_CP;
+ curp->flags |= RX_PKTFLAG_IOVQ;
queue_Append(&call->iovq, curp);
curp = call->currentPacket = (struct rx_packet *)0;
} else if (!call->curlen) {
if (++call->curvec >= curp->niovecs) {
/* current packet is exhausted, get ready for another */
/* don't worry about curvec and stuff, they get set somewhere else */
+ curp->flags &= ~RX_PKTFLAG_CP;
+ curp->flags |= RX_PKTFLAG_IOVQ;
queue_Append(&call->iovq, curp);
curp = call->currentPacket = (struct rx_packet *)0;
call->nLeft = 0;
rxi_SendAck(call, 0, serial, RX_ACK_DELAY, 0);
didHardAck = 1;
} else {
- struct clock when;
- clock_GetTime(&when);
+ struct clock when, now;
+ clock_GetTime(&now);
+ when = now;
/* Delay to consolidate ack packets */
clock_Add(&when, &rx_hardAckDelay);
if (!call->delayedAckEvent
RX_CALL_REFCOUNT_DELAY);
CALL_HOLD(call, RX_CALL_REFCOUNT_DELAY);
call->delayedAckEvent =
- rxevent_Post(&when, rxi_SendDelayedAck, call, 0);
+ rxevent_PostNow(&when, &now, rxi_SendDelayedAck, call, 0);
}
}
}
rxi_ReadvProc(struct rx_call *call, struct iovec *iov, int *nio, int maxio,
int nbytes)
{
- struct rx_packet *rp;
int requestCount;
int nextio;
&& (call->mode == RX_MODE_RECEIVING)) {
call->mode = RX_MODE_SENDING;
if (cp) {
+ cp->flags &= ~RX_PKTFLAG_CP;
rxi_FreePacket(cp);
cp = call->currentPacket = (struct rx_packet *)0;
call->nLeft = 0;
do {
if (call->nFree == 0) {
if (!call->error && cp) {
+ /* Clear the current packet now so that if
+ * we are forced to wait and drop the lock
+ * the packet we are planning on using
+ * cannot be freed.
+ */
+ cp->flags &= ~RX_PKTFLAG_CP;
+ call->currentPacket = (struct rx_packet *)0;
#ifdef AFS_GLOBAL_RXLOCK_KERNEL
/* Wait until TQ_BUSY is reset before adding any
* packets to the transmit queue
* conn->securityMaxTrailerSize */
hadd32(call->bytesSent, cp->length);
rxi_PrepareSendPacket(call, cp, 0);
+ cp->flags |= RX_PKTFLAG_TQ;
queue_Append(&call->tq, cp);
- cp = call->currentPacket = NULL;
+ cp = (struct rx_packet *)0;
if (!
(call->
flags & (RX_CALL_FAST_RECOVER |
RX_CALL_FAST_RECOVER_WAIT))) {
rxi_Start(0, call, 0, 0);
}
+ } else if (cp) {
+ cp->flags &= ~RX_PKTFLAG_CP;
+ rxi_FreePacket(cp);
+ cp = call->currentPacket = (struct rx_packet *)0;
}
/* Wait for transmit window to open up */
while (!call->error
- && call->tnext + 1 > call->tfirst + call->twind) {
+ && call->tnext + 1 > call->tfirst + (2 * call->twind)) {
clock_NewTime();
call->startWait = clock_Sec();
#endif /* RX_ENABLE_LOCKS */
}
if ((cp = rxi_AllocSendPacket(call, nbytes))) {
+ cp->flags |= RX_PKTFLAG_CP;
call->currentPacket = cp;
call->nFree = cp->length;
call->curvec = 1; /* 0th vec is always header */
}
if (call->error) {
if (cp) {
+ cp->flags &= ~RX_PKTFLAG_CP;
rxi_FreePacket(cp);
call->currentPacket = NULL;
}
buf += t;
nbytes -= t;
call->curpos += t;
- call->curlen -= t;
- call->nFree -= t;
+ call->curlen -= (u_short)t;
+ call->nFree -= (u_short)t;
if (!call->curlen) {
/* need to get another struct iov */
tcurpos = call->curpos;
memcpy(tcurpos, buf, nbytes);
call->curpos = tcurpos + nbytes;
- call->curlen = tcurlen - nbytes;
- call->nFree = tnFree - nbytes;
+ call->curlen = (u_short)(tcurlen - nbytes);
+ call->nFree = (u_short)(tnFree - nbytes);
return nbytes;
}
*
* We are relying on nFree being zero unless the call is in send mode.
*/
- tcurlen = (int)call->curlen;
- tnFree = (int)call->nFree;
+ tcurlen = call->curlen;
+ tnFree = call->nFree;
if (!call->error && tcurlen >= sizeof(afs_int32)
&& tnFree >= sizeof(afs_int32)) {
tcurpos = call->curpos;
- if (!((long)tcurpos & (sizeof(afs_int32) - 1))) {
+ if (!((size_t)tcurpos & (sizeof(afs_int32) - 1))) {
*((afs_int32 *) (tcurpos)) = *value;
} else {
memcpy(tcurpos, (char *)value, sizeof(afs_int32));
}
call->curpos = tcurpos + sizeof(afs_int32);
- call->curlen = tcurlen - sizeof(afs_int32);
- call->nFree = tnFree - sizeof(afs_int32);
+ call->curlen = (u_short)(tcurlen - sizeof(afs_int32));
+ call->nFree = (u_short)(tnFree - sizeof(afs_int32));
return sizeof(afs_int32);
}
&& (call->mode == RX_MODE_RECEIVING)) {
call->mode = RX_MODE_SENDING;
if (cp) {
+ cp->flags &= ~RX_PKTFLAG_CP;
rxi_FreePacket(cp);
cp = call->currentPacket = (struct rx_packet *)0;
call->nLeft = 0;
*nio = nextio;
return requestCount - nbytes;
}
+ cp->flags |= RX_PKTFLAG_IOVQ;
queue_Append(&call->iovq, cp);
tnFree = cp->length;
tcurvec = 1;
if (call->error) {
if (cp) {
+ cp->flags &= ~RX_PKTFLAG_CP;
+ cp->flags |= RX_PKTFLAG_IOVQ;
queue_Prepend(&call->iovq, cp);
- cp = call->currentPacket = NULL;
+ cp = call->currentPacket = (struct rx_packet *)0;
}
rxi_FreePackets(0, &call->iovq);
return 0;
* conn->securityMaxTrailerSize */
hadd32(call->bytesSent, cp->length);
rxi_PrepareSendPacket(call, cp, 0);
+ cp->flags |= RX_PKTFLAG_TQ;
queue_Append(&tmpq, cp);
+ cp = call->currentPacket = (struct rx_packet *)0;
/* The head of the iovq is now the current packet */
if (nbytes) {
if (queue_IsEmpty(&call->iovq)) {
call->error = RX_PROTOCOL_ERROR;
- cp = call->currentPacket = NULL;
rxi_FreePackets(0, &tmpq);
return 0;
}
cp = queue_First(&call->iovq, rx_packet);
queue_Remove(cp);
+ cp->flags &= ~RX_PKTFLAG_IOVQ;
+ cp->flags |= RX_PKTFLAG_CP;
call->currentPacket = cp;
call->nFree = cp->length;
call->curvec = 1;
|| iov[nextio].iov_len > (int)call->curlen) {
call->error = RX_PROTOCOL_ERROR;
if (cp) {
+ cp->flags &= ~RX_PKTFLAG_CP;
queue_Prepend(&tmpq, cp);
- call->currentPacket = NULL;
+ cp = call->currentPacket = (struct rx_packet *)0;
}
rxi_FreePackets(0, &tmpq);
return 0;
}
/* Wait for the length of the transmit queue to fall below call->twind */
- while (!call->error && call->tnext + 1 > call->tfirst + call->twind) {
+ while (!call->error && call->tnext + 1 > call->tfirst + (2 * call->twind)) {
clock_NewTime();
call->startWait = clock_Sec();
#ifdef RX_ENABLE_LOCKS
if (call->error) {
if (cp) {
+ cp->flags &= ~RX_PKTFLAG_CP;
rxi_FreePacket(cp);
- cp = call->currentPacket = NULL;
+ cp = call->currentPacket = (struct rx_packet *)0;
}
return 0;
}
/* cp->length is only supposed to be the user's data */
/* cp->length was already set to (then-current)
* MaxUserDataSize or less. */
+ cp->flags &= ~RX_PKTFLAG_CP;
cp->length -= call->nFree;
call->currentPacket = (struct rx_packet *)0;
call->nFree = 0;
/* The 1 specifies that this is the last packet */
hadd32(call->bytesSent, cp->length);
rxi_PrepareSendPacket(call, cp, 1);
+ cp->flags |= RX_PKTFLAG_TQ;
queue_Append(&call->tq, cp);
if (!
(call->