EDK II

Revision: 12901
          http://edk2.svn.sourceforge.net/edk2/?rev=12901&view=rev
Author:   oliviermartin
Date:     2011-12-29 12:16:02 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
BeagleBoard: Allow to overwrite the default toolchain

Each OS has its own default EDK2 toolchain. This change allows to overwrite
this default option.
Example: On Linux the default toolchain is ARMLINUXGCC, this command line can overwrite it:
TARGET_TOOLS=ARMGCC ./build.sh

Modified Paths:
--------------
    trunk/edk2/BeagleBoardPkg/build.sh

Modified: trunk/edk2/BeagleBoardPkg/build.sh
===================================================================
--- trunk/edk2/BeagleBoardPkg/build.sh	2011-12-29 12:15:08 UTC (rev 12900)
+++ trunk/edk2/BeagleBoardPkg/build.sh	2011-12-29 12:16:02 UTC (rev 12901)
@@ -51,20 +51,22 @@
 fi
 
 #
-# Pick a default tool type for a given OS
+# Pick a default tool type for a given OS if no toolchain already defined
 #
-case `uname` in
-  CYGWIN*) 
+if [ -z "$TARGET_TOOLS" ]
+then
+  case `uname` in
+    CYGWIN*) 
       TARGET_TOOLS=RVCT31CYGWIN 
       ;;
-  Linux*)  
+    Linux*)  
       if [[ ! -z `locate arm-linux-gnueabi-gcc` ]]; then
         TARGET_TOOLS=ARMLINUXGCC
       else 
         TARGET_TOOLS=ARMGCC 
       fi
       ;;
-  Darwin*) 
+    Darwin*) 
       Major=$(uname -r | cut -f 1 -d '.')
       if [[ $Major == 9 ]]
       then
@@ -74,7 +76,8 @@
         TARGET_TOOLS=XCODE32
       fi  
       ;;
-esac
+  esac
+fi
 
 TARGET=DEBUG
 for arg in "$@"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12900
          http://edk2.svn.sourceforge.net/edk2/?rev=12900&view=rev
Author:   oliviermartin
Date:     2011-12-29 12:15:08 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
EmbeddedPkg/PrePiLib: Ensure FvImageInfo has been initialized to zero

Signed-off-by: lgao4
Reviewed-by: oliviermartin

Modified Paths:
--------------
    trunk/edk2/EmbeddedPkg/Library/PrePiLib/FwVol.c

Modified: trunk/edk2/EmbeddedPkg/Library/PrePiLib/FwVol.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Library/PrePiLib/FwVol.c	2011-12-29 02:08:18 UTC (rev 12899)
+++ trunk/edk2/EmbeddedPkg/Library/PrePiLib/FwVol.c	2011-12-29 12:15:08 UTC (rev 12900)
@@ -792,6 +792,7 @@
   //
   // Collect FvImage Info.
   //
+  ZeroMem (&FvImageInfo, sizeof (FvImageInfo));
   Status = FfsGetVolumeInfo (FvImageHandle, &FvImageInfo);
   ASSERT_EFI_ERROR (Status);
   

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12899
          http://edk2.svn.sourceforge.net/edk2/?rev=12899&view=rev
Author:   lpleahy
Date:     2011-12-29 02:08:18 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
Update to support Tcp6 sockets.
Fixed average display.

For Tcp6 sink, use command:
 DataSink  6

Modified Paths:
--------------
    branches/SocketDev/AppPkg/Applications/Sockets/DataSink/DataSink.c
    branches/SocketDev/AppPkg/Applications/Sockets/DataSource/DataSource.c

Modified: branches/SocketDev/AppPkg/Applications/Sockets/DataSink/DataSink.c
===================================================================
--- branches/SocketDev/AppPkg/Applications/Sockets/DataSink/DataSink.c	2011-12-28 09:48:15 UTC (rev 12898)
+++ branches/SocketDev/AppPkg/Applications/Sockets/DataSink/DataSink.c	2011-12-29 02:08:18 UTC (rev 12899)
@@ -28,10 +28,12 @@
 #include <sys/socket.h>
 
 
-#define MAX_CONNECTIONS       ( 1 + 16 )  ///<  Maximum number of client connections
-#define RANGE_SWITCH                2048  ///<  Switch display ranges
-#define DATA_RATE_UPDATE_SHIFT      2     ///<  2n seconds between updates
+#define DATA_SAMPLE_SHIFT           5       ///<  Shift for number of samples
+#define MAX_CONNECTIONS       ( 1 + 16 )    ///<  Maximum number of client connections
+#define RANGE_SWITCH        ( 1024 * 1024 ) ///<  Switch display ranges
+#define DATA_RATE_UPDATE_SHIFT      2       ///<  2n seconds between updates
 #define AVERAGE_SHIFT_COUNT ( 6 - DATA_RATE_UPDATE_SHIFT )  ///<  2n samples in average
+#define DATA_SAMPLES        ( 1 << DATA_SAMPLE_SHIFT )      ///<  Number of samples
 
 #define TPL_DATASINK        TPL_CALLBACK  ///<  Synchronization TPL
 
@@ -39,16 +41,16 @@
 #define DATA_BUFFER_SIZE    (( 65536 / PACKET_SIZE ) * PACKET_SIZE )  ///<  Buffer size in bytes
 
 typedef struct _DT_PORT {
-  UINT64 BytesAverage;
-  UINT64 BytesPrevious;
   UINT64 BytesTotal;
-  struct sockaddr_in RemoteAddress;
-  UINT64 Samples;
+  struct sockaddr_in6 IpAddress;
+  UINT32 In;
+  UINT32 Samples;
+  UINT64 BytesReceived[ DATA_SAMPLES ];
 } DT_PORT;
 
 volatile BOOLEAN bTick;
 BOOLEAN bTimerRunning;
-struct sockaddr_in LocalAddress;
+struct sockaddr_in6 LocalAddress;
 EFI_EVENT pTimer;
 int ListenSocket;
 UINT8 Buffer[ DATA_BUFFER_SIZE ];
@@ -120,7 +122,7 @@
   //
   SocketStatus = bind ( ListenSocket,
                         (struct sockaddr *) &LocalAddress,
-                        LocalAddress.sin_len );
+                        LocalAddress.sin6_len );
   if ( 0 == SocketStatus ) {
     //
     //  Start listening on the local socket
@@ -139,14 +141,7 @@
       PollFd[ Index ].fd = ListenSocket;
       PollFd[ Index ].events = POLLRDNORM | POLLHUP;
       PollFd[ Index ].revents = 0;
-      Port[ Index ].BytesAverage = 0;
-      Port[ Index ].BytesPrevious = 0;
-      Port[ Index ].BytesTotal = 0;
-      Port[ Index ].Samples = 0;
-      Port[ Index ].RemoteAddress.sin_len = 0;
-      Port[ Index ].RemoteAddress.sin_family = 0;
-      Port[ Index ].RemoteAddress.sin_port = 0;
-      Port[ Index ].RemoteAddress.sin_addr.s_addr= 0;
+      ZeroMem ( &Port[ Index ], sizeof ( Port[ Index ]));
     }
   }
 
