rxi_AbortIfServerBusy(osi_socket socket, struct rx_connection *conn,
struct rx_packet *np)
{
+ afs_uint32 serial;
+
if ((rx_BusyThreshold > 0) &&
(rx_atomic_read(&rx_nWaiting) > rx_BusyThreshold)) {
+ MUTEX_ENTER(&conn->conn_data_lock);
+ serial = ++conn->serial;
+ MUTEX_EXIT(&conn->conn_data_lock);
rxi_SendRawAbort(socket, conn->peer->host, conn->peer->port,
- rx_BusyError, np, 0);
+ serial, rx_BusyError, np, 0);
if (rx_stats_active)
rx_atomic_inc(&rx_stats.nBusies);
return 1;
memset(&addr.sin_zero, 0, sizeof(addr.sin_zero));
#ifdef STRUCT_SOCKADDR_HAS_SA_LEN
addr.sin_len = sizeof(addr);
-#endif /* AFS_OSF_ENV */
+#endif
drop = (*rx_justReceived) (np, &addr);
/* drop packet if return value is non-zero */
if (drop)
don't abort an abort. */
if (!conn) {
if (unknownService && (np->header.type != RX_PACKET_TYPE_ABORT))
- rxi_SendRawAbort(socket, host, port, RX_INVALID_OPERATION,
+ rxi_SendRawAbort(socket, host, port, 0, RX_INVALID_OPERATION,
np, 0);
return np;
}
rx_packetread(np, rx_AckDataSize(ap->nAcks) + (int)sizeof(afs_int32),
(int)sizeof(afs_int32), &tSize);
tSize = (afs_uint32) ntohl(tSize);
+ if (tSize > RX_MAX_PACKET_SIZE)
+ tSize = RX_MAX_PACKET_SIZE;
+ if (tSize < RX_MIN_PACKET_SIZE)
+ tSize = RX_MIN_PACKET_SIZE;
peer->natMTU = rxi_AdjustIfMTU(MIN(tSize, peer->ifMTU));
/* Get the maximum packet size to send to this peer */
rx_packetread(np, rx_AckDataSize(ap->nAcks), (int)sizeof(afs_int32),
&tSize);
tSize = (afs_uint32) ntohl(tSize);
+ if (tSize > RX_MAX_PACKET_SIZE)
+ tSize = RX_MAX_PACKET_SIZE;
+ if (tSize < RX_MIN_PACKET_SIZE)
+ tSize = RX_MIN_PACKET_SIZE;
tSize = (afs_uint32) MIN(tSize, rx_MyMaxSendSize);
tSize = rxi_AdjustMaxMTU(peer->natMTU, tSize);
rx_AckDataSize(ap->nAcks) + 2 * (int)sizeof(afs_int32),
(int)sizeof(afs_int32), &tSize);
tSize = (afs_uint32) ntohl(tSize); /* peer's receive window, if it's */
+ if (tSize == 0)
+ tSize = 1;
+ if (tSize >= rx_maxSendWindow)
+ tSize = rx_maxSendWindow;
if (tSize < call->twind) { /* smaller than our send */
call->twind = tSize; /* window, we must send less... */
call->ssthresh = MIN(call->twind, call->ssthresh);
rx_AckDataSize(ap->nAcks) + 2 * (int)sizeof(afs_int32),
sizeof(afs_int32), &tSize);
tSize = (afs_uint32) ntohl(tSize);
+ if (tSize == 0)
+ tSize = 1;
+ if (tSize >= rx_maxSendWindow)
+ tSize = rx_maxSendWindow;
/*
* As of AFS 3.5 we set the send window to match the receive window.
*/
if (rx_IsClientConn(call->conn))
force = 1;
- if (call->abortCode != call->error) {
+ /*
+ * An opcode that has been deprecated or has yet to be implemented is not
+ * a misbehavior of the client. Do not punish the client by introducing
+ * delays.
+ */
+ if (call->error == RXGEN_OPCODE) {
+ force = 1;
+ } else if (call->abortCode != call->error) {
call->abortCode = call->error;
call->abortCount = 0;
}
|| call->abortCount < rxi_callAbortThreshhold) {
rxi_CancelDelayedAbortEvent(call);
error = htonl(call->error);
- call->abortCount++;
+ if (!force)
+ call->abortCount++;
packet =
rxi_SendSpecial(call, call->conn, packet, RX_PACKET_TYPE_ABORT,
(char *)&error, sizeof(error), istack);
*
* This routine is both an event handler and a function called directly;
* when called directly the passed |event| is NULL and the
- * conn->conn->data>lock must must not be held.
+ * conn->conn->data>lock must must not be held. Also, when called as an
+ * an event handler, we must putConnection before we exit; but when called
+ * directly (the first challenge), we must NOT putConnection.
*/
static void
rxi_ChallengeEvent(struct rxevent *event,
void *arg0, void *arg1, int tries)
{
struct rx_connection *conn = arg0;
+ int event_raised = 0; /* assume we were called directly */
MUTEX_ENTER(&conn->conn_data_lock);
- if (event != NULL && event == conn->challengeEvent)
+ if (event != NULL && event == conn->challengeEvent) {
+ event_raised = 1; /* called as an event */
rxevent_Put(&conn->challengeEvent);
+ }
MUTEX_EXIT(&conn->conn_data_lock);
/* If there are no active calls it is not worth re-issuing the
* challenge. If the client issues another call on this connection
* the challenge can be requested at that time.
*/
- if (!rxi_HasActiveCalls(conn)) {
- putConnection(conn);
- return;
- }
+ if (!rxi_HasActiveCalls(conn))
+ goto done;
if (RXS_CheckAuthentication(conn->securityObject, conn) != 0) {
struct rx_packet *packet;
}
}
MUTEX_EXIT(&conn->conn_call_lock);
- putConnection(conn);
- return;
+ goto done;
}
packet = rxi_AllocPacket(RX_PACKET_CLASS_SPECIAL);
}
MUTEX_EXIT(&conn->conn_data_lock);
}
- putConnection(conn);
+ done:
+ if (event_raised)
+ putConnection(conn);
}
/* Call this routine to start requesting the client to authenticate
git://git.openafs.org / openafs.git / blobdiff