Minor fixes and cleanups to work under Linux

2 files changed, 10 insertions, 27 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp
index 2fe81c401ca..a971de7916d 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp
@@ -238,12 +238,12 @@ CORBA::Boolean
 Video_Server_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &the_spec,  
                                                           CORBA::Environment &env) 
 {
-  ACE_DEBUG ((LM_DEBUG,"(%P|%t) Video_Server_StreamEndPoint::handle_connection_requested:() %s \n",
-              the_spec[0]));
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t) Video_Server_StreamEndPoint::handle_connection_requested:()  \n"));
   
   char *server_string;
 
   server_string = CORBA::string_dup ((const char *) the_spec [0]);
+  ACE_DEBUG ((LM_DEBUG, server_string));
   CORBA::Boolean result;
   result = VIDEO_CONTROL_I::instance ()->set_peer (server_string,env);
   // Get media control from my vdev and call set_peer on that.
@@ -256,13 +256,13 @@ Video_Server_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &t
                    server_string);
   
   TAO_Reverse_FlowSpec_Entry server_entry ("video",
-                              "OUT",
-                              "MIME:video/mpeg",
-                              "UDP",
-                              server_addr);
-     
+                                           "OUT",
+                                           "MIME:video/mpeg",
+                                           "UDP",
+                                           server_addr);
+  
   ACE_DEBUG ((LM_DEBUG,"\nServer Entry = %s\n", server_entry.entry_to_string ()));
-
+  
   the_spec.length (1);
   
   the_spec [0]= server_entry.entry_to_string ();
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp
index af0d59b0f5b..542b6b40720 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp
@@ -25,23 +25,6 @@
  *         email: scen@cse.ogi.edu
  */
 #include "ace/OS.h"
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <time.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
 
 #include "include/common.h"
 #include "mpeg_shared/routine.h"
@@ -2051,7 +2034,7 @@ static void on_exit_routine(void)
   /*
   fprintf(stderr, "A VS session terminated.\n");
   */
-  if (getpeername(VIDEO_SINGLETON::instance ()->serviceSocket,
+  if (ACE_OS::getpeername(VIDEO_SINGLETON::instance ()->serviceSocket,
                   (struct sockaddr *)&peeraddr_in, &size) == 0 &&
       peeraddr_in.sin_family == AF_INET) {
     if (strncmp(inet_ntoa(peeraddr_in.sin_addr), "129.95.50", 9)) {
@@ -2059,7 +2042,7 @@ static void on_exit_routine(void)
       time_t val =ACE_OS::time (NULL);
       char * buf = ACE_OS::ctime (&VIDEO_SINGLETON::instance ()->start_time);
       
-      hp = gethostbyaddr((char *)&(peeraddr_in.sin_addr), 4, AF_INET);
+      hp = ACE_OS::gethostbyaddr((char *)&(peeraddr_in.sin_addr), 4, AF_INET);
       buf[strlen(buf)-1] = 0;
       printf("%s: %s %3dm%02ds %dP %s\n",
              buf,