@@ -203,11 +198,14 @@
 /**
   Create the socket
 
+  @param [in] Family    Network family, AF_INET or AF_INET6
+
   @retval  EFI_SUCCESS  The application is running normally
   @retval  Other        The user stopped the application
 **/
 EFI_STATUS
 SocketNew (
+  sa_family_t Family
   )
 {
   EFI_STATUS Status;
@@ -216,9 +214,9 @@
   //  Get the port number
   //
   ZeroMem ( &LocalAddress, sizeof ( LocalAddress ));
-  LocalAddress.sin_len = sizeof ( LocalAddress );
-  LocalAddress.sin_family = AF_INET;
-  LocalAddress.sin_port = htons ( PcdGet16 ( DataSource_Port ));
+  LocalAddress.sin6_len = sizeof ( LocalAddress );
+  LocalAddress.sin6_family = Family;
+  LocalAddress.sin6_port = htons ( PcdGet16 ( DataSource_Port ));
   
   //
   //  Loop creating the socket
@@ -234,7 +232,7 @@
     //
     //  Attempt to create the socket
     //
-    ListenSocket = socket ( AF_INET,
+    ListenSocket = socket ( LocalAddress.sin6_family,
                             SOCK_STREAM,
                             IPPROTO_TCP );
     if ( -1 != ListenSocket ) {
@@ -274,7 +272,11 @@
   int FdCount;
   nfds_t Index;
   socklen_t LengthInBytes;
-  struct sockaddr_in RemoteAddress;
+  struct sockaddr_in * pPortIpAddress4;
+  struct sockaddr_in6 * pPortIpAddress6;
+  struct sockaddr_in * pRemoteAddress4;
+  struct sockaddr_in6 * pRemoteAddress6;
+  struct sockaddr_in6 RemoteAddress;
   int Socket;
   EFI_STATUS Status;
   EFI_TPL TplPrevious;
@@ -282,6 +284,8 @@
   //
   //  Check for control-C
   //
+  pRemoteAddress4 = (struct sockaddr_in *)&RemoteAddress;
+  pRemoteAddress6 = (struct sockaddr_in6 *)&RemoteAddress;
   bListenError = FALSE;
   Status = ControlCCheck ( );
   if ( !EFI_ERROR ( Status )) {
@@ -311,6 +315,8 @@
         //
         //  Account for this descriptor
         //
+        pPortIpAddress4 = (struct sockaddr_in *)&Port[ Index ].IpAddress;
+        pPortIpAddress6 = (struct sockaddr_in6 *)&Port[ Index ].IpAddress;
         if ( 0 != PollFd[ Index ].revents ) {
           FdCount -= 1;
         }
@@ -327,14 +333,38 @@
                       errno ));
           }
           else {
-            DEBUG (( DEBUG_ERROR,
-                      "ERROR - Network closed on socket %d.%d.%d.%d:%d, errno: %d\r\n",
-                      Port[ Index ].RemoteAddress.sin_addr.s_addr & 0xff,
-                      ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 8 ) & 0xff,
-                      ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 16 ) & 0xff,
-                      ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 24 ) & 0xff,
-                      htons ( Port[ Index ].RemoteAddress.sin_port ),
-                      errno ));
+            if ( AF_INET == pPortIpAddress4->sin_family ) {
+              DEBUG (( DEBUG_ERROR,
+                        "ERROR - Network closed on socket %d.%d.%d.%d:%d, errno: %d\r\n",
+                        pPortIpAddress4->sin_addr.s_addr & 0xff,
+                        ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
+                        ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
+                        ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
+                        htons ( pPortIpAddress4->sin_port ),
+                        errno ));
+            }
+            else {
+              DEBUG (( DEBUG_ERROR,
+                        "ERROR - Network closed on socket [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d, errno: %d\r\n",
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 0 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 1 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 2 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 3 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 4 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 5 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 6 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 7 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 8 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 9 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 10 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 11 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 12 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
+                        pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
+                        htons ( pPortIpAddress6->sin6_port ),
+                        errno ));
+            }
 
             //
             //  Close the socket
@@ -342,25 +372,74 @@
             CloseStatus = close ( PollFd[ Index ].fd );
             if ( 0 == CloseStatus ) {
               bRemoveSocket = TRUE;
-              DEBUG (( DEBUG_INFO,
-                        "0x%08x: Socket closed for %d.%d.%d.%d:%d\r\n",
-                        PollFd[ Index ].fd,
-                        Port[ Index ].RemoteAddress.sin_addr.s_addr & 0xff,
-                        ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 8 ) & 0xff,
-                        ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 16 ) & 0xff,
-                        ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 24 ) & 0xff,
-                        htons ( Port[ Index ].RemoteAddress.sin_port )));
+              if ( AF_INET == pPortIpAddress4->sin_family ) {
+                DEBUG (( DEBUG_INFO,
+                          "0x%08x: Socket closed for %d.%d.%d.%d:%d\r\n",
+                          PollFd[ Index ].fd,
+                          pPortIpAddress4->sin_addr.s_addr & 0xff,
+                          ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
+                          ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
+                          ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
+                          htons ( pPortIpAddress4->sin_port )));
+              }
+              else {
+                DEBUG (( DEBUG_INFO,
+                          "0x%08x: Socket closed for [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d\r\n",
+                          PollFd[ Index ].fd,
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 0 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 1 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 2 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 3 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 4 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 5 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 6 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 7 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 8 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 9 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 10 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 11 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 12 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
+                          htons ( pPortIpAddress6->sin6_port )));
+              }
             }
             else {
-              DEBUG (( DEBUG_ERROR,
-                        "ERROR - Failed to close socket 0x%08x for %d.%d.%d.%d:%d, errno: %d\r\n",
-                        PollFd[ Index ].fd,
-                        Port[ Index ].RemoteAddress.sin_addr.s_addr & 0xff,
-                        ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 8 ) & 0xff,
-                        ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 16 ) & 0xff,
-                        ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 24 ) & 0xff,
-                        htons ( Port[ Index ].RemoteAddress.sin_port ),
-                        errno ));
+              if ( AF_INET == pPortIpAddress4->sin_family ) {
+                DEBUG (( DEBUG_ERROR,
+                          "ERROR - Failed to close socket 0x%08x for %d.%d.%d.%d:%d, errno: %d\r\n",
+                          PollFd[ Index ].fd,
+                          pPortIpAddress4->sin_addr.s_addr & 0xff,
+                          ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
+                          ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
+                          ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
+                          htons ( pPortIpAddress4->sin_port ),
+                          errno ));
+              }
+              else {
+                DEBUG (( DEBUG_ERROR,
+                          "ERROR - Failed to close socket 0x%08x for [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d, errno: %d\r\n",
+                          PollFd[ Index ].fd,
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 0 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 1 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 2 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 3 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 4 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 5 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 6 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 7 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 8 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 9 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 10 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 11 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 12 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
+                          htons ( pPortIpAddress6->sin6_port ),
+                          errno ));
+              }
             }
           }
         }
