rx-dpf-20060217

typo

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

conditionalize rx_intentionallyDroppedOnReadPer100

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 0f4defca3a12bec7ba9df7de4d25b88802d7c41c..206b58998808691b7a8e9d9ae99d32ae65207fdd 100644 (file)
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -2435,7 +2435,7 @@ rxi_ReceivePacket(register struct rx_packet *np, osi_socket socket,
     packetType = (np->header.type > 0 && np->header.type < RX_N_PACKET_TYPES)
        ? rx_packetTypes[np->header.type - 1] : "*UNKNOWN*";
     dpf(("R %d %s: %x.%d.%d.%d.%d.%d.%d flags %d, packet %x",
-        np->header.serial, packetType, ntohl(host), htohs(port), np->header.serviceId,
+        np->header.serial, packetType, ntohl(host), ntohs(port), np->header.serviceId,
         np->header.epoch, np->header.cid, np->header.callNumber,
         np->header.seq, np->header.flags, np));
 #endif

diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index ec2436b892d56611239c62b0ee9b50f0b2d6d55c..0af351b52ead39ac4de5f10f20cecb2bcc0c0f4c 100644 (file)
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -1409,7 +1409,9 @@ rxi_ReadPacket(osi_socket socket, register struct rx_packet *p, afs_uint32 * hos
                 ntohs(from.sin_port), nbytes));
        }
        return 0;
-    } else if ((rx_intentionallyDroppedOnReadPer100 > 0)
+    } 
+#ifdef RXDEBUG
+    else if ((rx_intentionallyDroppedOnReadPer100 > 0)
                && (random() % 100 < rx_intentionallyDroppedOnReadPer100)) {
        rxi_DecodePacketHeader(p);
 
@@ -1422,7 +1424,9 @@ rxi_ReadPacket(osi_socket socket, register struct rx_packet *p, afs_uint32 * hos
              p->length));
        rxi_TrimDataBufs(p, 1);
        return 0;
-    } else {
+    } 
+#endif
+    else {
        /* Extract packet header. */
        rxi_DecodePacketHeader(p);