@@ -399,12 +478,34 @@
                 //
                 //  Display the connection
                 //
-                Print ( L"Rejecting connection to remote system %d.%d.%d.%d:%d\r\n",
-                        RemoteAddress.sin_addr.s_addr & 0xff,
-                        ( RemoteAddress.sin_addr.s_addr >> 8 ) & 0xff,
-                        ( RemoteAddress.sin_addr.s_addr >> 16 ) & 0xff,
-                        ( RemoteAddress.sin_addr.s_addr >> 24 ) & 0xff,
-                        htons ( RemoteAddress.sin_port ));
+                if ( AF_INET == pRemoteAddress4->sin_family ) {
+                  Print ( L"Rejecting connection to remote system %d.%d.%d.%d:%d\r\n",
+                          pRemoteAddress4->sin_addr.s_addr & 0xff,
+                          ( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff,
+                          ( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff,
+                          ( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff,
+                          htons ( pRemoteAddress4->sin_port ));
+                }
+                else {
+                  Print ( L"Rejecting connection to remote system [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d\r\n",
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 0 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 1 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 2 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 3 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 4 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 5 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 6 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 7 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 8 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 9 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 10 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 11 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 12 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
+                          htons ( pRemoteAddress6->sin6_port ));
+                }
 
                 //
                 //  No room for this connection
@@ -413,14 +514,38 @@
                 CloseStatus = close ( Socket );
                 if ( 0 == CloseStatus ) {
                   bRemoveSocket = TRUE;
-                  DEBUG (( DEBUG_INFO,
-                            "0x%08x: Socket closed for %d.%d.%d.%d:%d\r\n",
-                            PollFd[ Index ].fd,
-                            RemoteAddress.sin_addr.s_addr & 0xff,
-                            ( RemoteAddress.sin_addr.s_addr >> 8 ) & 0xff,
-                            ( RemoteAddress.sin_addr.s_addr >> 16 ) & 0xff,
-                            ( RemoteAddress.sin_addr.s_addr >> 24 ) & 0xff,
-                            htons ( RemoteAddress.sin_port )));
+                  if ( AF_INET == pRemoteAddress4->sin_family ) {
+                    DEBUG (( DEBUG_INFO,
+                              "0x%08x: Socket closed for %d.%d.%d.%d:%d\r\n",
+                              PollFd[ Index ].fd,
+                              pRemoteAddress4->sin_addr.s_addr & 0xff,
+                              ( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff,
+                              ( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff,
+                              ( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff,
+                              htons ( pRemoteAddress4->sin_port )));
+                  }
+                  else {
+                    DEBUG (( DEBUG_INFO,
+                              "0x%08x: Socket closed for [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d\r\n",
+                              PollFd[ Index ].fd,
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 0 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 1 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 2 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 3 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 4 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 5 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 6 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 7 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 8 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 9 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 10 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 11 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 12 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
+                              pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
+                              htons ( pRemoteAddress6->sin6_port )));
+                  }
                 }
                 else {
                   DEBUG (( DEBUG_ERROR,
@@ -439,25 +564,41 @@
                 //
                 //  Display the connection
                 //
-                Print ( L"Connected to remote system %d.%d.%d.%d:%d\r\n",
-                        RemoteAddress.sin_addr.s_addr & 0xff,
-                        ( RemoteAddress.sin_addr.s_addr >> 8 ) & 0xff,
-                        ( RemoteAddress.sin_addr.s_addr >> 16 ) & 0xff,
-                        ( RemoteAddress.sin_addr.s_addr >> 24 ) & 0xff,
-                        htons ( RemoteAddress.sin_port ));
+                if ( AF_INET == pRemoteAddress4->sin_family ) {
+                  Print ( L"Connected to remote system %d.%d.%d.%d:%d\r\n",
+                          pRemoteAddress4->sin_addr.s_addr & 0xff,
+                          ( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff,
+                          ( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff,
+                          ( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff,
+                          htons ( pRemoteAddress4->sin_port ));
+                }
+                else {
+                  Print ( L"Connected to remote system [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d\r\n",
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 0 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 1 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 2 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 3 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 4 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 5 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 6 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 7 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 8 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 9 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 10 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 11 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 12 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
+                          pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
+                          htons ( pRemoteAddress6->sin6_port ));
+                }
 
                 //
                 //  Allocate the client connection
                 //
                 Index = MaxPort++;
-                Port[ Index ].BytesAverage = 0;
-                Port[ Index ].BytesPrevious = 0;
-                Port[ Index ].BytesTotal = 0;
-                Port[ Index ].Samples = 0;
-                Port[ Index ].RemoteAddress.sin_len = RemoteAddress.sin_len;
-                Port[ Index ].RemoteAddress.sin_family = RemoteAddress.sin_family;
-                Port[ Index ].RemoteAddress.sin_port = RemoteAddress.sin_port;
-                Port[ Index ].RemoteAddress.sin_addr = RemoteAddress.sin_addr;
+                ZeroMem ( &Port[ Index ], sizeof ( Port[ Index ]));
+                CopyMem ( pPortIpAddress6, pRemoteAddress6, sizeof ( *pRemoteAddress6 ));
                 PollFd[ Index ].fd = Socket;
                 PollFd[ Index ].events = POLLRDNORM | POLLHUP;
                 PollFd[ Index ].revents = 0;
@@ -475,15 +616,40 @@
               //
               //  Display the amount of data received
               //
-              DEBUG (( DEBUG_INFO,
-                        "0x%08x: Socket received 0x%08x bytes from %d.%d.%d.%d:%d\r\n",
-                        PollFd[ Index ].fd,
-                        BytesReceived,
-                        Port[ Index ].RemoteAddress.sin_addr.s_addr & 0xff,
-                        ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 8 ) & 0xff,
-                        ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 16 ) & 0xff,
-                        ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 24 ) & 0xff,
-                        htons ( Port[ Index ].RemoteAddress.sin_port )));
+              if ( AF_INET == pPortIpAddress4->sin_family ) {
+                DEBUG (( DEBUG_INFO,
+                          "0x%08x: Socket received 0x%08x bytes from %d.%d.%d.%d:%d\r\n",
+                          PollFd[ Index ].fd,
+                          BytesReceived,
+                          pPortIpAddress4->sin_addr.s_addr & 0xff,
+                          ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
+                          ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
+                          ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
+                          htons ( pPortIpAddress4->sin_port )));
+              }
+              else {
+                DEBUG (( DEBUG_INFO,
+                          "0x%08x: Socket received 0x%08x bytes from [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d\r\n",
+                          PollFd[ Index ].fd,
+                          BytesReceived,
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 0 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 1 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 2 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 3 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 4 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 5 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 6 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 7 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 8 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 9 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 10 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 11 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 12 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
+                          htons ( pPortIpAddress6->sin6_port )));
+              }
 
               //
               //  Synchronize with the TimerCallback routine
@@ -504,36 +670,109 @@
               //
               //  Close the socket
               //
-              DEBUG (( DEBUG_INFO,
-                        "ERROR - Receive failure for %d.%d.%d.%d:%d, errno: %d\r\n",
-                        Port[ Index ].RemoteAddress.sin_addr.s_addr & 0xff,
-                        ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 8 ) & 0xff,
-                        ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 16 ) & 0xff,
-                        ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 24 ) & 0xff,
-                        htons ( Port[ Index ].RemoteAddress.sin_port ),
-                        errno ));
+              if ( AF_INET == pPortIpAddress4->sin_family ) {
+                DEBUG (( DEBUG_INFO,
+                          "ERROR - Receive failure for %d.%d.%d.%d:%d, errno: %d\r\n",
+                          pPortIpAddress4->sin_addr.s_addr & 0xff,
+                          ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
+                          ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
+                          ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
+                          htons ( pPortIpAddress4->sin_port ),
+                          errno ));
+              }
+              else {
+                DEBUG (( DEBUG_INFO,
+                          "ERROR - Receive failure for [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d, errno: %d\r\n",
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 0 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 1 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 2 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 3 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 4 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 5 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 6 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 7 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 8 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 9 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 10 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 11 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 12 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
+                          pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
+                          htons ( pPortIpAddress6->sin6_port ),
+                          errno ));
+              }
               CloseStatus = close ( PollFd[ Index ].fd );
               if ( 0 == CloseStatus ) {
                 bRemoveSocket = TRUE;
-                DEBUG (( DEBUG_INFO,
-                          "0x%08x: Socket closed for %d.%d.%d.%d:%d\r\n",
-                          PollFd[ Index ].fd,
-                          Port[ Index ].RemoteAddress.sin_addr.s_addr & 0xff,
-                          ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 8 ) & 0xff,
-                          ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 16 ) & 0xff,
-                          ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 24 ) & 0xff,
-                          htons ( Port[ Index ].RemoteAddress.sin_port )));
+                if ( AF_INET == pPortIpAddress4->sin_family ) {
+                  DEBUG (( DEBUG_INFO,
+                            "0x%08x: Socket closed for %d.%d.%d.%d:%d\r\n",
+                            PollFd[ Index ].fd,
+                            pPortIpAddress4->sin_addr.s_addr & 0xff,
+                            ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
+                            ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
+                            ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
+                            htons ( pPortIpAddress4->sin_port )));
+                }
+                else {
+                  DEBUG (( DEBUG_INFO,
+                            "0x%08x: Socket closed for [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d\r\n",
+                            PollFd[ Index ].fd,
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 0 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 1 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 2 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 3 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 4 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 5 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 6 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 7 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 8 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 9 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 10 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 11 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 12 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
+                            htons ( pPortIpAddress6->sin6_port )));
+                }
               }
               else {
-                DEBUG (( DEBUG_ERROR,
-                          "ERROR - Failed to close socket 0x%08x for %d.%d.%d.%d:%d, errno: %d\r\n",
-                          PollFd[ Index ].fd,
-                          Port[ Index ].RemoteAddress.sin_addr.s_addr & 0xff,
-                          ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 8 ) & 0xff,
-                          ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 16 ) & 0xff,
-                          ( Port[ Index ].RemoteAddress.sin_addr.s_addr >> 24 ) & 0xff,
-                          htons ( Port[ Index ].RemoteAddress.sin_port ),
-                          errno ));
+                if ( AF_INET == pPortIpAddress4->sin_family ) {
+                  DEBUG (( DEBUG_ERROR,
+                            "ERROR - Failed to close socket 0x%08x for %d.%d.%d.%d:%d, errno: %d\r\n",
+                            PollFd[ Index ].fd,
+                            pPortIpAddress4->sin_addr.s_addr & 0xff,
+                            ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
+                            ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
+                            ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
+                            htons ( pPortIpAddress4->sin_port ),
+                            errno ));
+                }
+                else {
+                  DEBUG (( DEBUG_ERROR,
+                            "ERROR - Failed to close socket 0x%08x for [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d, errno: %d\r\n",
+                            PollFd[ Index ].fd,
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 0 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 1 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 2 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 3 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 4 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 5 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 6 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 7 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 8 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 9 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 10 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 11 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 12 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
+                            pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
+                            htons ( pPortIpAddress6->sin6_port ),
+                            errno ));
+                }
               }
             }
 
@@ -555,14 +794,9 @@
           MaxPort -= 1;
           for ( Entry = Index + 1; MaxPort >= Entry; Entry++ ) {
             EntryPrevious = Entry;
-            Port[ EntryPrevious ].BytesAverage = Port[ Entry ].BytesAverage;
-            Port[ EntryPrevious ].BytesPrevious = Port[ Entry ].BytesPrevious;
-            Port[ EntryPrevious ].BytesTotal = Port[ Entry ].BytesTotal;
-            Port[ EntryPrevious ].RemoteAddress.sin_len = Port[ Entry ].RemoteAddress.sin_len;
-            Port[ EntryPrevious ].RemoteAddress.sin_family = Port[ Entry ].RemoteAddress.sin_family;
-            Port[ EntryPrevious ].RemoteAddress.sin_port = Port[ Entry ].RemoteAddress.sin_port;
-            Port[ EntryPrevious ].RemoteAddress.sin_addr.s_addr = Port[ Entry ].RemoteAddress.sin_addr.s_addr;
-            Port[ EntryPrevious ].Samples = Port[ Entry ].Samples;
+            CopyMem ( &Port[ EntryPrevious ],
+                      &Port[ Entry ],
+                      sizeof ( Port[ Entry ]));
             PollFd[ EntryPrevious ].events = PollFd[ Entry ].events;
             PollFd[ EntryPrevious ].fd = PollFd[ Entry ].fd;
             PollFd[ EntryPrevious ].revents = PollFd[ Entry ].revents;
@@ -605,11 +839,12 @@
   IN VOID * pContext
   )
 {
-  UINT64 Average;
+  UINT32 Average;
+  UINT64 BitsPerSecond;
   UINT64 BytesReceived;
-  UINT32 Delta;
-  UINT64 DeltaBytes;
+  UINT32 Count;
   nfds_t Index;
+  UINT64 TotalBytes;
 
   //
   //  Notify the other code of the timer tick
@@ -627,65 +862,84 @@
     if (( ListenSocket != PollFd[ Index ].fd )
       && ( 0 != BytesReceived )) {
       //
-      //  Update the average bytes per second
+      //  Update the received data samples
       //
-      DeltaBytes = Port[ Index ].BytesAverage >> AVERAGE_SHIFT_COUNT;
-      Port[ Index ].BytesAverage -= DeltaBytes;
-      DeltaBytes = BytesReceived - Port[ Index ].BytesPrevious;
-      Port[ Index ].BytesPrevious = BytesReceived;
-      Port[ Index ].BytesAverage += DeltaBytes;
-
+      Port[ Index ].BytesTotal = 0;
+      Port[ Index ].BytesReceived [ Port[ Index ].In ] = BytesReceived;
+      Port[ Index ].In += 1;
+      if ( DATA_SAMPLES <= Port[ Index ].In ) {
+        Port[ Index ].In = 0;
+      }
+      
       //
       //  Separate the samples
       //
-      if (( 2 << AVERAGE_SHIFT_COUNT ) == Port[ Index ].Samples ) {
+      if ( DATA_SAMPLES == Port[ Index ].Samples ) {
         Print ( L"---------- Stable average ----------\r\n" );
       }
       Port[ Index ].Samples += 1;
 
       //
+      //  Compute the data rate
+      //
+      TotalBytes = 0;
+      for ( Count = 0; DATA_SAMPLES > Count; Count++ )
+      {
+          TotalBytes += Port[ Index ].BytesReceived[ Count ];
+      }
+      Average = (UINT32)RShiftU64 ( TotalBytes, DATA_SAMPLE_SHIFT );
+      BitsPerSecond = Average * 8;
+
+      //
       //  Display the data rate
       //
-      Delta = (UINT32)( DeltaBytes >> DATA_RATE_UPDATE_SHIFT );
-      Average = Port[ Index ].BytesAverage >> ( AVERAGE_SHIFT_COUNT + DATA_RATE_UPDATE_SHIFT );
-      if ( Average < RANGE_SWITCH ) {
-        Print ( L"%d Bytes/sec, Ave: %d Bytes/Sec\r\n",
-                Delta,
-                (UINT32) Average );
+      if (( RANGE_SWITCH >> 10 ) > Average ) {
+        Print ( L"Ave: %d Bytes/Sec, %Ld Bits/sec\r\n",
+                Average,
+                BitsPerSecond );
       }
       else {
-        Average >>= 10;
-        if ( Average < RANGE_SWITCH ) {
-          Print ( L"%d Bytes/sec, Ave: %d KiBytes/Sec\r\n",
-                  Delta,
-                  (UINT32) Average );
+        BitsPerSecond /= 1000;
+        if ( RANGE_SWITCH > Average ) {
+          Print ( L"Ave: %d.%03d KiBytes/Sec, %Ld KBits/sec\r\n",
+                  Average >> 10,
+                  (( Average & 0x3ff ) * 1000 ) >> 10,
+                  BitsPerSecond );
         }
         else {
+          BitsPerSecond /= 1000;
           Average >>= 10;
-          if ( Average < RANGE_SWITCH ) {
-            Print ( L"%d Bytes/sec, Ave: %d MiBytes/Sec\r\n",
-                    Delta,
-                    (UINT32) Average );
+          if ( RANGE_SWITCH > Average ) {
+            Print ( L"Ave: %d.%03d MiBytes/Sec, %Ld MBits/sec\r\n",
+                    Average >> 10,
+                    (( Average & 0x3ff ) * 1000 ) >> 10,
+                    BitsPerSecond );
           }
           else {
+            BitsPerSecond /= 1000;
             Average >>= 10;
-            if ( Average < RANGE_SWITCH ) {
-              Print ( L"%d Bytes/sec, Ave: %d GiBytes/Sec\r\n",
-                      Delta,
-                      (UINT32) Average );
+            if ( RANGE_SWITCH > Average ) {
+              Print ( L"Ave: %d.%03d GiBytes/Sec, %Ld GBits/sec\r\n",
+                      Average >> 10,
+                      (( Average & 0x3ff ) * 1000 ) >> 10,
+                      BitsPerSecond );
             }
             else {
+              BitsPerSecond /= 1000;
               Average >>= 10;
-              if ( Average < RANGE_SWITCH ) {
-                Print ( L"%d Bytes/sec, Ave: %d TiBytes/Sec\r\n",
-                        Delta,
-                        Average );
+              if ( RANGE_SWITCH > Average ) {
+                Print ( L"Ave: %d.%03d TiBytes/Sec, %Ld TBits/sec\r\n",
+                        Average >> 10,
+                        (( Average & 0x3ff ) * 1000 ) >> 10,
+                        BitsPerSecond );
               }
               else {
+                BitsPerSecond /= 1000;
                 Average >>= 10;
-                Print ( L"%d Bytes/sec, Ave: %d PiBytes/Sec\r\n",
-                        Delta,
-                        (UINT32) Average );
+                Print ( L"Ave: %d.%03d PiBytes/Sec, %Ld PBits/sec\r\n",
+                        Average >> 10,
+                        (( Average & 0x3ff ) * 1000 ) >> 10,
+                        BitsPerSecond );
               }
             }
           }
@@ -909,12 +1163,18 @@
   IN char **Argv
   )
 {
+  sa_family_t Family;
   EFI_STATUS Status;
 
   DEBUG (( DEBUG_INFO,
             "DataSink starting\r\n" ));
 
   //
+  //  Determine the family to use
+  //
+  Family = ( 1 < Argc ) ? AF_INET6 : AF_INET;
+
+  //
   //  Use for/break instead of goto
   //
   for ( ; ; ) {
@@ -966,7 +1226,7 @@
       //
       //  Wait for the network layer to initialize
       //
-      Status = SocketNew ( );
+      Status = SocketNew ( Family );
       if ( EFI_ERROR ( Status )) {
         continue;
       }
@@ -987,7 +1247,7 @@
       }
 
       //
-      //  Send data until the connection breaks
+      //  Receive data until the connection breaks
       //
       do {
         Status = SocketPoll ( );

Modified: branches/SocketDev/AppPkg/Applications/Sockets/DataSource/DataSource.c
===================================================================
--- branches/SocketDev/AppPkg/Applications/Sockets/DataSource/DataSource.c	2011-12-28 09:48:15 UTC (rev 12898)
+++ branches/SocketDev/AppPkg/Applications/Sockets/DataSource/DataSource.c	2011-12-29 02:08:18 UTC (rev 12899)
@@ -30,10 +30,14 @@
 #include <sys/poll.h>
 #include <sys/socket.h>
 
+#include <stdio.h>
 
-#define RANGE_SWITCH                2048  ///<  Switch display ranges
-#define DATA_RATE_UPDATE_SHIFT      2     ///<  2n seconds between updates
+
+#define DATA_SAMPLE_SHIFT           5       ///<  Shift for number of samples
+#define RANGE_SWITCH        ( 1024 * 1024 ) ///<  Switch display ranges
+#define DATA_RATE_UPDATE_SHIFT      2       ///<  2n seconds between updates
 #define AVERAGE_SHIFT_COUNT ( 6 - DATA_RATE_UPDATE_SHIFT )  ///<  2n samples in average
+#define DATA_SAMPLES        ( 1 << DATA_SAMPLE_SHIFT )      ///<  Number of samples
 
 #define TPL_DATASOURCE      TPL_CALLBACK  ///<  Synchronization TPL
 
@@ -74,16 +78,16 @@
 //
 //  Remote IP Address Data
 //
-struct sockaddr_in RemoteHostAddress;
+struct sockaddr_in6 RemoteHostAddress;
 CHAR8 * pRemoteHost;
 
 //
 //  Traffic Data
 //
 UINT64 TotalBytesSent;
-UINT64 PreviousBytes;
-UINT64 AverageBytes;
-UINT64 Samples;
+UINT32 In;
+UINT32 Samples;
+UINT64 BytesSent[ DATA_SAMPLES ];
 UINT8 Buffer[ DATA_BUFFER_SIZE ];
 
 
@@ -185,13 +189,18 @@
 IpAddress (
   )
 {
-  CHAR8 * pSeparator;
-  INT32 RemoteAddress;
+  struct sockaddr_in * pRemoteAddress4;
+  struct sockaddr_in6 * pRemoteAddress6;
+  UINT32 RemoteAddress;
   EFI_STATUS Status;
   UINT32 Value1;
   UINT32 Value2;
   UINT32 Value3;
   UINT32 Value4;
+  UINT32 Value5;
+  UINT32 Value6;
+  UINT32 Value7;
+  UINT32 Value8;
 
   //
   //  Assume failure
@@ -199,35 +208,106 @@
   Status = EFI_INVALID_PARAMETER;
 
   //
+  //  Get the port number
+  //
+  ZeroMem ( &RemoteHostAddress, sizeof ( RemoteHostAddress ));
+  RemoteHostAddress.sin6_port = htons ( PcdGet16 ( DataSource_Port ));
+  pRemoteAddress4 = (struct sockaddr_in *)&RemoteHostAddress;
+  pRemoteAddress6 = &RemoteHostAddress;
+  
+  //
   //  Convert the IP address from a string to a numeric value
   //
-  pSeparator = GetDigit ( pRemoteHost, &Value1 );
-  if (( 255 >= Value1 ) && ( '.' == *pSeparator )) {
-    pSeparator = GetDigit ( ++pSeparator, &Value2 );
-    if (( 255 >= Value2 ) && ( '.' == *pSeparator )) {
-      pSeparator = GetDigit ( ++pSeparator, &Value3 );
-      if (( 255 >= Value3 ) && ( '.' == *pSeparator )) {
-        pSeparator = GetDigit ( ++pSeparator, &Value4 );
-        if (( 255 >= Value4 ) && ( 0 == *pSeparator )) {
-          RemoteAddress = Value1
-                        | ( Value2 << 8 )
-                        | ( Value3 << 16 )
-                        | ( Value4 << 24 );
-          RemoteHostAddress.sin_addr.s_addr = (UINT32) RemoteAddress;
-          Status = EFI_SUCCESS;
-          DEBUG (( DEBUG_INFO,
-                    "%d.%d.%d.%d: Remote host IP address\r\n",
-                    Value1,
-                    Value2,
-                    Value3,
-                    Value4 ));
-        }
-      }
-    }
+  if (( 4 == sscanf ( pRemoteHost,
+                      "%d.%d.%d.%d",
+                      &Value1,
+                      &Value2,
+                      &Value3,
+                      &Value4 ))
+      && ( 255 >= Value1 )
+      && ( 255 >= Value2 )
+      && ( 255 >= Value3 )
+      && ( 255 >= Value4 )) {
+    //
+    //  Build the IPv4 address
+    //
+    pRemoteAddress4->sin_len = sizeof ( *pRemoteAddress4 );
+    pRemoteAddress4->sin_family = AF_INET;
+    RemoteAddress = Value1
+                  | ( Value2 << 8 )
+                  | ( Value3 << 16 )
+                  | ( Value4 << 24 );
+    pRemoteAddress4->sin_addr.s_addr = RemoteAddress;
+    Status = EFI_SUCCESS;
+
+    //
+    //  Display the IP address
+    //
+    DEBUG (( DEBUG_INFO,
+              "%d.%d.%d.%d: Remote host IP address\r\n",
+              Value1,
+              Value2,
+              Value3,
+              Value4 ));
   }
-  if ( EFI_ERROR ( Status )) {
-    Print ( L"Invalid digit detected: %d\r\n", *pSeparator );
+  else if (( 8 == sscanf ( pRemoteHost,
+                           "%x:%x:%x:%x:%x:%x:%x:%x",
+                           &Value1,
+                           &Value2,
+                           &Value3,
+                           &Value4,
+                           &Value5,
+                           &Value6,
+                           &Value7,
+                           &Value8 ))
+            && ( 0xffff >= Value1 )
+            && ( 0xffff >= Value2 )
+            && ( 0xffff >= Value3 )
+            && ( 0xffff >= Value4 )
+            && ( 0xffff >= Value5 )
+            && ( 0xffff >= Value6 )
+            && ( 0xffff >= Value7 )
+            && ( 0xffff >= Value8 )) {
+    //
+    //  Build the IPv6 address
+    //
+    pRemoteAddress6->sin6_len = sizeof ( *pRemoteAddress6 );
+    pRemoteAddress6->sin6_family = AF_INET6;
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 0 ] = (UINT8)( Value1 >> 8 );
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 1 ] = (UINT8)Value1;
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 2 ] = (UINT8)( Value2 >> 8 );
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 3 ] = (UINT8)Value2;
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 4 ] = (UINT8)( Value3 >> 8 );
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 5 ] = (UINT8)Value3;
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 6 ] = (UINT8)( Value4 >> 8 );
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 7 ] = (UINT8)Value4;
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 8 ] = (UINT8)( Value5 >> 8 );
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 9 ] = (UINT8)Value5;
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 10 ] = (UINT8)( Value6 >> 8 );
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 11 ] = (UINT8)Value6;
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 12 ] = (UINT8)( Value7 >> 8 );
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ] = (UINT8)Value7;
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ] = (UINT8)( Value8 >> 8 );
+    pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ] = (UINT8)Value8;
+    Status = EFI_SUCCESS;
+
+    //
+    //  Display the IP address
+    //
+    DEBUG (( DEBUG_INFO,
+              "[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]: Remote host IP address\r\n",
+              Value1,
+              Value2,
+              Value3,
+              Value4,
+              Value5,
+              Value6,
+              Value7,
+              Value8 ));
   }
+  else {
+    Print ( L"ERROR - Invalid IP address!\r\n" );
+  }
 
   //
   //  Return the operation status
@@ -290,19 +370,43 @@
   )
 {
   int ConnectStatus;
-  UINT32 RemoteAddress;
+  struct sockaddr_in * pRemoteAddress4;
+  struct sockaddr_in6 * pRemoteAddress6;
   EFI_STATUS Status;
 
   //
   //  Display the connecting message
   //
-  RemoteAddress = RemoteHostAddress.sin_addr.s_addr;
-  Print ( L"Connecting to remote system %d.%d.%d.%d:%d\r\n",
-          RemoteAddress & 0xff,
-          ( RemoteAddress >> 8 ) & 0xff,
-          ( RemoteAddress >> 16 ) & 0xff,
-          ( RemoteAddress >> 24 ) & 0xff,
-          htons ( RemoteHostAddress.sin_port ));
+  pRemoteAddress4 = (struct sockaddr_in *)&RemoteHostAddress;
+  pRemoteAddress6 = &RemoteHostAddress;
+  if ( AF_INET == pRemoteAddress6->sin6_family ) {
+    Print ( L"Connecting to remote system %d.%d.%d.%d:%d\r\n",
+            pRemoteAddress4->sin_addr.s_addr & 0xff,
+            ( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff,
+            ( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff,
+            ( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff,
+            htons ( pRemoteAddress4->sin_port ));
+  }
+  else {
+    Print ( L"Connecting to remote system [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d\r\n",
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 0 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 1 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 2 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 3 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 4 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 5 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 6 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 7 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 8 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 9 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 10 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 11 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 12 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
+            pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
+            htons ( pRemoteAddress6->sin6_port ));
+  }
 
   //
   //  Connect to the remote system
@@ -327,15 +431,37 @@
     //  Connect to the remote system
     //
     ConnectStatus = connect ( Socket,
-                              (struct sockaddr *) &RemoteHostAddress,
-                              RemoteHostAddress.sin_len );
+                              (struct sockaddr *)pRemoteAddress6,
+                              pRemoteAddress6->sin6_len );
     if ( -1 != ConnectStatus ) {
-      Print ( L"Connected to remote system %d.%d.%d.%d:%d\r\n",
-              RemoteAddress & 0xff,
-              ( RemoteAddress >> 8 ) & 0xff,
-              ( RemoteAddress >> 16 ) & 0xff,
-              ( RemoteAddress >> 24 ) & 0xff,
-              htons ( RemoteHostAddress.sin_port ));
+      if ( AF_INET == pRemoteAddress6->sin6_family ) {
+        Print ( L"Connected to remote system %d.%d.%d.%d:%d\r\n",
+                pRemoteAddress4->sin_addr.s_addr & 0xff,
+                ( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff,
+                ( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff,
+                ( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff,
+                htons ( pRemoteAddress4->sin_port ));
+      }
+      else {
+        Print ( L"Connected to remote system [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d\r\n",
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 0 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 1 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 2 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 3 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 4 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 5 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 6 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 7 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 8 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 9 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 10 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 11 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 12 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
+                pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
+                htons ( pRemoteAddress6->sin6_port ));
+      }
     }
     else {
       //
@@ -358,11 +484,14 @@
 /**
   Create the socket
 
+  @param [in] Family    Network family, AF_INET or AF_INET6
+
   @retval  EFI_SUCCESS  The application is running normally
   @retval  Other        The user stopped the application
 **/
 EFI_STATUS
 SocketNew (
+  sa_family_t Family
   )
 {
   EFI_STATUS Status;
@@ -384,7 +513,7 @@
     //
     //  Attempt to create the socket
     //
-    Socket = socket ( AF_INET,
+    Socket = socket ( Family,
                       SOCK_STREAM,
                       IPPROTO_TCP );
     if ( -1 != Socket ) {
@@ -419,7 +548,7 @@
   //
   //  Restart the timer
   //
-  TimerStart ( 1000 << DATA_RATE_UPDATE_SHIFT );
+  TimerStart ( 1 * 1000 );
 
   //
   //  Loop until the connection breaks or the user stops
@@ -497,7 +626,7 @@
     //
     //  Wait for the network layer to initialize
     //
-    Status = SocketNew ( );
+    Status = SocketNew ( RemoteHostAddress.sin6_family );
     if ( EFI_ERROR ( Status )) {
       break;
     }
@@ -584,13 +713,13 @@
           //
           //  Display the port closed message
           //
-          pIpAddress = (UINT8 *)&RemoteHostAddress.sin_addr.s_addr;
+          pIpAddress = (UINT8 *)&((struct sockaddr_in *)&RemoteHostAddress)->sin_addr.s_addr;
           Print ( L"Closed connection to %d.%d.%d.%d:%d\r\n",
                   pIpAddress[0],
                   pIpAddress[1],
                   pIpAddress[2],
                   pIpAddress[3],
-                  htons ( RemoteHostAddress.sin_port ));
+                  htons ( ((struct sockaddr_in *)&RemoteHostAddress)->sin_port ));
         }
       }
     }
@@ -786,13 +915,13 @@
     //  Display the connecting message
     //
     if ( bTcp4Connecting ) {
-      pIpAddress = (UINT8 *)&RemoteHostAddress.sin_addr.s_addr;
+      pIpAddress = (UINT8 *)&((struct sockaddr_in *)&RemoteHostAddress)->sin_addr.s_addr;
       Print ( L"Connecting to %d.%d.%d.%d:%d\r\n",
               pIpAddress[0],
               pIpAddress[1],
               pIpAddress[2],
               pIpAddress[3],
-              htons ( RemoteHostAddress.sin_port ));
+              htons ( ((struct sockaddr_in *)&RemoteHostAddress)->sin_port ));
       bTcp4Connecting = FALSE;
     }
 
@@ -885,7 +1014,7 @@
   //
   //  Restart the timer
   //
-  TimerStart ( 1000 << DATA_RATE_UPDATE_SHIFT );
+  TimerStart ( 1 * 1000 );
 
   //
   //  Initialize the packet
@@ -1095,11 +1224,11 @@
     Tcp4ConfigData.AccessPoint.StationAddress.Addr[2] = 0;
     Tcp4ConfigData.AccessPoint.StationAddress.Addr[3] = 0;
     Tcp4ConfigData.AccessPoint.StationPort = 0;
-    Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[0] = (UINT8)  RemoteHostAddress.sin_addr.s_addr;
-    Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[1] = (UINT8)( RemoteHostAddress.sin_addr.s_addr >> 8 );
-    Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[2] = (UINT8)( RemoteHostAddress.sin_addr.s_addr >> 16 );
-    Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[3] = (UINT8)( RemoteHostAddress.sin_addr.s_addr >> 24 );
-    Tcp4ConfigData.AccessPoint.RemotePort = RemoteHostAddress.sin_port;
+    Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[0] = (UINT8)  ((struct sockaddr_in *)&RemoteHostAddress)->sin_addr.s_addr;
+    Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[1] = (UINT8)( ((struct sockaddr_in *)&RemoteHostAddress)->sin_addr.s_addr >> 8 );
+    Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[2] = (UINT8)( ((struct sockaddr_in *)&RemoteHostAddress)->sin_addr.s_addr >> 16 );
+    Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[3] = (UINT8)( ((struct sockaddr_in *)&RemoteHostAddress)->sin_addr.s_addr >> 24 );
+    Tcp4ConfigData.AccessPoint.RemotePort = ((struct sockaddr_in *)&RemoteHostAddress)->sin_port;
     Tcp4ConfigData.AccessPoint.UseDefaultAddress = TRUE;
     Tcp4ConfigData.AccessPoint.SubnetMask.Addr[0] = 0;
     Tcp4ConfigData.AccessPoint.SubnetMask.Addr[1] = 0;
@@ -1152,13 +1281,13 @@
     //
     //  Display the connection
     //
-    pIpAddress = (UINT8 *)&RemoteHostAddress.sin_addr.s_addr;
+    pIpAddress = (UINT8 *)&((struct sockaddr_in *)&RemoteHostAddress)->sin_addr.s_addr;
     Print ( L"Connected to %d.%d.%d.%d:%d\r\n",
             pIpAddress[0],
             pIpAddress[1],
             pIpAddress[2],
             pIpAddress[3],
-            htons ( RemoteHostAddress.sin_port ));
+            htons ( ((struct sockaddr_in *)&RemoteHostAddress)->sin_port ));
   } while ( 0 );
 
   if ( EFI_ERROR ( Status )) {
@@ -1193,10 +1322,10 @@
   IN VOID * pContext
   )
 {
-  UINT64 BytesSent;
-  UINT64 DeltaBytes;
-  UINT32 Delta;
-  UINT64 Average;
+  UINT32 Average;
+  UINT64 BitsPerSecond;
+  UINT32 Index;
+  UINT64 TotalBytes;
 
   //
   //  Notify the other code of the timer tick
@@ -1206,65 +1335,82 @@
   //
   //  Update the average bytes per second
   //
-  BytesSent = TotalBytesSent;
-  if ( 0 != BytesSent ) {
-    DeltaBytes = AverageBytes >> AVERAGE_SHIFT_COUNT;
-    AverageBytes -= DeltaBytes;
-    DeltaBytes = BytesSent - PreviousBytes;
-    PreviousBytes = BytesSent;
-    AverageBytes += DeltaBytes;
+  if ( 0 != TotalBytesSent ) {
+    BytesSent[ In ] = TotalBytesSent;
+    TotalBytesSent = 0;
+    In += 1;
+    if ( DATA_SAMPLES <= In ) {
+      In = 0;
+    }
 
     //
     //  Separate the samples
     //
-    if (( 2 << AVERAGE_SHIFT_COUNT ) == Samples ) {
+    if ( DATA_SAMPLES == Samples ) {
       Print ( L"---------- Stable average ----------\r\n" );
     }
     Samples += 1;
 
     //
+    //  Compute the data rate
+    //
+    TotalBytes = 0;
+    for ( Index = 0; DATA_SAMPLES > Index; Index++ ) {
+      TotalBytes += BytesSent[ Index ];
+    }
+    Average = (UINT32)RShiftU64 ( TotalBytes, DATA_SAMPLE_SHIFT );
+    BitsPerSecond = Average * 8;
+
+    //
     //  Display the data rate
     //
-    Delta = (UINT32)( DeltaBytes >> DATA_RATE_UPDATE_SHIFT );
-    Average = AverageBytes >> ( AVERAGE_SHIFT_COUNT + DATA_RATE_UPDATE_SHIFT );
-    if ( Average < RANGE_SWITCH ) {
-      Print ( L"%d Bytes/sec, Ave: %d Bytes/Sec\r\n",
-              Delta,
-              (UINT32) Average );
+    if (( RANGE_SWITCH >> 10 ) > Average ) {
+      Print ( L"Ave: %d Bytes/Sec, %Ld Bits/sec\r\n",
+              Average,
+              BitsPerSecond );
     }
     else {
-      Average >>= 10;
-      if ( Average < RANGE_SWITCH ) {
-        Print ( L"%d Bytes/sec, Ave: %d KiBytes/Sec\r\n",
-                Delta,
-                (UINT32) Average );
+      BitsPerSecond /= 1000;
+      if ( RANGE_SWITCH > Average ) {
+        Print ( L"Ave: %d.%03d KiBytes/Sec, %Ld KBits/sec\r\n",
+                Average >> 10,
+                (( Average & 0x3ff ) * 1000 ) >> 10,
+                BitsPerSecond );
       }
       else {
+        BitsPerSecond /= 1000;
         Average >>= 10;
-        if ( Average < RANGE_SWITCH ) {
-          Print ( L"%d Bytes/sec, Ave: %d MiBytes/Sec\r\n",
-                  Delta,
-                  (UINT32) Average );
+        if ( RANGE_SWITCH > Average ) {
+          Print ( L"Ave: %d.%03d MiBytes/Sec, %Ld MBits/sec\r\n",
+                  Average >> 10,
+                  (( Average & 0x3ff ) * 1000 ) >> 10,
+                  BitsPerSecond );
         }
         else {
+          BitsPerSecond /= 1000;
           Average >>= 10;
-          if ( Average < RANGE_SWITCH ) {
-            Print ( L"%d Bytes/sec, Ave: %d GiBytes/Sec\r\n",
-                    Delta,
-                    (UINT32) Average );
+          if ( RANGE_SWITCH > Average ) {
+            Print ( L"Ave: %d.%03d GiBytes/Sec, %Ld GBits/sec\r\n",
+                    Average >> 10,
+                    (( Average & 0x3ff ) * 1000 ) >> 10,
+                    BitsPerSecond );
           }
           else {
+            BitsPerSecond /= 1000;
             Average >>= 10;
-            if ( Average < RANGE_SWITCH ) {
-              Print ( L"%d Bytes/sec, Ave: %d TiBytes/Sec\r\n",
-                      Delta,
-                      Average );
+            if ( RANGE_SWITCH > Average ) {
+              Print ( L"Ave: %d.%03d TiBytes/Sec, %Ld TBits/sec\r\n",
+                      Average >> 10,
+                      (( Average & 0x3ff ) * 1000 ) >> 10,
+                      BitsPerSecond );
             }
             else {
+              BitsPerSecond /= 1000;
               Average >>= 10;
-              Print ( L"%d Bytes/sec, Ave: %d PiBytes/Sec\r\n",
-                      Delta,
-                      (UINT32) Average );
+              Print ( L"Ave: %d.%03d PiBytes/Sec, %Ld PBits/sec\r\n",
+                      Average >> 10,
+                      (( Average & 0x3ff ) * 1000 ) >> 10,
+                      BitsPerSecond );
             }
           }
         }
@@ -1528,19 +1674,10 @@
     //  No bytes sent so far
     //
     TotalBytesSent = 0;
-    AverageBytes = 0;
-    PreviousBytes = 0;
     Samples = 0;
+    memset ( &BytesSent, 0, sizeof ( BytesSent ));
 
     //
-    //  Get the port number
-    //
-    ZeroMem ( &RemoteHostAddress, sizeof ( RemoteHostAddress ));
-    RemoteHostAddress.sin_len = sizeof ( RemoteHostAddress );
-    RemoteHostAddress.sin_family = AF_INET;
-    RemoteHostAddress.sin_port = htons ( PcdGet16 ( DataSource_Port ));
-
-    //
     //  Get the IP address
     //
     pRemoteHost = Argv[1];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.